Skip to content

Commit 8c00a53

Browse files
dmexdmex
committed
WindowExplorer: Update window properties dialog layout, Add window property storage tab, Add window module name column to treelist
1 parent 1f5d782 commit 8c00a53

File tree

12 files changed

+1264
-748
lines changed

12 files changed

+1264
-748
lines changed

‎plugins/WindowExplorer/WindowExplorer.rc

Lines changed: 20 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -98,84 +98,28 @@ BEGIN
9898
EDITTEXT IDC_SEARCHEDIT,302,3,143,14,ES_AUTOHSCROLL
9999
END
100100

101-
IDD_WNDPROPS DIALOGEX 0, 0, 233, 152
101+
IDD_WNDPROPSTORAGE DIALOGEX 0, 0, 271, 224
102102
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
103-
CAPTION "Properties"
103+
CAPTION "Property Storage"
104104
FONT 8, "MS Shell Dlg", 400, 0, 0x1
105105
BEGIN
106-
LTEXT "Property list for the window:",IDC_STATIC,7,7,92,8
107-
CONTROL "",IDC_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,20,219,125
106+
CONTROL "",IDC_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP,0,0,271,224
108107
END
109108

110-
IDD_WNDGENERAL DIALOGEX 0, 0, 233, 147
109+
IDD_WNDGENERAL DIALOGEX 0, 0, 271, 224
111110
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
112111
CAPTION "General"
113112
FONT 8, "MS Shell Dlg", 400, 0, 0x1
114113
BEGIN
115-
LTEXT "Text:",IDC_STATIC,7,8,18,8
116-
EDITTEXT IDC_TEXT,33,7,193,12,ES_AUTOHSCROLL | ES_READONLY
117-
LTEXT "Thread:",IDC_STATIC,7,22,26,8
118-
LTEXT "Static",IDC_THREAD,77,22,149,8,SS_ENDELLIPSIS
119-
LTEXT "Rectangle:",IDC_STATIC,7,33,36,8
120-
LTEXT "Static",IDC_RECTANGLE,77,33,149,8,SS_ENDELLIPSIS
121-
LTEXT "Normal rectangle:",IDC_STATIC,7,44,60,8
122-
LTEXT "Static",IDC_NORMALRECTANGLE,77,44,149,8,SS_ENDELLIPSIS
123-
LTEXT "Client rectangle:",IDC_STATIC,7,55,56,8
124-
LTEXT "Static",IDC_CLIENTRECTANGLE,77,55,149,8,SS_ENDELLIPSIS
125-
LTEXT "Instance handle:",IDC_STATIC,7,66,56,8
126-
LTEXT "Static",IDC_INSTANCEHANDLE,77,66,149,8,SS_ENDELLIPSIS
127-
LTEXT "Menu handle:",IDC_STATIC,7,77,45,8
128-
LTEXT "Static",IDC_MENUHANDLE,77,77,149,8,SS_ENDELLIPSIS
129-
LTEXT "User data:",IDC_STATIC,7,88,36,8
130-
LTEXT "Static",IDC_USERDATA,77,88,149,8,SS_ENDELLIPSIS
131-
LTEXT "Unicode:",IDC_STATIC,7,99,29,8
132-
LTEXT "Static",IDC_UNICODE,77,99,149,8
133-
LTEXT "Window proc:",IDC_STATIC,7,110,45,8
134-
EDITTEXT IDC_WINDOWPROC,75,110,151,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
135-
LTEXT "Dialog proc:",IDC_STATIC,7,121,39,8
136-
EDITTEXT IDC_DIALOGPROC,75,121,151,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
137-
LTEXT "Dialog control ID:",IDC_STATIC,7,132,61,8
138-
LTEXT "Static",IDC_CTRLID,77,132,149,8
114+
CONTROL "",IDC_WINDOWINFO,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_ALIGNLEFT | WS_TABSTOP,0,0,271,224
139115
END
140116

