diff --git a/dll/win32/msgina/resources/reactos.bmp b/dll/win32/msgina/resources/reactos.bmp index 7eb8a6b3d9e..2ec7eeb1772 100644 Binary files a/dll/win32/msgina/resources/reactos.bmp and b/dll/win32/msgina/resources/reactos.bmp differ diff --git a/dll/win32/msgina/resources/svg/rosbanner.svg b/dll/win32/msgina/resources/svg/rosbanner.svg deleted file mode 100644 index 9b410f5ef61..00000000000 --- a/dll/win32/msgina/resources/svg/rosbanner.svg +++ /dev/null @@ -1,1788 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ReactOS - - - Copyright © 1996 - 2024 ReactOS Team & Contributors - - - - diff --git a/dll/win32/shell32/bitmap_res.rc b/dll/win32/shell32/bitmap_res.rc index 417239c77a7..4014180e00e 100644 --- a/dll/win32/shell32/bitmap_res.rc +++ b/dll/win32/shell32/bitmap_res.rc @@ -1,7 +1,5 @@ -IDB_REACTOS BITMAP "res/bitmaps/reactos.bmp" -IDB_REACTOS_WORKSTATION BITMAP "res/bitmaps/reactosworkstation.bmp" -IDB_REACTOS_SERVER BITMAP "res/bitmaps/reactosserver.bmp" -IDB_LINEBAR BITMAP "res/bitmaps/line.bmp" +IDB_REACTOS BITMAP "res/bitmaps/reactos.bmp" +IDB_LINEBAR BITMAP "res/bitmaps/line.bmp" IDB_DLG_BG BITMAP "res/bitmaps/dlg_bg.bmp" IDB_REACTOS_FLAG BITMAP "res/bitmaps/reactos_flag.bmp" diff --git a/dll/win32/shell32/res/bitmaps/reactos.bmp b/dll/win32/shell32/res/bitmaps/reactos.bmp index 7eb8a6b3d9e..2ec7eeb1772 100644 Binary files a/dll/win32/shell32/res/bitmaps/reactos.bmp and b/dll/win32/shell32/res/bitmaps/reactos.bmp differ diff --git a/dll/win32/shell32/res/bitmaps/reactosserver.bmp b/dll/win32/shell32/res/bitmaps/reactosserver.bmp deleted file mode 100644 index ac446d9957e..00000000000 Binary files a/dll/win32/shell32/res/bitmaps/reactosserver.bmp and /dev/null differ diff --git a/dll/win32/shell32/res/bitmaps/reactosworkstation.bmp b/dll/win32/shell32/res/bitmaps/reactosworkstation.bmp deleted file mode 100644 index 5fde0f3e778..00000000000 Binary files a/dll/win32/shell32/res/bitmaps/reactosworkstation.bmp and /dev/null differ diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index ca9a02e7cf6..6721e625e5d 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -28,8 +28,6 @@ /* Bitmaps */ #define IDB_REACTOS 131 -#define IDB_REACTOS_WORKSTATION 400 -#define IDB_REACTOS_SERVER 401 #define IDB_LINEBAR 138 #define IDB_SHELL_IEXPLORE_LG 204 #define IDB_SHELL_IEXPLORE_LG_HOT 205 diff --git a/dll/win32/shell32/wine/shell32_main.c b/dll/win32/shell32/wine/shell32_main.c index 6f50815036b..e6dc9810c79 100644 --- a/dll/win32/shell32/wine/shell32_main.c +++ b/dll/win32/shell32/wine/shell32_main.c @@ -45,7 +45,6 @@ #include #include -#include WINE_DEFAULT_DEBUG_CHANNEL(shell); const char * const SHELL_Authors[] = { "Copyright 1993-"COPYRIGHT_YEAR" WINE team", "Copyright 1998-"COPYRIGHT_YEAR" ReactOS Team", 0 }; @@ -1085,16 +1084,7 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM WCHAR szAuthorsText[20]; // Preload the ROS bitmap - if (IsWindowsServer()) - { - // Load Server Bitmap - hLogoBmp = (HBITMAP)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDB_REACTOS_SERVER), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); - } - else - { - // Load Workstation Bitmap - hLogoBmp = (HBITMAP)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDB_REACTOS_WORKSTATION), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); - } + hLogoBmp = (HBITMAP)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDB_REACTOS), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); hLineBmp = (HBITMAP)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDB_LINEBAR), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); if (hLogoBmp && hLineBmp) diff --git a/dll/win32/syssetup/resources/reactos.bmp b/dll/win32/syssetup/resources/reactos.bmp index 7eb8a6b3d9e..2ec7eeb1772 100644 Binary files a/dll/win32/syssetup/resources/reactos.bmp and b/dll/win32/syssetup/resources/reactos.bmp differ