Skip to content

Commit 0702d28

Browse files
dmexdmex
committed
ExtraPlugins: Remove duplicate code
1 parent c2be326 commit 0702d28

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+31
-6015
lines changed

‎plugins/ExtraPlugins/ExtraPlugins.rc

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -157,25 +157,11 @@ BEGIN
157157
END
158158

159159

160-
/////////////////////////////////////////////////////////////////////////////
161-
//
162-
// Bitmap
163-
//
164-
165-
IDB_SEARCH_ACTIVE_BMP BITMAP "resources\\active_search.bmp"
166-
167-
IDB_SEARCH_INACTIVE_BMP BITMAP "resources\\inactive_search.bmp"
168-
169-
170160
/////////////////////////////////////////////////////////////////////////////
171161
//
172162
// PNG
173163
//
174164

175-
IDB_SEARCH_ACTIVE PNG "resources\\active_search.png"
176-
177-
IDB_SEARCH_INACTIVE PNG "resources\\inactive_search.png"
178-
179165
IDB_SETTINGS_PNG PNG "resources\\cog_edit_modern.png"
180166

181167
#endif // English (Australia) resources

‎plugins/ExtraPlugins/ExtraPlugins.vcxproj

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -82,17 +82,6 @@
8282
<ClCompile Include="cloud.c" />
8383
<ClCompile Include="dialog.c" />
8484
<ClCompile Include="disabled.c" />
85-
<ClCompile Include="json-c\arraylist.c" />
86-
<ClCompile Include="json-c\debug.c" />
87-
<ClCompile Include="json-c\json_c_version.c" />
88-
<ClCompile Include="json-c\json_object.c" />
89-
<ClCompile Include="json-c\json_object_iterator.c" />
90-
<ClCompile Include="json-c\json_tokener.c" />
91-
<ClCompile Include="json-c\json_util.c" />
92-
<ClCompile Include="json-c\libjson.c" />
93-
<ClCompile Include="json-c\linkhash.c" />
94-
<ClCompile Include="json-c\printbuf.c" />
95-
<ClCompile Include="json-c\random_seed.c" />
9685
<ClCompile Include="main.c" />
9786
<ClCompile Include="miniz\miniz.c" />
9887
<ClCompile Include="plugin.c" />
@@ -107,23 +96,6 @@
10796
<ClCompile Include="wndtree.c" />
10897
</ItemGroup>
10998
<ItemGroup>
110-
<ClInclude Include="json-c\arraylist.h" />
111-
<ClInclude Include="json-c\bits.h" />
112-
<ClInclude Include="json-c\config.h" />
113-
<ClInclude Include="json-c\debug.h" />
114-
<ClInclude Include="json-c\json.h" />
115-
<ClInclude Include="json-c\json_config.h" />
116-
<ClInclude Include="json-c\json_c_version.h" />
117-
<ClInclude Include="json-c\json_inttypes.h" />
118-
<ClInclude Include="json-c\json_object.h" />
119-
<ClInclude Include="json-c\json_object_iterator.h" />
120-
<ClInclude Include="json-c\json_object_private.h" />
121-
<ClInclude Include="json-c\json_tokener.h" />
122-
<ClInclude Include="json-c\json_util.h" />
123-
<ClInclude Include="json-c\linkhash.h" />
124-
<ClInclude Include="json-c\math_compat.h" />
125-
<ClInclude Include="json-c\printbuf.h" />
126-
<ClInclude Include="json-c\random_seed.h" />
12799
<ClInclude Include="main.h" />
128100
<ClInclude Include="miniz\miniz.h" />
129101
<ClInclude Include="resource.h" />
@@ -132,11 +104,7 @@
132104
<ResourceCompile Include="ExtraPlugins.rc" />
133105
</ItemGroup>
134106
<ItemGroup>
135-
<Image Include="resources\active_search.bmp" />
136-
<Image Include="resources\active_search.png" />
137107
<Image Include="resources\cog_edit_modern.png" />
138-
<Image Include="resources\inactive_search.bmp" />
139-
<Image Include="resources\inactive_search.png" />
140108
</ItemGroup>
141109
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
142110
</Project>

‎plugins/ExtraPlugins/ExtraPlugins.vcxproj.filters

