From 3fcebdaae2f7e16ef3fe5462f46f9b1ff7a4bfd6 Mon Sep 17 00:00:00 2001
From: Damien Fouilleul <damienf@videolan.org>
Date: Mon, 18 Feb 2008 11:27:52 +0000
Subject: [PATCH] activex: it sounds like latest windres no longer supports
resource by name, use integer instead
---
projects/activex/axvlc_rc.rc | 2 +-
projects/activex/plugin.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/projects/activex/axvlc_rc.rc b/projects/activex/axvlc_rc.rc
index 090a17e0d088..e6037d267602 100644
--- 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 e5ce069398a8..e234c67fc17b 100644
--- 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];
--
GitLab