Skip to content

Commit de71264

Browse files
style(shell): ctxmenu style
1 parent f6340b2 commit de71264

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/shell/contextmenu/contextmenu.cc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -215,17 +215,17 @@ menu menu::construct_with_hmenu(HMENU hMenu, HWND hWnd, bool is_top) {
215215
}
216216

217217
result = *pHBitmap;
218-
if (result && ::GetObjectType(result) == OBJ_BITMAP) {
218+
if (result && GetObjectType(result) == OBJ_BITMAP) {
219219
BITMAP bitmap{};
220-
if (::GetObjectW(result, sizeof(BITMAP), &bitmap) ==
221-
sizeof(BITMAP)) {
220+
if (GetObjectW(result, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)) {
222221
auto bmWidthBytes =
223222
((bitmap.bmWidth * bitmap.bmBitsPixel + 31) / 32) * 4;
224223
if (bmWidthBytes == bitmap.bmWidthBytes &&
225-
(bitmap.bmBitsPixel == 32 || bitmap.bmBitsPixel == 24 ||
226-
bitmap.bmBitsPixel == 16 || bitmap.bmBitsPixel == 8) &&
227-
bitmap.bmWidth >= 4 && bitmap.bmWidth <= 64 &&
228-
bitmap.bmHeight >= 4 && bitmap.bmHeight <= 64) {
224+
(bitmap.bmBitsPixel % 8 == 0 && bitmap.bmBitsPixel < 128) &&
225+
4 <= bitmap.bmWidth && bitmap.bmWidth <= 64 &&
226+
4 <= bitmap.bmHeight && bitmap.bmHeight <= 64 &&
227+
bitmap.bmPlanes == 1 && bitmap.bmBitsPixel <= 32 &&
228+
bitmap.bmBits != nullptr && bitmap.bmBits != (void *)-1) {
229229
item.icon_bitmap = (size_t)result;
230230
if (config::current->context_menu
231231
.search_large_dwItemData_range) {

0 commit comments

Comments
 (0)