activex: it sounds like latest windres no longer supports resource by name, use integ...

diff --git a/projects/activex/axvlc_rc.rc b/projects/activex/axvlc_rc.rc
index 090a17e0d088636a103a4c7d9d048ee29c747679..e6037d2676027d4278064d95d64fa6c5c5e77431 100644 (file)
--- a/projects/activex/axvlc_rc.rc
+++ b/projects/activex/axvlc_rc.rc
@@ -32,7 +32,7 @@ BEGIN
   END
 END
 
-INPLACE-PICT BITMAP DISCARDABLE "inplace.bmp"
+1 BITMAP DISCARDABLE "inplace.bmp"
 
 1 TYPELIB "axvlc.tlb"
 

diff --git a/projects/activex/plugin.cpp b/projects/activex/plugin.cpp
index e5ce069398a8391eb6370a45fbaf152276bf00a3..e234c67fc17b161d67b229e2fe19e45da6b70957 100644 (file)
--- a/projects/activex/plugin.cpp
+++ b/projects/activex/plugin.cpp
@@ -106,7 +106,7 @@ VLCPluginClass::VLCPluginClass(LONG *p_class_ref, HINSTANCE hInstance, REFCLSID
         _inplace_wndclass_atom = 0;
     }
 
-    HBITMAP hbitmap = (HBITMAP)LoadImage(getHInstance(), TEXT("INPLACE-PICT"), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
+    HBITMAP hbitmap = (HBITMAP)LoadImage(getHInstance(), MAKEINTRESOURCE(1), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
     if( NULL != hbitmap )
     {
         PICTDESC pictDesc;
@@ -433,7 +433,7 @@ HRESULT VLCPlugin::getVLC(libvlc_instance_t** pp_libvlc)
         /*
         ** default initialization options
         */
-        char *ppsz_argv[32] = { "vlc" };
+        const char *ppsz_argv[32] = { "vlc" };
         int   ppsz_argc = 1;
 
         char p_progpath[MAX_PATH];