Commit 3fcebdaa authored by Damien Fouilleul's avatar Damien Fouilleul

activex: it sounds like latest windres no longer supports resource by name, use integer instead

parent 390b9dcb
......@@ -32,7 +32,7 @@ BEGIN
END
END
INPLACE-PICT BITMAP DISCARDABLE "inplace.bmp"
1 BITMAP DISCARDABLE "inplace.bmp"
1 TYPELIB "axvlc.tlb"
......@@ -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];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment