Changeset 63298 in vbox for trunk/src/VBox/Frontends/VBoxSDL

Timestamp:

Aug 10, 2016 4:35:00 PM (8 years ago)

Author:

vboxsync

Message:

VBoxSDL: warnings

Location:

trunk/src/VBox/Frontends/VBoxSDL

Files:

• Framebuffer.cpp (modified) (14 diffs)
• VBoxSDL.cpp (modified) (8 diffs)
• VBoxSDL.h (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- *
- * VBox frontends: VBoxSDL (simple frontend based on SDL):
- * Implementation of VBoxSDLFB (SDL framebuffer) class
+ * VBoxSDL - Implementation of VBoxSDLFB (SDL framebuffer) class
  */
 
@@ -45 +43 @@
 
 #if defined(RT_OS_WINDOWS) || defined(RT_OS_LINUX)
-#include <SDL_syswm.h>           /* for SDL_GetWMInfo() */
+# ifdef _MSC_VER
+#  pragma warning(push)
+#  pragma warning(disable: 4121) /* warning C4121: 'SDL_SysWMmsg' : alignment of a member was sensitive to packing*/
+# endif
+# include <SDL_syswm.h>           /* for SDL_GetWMInfo() */
+# ifdef _MSC_VER
+#  pragma warning(pop)
+# endif
 #endif
 
@@ -153 +158 @@
 #ifdef RT_OS_WINDOWS
     HRESULT hr = CoCreateFreeThreadedMarshaler(this, m_pUnkMarshaler.asOutParam());
-    Log(("CoCreateFreeThreadedMarshaler hr %08X\n", hr));
+    Log(("CoCreateFreeThreadedMarshaler hr %08X\n", hr)); NOREF(hr);
 #endif
 
@@ -561 +566 @@
 STDMETHODIMP VBoxSDLFB::VideoModeSupported(ULONG width, ULONG height, ULONG bpp, BOOL *supported)
 {
+    RT_NOREF(bpp);
+
     if (!supported)
         return E_POINTER;
@@ -616 +623 @@
 STDMETHODIMP VBoxSDLFB::ProcessVHWACommand(BYTE *pCommand)
 {
+    RT_NOREF(pCommand);
     return E_NOTIMPL;
 }
@@ -621 +629 @@
 STDMETHODIMP VBoxSDLFB::Notify3DEvent(ULONG uType, ComSafeArrayIn(BYTE, aData))
 {
+    RT_NOREF(uType, aData);
     return E_NOTIMPL;
 }
@@ -917 +926 @@
     SDL_VERSION(&info.version);
     if (SDL_GetWMInfo(&info))
-        mWinId = (LONG64) info.window;
+        mWinId = (intptr_t) info.window;
 # elif defined (RT_OS_LINUX)
     SDL_SysWMinfo info;
@@ -1151 +1160 @@
 
 #ifdef VBOX_SECURELABEL
+
 /**
  * Setup the secure labeling parameters
@@ -1213 +1223 @@
 void VBoxSDLFB::paintSecureLabel(int x, int y, int w, int h, bool fForce)
 {
-#ifdef VBOXSDL_WITH_X11
+    RT_NOREF(x, w, h);
+# ifdef VBOXSDL_WITH_X11
     AssertMsg(gSdlNativeThread == RTThreadNativeSelf(), ("Wrong thread! SDL is not threadsafe!\n"));
-#endif
+# endif
     /* only when the function is present */
     if (!pTTF_RenderUTF8_Solid)
@@ -1250 +1261 @@
     SDL_UpdateRect(mScreen, 0, 0, mScreen->w, mLabelHeight);
 }
+
 #endif /* VBOX_SECURELABEL */
 
@@ -1411 +1423 @@
 STDMETHODIMP VBoxSDLFBOverlay::COMGETTER(Alpha)(ULONG *alpha)
 {
+    RT_NOREF(alpha);
     LogFlow(("VBoxSDLFBOverlay::GetAlpha\n"));
     return E_NOTIMPL;
@@ -1423 +1436 @@
 STDMETHODIMP VBoxSDLFBOverlay::COMSETTER(Alpha)(ULONG alpha)
 {
+    RT_NOREF(alpha);
     LogFlow(("VBoxSDLFBOverlay::SetAlpha\n"));
     return E_NOTIMPL;
@@ -1594 +1608 @@
                                              ULONG w, ULONG h, BOOL *finished)
 {
+    RT_NOREF(aScreenId, bytesPerLine, finished);
     AssertReturn(pixelFormat == BitmapFormat_BGR, E_INVALIDARG);
     AssertReturn(vram == 0, E_INVALIDARG);
@@ -1623 +1638 @@
  * Basically, we support anything with 32bpp.
  */
-STDMETHODIMP VBoxSDLFBOverlay::VideoModeSupported(ULONG width, ULONG height, ULONG bpp,
-                                               BOOL *supported)
-{
+STDMETHODIMP VBoxSDLFBOverlay::VideoModeSupported(ULONG width, ULONG height, ULONG bpp, BOOL *supported)
+{
+    RT_NOREF(width, height);
     if (!supported)
         return E_POINTER;

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -46 +46 @@
 #endif
 
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable: 4121) /* warning C4121: 'SDL_SysWMmsg' : alignment of a member was sensitive to packing*/
+#endif
 #ifndef RT_OS_DARWIN
-#include <SDL_syswm.h>           /* for SDL_GetWMInfo() */
+# include <SDL_syswm.h>          /* for SDL_GetWMInfo() */
+#endif
+#ifdef _MSC_VER
+# pragma warning(pop)
 #endif
 
@@ -321 +328 @@
     STDMETHOD(HandleEvent)(VBoxEventType_T aType, IEvent * aEvent)
     {
+        RT_NOREF(aEvent);
         switch (aType)
         {
@@ -552 +560 @@
                 if (SDL_GetWMInfo(&info))
                 {
-#if defined(VBOXSDL_WITH_X11)
+# if defined(VBOXSDL_WITH_X11)
                     pSWEv->COMSETTER(WinId)((LONG64)info.info.x11.wmwindow);
-#elif defined(RT_OS_WINDOWS)
-                    pSWEv->COMSETTER(WinId)((LONG64)info.window);
-#else
+# elif defined(RT_OS_WINDOWS)
+                    pSWEv->COMSETTER(WinId)((intptr_t)info.window);
+# else
                     AssertFailed();
-#endif
+# endif
                 }
 #endif /* !RT_OS_DARWIN */
@@ -741 +749 @@
 DECLEXPORT(int) TrustedMain(int argc, char **argv, char **envp)
 {
+    RT_NOREF(envp);
 #ifdef RT_OS_WINDOWS
     ATL::CComModule _Module; /* Required internally by ATL (constructor records instance in global variable). */
@@ -3669 +3678 @@
         if (!keycode)
         {
-#ifdef DEBUG_bird
+# ifdef DEBUG_bird
             RTPrintf("Untranslated: keycode=%#x (%d)\n", keycode, keycode);
-#endif
+# endif
             keycode = Keyevent2KeycodeFallback(ev);
         }
     }
-#ifdef DEBUG_bird
+# ifdef DEBUG_bird
     RTPrintf("scancode=%#x -> %#x\n", ev->keysym.scancode, keycode);
-#endif
-
-#elif RT_OS_OS2
+# endif
+
+#elif defined(RT_OS_OS2)
     keycode = Keyevent2KeycodeFallback(ev);
 #endif /* RT_OS_DARWIN */
@@ -5039 +5048 @@
 static Uint32 StartupTimer(Uint32 interval, void *param)
 {
+    RT_NOREF(param);
+
     /* post message so we can do something in the startup loop */
     SDL_Event event = {0};
@@ -5053 +5064 @@
 static Uint32 ResizeTimer(Uint32 interval, void *param)
 {
+    RT_NOREF(interval, param);
+
     /* post message so the window is actually resized */
     SDL_Event event = {0};
@@ -5067 +5080 @@
 static Uint32 QuitTimer(Uint32 interval, void *param)
 {
+    RT_NOREF(interval, param);
+
     BOOL fHandled = FALSE;
 

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.h

@@ -24 +24 @@
 #ifdef RT_OS_WINDOWS /** @todo check why we need to do this on windows. */
 /* convince SDL to not overload main() */
-#define _SDL_main_h
+# define _SDL_main_h
 #endif
+
 /* include this first so Windows.h get's in before our stuff. */
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable: 4121) /* warning C4121: 'SDL_SysWMmsg' : alignment of a member was sensitive to packing*/
+#endif
 #include <SDL.h>
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
 
 /** custom SDL event for display update handling */