Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-21 19:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GP-5069_dev747368_PR-7086_hippietrail_exe-icon' (Closes #7086)
This commit is contained in:
Ryan Kurtz 2024-10-28 17:38:59 -04:00
commit 7bc15c87c1
7 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Ghidra/Features/Base/certification.manifest
View File

@ -865,9 +865,12 @@ src/main/resources/images/openFolderInView.png||Modified Nuvola Icons - LGPL 2.1
src/main/resources/images/openFolderLabels.png||Modified Nuvola Icons - LGPL 2.1||||END|
src/main/resources/images/openFolderNamespaces.dark.png||GHIDRA||||END|
src/main/resources/images/openFolderNamespaces.png||Modified Nuvola Icons - LGPL 2.1||||END|
src/main/resources/images/oxygen/16x16/application-javascript.png||Oxygen Icons - LGPL 3.0||||END|
src/main/resources/images/oxygen/16x16/application-pdf.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
src/main/resources/images/oxygen/16x16/application-x-bzip.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
src/main/resources/images/oxygen/16x16/application-x-desktop.png||Oxygen Icons - LGPL 3.0||||END|
src/main/resources/images/oxygen/16x16/application-x-java-archive.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
src/main/resources/images/oxygen/16x16/application-x-shellscript.png||Oxygen Icons - LGPL 3.0||||END|
src/main/resources/images/oxygen/16x16/application-x-subrip.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
src/main/resources/images/oxygen/16x16/bookmarks.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
src/main/resources/images/oxygen/16x16/games-config-background.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
@ -879,6 +882,7 @@ src/main/resources/images/oxygen/16x16/text-x-c++src.png||Oxygen Icons - LGPL 3.
src/main/resources/images/oxygen/16x16/text-x-chdr.png||Oxygen Icons - LGPL 3.0||||END|
src/main/resources/images/oxygen/16x16/text-x-csharp.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
src/main/resources/images/oxygen/16x16/text-x-pascal.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
src/main/resources/images/oxygen/16x16/text-x-python.png||Oxygen Icons - LGPL 3.0||||END|
src/main/resources/images/package.png||Nuvola Icons - LGPL 2.1|||Nuvola icon set|END|
src/main/resources/images/package_development.png||Nuvola Icons - LGPL 2.1|||nuvola|END|
src/main/resources/images/package_green.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END|

8
Ghidra/Features/Base/data/base.file.extensions.icons.theme.properties
View File

@ -2,6 +2,7 @@
icon.fsbrowser.file.extension.default = images/page_white.png
icon.fsbrowser.file.extension.apk = images/package.png
icon.fsbrowser.file.extension.bat = images/oxygen/16x16/application-x-shellscript.png
icon.fsbrowser.file.extension.c = images/text-x-csrc.png
icon.fsbrowser.file.extension.cpp = images/oxygen/16x16/text-x-c++src.png
icon.fsbrowser.file.extension.class = images/famfamfam_silk_icons_v013/cup.png
@ -9,7 +10,10 @@ icon.fsbrowser.file.extension.cs = images/oxygen/16x16/text-x-csharp.png
icon.fsbrowser.file.extension.css = images/famfamfam_silk_icons_v013/css.png
icon.fsbrowser.file.extension.data = images/famfamfam_silk_icons_v013/database.png
icon.fsbrowser.file.extension.dfu = images/famfamfam_silk_icons_v013/bullet_blue.png
icon.fsbrowser.file.extension.dll = images/oxygen/16x16/application-x-desktop.png
icon.fsbrowser.file.extension.dmg = images/bullet_green.png
icon.fsbrowser.file.extension.dylib = images/oxygen/16x16/application-x-desktop.png
icon.fsbrowser.file.extension.exe = images/oxygen/16x16/application-x-desktop.png
icon.fsbrowser.file.extension.f = images/F.gif
icon.fsbrowser.file.extension.h = images/oxygen/16x16/text-x-chdr.png
icon.fsbrowser.file.extension.html = images/famfamfam_silk_icons_v013/html.png
@ -20,14 +24,18 @@ icon.fsbrowser.file.extension.ipsw = images/oxygen/16x16/multimedia-player
icon.fsbrowser.file.extension.iso = images/nuvola/16x16/cdimage.png
icon.fsbrowser.file.extension.jar = images/oxygen/16x16/application-x-java-archive.png
icon.fsbrowser.file.extension.java = images/famfamfam_silk_icons_v013/page_white_cup.png
icon.fsbrowser.file.extension.js = images/oxygen/16x16/application-javascript.png
icon.fsbrowser.file.extension.kext = images/famfamfam_silk_icons_v013/bullet_pink.png
icon.fsbrowser.file.extension.lib = images/famfamfam_silk_icons_v013/server.png
icon.fsbrowser.file.extension.o = images/oxygen/16x16/application-x-subrip.png
icon.fsbrowser.file.extension.obj = images/oxygen/16x16/application-x-subrip.png
icon.fsbrowser.file.extension.p = images/oxygen/16x16/text-x-pascal.png
icon.fsbrowser.file.extension.pdf = images/oxygen/16x16/application-pdf.png
icon.fsbrowser.file.extension.plist = images/oxygen/16x16/insert-table.png
icon.fsbrowser.file.extension.png = images/famfamfam_silk_icons_v013/bullet_red.png
icon.fsbrowser.file.extension.py = images/oxygen/16x16/text-x-python.png
icon.fsbrowser.file.extension.rss = images/famfamfam_silk_icons_v013/rss.png
icon.fsbrowser.file.extension.sh = images/oxygen/16x16/application-x-shellscript.png
icon.fsbrowser.file.extension.strings = images/oxygen/16x16/insert-text.png
icon.fsbrowser.file.extension.txt = images/oxygen/16x16/text-x-bibtex.png
icon.fsbrowser.file.extension.usb = images/nuvola/16x16/usb.png

24
Ghidra/Features/Base/src/main/java/ghidra/plugins/fsbrowser/FSBRootNode.java
View File

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -192,16 +192,18 @@ public class FSBRootNode extends FSBNode {
}
public FSRL getProgramProviderFSRL(FSRL fsrl) {
GFileSystem fs = fsRef.getFilesystem();
if (fs instanceof GFileSystemProgramProvider programProviderFS) {
try {
GFile gfile = fs.lookup(fsrl.getPath());
if (gfile != null && programProviderFS.canProvideProgram(gfile)) {
return fsrl;
if (fsRef != null) {
GFileSystem fs = fsRef.getFilesystem();
if (fs instanceof GFileSystemProgramProvider programProviderFS) {
try {
GFile gfile = fs.lookup(fsrl.getPath());
if (gfile != null && programProviderFS.canProvideProgram(gfile)) {
return fsrl;
}
}
catch (IOException e) {
// ignore error and fall thru
}
}
catch (IOException e) {
// ignore error and fall thru
}
}
return null;

BIN
Ghidra/Features/Base/src/main/resources/images/oxygen/16x16/application-javascript.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 634 B

BIN
Ghidra/Features/Base/src/main/resources/images/oxygen/16x16/application-x-desktop.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 498 B

BIN
Ghidra/Features/Base/src/main/resources/images/oxygen/16x16/application-x-shellscript.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 527 B

BIN
Ghidra/Features/Base/src/main/resources/images/oxygen/16x16/text-x-python.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 661 B