Lines changed: 0 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -39,39 +39,6 @@
3939
<ClCompile Include="cloud.c">
4040
<Filter>Source Files</Filter>
4141
</ClCompile>
42-
<ClCompile Include="json-c\arraylist.c">
43-
<Filter>Source Files\json-c</Filter>
44-
</ClCompile>
45-
<ClCompile Include="json-c\json_c_version.c">
46-
<Filter>Source Files\json-c</Filter>
47-
</ClCompile>
48-
<ClCompile Include="json-c\json_object.c">
49-
<Filter>Source Files\json-c</Filter>
50-
</ClCompile>
51-
<ClCompile Include="json-c\json_object_iterator.c">
52-
<Filter>Source Files\json-c</Filter>
53-
</ClCompile>
54-
<ClCompile Include="json-c\json_tokener.c">
55-
<Filter>Source Files\json-c</Filter>
56-
</ClCompile>
57-
<ClCompile Include="json-c\json_util.c">
58-
<Filter>Source Files\json-c</Filter>
59-
</ClCompile>
60-
<ClCompile Include="json-c\linkhash.c">
61-
<Filter>Source Files\json-c</Filter>
62-
</ClCompile>
63-
<ClCompile Include="json-c\random_seed.c">
64-
<Filter>Source Files\json-c</Filter>
65-
</ClCompile>
66-
<ClCompile Include="json-c\debug.c">
67-
<Filter>Source Files\json-c</Filter>
68-
</ClCompile>
69-
<ClCompile Include="json-c\libjson.c">
70-
<Filter>Source Files\json-c</Filter>
71-
</ClCompile>
72-
<ClCompile Include="json-c\printbuf.c">
73-
<Filter>Source Files\json-c</Filter>
74-
</ClCompile>
7542
<ClCompile Include="miniz\miniz.c">
7643
<Filter>Source Files\zip</Filter>
7744
</ClCompile>
@@ -116,57 +83,6 @@
11683
<ClInclude Include="resource.h">
11784
<Filter>Header Files</Filter>
11885
</ClInclude>
119-
<ClInclude Include="json-c\json_config.h">
120-
<Filter>Source Files\json-c</Filter>
121-
</ClInclude>
122-
<ClInclude Include="json-c\json.h">
123-
<Filter>Source Files\json-c</Filter>
124-
</ClInclude>
125-
<ClInclude Include="json-c\arraylist.h">
126-
<Filter>Header Files\json-c</Filter>
127-
</ClInclude>
128-
<ClInclude Include="json-c\json_c_version.h">
129-
<Filter>Header Files\json-c</Filter>
130-
</ClInclude>
131-
<ClInclude Include="json-c\json_inttypes.h">
132-
<Filter>Header Files\json-c</Filter>
133-
</ClInclude>
134-
<ClInclude Include="json-c\json_object.h">
135-
<Filter>Header Files\json-c</Filter>
136-
</ClInclude>
137-
<ClInclude Include="json-c\json_object_iterator.h">
138-
<Filter>Header Files\json-c</Filter>
139-
</ClInclude>
140-
<ClInclude Include="json-c\json_object_private.h">
141-
<Filter>Header Files\json-c</Filter>
142-
</ClInclude>
143-
<ClInclude Include="json-c\json_tokener.h">
144-
<Filter>Header Files\json-c</Filter>
145-
</ClInclude>
146-
<ClInclude Include="json-c\json_util.h">
147-
<Filter>Header Files\json-c</Filter>
148-
</ClInclude>
149-
<ClInclude Include="json-c\linkhash.h">
150-
<Filter>Header Files\json-c</Filter>
151-
</ClInclude>
152-
<ClInclude Include="json-c\math_compat.h">
153-
<Filter>Header Files\json-c</Filter>
154-
</ClInclude>
155-
<ClInclude Include="json-c\printbuf.h">
156-
<Filter>Header Files\json-c</Filter>
157-
</ClInclude>
158-
<ClInclude Include="json-c\random_seed.h">
159-
<Filter>Header Files\json-c</Filter>
160-
</ClInclude>
161-
<ClInclude Include="json-c\bits.h">
162-
<Filter>Header Files\json-c</Filter>
163-
</ClInclude>
164-
<ClInclude Include="json-c\config.h">
165-
<Filter>Header Files\json-c</Filter>
166-
</ClInclude>
167-
<ClInclude Include="json-c\debug.h">
168-
<Filter>Header Files\json-c</Filter>
169-
</ClInclude>
17086
<ClInclude Include="miniz\miniz.h">
17187
<Filter>Header Files\zip</Filter>
17288
</ClInclude>
@@ -177,18 +93,6 @@
17793
</ResourceCompile>
17894
</ItemGroup>
17995
<ItemGroup>
180-
<Image Include="resources\inactive_search.bmp">
181-
<Filter>Resource Files\Images</Filter>
182-
</Image>
183-
<Image Include="resources\inactive_search.png">
184-
<Filter>Resource Files\Images</Filter>
185-
</Image>
186-
<Image Include="resources\active_search.png">
187-
<Filter>Resource Files\Images</Filter>
188-
</Image>
189-
<Image Include="resources\active_search.bmp">
190-
<Filter>Resource Files\Images</Filter>
191-
</Image>
19296
<Image Include="resources\cog_edit_modern.png">
19397
<Filter>Resource Files\Images</Filter>
19498
</Image>

