Skip to content

Commit 67b2e1c

Browse files
dmexdmex
committed
OnlineChecks: Update all dialogs to TaskDialog based dialogs
1 parent 937a465 commit 67b2e1c

File tree

12 files changed

+1056
-684
lines changed

12 files changed

+1056
-684
lines changed

‎plugins/OnlineChecks/OnlineChecks.rc

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -87,19 +87,6 @@ END
8787
// Dialog
8888
//
8989

90-
IDD_PROGRESS DIALOGEX 0, 0, 241, 58
91-
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
92-
EXSTYLE WS_EX_APPWINDOW
93-
CAPTION "Uploading To"
94-
FONT 8, "MS Shell Dlg", 400, 0, 0x1
95-
BEGIN
96-
LTEXT "Message",IDC_MESSAGE,7,5,227,12
97-
CONTROL "",IDC_PROGRESS1,"msctls_progress32",0x0,7,23,227,9
98-
LTEXT "Connecting...",IDC_STATUS,7,39,172,11
99-
PUSHBUTTON "Yes",IDYES,133,37,50,14,NOT WS_VISIBLE
100-
DEFPUSHBUTTON "Cancel",IDNO,185,37,50,14
101-
END
102-
10390
IDD_OPTIONS DIALOGEX 0, 0, 201, 57
10491
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
10592
CAPTION "Options"
@@ -121,14 +108,6 @@ END
121108
#ifdef APSTUDIO_INVOKED
122109
GUIDELINES DESIGNINFO
123110
BEGIN
124-
IDD_PROGRESS, DIALOG
125-
BEGIN
126-
LEFTMARGIN, 7
127-
RIGHTMARGIN, 234
128-
TOPMARGIN, 5
129-
BOTTOMMARGIN, 51
130-
END
131-
132111
IDD_OPTIONS, DIALOG
133112
BEGIN
134113
LEFTMARGIN, 7
@@ -145,11 +124,6 @@ END
145124
// AFX_DIALOG_LAYOUT
146125
//
147126

148-
IDD_PROGRESS AFX_DIALOG_LAYOUT
149-
BEGIN
150-
0
151-
END
152-
153127
IDD_OPTIONS AFX_DIALOG_LAYOUT
154128
BEGIN
155129
0

‎plugins/OnlineChecks/OnlineChecks.vcxproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@
7979
<ClCompile Include="db.c" />
8080
<ClCompile Include="main.c" />
8181
<ClCompile Include="options.c" />
82+
<ClCompile Include="page1.c" />
83+
<ClCompile Include="page2.c" />
84+
<ClCompile Include="page3.c" />
8285
<ClCompile Include="upload.c" />
8386
<ClCompile Include="virustotal.c" />
8487
</ItemGroup>

‎plugins/OnlineChecks/OnlineChecks.vcxproj.filters

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
<ClCompile Include="main.c">
1919
<Filter>Source Files</Filter>
2020
</ClCompile>
21-
<ClCompile Include="upload.c">
22-
<Filter>Source Files</Filter>
23-
</ClCompile>
2421
<ClCompile Include="db.c">
2522
<Filter>Source Files</Filter>
2623
</ClCompile>
@@ -30,6 +27,18 @@
3027
<ClCompile Include="options.c">
3128
<Filter>Source Files</Filter>
3229
</ClCompile>
30+
<ClCompile Include="upload.c">
31+
<Filter>Source Files</Filter>
32+
</ClCompile>
33+
<ClCompile Include="page1.c">
34+
<Filter>Source Files</Filter>
35+
</ClCompile>
36+
<ClCompile Include="page2.c">
37+
<Filter>Source Files</Filter>
38+
</ClCompile>
39+
<ClCompile Include="page3.c">
40+
<Filter>Source Files</Filter>
41+
</ClCompile>
3342
</ItemGroup>
3443
<ItemGroup>
3544
<ClInclude Include="onlnchk.h">

