Make sure there is a new-line at the end of the .gitignore files.

[vlc] / projects / activex / plugin.cpp

diff --git a/projects/activex/plugin.cpp b/projects/activex/plugin.cpp
index e5ce069398a8391eb6370a45fbaf152276bf00a3..22a1ed4f767a0e5764a99097dd6db629362c6e43 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(2), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
     if( NULL != hbitmap )
     {
         PICTDESC pictDesc;
@@ -433,8 +433,8 @@ HRESULT VLCPlugin::getVLC(libvlc_instance_t** pp_libvlc)
         /*
         ** default initialization options
         */
-        char *ppsz_argv[32] = { "vlc" };
-        int   ppsz_argc = 1;
+        const char *ppsz_argv[32] = { };
+        int   ppsz_argc = 0;
 
         char p_progpath[MAX_PATH];
         {