141-
IDD_WNDSTYLES DIALOGEX 0, 0, 233, 140
117+
IDD_WNDPROPLIST DIALOGEX 0, 0, 271, 224
142118
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
143-
CAPTION "Styles"
119+
CAPTION "Property List"
144120
FONT 8, "MS Shell Dlg", 400, 0, 0x1
145121
BEGIN
146-
LTEXT "Styles:",IDC_STATIC,7,7,23,8
147-
LTEXT "Static",IDC_STYLES,67,7,159,8
148-
LISTBOX IDC_STYLESLIST,7,19,219,46,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
149-
LTEXT "Extended styles:",IDC_STATIC,7,69,56,8
150-
LTEXT "Static",IDC_EXTENDEDSTYLES,67,69,159,8
151-
LISTBOX IDC_EXTENDEDSTYLESLIST,7,81,219,46,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
152-
END
153-
154-
IDD_WNDCLASS DIALOGEX 0, 0, 233, 132
155-
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
156-
CAPTION "Class"
157-
FONT 8, "MS Shell Dlg", 400, 0, 0x1
158-
BEGIN
159-
LTEXT "Name:",IDC_STATIC,7,8,22,8
160-
EDITTEXT IDC_NAME,33,7,193,12,ES_AUTOHSCROLL | ES_READONLY
161-
LTEXT "Atom:",IDC_STATIC,7,22,20,8
162-
LTEXT "Static",IDC_ATOM,77,22,149,8,SS_ENDELLIPSIS
163-
LTEXT "Styles:",IDC_STATIC,7,33,23,8
164-
EDITTEXT IDC_STYLES,75,33,150,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
165-
LTEXT "Instance handle:",IDC_STATIC,7,44,56,8
166-
LTEXT "Static",IDC_INSTANCEHANDLE,77,44,149,8,SS_ENDELLIPSIS
167-
LTEXT "Icon handle:",IDC_STATIC,7,55,42,8
168-
LTEXT "Static",IDC_ICONHANDLE,77,55,149,8,SS_ENDELLIPSIS
169-
LTEXT "Small icon handle:",IDC_STATIC,7,66,60,8
170-
LTEXT "Static",IDC_SMALLICONHANDLE,77,66,149,8,SS_ENDELLIPSIS
171-
LTEXT "Cursor handle:",IDC_STATIC,7,77,49,8
172-
LTEXT "Static",IDC_CURSORHANDLE,77,77,149,8,SS_ENDELLIPSIS
173-
LTEXT "Background brush:",IDC_STATIC,7,88,61,8
174-
LTEXT "Static",IDC_BACKGROUNDBRUSH,77,88,149,8,SS_ENDELLIPSIS
175-
LTEXT "Menu name:",IDC_STATIC,7,99,41,8
176-
LTEXT "Static",IDC_MENUNAME,77,99,149,8,SS_ENDELLIPSIS
177-
LTEXT "Window proc:",IDC_STATIC,7,110,45,8
178-
EDITTEXT IDC_WINDOWPROC,75,110,151,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
122+
CONTROL "",IDC_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP,0,0,271,224
179123
END
180124

181125

@@ -195,36 +139,20 @@ BEGIN
195139
BOTTOMMARGIN, 307
196140
END
197141

198-
IDD_WNDPROPS, DIALOG
142+
IDD_WNDPROPSTORAGE, DIALOG
199143
BEGIN
200-
LEFTMARGIN, 7
201-
RIGHTMARGIN, 226
202-
TOPMARGIN, 7
203-
BOTTOMMARGIN, 145
144+
BOTTOMMARGIN, 218
204145
END
205146

206147
IDD_WNDGENERAL, DIALOG
207148
BEGIN
208-
LEFTMARGIN, 7
209-
RIGHTMARGIN, 226
210-
TOPMARGIN, 7
211-
BOTTOMMARGIN, 140
212-
END
213-
214-
IDD_WNDSTYLES, DIALOG
215-
BEGIN
216-
LEFTMARGIN, 7
217-
RIGHTMARGIN, 226
218-
TOPMARGIN, 7
219-
BOTTOMMARGIN, 133
149+
RIGHTMARGIN, 233
150+
BOTTOMMARGIN, 147
220151
END
221152

222-
IDD_WNDCLASS, DIALOG
153+
IDD_WNDPROPLIST, DIALOG
223154
BEGIN
224-
LEFTMARGIN, 7
225-
RIGHTMARGIN, 226
226-
TOPMARGIN, 7
227-
BOTTOMMARGIN, 125
155+
BOTTOMMARGIN, 218
228156
END
229157
END
230158
#endif // APSTUDIO_INVOKED
@@ -286,7 +214,12 @@ BEGIN
286214
0
287215
END
288216