‎plugins/OnlineChecks/main.c

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -64,23 +64,22 @@ VOID ProcessesUpdatedCallback(
6464
while (listEntry != &ProcessListHead)
6565
{
6666
PPROCESS_EXTENSION extension;
67+
PPH_STRING filePath = NULL;
68+
PPH_PROCESS_ITEM processItem = NULL;
69+
PPH_MODULE_ITEM moduleItem = NULL;
6770

6871
extension = CONTAINING_RECORD(listEntry, PROCESS_EXTENSION, ListEntry);
6972

70-
PPH_STRING filePath = NULL;
71-
PPH_PROCESS_ITEM processItem = extension->ProcessItem;
72-
PPH_MODULE_ITEM moduleItem = extension->ModuleItem;
73-
74-
if (processItem)
73+
if (processItem = extension->ProcessItem)
7574
{
7675
filePath = processItem->FileName;
7776
}
78-
else if (moduleItem)
77+
else if (moduleItem = extension->ModuleItem)
7978
{
8079
filePath = moduleItem->FileName;
8180
}
8281

83-
if (!PhIsNullOrEmptyString(filePath)) // !PH_IS_FAKE_PROCESS_ID(processItem->ProcessId)
82+
if (!PhIsNullOrEmptyString(filePath))
8483
{
8584
if (!extension->ResultValid)
8685
{
@@ -138,7 +137,6 @@ VOID NTAPI MenuItemCallback(
138137
)
139138
{
140139
PPH_PLUGIN_MENU_ITEM menuItem = Parameter;
141-
PPH_STRING fileName;
142140

143141
switch (menuItem->Id)
144142
{
@@ -190,12 +188,10 @@ VOID NTAPI MenuItemCallback(
190188
}
191189
break;
192190
case MENUITEM_VIRUSTOTAL_UPLOAD:
193-
fileName = menuItem->Context;
194-
UploadToOnlineService(fileName, MENUITEM_VIRUSTOTAL_UPLOAD);
191+
UploadToOnlineService(menuItem->Context, MENUITEM_VIRUSTOTAL_UPLOAD);
195192
break;
196193
case MENUITEM_JOTTI_UPLOAD:
197-
fileName = menuItem->Context;
198-
UploadToOnlineService(fileName, MENUITEM_JOTTI_UPLOAD);
194+
UploadToOnlineService(menuItem->Context, MENUITEM_JOTTI_UPLOAD);
199195
break;
200196
}
201197
}
@@ -213,7 +209,7 @@ VOID NTAPI MainMenuInitializingCallback(
213209
return;
214210

215211
enableMenuItem = PhPluginCreateEMenuItem(PluginInstance, 0, ENABLE_SERVICE_VIRUSTOTAL, L"Enable VirusTotal scanning", NULL);
216-
detectMenuItem = PhPluginCreateEMenuItem(PluginInstance, 0, MENUITEM_VIRUSTOTAL_QUEUE, L"VirusTotal detections", NULL);
212+
detectMenuItem = PhPluginCreateEMenuItem(PluginInstance, 0, MENUITEM_VIRUSTOTAL_QUEUE, L"VirusTotal Upload Queue", NULL);
217213
PhInsertEMenuItem(menuInfo->Menu, PhPluginCreateEMenuItem(PluginInstance, PH_EMENU_SEPARATOR, 0, NULL, NULL), -1);
218214
PhInsertEMenuItem(menuInfo->Menu, enableMenuItem, -1);
219215
PhInsertEMenuItem(menuInfo->Menu, detectMenuItem, -1);
@@ -224,23 +220,18 @@ VOID NTAPI MainMenuInitializingCallback(
224220

225221
PPH_EMENU_ITEM CreateSendToMenu(
226222
_In_ PPH_EMENU_ITEM Parent,
227-
_In_ PWSTR InsertAfter,
228223
_In_ PPH_STRING FileName
229224
)
230225
{
231226
PPH_EMENU_ITEM sendToMenu;
232227
PPH_EMENU_ITEM menuItem;
233228
ULONG insertIndex;
234229

235-
// Create the Send To menu.
236230
sendToMenu = PhPluginCreateEMenuItem(PluginInstance, 0, 0, L"Send to", NULL);
237231
PhInsertEMenuItem(sendToMenu, PhPluginCreateEMenuItem(PluginInstance, 0, MENUITEM_VIRUSTOTAL_UPLOAD, L"virustotal.com", FileName), -1);
238232
PhInsertEMenuItem(sendToMenu, PhPluginCreateEMenuItem(PluginInstance, 0, MENUITEM_JOTTI_UPLOAD, L"virusscan.jotti.org", FileName), -1);
239-
//PhInsertEMenuItem(sendToMenu, PhPluginCreateEMenuItem(PluginInstance, 0, ID_SENDTO_SERVICE3, L"camas.comodo.com", FileName), -1);
240-
241-
menuItem = PhFindEMenuItem(Parent, PH_EMENU_FIND_STARTSWITH, InsertAfter, 0);
242233

243-
if (menuItem)
234+
if (menuItem = PhFindEMenuItem(Parent, PH_EMENU_FIND_STARTSWITH, L"Search online", 0))
244235
insertIndex = PhIndexOfEMenuItem(Parent, menuItem);
245236
else
246237
insertIndex = -1;
@@ -265,7 +256,7 @@ VOID NTAPI ProcessMenuInitializingCallback(
265256
else
266257
processItem = NULL;
267258

268-
sendToMenu = CreateSendToMenu(menuInfo->Menu, L"Search online", processItem ? processItem->FileName : NULL);
259+
sendToMenu = CreateSendToMenu(menuInfo->Menu, processItem ? processItem->FileName : NULL);
269260

270261
// Only enable the Send To menu if there is exactly one process selected and it has a file name.
271262
if (!processItem || !processItem->FileName)
@@ -288,7 +279,7 @@ VOID NTAPI ModuleMenuInitializingCallback(
288279
else
289280
moduleItem = NULL;
290281

291-
sendToMenu = CreateSendToMenu(menuInfo->Menu, L"Search online", moduleItem ? moduleItem->FileName : NULL);
282+
sendToMenu = CreateSendToMenu(menuInfo->Menu, moduleItem ? moduleItem->FileName : NULL);
292283

293284
if (!moduleItem)
294285
{

0 commit comments

Comments
 (0)