‎plugins/ExtraPlugins/cloud.c

Lines changed: 28 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,6 @@ ULONGLONG ParseVersionString(
4444
return MAKE_VERSION_ULONGLONG(majorInteger, minorInteger, reservedInteger, revisionInteger);
4545
}
4646

47-
json_object_ptr json_get_object(
48-
_In_ json_object_ptr Object,
49-
_In_ PCSTR Key
50-
)
51-
{
52-
json_object_ptr returnObj;
53-
54-
if (json_object_object_get_ex(Object, Key, &returnObj))
55-
{
56-
return returnObj;
57-
}
58-
59-
return NULL;
60-
}
61-
6247
HICON PluginDownloadImageThread(
6348
_In_ PPH_STRING ImageDownloadUrl
6449
)
@@ -197,7 +182,7 @@ NTSTATUS QueryPluginsCallbackThread(
197182
WINHTTP_CURRENT_USER_IE_PROXY_CONFIG proxyConfig = { 0 };
198183
ULONG xmlStringBufferLength = 0;
199184
PSTR xmlStringBuffer = NULL;
200-
json_object_ptr rootJsonObject;
185+
PVOID rootJsonObject;
201186
PWCT_CONTEXT context = Parameter;
202187

203188
WinHttpGetIEProxyConfigForCurrentUser(&proxyConfig);
@@ -255,12 +240,12 @@ NTSTATUS QueryPluginsCallbackThread(
255240
if (!ReadRequestString(httpRequestHandle, &xmlStringBuffer, &xmlStringBufferLength))
256241
goto CleanupExit;
257242

258-
if (!(rootJsonObject = json_tokener_parse(xmlStringBuffer)))
243+
if (!(rootJsonObject = CreateJsonParser(xmlStringBuffer)))
259244
goto CleanupExit;
260245

261-
for (INT i = 0; i < json_object_array_length(rootJsonObject); i++)
246+
for (INT i = 0; i < JsonGetArrayLength(rootJsonObject); i++)
262247
{
263-
json_object_ptr jvalue;
248+
PVOID jvalue;
264249
PPLUGIN_NODE entry;
265250
SYSTEMTIME time = { 0 };
266251
SYSTEMTIME localTime = { 0 };
@@ -270,28 +255,28 @@ NTSTATUS QueryPluginsCallbackThread(
270255
entry = PhCreateAlloc(sizeof(PLUGIN_NODE));
271256
memset(entry, 0, sizeof(PLUGIN_NODE));
272257

273-
jvalue = json_object_array_get_idx(rootJsonObject, i);
274-
entry->Id = PhConvertUtf8ToUtf16(json_object_get_string(json_get_object(jvalue, "plugin_id")));
275-
entry->Visible = PhConvertUtf8ToUtf16(json_object_get_string(json_get_object(jvalue, "plugin_visible")));
276-
entry->InternalName = PhConvertUtf8ToUtf16(json_object_get_string(json_get_object(jvalue, "plugin_internal_name")));
277-
entry->Name = PhConvertUtf8ToUtf16(json_object_get_string(json_get_object(jvalue, "plugin_name")));
278-
entry->Version = PhConvertUtf8ToUtf16(json_object_get_string(json_get_object(jvalue, "plugin_version")));
279-
entry->Author = PhConvertUtf8ToUtf16(json_object_get_string(json_get_object(jvalue, "plugin_author")));
280-
entry->Description = PhConvertUtf8ToUtf16(json_object_get_string(json_get_object(jvalue, "plugin_description")));
281-
entry->IconUrl = PhConvertUtf8ToUtf16(json_object_get_string(json_get_object(jvalue, "plugin_icon")));
282-
entry->Requirements = PhConvertUtf8ToUtf16(json_object_get_string(json_get_object(jvalue, "plugin_requirements")));
283-
entry->FeedbackUrl = PhConvertUtf8ToUtf16(json_object_get_string(json_get_object(jvalue, "plugin_feedback")));
284-
entry->Screenshots = PhConvertUtf8ToUtf16(json_object_get_string(json_get_object(jvalue, "plugin_screenshots")));
285-
entry->AddedTime = PhConvertUtf8ToUtf16(json_object_get_string(json_get_object(jvalue, "plugin_datetime_added")));
286-
entry->UpdatedTime = PhConvertUtf8ToUtf16(json_object_get_string(json_get_object(jvalue, "plugin_datetime_updated")));
287-
entry->Download_count = PhConvertUtf8ToUtf16(json_object_get_string(json_get_object(jvalue, "plugin_download_count")));
288-
entry->Download_link_32 = PhConvertUtf8ToUtf16(json_object_get_string(json_get_object(jvalue, "plugin_download_link_32")));
289-
entry->Download_link_64 = PhConvertUtf8ToUtf16(json_object_get_string(json_get_object(jvalue, "plugin_download_link_64")));
290-
entry->SHA2_32 = PhConvertUtf8ToUtf16(json_object_get_string(json_get_object(jvalue, "plugin_hash_32")));
291-
entry->SHA2_64 = PhConvertUtf8ToUtf16(json_object_get_string(json_get_object(jvalue, "plugin_hash_64")));
292-
entry->HASH_32 = PhConvertUtf8ToUtf16(json_object_get_string(json_get_object(jvalue, "plugin_signed_32")));
293-
entry->HASH_64 = PhConvertUtf8ToUtf16(json_object_get_string(json_get_object(jvalue, "plugin_signed_64")));
294-
entry->FileName = PhConvertUtf8ToUtf16(json_object_get_string(json_get_object(jvalue, "plugin_filename")));
258+
jvalue = JsonGetObjectArrayIndex(rootJsonObject, i);
259+
entry->Id = PhConvertUtf8ToUtf16(GetJsonValueAsString(jvalue, "plugin_id"));
260+
entry->Visible = PhConvertUtf8ToUtf16(GetJsonValueAsString(jvalue, "plugin_visible"));
261+
entry->InternalName = PhConvertUtf8ToUtf16(GetJsonValueAsString(jvalue, "plugin_internal_name"));
262+
entry->Name = PhConvertUtf8ToUtf16(GetJsonValueAsString(jvalue, "plugin_name"));
263+
entry->Version = PhConvertUtf8ToUtf16(GetJsonValueAsString(jvalue, "plugin_version"));
264+
entry->Author = PhConvertUtf8ToUtf16(GetJsonValueAsString(jvalue, "plugin_author"));
265+
entry->Description = PhConvertUtf8ToUtf16(GetJsonValueAsString(jvalue, "plugin_description"));
266+
entry->IconUrl = PhConvertUtf8ToUtf16(GetJsonValueAsString(jvalue, "plugin_icon"));
267+
entry->Requirements = PhConvertUtf8ToUtf16(GetJsonValueAsString(jvalue, "plugin_requirements"));
268+
entry->FeedbackUrl = PhConvertUtf8ToUtf16(GetJsonValueAsString(jvalue, "plugin_feedback"));
269+
entry->Screenshots = PhConvertUtf8ToUtf16(GetJsonValueAsString(jvalue, "plugin_screenshots"));
270+
entry->AddedTime = PhConvertUtf8ToUtf16(GetJsonValueAsString(jvalue, "plugin_datetime_added"));
271+
entry->UpdatedTime = PhConvertUtf8ToUtf16(GetJsonValueAsString(jvalue, "plugin_datetime_updated"));
272+
entry->Download_count = PhConvertUtf8ToUtf16(GetJsonValueAsString(jvalue, "plugin_download_count"));
273+
entry->Download_link_32 = PhConvertUtf8ToUtf16(GetJsonValueAsString(jvalue, "plugin_download_link_32"));
274+
entry->Download_link_64 = PhConvertUtf8ToUtf16(GetJsonValueAsString(jvalue, "plugin_download_link_64"));
275+
entry->SHA2_32 = PhConvertUtf8ToUtf16(GetJsonValueAsString(jvalue, "plugin_hash_32"));
276+
entry->SHA2_64 = PhConvertUtf8ToUtf16(GetJsonValueAsString(jvalue, "plugin_hash_64"));
277+
entry->HASH_32 = PhConvertUtf8ToUtf16(GetJsonValueAsString(jvalue, "plugin_signed_32"));
278+
entry->HASH_64 = PhConvertUtf8ToUtf16(GetJsonValueAsString(jvalue, "plugin_signed_64"));
279+
entry->FileName = PhConvertUtf8ToUtf16(GetJsonValueAsString(jvalue, "plugin_filename"));
295280

296281
swscanf(
297282
PhGetString(entry->UpdatedTime),
@@ -347,7 +332,7 @@ NTSTATUS QueryPluginsCallbackThread(
347332
(info->dwFileVersionMS >> 0) & 0xffff,
348333
(info->dwFileVersionLS >> 16) & 0xffff,
349334
(info->dwFileVersionLS >> 0) & 0xffff
350-
);
335+
);
351336
}
352337
}
353338

@@ -357,7 +342,7 @@ NTSTATUS QueryPluginsCallbackThread(
357342
L"\\StringFileInfo\\%04x%04x\\InternalName",
358343
languageInfo[0],
359344
languageInfo[1]
360-
);
345+
);
361346

362347
if (VerQueryValue(versionInfo, PhGetStringOrEmpty(internalNameString), &buffer, &bufferSize))
363348
{

‎plugins/ExtraPlugins/json-c/AUTHORS

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎plugins/ExtraPlugins/json-c/COPYING

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)