From 9f1e62a822fca051dc6280b9a6120fc22d3fb396 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 7 Nov 2023 12:34:52 +0300 Subject: =?UTF-8?q?fixes=20#3874=20(WUMF:=20=D0=BF=D0=B5=D1=80=D0=B5=D1=81?= =?UTF-8?q?=D1=82=D0=B0=D0=BB=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4?= =?UTF-8?q?=D0=B8=D1=82=D1=8C=D1=81=D1=8F=20=D0=B7=D0=B0=D0=B3=D0=BE=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2=D0=BE=D0=BA=20=D0=BE=D0=BA=D0=BD=D0=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/WhoUsesMyFiles/src/list.cpp | 43 ++++++++----------- plugins/WhoUsesMyFiles/src/options.cpp | 76 ++++++++++++++++----------------- plugins/WhoUsesMyFiles/src/wumf.cpp | 71 +++++++++++++++--------------- plugins/WhoUsesMyFiles/src/wumfplug.cpp | 4 +- 4 files changed, 93 insertions(+), 101 deletions(-) (limited to 'plugins/WhoUsesMyFiles/src') diff --git a/plugins/WhoUsesMyFiles/src/list.cpp b/plugins/WhoUsesMyFiles/src/list.cpp index 7b9251cc19..8452df05fb 100644 --- a/plugins/WhoUsesMyFiles/src/list.cpp +++ b/plugins/WhoUsesMyFiles/src/list.cpp @@ -1,13 +1,6 @@ #include "stdafx.h" -PWumf new_wumf( uint32_t dwID, - LPTSTR szUser, - LPTSTR szPath, - LPTSTR szComp, - LPTSTR szUNC, - uint32_t dwSess, - uint32_t dwPerm, - uint32_t dwAttr) +PWumf new_wumf(uint32_t dwID, LPTSTR szUser, LPTSTR szPath, LPTSTR szComp, LPTSTR szUNC, uint32_t dwSess, uint32_t dwPerm, uint32_t dwAttr) { PWumf w = (PWumf)mir_calloc(sizeof(Wumf)); if (!w) @@ -16,13 +9,13 @@ PWumf new_wumf( uint32_t dwID, w->szUser = mir_wstrdup(szUser); w->szPath = mir_wstrdup(szPath); w->szComp = mir_wstrdup(szComp); - w->szUNC = mir_wstrdup(szUNC); + w->szUNC = mir_wstrdup(szUNC); - switch(dwPerm) { - case PERM_FILE_READ: mir_wstrcpy(w->szPerm, L"Read");break; - case PERM_FILE_WRITE: mir_wstrcpy(w->szPerm, L"Write");break; - case PERM_FILE_CREATE: mir_wstrcpy(w->szPerm, L"Create");break; - default: mir_wstrcpy(w->szPerm, L"Execute"); + switch (dwPerm) { + case PERM_FILE_READ: mir_wstrcpy(w->szPerm, L"Read"); break; + case PERM_FILE_WRITE: mir_wstrcpy(w->szPerm, L"Write"); break; + case PERM_FILE_CREATE: mir_wstrcpy(w->szPerm, L"Create"); break; + default: mir_wstrcpy(w->szPerm, L"Execute"); } mir_snwprintf(w->szID, L"%i", dwID); @@ -32,7 +25,7 @@ PWumf new_wumf( uint32_t dwID, w->dwPerm = dwPerm; w->mark = FALSE; w->next = nullptr; - return w; + return w; } BOOL del_wumf(PWumf w) @@ -46,14 +39,14 @@ BOOL del_wumf(PWumf w) return TRUE; } -BOOL add_cell(PWumf* l, PWumf w) +BOOL add_cell(PWumf *l, PWumf w) { if (!w || !l)return FALSE; if (!(*l)) *l = w; else { PWumf p = *l; - while(p->next) p = p->next; + while (p->next) p = p->next; p->next = w; } w->next = nullptr; @@ -67,7 +60,7 @@ BOOL del_cell(PWumf *l, PWumf w) if (w == *l) *l = p->next; else { - while(p && p->next != w) p = p->next; + while (p && p->next != w) p = p->next; if (!p) return FALSE; p->next = w->next; } @@ -76,7 +69,7 @@ BOOL del_cell(PWumf *l, PWumf w) BOOL cpy_cell(PWumf *l, PWumf w) { - PWumf w1 = new_wumf(w->dwID, w->szUser, w->szPath, w->szComp,w->szUNC, w->dwSess, w->dwPerm, w->dwAttr); + PWumf w1 = new_wumf(w->dwID, w->szUser, w->szPath, w->szComp, w->szUNC, w->dwSess, w->dwPerm, w->dwAttr); if (!w1) return FALSE; w1->mark = w->mark; @@ -89,7 +82,7 @@ PWumf cpy_list(PWumf *l) if (!l || !*l) return nullptr; w = *l; - while(w) { + while (w) { if (!cpy_cell(&p, w))return nullptr; w = w->next; } @@ -100,7 +93,7 @@ PWumf fnd_cell(PWumf *l, uint32_t dwID) { if (!l || !*l)return nullptr; PWumf w = *l; - while(w && w->dwID != dwID) w = w->next; + while (w && w->dwID != dwID) w = w->next; return w; } @@ -108,9 +101,9 @@ BOOL del_all(PWumf *l) { if (!l || !*l) return FALSE; PWumf w = *l; - while(w) { + while (w) { PWumf p = w->next; - if (!del_cell(l, w)) + if (!del_cell(l, w)) return FALSE; w = p; @@ -124,7 +117,7 @@ BOOL del_marked(PWumf *l) PWumf w, p; if (!l)return FALSE; w = *l; - while(w) { + while (w) { p = w->next; if (w->mark) if (!del_cell(l, w)) @@ -138,7 +131,7 @@ BOOL del_marked(PWumf *l) void mark_all(PWumf *l, BOOL mark) { PWumf w = *l; - while(w) { + while (w) { w->mark = mark; w = w->next; } diff --git a/plugins/WhoUsesMyFiles/src/options.cpp b/plugins/WhoUsesMyFiles/src/options.cpp index 750bbcab13..a47a2c8bc9 100644 --- a/plugins/WhoUsesMyFiles/src/options.cpp +++ b/plugins/WhoUsesMyFiles/src/options.cpp @@ -46,9 +46,9 @@ void ShowThePreview() void DisableDelayOptions(HWND hwndDlg) { - CheckDlgButton(hwndDlg, IDC_DELAY_INF,BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_DELAY_SET,BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_DELAY_DEF,BST_CHECKED); + CheckDlgButton(hwndDlg, IDC_DELAY_INF, BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_DELAY_SET, BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_DELAY_DEF, BST_CHECKED); EnableWindow(GetDlgItem(hwndDlg, IDC_DELAY_INF), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_DELAY_SET), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_DELAY_DEF), FALSE); @@ -58,10 +58,10 @@ void DisableDelayOptions(HWND hwndDlg) void ChooseFile(HWND hwndDlg) { - wchar_t szFile[MAX_PATH]; szFile[0]=0; + wchar_t szFile[MAX_PATH]; szFile[0] = 0; // Initialize OPENFILENAME - OPENFILENAME ofn = {0}; // common dialog box structure + OPENFILENAME ofn = {}; // common dialog box structure ofn.lStructSize = sizeof(OPENFILENAME); ofn.hwndOwner = hwndDlg; ofn.lpstrFile = szFile; @@ -71,9 +71,9 @@ void ChooseFile(HWND hwndDlg) ofn.Flags = OFN_CREATEPROMPT; // Display the Open dialog box. if (GetSaveFileName(&ofn)) { - HANDLE hf = CreateFile(szFile,GENERIC_WRITE,0,nullptr,OPEN_ALWAYS,FILE_ATTRIBUTE_NORMAL, nullptr); + HANDLE hf = CreateFile(szFile, GENERIC_WRITE, 0, nullptr, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr); if (hf != INVALID_HANDLE_VALUE) { - SetDlgItemText(hwndDlg,IDC_FILE,szFile); + SetDlgItemText(hwndDlg, IDC_FILE, szFile); mir_wstrncpy(WumfOptions.LogFile, szFile, MAX_PATH); CloseHandle(hf); } @@ -85,13 +85,13 @@ void ChooseFile(HWND hwndDlg) } } -INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg,UINT msg,WPARAM wparam,LPARAM lparam) +INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wparam, LPARAM lparam) { uint16_t wControlId = LOWORD(wparam); uint16_t wNotifyCode = HIWORD(wparam); int seconds; - switch(msg) { + switch (msg) { case WM_INITDIALOG: TranslateDialogDefault(hwndDlg); CheckDlgButton(hwndDlg, IDC_COLOR_WIN, WumfOptions.UseWinColor ? BST_CHECKED : BST_UNCHECKED); @@ -100,8 +100,8 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg,UINT msg,WPARAM wparam,LPARAM lpara EnableWindow(GetDlgItem(hwndDlg, IDC_COLOR_BACK), WumfOptions.SelectColor); EnableWindow(GetDlgItem(hwndDlg, IDC_COLOR_TEXT), WumfOptions.SelectColor); if (WumfOptions.SelectColor) { - SendDlgItemMessage(hwndDlg,IDC_COLOR_BACK,CPM_SETCOLOUR,0,WumfOptions.ColorBack); - SendDlgItemMessage(hwndDlg,IDC_COLOR_TEXT,CPM_SETCOLOUR,0,WumfOptions.ColorText); + SendDlgItemMessage(hwndDlg, IDC_COLOR_BACK, CPM_SETCOLOUR, 0, WumfOptions.ColorBack); + SendDlgItemMessage(hwndDlg, IDC_COLOR_TEXT, CPM_SETCOLOUR, 0, WumfOptions.ColorText); } CheckDlgButton(hwndDlg, IDC_DELAY_INF, WumfOptions.DelayInf ? BST_CHECKED : BST_UNCHECKED); @@ -114,13 +114,13 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg,UINT msg,WPARAM wparam,LPARAM lpara CheckDlgButton(hwndDlg, IDC_ALERT_FOLDER, WumfOptions.AlertFolders ? BST_CHECKED : BST_UNCHECKED); if (WumfOptions.LogToFile) { - CheckDlgButton(hwndDlg,IDC_LOG_INTO_FILE,BST_CHECKED); + CheckDlgButton(hwndDlg, IDC_LOG_INTO_FILE, BST_CHECKED); EnableWindow(GetDlgItem(hwndDlg, IDC_FILE), TRUE); EnableWindow(GetDlgItem(hwndDlg, IDC_SEL_FILE), TRUE); - SetDlgItemText(hwndDlg,IDC_FILE,WumfOptions.LogFile); + SetDlgItemText(hwndDlg, IDC_FILE, WumfOptions.LogFile); } else { - CheckDlgButton(hwndDlg,IDC_LOG_INTO_FILE,BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_LOG_INTO_FILE, BST_UNCHECKED); EnableWindow(GetDlgItem(hwndDlg, IDC_FILE), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_SEL_FILE), FALSE); SetDlgItemText(hwndDlg, IDC_FILE, L""); @@ -128,15 +128,15 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg,UINT msg,WPARAM wparam,LPARAM lpara break; case WM_COMMAND: - switch(wNotifyCode) { - case BN_CLICKED : - switch(wControlId) { + switch (wNotifyCode) { + case BN_CLICKED: + switch (wControlId) { case IDC_DELAY_SET: case IDC_DELAY_DEF: case IDC_DELAY_INF: - WumfOptions.DelaySet = (IsDlgButtonChecked(hwndDlg, IDC_DELAY_SET) == BST_CHECKED); - WumfOptions.DelayDef = (IsDlgButtonChecked(hwndDlg, IDC_DELAY_DEF) == BST_CHECKED); - WumfOptions.DelayInf = (IsDlgButtonChecked(hwndDlg, IDC_DELAY_INF) == BST_CHECKED); + WumfOptions.DelaySet = (IsDlgButtonChecked(hwndDlg, IDC_DELAY_SET) == BST_CHECKED); + WumfOptions.DelayDef = (IsDlgButtonChecked(hwndDlg, IDC_DELAY_DEF) == BST_CHECKED); + WumfOptions.DelayInf = (IsDlgButtonChecked(hwndDlg, IDC_DELAY_INF) == BST_CHECKED); EnableWindow(GetDlgItem(hwndDlg, IDC_DELAY_SEC), WumfOptions.DelaySet); SetDlgItemInt(hwndDlg, IDC_DELAY_SEC, WumfOptions.DelaySec, TRUE); SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); @@ -144,18 +144,18 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg,UINT msg,WPARAM wparam,LPARAM lpara case IDC_COLOR_SET: case IDC_COLOR_DEF: case IDC_COLOR_WIN: - WumfOptions.SelectColor = (IsDlgButtonChecked(hwndDlg, IDC_COLOR_SET) == BST_CHECKED); - WumfOptions.UseDefColor = (IsDlgButtonChecked(hwndDlg, IDC_COLOR_DEF) == BST_CHECKED); - WumfOptions.UseWinColor = (IsDlgButtonChecked(hwndDlg, IDC_COLOR_WIN) == BST_CHECKED); - EnableWindow(GetDlgItem(hwndDlg, IDC_COLOR_BACK),WumfOptions.SelectColor); + WumfOptions.SelectColor = (IsDlgButtonChecked(hwndDlg, IDC_COLOR_SET) == BST_CHECKED); + WumfOptions.UseDefColor = (IsDlgButtonChecked(hwndDlg, IDC_COLOR_DEF) == BST_CHECKED); + WumfOptions.UseWinColor = (IsDlgButtonChecked(hwndDlg, IDC_COLOR_WIN) == BST_CHECKED); + EnableWindow(GetDlgItem(hwndDlg, IDC_COLOR_BACK), WumfOptions.SelectColor); EnableWindow(GetDlgItem(hwndDlg, IDC_COLOR_TEXT), WumfOptions.SelectColor); - SendDlgItemMessage(hwndDlg,IDC_COLOR_BACK,CPM_SETCOLOUR,0,WumfOptions.ColorBack); - SendDlgItemMessage(hwndDlg,IDC_COLOR_TEXT,CPM_SETCOLOUR,0,WumfOptions.ColorText); + SendDlgItemMessage(hwndDlg, IDC_COLOR_BACK, CPM_SETCOLOUR, 0, WumfOptions.ColorBack); + SendDlgItemMessage(hwndDlg, IDC_COLOR_TEXT, CPM_SETCOLOUR, 0, WumfOptions.ColorText); SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); break; /* end */ case IDC_LOG_INTO_FILE: - WumfOptions.LogToFile = (IsDlgButtonChecked(hwndDlg, IDC_LOG_INTO_FILE) == BST_CHECKED); + WumfOptions.LogToFile = (IsDlgButtonChecked(hwndDlg, IDC_LOG_INTO_FILE) == BST_CHECKED); EnableWindow(GetDlgItem(hwndDlg, IDC_FILE), WumfOptions.LogToFile); EnableWindow(GetDlgItem(hwndDlg, IDC_SEL_FILE), WumfOptions.LogToFile); SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); @@ -180,14 +180,14 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg,UINT msg,WPARAM wparam,LPARAM lpara } break; - case CPN_COLOURCHANGED: - WumfOptions.ColorText = SendDlgItemMessage(hwndDlg,IDC_COLOR_TEXT,CPM_GETCOLOUR,0,0); - WumfOptions.ColorBack = SendDlgItemMessage(hwndDlg,IDC_COLOR_BACK,CPM_GETCOLOUR,0,0); + case CPN_COLOURCHANGED: + WumfOptions.ColorText = SendDlgItemMessage(hwndDlg, IDC_COLOR_TEXT, CPM_GETCOLOUR, 0, 0); + WumfOptions.ColorBack = SendDlgItemMessage(hwndDlg, IDC_COLOR_BACK, CPM_GETCOLOUR, 0, 0); SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); break; case EN_CHANGE: - switch(wControlId) { + switch (wControlId) { case IDC_DELAY_SEC: seconds = GetDlgItemInt(hwndDlg, IDC_DELAY_SEC, nullptr, FALSE); if (seconds > LIFETIME_MAX) @@ -199,23 +199,23 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg,UINT msg,WPARAM wparam,LPARAM lpara SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); break; case IDC_FILE: - GetDlgItemText(hwndDlg,IDC_FILE,WumfOptions.LogFile, _countof(WumfOptions.LogFile)); + GetDlgItemText(hwndDlg, IDC_FILE, WumfOptions.LogFile, _countof(WumfOptions.LogFile)); SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); break; } break; case EN_KILLFOCUS: - switch(wControlId) { + switch (wControlId) { case IDC_DELAY_SEC: - SetDlgItemInt(hwndDlg, IDC_DELAY_SEC, WumfOptions.DelaySec, FALSE); + SetDlgItemInt(hwndDlg, IDC_DELAY_SEC, WumfOptions.DelaySec, FALSE); break; } break; } - break; + break; - case WM_NOTIFY: - switch(((LPNMHDR)lparam)->idFrom) { + case WM_NOTIFY: + switch (((LPNMHDR)lparam)->idFrom) { case 0: switch (((LPNMHDR)lparam)->code) { case PSN_RESET: @@ -227,7 +227,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg,UINT msg,WPARAM wparam,LPARAM lpara g_plugin.setDword(COLOR_BACK, (uint32_t)WumfOptions.ColorBack); g_plugin.setByte(COLOR_DEF, (uint8_t)WumfOptions.UseDefColor); g_plugin.setByte(COLOR_WIN, (uint8_t)WumfOptions.UseWinColor); - g_plugin.setByte(COLOR_SET, (uint8_t)WumfOptions.SelectColor ); + g_plugin.setByte(COLOR_SET, (uint8_t)WumfOptions.SelectColor); g_plugin.setByte(DELAY_DEF, (uint8_t)WumfOptions.DelayDef); g_plugin.setByte(DELAY_INF, (uint8_t)WumfOptions.DelayInf); g_plugin.setByte(DELAY_SET, (uint8_t)WumfOptions.DelaySet); diff --git a/plugins/WhoUsesMyFiles/src/wumf.cpp b/plugins/WhoUsesMyFiles/src/wumf.cpp index 500dea74a2..c60a537716 100644 --- a/plugins/WhoUsesMyFiles/src/wumf.cpp +++ b/plugins/WhoUsesMyFiles/src/wumf.cpp @@ -13,35 +13,35 @@ BOOL wumf(); static int DlgResizer(HWND, LPARAM, UTILRESIZECONTROL *urc) { - switch(urc->wId) { + switch (urc->wId) { case IDC_CONNLIST: - return RD_ANCHORX_WIDTH|RD_ANCHORY_HEIGHT; + return RD_ANCHORX_WIDTH | RD_ANCHORY_HEIGHT; case IDOK: - return RD_ANCHORX_RIGHT|RD_ANCHORY_BOTTOM; + return RD_ANCHORX_RIGHT | RD_ANCHORY_BOTTOM; } - return RD_ANCHORX_LEFT|RD_ANCHORY_TOP; + return RD_ANCHORX_LEFT | RD_ANCHORY_TOP; } void AddToList(HWND hList, PWumf w) { - LVITEM lvi = { 0 }; - lvi.iItem = ListView_GetItemCount(hList)+1; - lvi.mask = LVIF_PARAM|LVIF_TEXT; + LVITEM lvi = {}; + lvi.iItem = ListView_GetItemCount(hList) + 1; + lvi.mask = LVIF_PARAM | LVIF_TEXT; lvi.pszText = w->szID; lvi.lParam = (LPARAM)w; - ListView_InsertItem(hList,&lvi); + ListView_InsertItem(hList, &lvi); } void ShowList(PWumf l, HWND hList) { PWumf w = l; - while(w) { - AddToList(hList,w); + while (w) { + AddToList(hList, w); w = w->next; } } -VOID OnGetDispInfo(NMLVDISPINFO *plvdi) +VOID OnGetDispInfo(NMLVDISPINFO *plvdi) { PWumf w = (PWumf)(plvdi->item.lParam); switch (plvdi->item.iSubItem) { @@ -58,18 +58,19 @@ VOID OnGetDispInfo(NMLVDISPINFO *plvdi) plvdi->item.pszText = w->szPerm; break; } -} +} INT_PTR CALLBACK ConnDlgProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { - switch( Msg ) { + switch (Msg) { case WM_INITDIALOG: + TranslateDialogDefault(hWnd); { HWND hList = GetDlgItem(hWnd, IDC_CONNLIST); ListView_SetExtendedListViewStyle(hList, LVS_EX_FULLROWSELECT); - LV_COLUMN lvc = { 0 }; - lvc.mask = LVCF_TEXT|LVCF_FMT|LVCF_WIDTH; + LV_COLUMN lvc = {}; + lvc.mask = LVCF_TEXT | LVCF_FMT | LVCF_WIDTH; lvc.fmt = LVCFMT_LEFT; lvc.cx = 40; lvc.pszText = L"ID"; @@ -91,15 +92,15 @@ INT_PTR CALLBACK ConnDlgProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) MessageBox(nullptr, TranslateT("Plugin WhoUsesMyFiles requires admin privileges in order to work."), L"Miranda NG", MB_OK); ShowList(lst, hList); } - Utils_RestoreWindowPosition(hWnd, NULL, MODULENAME,"conn"); + Utils_RestoreWindowPosition(hWnd, NULL, MODULENAME, "conn"); return TRUE; case WM_CLOSE: - PostMessage( hWnd, WM_COMMAND, IDCANCEL, 0l ); + PostMessage(hWnd, WM_COMMAND, IDCANCEL, 0l); break; case WM_COMMAND: - switch( LOWORD(wParam)) { + switch (LOWORD(wParam)) { case IDOK: case IDCANCEL: PostMessage(hWnd, WM_DESTROY, 0, 0); @@ -109,18 +110,18 @@ INT_PTR CALLBACK ConnDlgProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) case WM_SIZE: Utils_ResizeDialog(hWnd, g_plugin.getInst(), MAKEINTRESOURCEA(IDD_CONNLIST), DlgResizer); - Utils_SaveWindowPosition(hWnd, NULL, MODULENAME,"conn"); + Utils_SaveWindowPosition(hWnd, NULL, MODULENAME, "conn"); return TRUE; case WM_MOVE: - Utils_SaveWindowPosition(hWnd, NULL, MODULENAME,"conn"); + Utils_SaveWindowPosition(hWnd, NULL, MODULENAME, "conn"); break; case WM_NOTIFY: - switch (((LPNMHDR) lParam)->code) { - case LVN_GETDISPINFO: - OnGetDispInfo((NMLVDISPINFO*)lParam); - break; + switch (((LPNMHDR)lParam)->code) { + case LVN_GETDISPINFO: + OnGetDispInfo((NMLVDISPINFO *)lParam); + break; } break; @@ -146,7 +147,7 @@ void LogWumf(PWumf w) return; } } - + SYSTEMTIME time; GetLocalTime(&time); @@ -162,11 +163,10 @@ BOOL wumf() DWORD ent_read = 0, ent_total = 0, res_handle = 0; NET_API_STATUS res = NERR_Success; if ((res = NetSessionEnum(nullptr, nullptr, nullptr, 1, (LPBYTE *)&s_info, MAX_PREFERRED_LENGTH, &ent_read, &ent_total, &res_handle)) == NERR_Success || - res == ERROR_MORE_DATA) - { + res == ERROR_MORE_DATA) { mark_all(&list, TRUE); - for(unsigned i = 0; i < ent_read; i++) - process_session(s_info[ i ]); + for (unsigned i = 0; i < ent_read; i++) + process_session(s_info[i]); NetApiBufferFree(s_info); } @@ -181,10 +181,9 @@ void process_session(SESSION_INFO_1 s_info) DWORD ent_read = 0, ent_total = 0, res_handle = 0; NET_API_STATUS res = NERR_Success; if ((res = NetFileEnum(nullptr, nullptr, s_info.sesi1_username, 3, (LPBYTE *)&f_info, MAX_PREFERRED_LENGTH, &ent_read, &ent_total, (PDWORD_PTR)&res_handle)) == NERR_Success || - res == ERROR_MORE_DATA) - { - for(unsigned i=0; i < ent_read; i++) - process_file(s_info, f_info[ i ]); + res == ERROR_MORE_DATA) { + for (unsigned i = 0; i < ent_read; i++) + process_file(s_info, f_info[i]); NetApiBufferFree(f_info); } @@ -206,13 +205,13 @@ void process_file(SESSION_INFO_1 s_info, FILE_INFO_3 f_info) else w->mark = FALSE; } -void printError(uint32_t res) +void printError(uint32_t res) { LPVOID lpMsgBuf; - FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS, nullptr, res, 0, (LPTSTR) &lpMsgBuf, 0, nullptr ); + FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, nullptr, res, 0, (LPTSTR)&lpMsgBuf, 0, nullptr); OutputDebugString((LPCTSTR)lpMsgBuf); msg((LPCTSTR)lpMsgBuf); - LocalFree( lpMsgBuf ); + LocalFree(lpMsgBuf); } VOID CALLBACK TimerProc(HWND, UINT, UINT_PTR, DWORD) diff --git a/plugins/WhoUsesMyFiles/src/wumfplug.cpp b/plugins/WhoUsesMyFiles/src/wumfplug.cpp index 0ef373eac5..6940709059 100644 --- a/plugins/WhoUsesMyFiles/src/wumfplug.cpp +++ b/plugins/WhoUsesMyFiles/src/wumfplug.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -WUMF_OPTIONS WumfOptions = { 0 }; +WUMF_OPTIONS WumfOptions = {}; HGENMENU hMenuItem = nullptr; HWND hDlg; @@ -34,7 +34,7 @@ int OptionsInit(WPARAM, LPARAM); void LoadOptions() { - DBVARIANT dbv = { 0 }; + DBVARIANT dbv = {}; dbv.type = DBVT_WCHAR; memset(&WumfOptions, 0, sizeof(WumfOptions)); if (g_plugin.getWString(OPT_FILE, &dbv) == 0) { -- cgit v1.2.3