Changeset 83072 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray

Timestamp:

Feb 14, 2020 10:48:14 AM (5 years ago)

Author:

vboxsync

Message:

VBoxTray: Fix for icon regression from r135890 (Artwork/win/TemplateExe.rc).

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• VBoxHelpers.cpp (modified) (2 diffs)
• VBoxTray.cpp (modified) (2 diffs)
• resource.h (deleted)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxHelpers.cpp

@@ -25 +25 @@
 
 #include "VBoxHelpers.h"
-#include "resource.h"
 
 
@@ -298 +297 @@
     {
         /* Load (or retrieve handle of) the app's icon. */
-        HICON hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_VIRTUALBOX));
+        HICON hIcon = LoadIcon(hInst, "IDI_ICON1"); /* see Artwork/win/TemplateR3.rc */
         if (hIcon)
             niData.dwInfoFlags = NIIF_USER; /* Use an own notification icon. */

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp

@@ -37 +37 @@
 #include "VBoxLA.h"
 #include <VBoxHook.h>
-#include "resource.h"
 
 #include <sddl.h>
@@ -208 +207 @@
 static int vboxTrayCreateTrayIcon(void)
 {
-    HICON hIcon = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_VIRTUALBOX));
+    HICON hIcon = LoadIcon(g_hInstance, "IDI_ICON1"); /* see Artwork/win/TemplateR3.rc */
     if (hIcon == NULL)
     {