289-
IDD_WNDCLASS AFX_DIALOG_LAYOUT
217+
IDD_WNDPROPSTORAGE AFX_DIALOG_LAYOUT
218+
BEGIN
219+
0
220+
END
221+
222+
IDD_WNDPROPLIST AFX_DIALOG_LAYOUT
290223
BEGIN
291224
0
292225
END

‎plugins/WindowExplorer/WindowExplorer.vcxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,14 @@
7373
</ItemDefinitionGroup>
7474
<ItemGroup>
7575
<ClCompile Include="main.c" />
76+
<ClCompile Include="prpsh.c" />
7677
<ClCompile Include="utils.c" />
7778
<ClCompile Include="wnddlg.c" />
7879
<ClCompile Include="wndprp.c" />
7980
<ClCompile Include="wndtree.c" />
8081
</ItemGroup>
8182
<ItemGroup>
83+
<ClInclude Include="prpsh.h" />
8284
<ClInclude Include="resource.h" />
8385
<ClInclude Include="wndexp.h" />
8486
<ClInclude Include="wndtree.h" />

‎plugins/WindowExplorer/WindowExplorer.vcxproj.filters

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
<ClCompile Include="wndprp.c">
3131
<Filter>Source Files</Filter>
3232
</ClCompile>
33+
<ClCompile Include="prpsh.c">
34+
<Filter>Source Files</Filter>
35+
</ClCompile>
3336
</ItemGroup>
3437
<ItemGroup>
3538
<ClInclude Include="wndexp.h">
@@ -41,6 +44,9 @@
4144
<ClInclude Include="wndtree.h">
4245
<Filter>Header Files</Filter>
4346
</ClInclude>
47+
<ClInclude Include="prpsh.h">
48+
<Filter>Header Files</Filter>
49+
</ClInclude>
4450
</ItemGroup>
4551
<ItemGroup>
4652
<None Include="CHANGELOG.txt" />

‎plugins/WindowExplorer/main.c

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -209,22 +209,20 @@ LOGICAL DllMain(
209209
{
210210
case DLL_PROCESS_ATTACH:
211211
{
212-
213212
PPH_PLUGIN_INFORMATION info;
214213
PH_SETTING_CREATE settings[] =
215214
{
216215
{ IntegerSettingType, SETTING_NAME_SHOW_DESKTOP_WINDOWS, L"0" },
217216
{ StringSettingType, SETTING_NAME_WINDOW_TREE_LIST_COLUMNS, L"" },
218-
{ IntegerPairSettingType, SETTING_NAME_WINDOWS_WINDOW_POSITION, L"100,100" },
219-
{ ScalableIntegerPairSettingType, SETTING_NAME_WINDOWS_WINDOW_SIZE, L"@96|690,540" }
217+
{ IntegerPairSettingType, SETTING_NAME_WINDOWS_WINDOW_POSITION, L"0,0" },
218+
{ ScalableIntegerPairSettingType, SETTING_NAME_WINDOWS_WINDOW_SIZE, L"@96|690,540" },
219+
{ StringSettingType, SETTING_NAME_WINDOWS_PROPERTY_COLUMNS, L"" },
220+
{ IntegerPairSettingType, SETTING_NAME_WINDOWS_PROPERTY_POSITION, L"0,0" },
221+
{ ScalableIntegerPairSettingType, SETTING_NAME_WINDOWS_PROPERTY_SIZE, L"@96|690,540" },
222+
{ StringSettingType, SETTING_NAME_WINDOWS_PROPLIST_COLUMNS, L"" },
223+
{ StringSettingType, SETTING_NAME_WINDOWS_PROPSTORAGE_COLUMNS, L"" },
220224
};
221225

222-
//BOOLEAN isClient = FALSE;
223-
//if (!GetModuleHandle(L"ProcessHacker.exe") || !WeGetProcedureAddress("PhInstanceHandle"))
224-
//{
225-
// isClient = TRUE;
226-
//}
227-
228226
PluginInstance = PhRegisterPlugin(PLUGIN_NAME, Instance, &info);
229227

230228
if (!PluginInstance)

0 commit comments

Comments
 (0)