Changeset 62934 in vbox

Timestamp:

Aug 3, 2016 5:32:43 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

109537

Message:

Devices: warnings

Location:

trunk

Files:

• include/iprt/win/objbase.h (modified) (1 diff)
• src/VBox/Devices/Graphics/shaderlib/libWineStub/Makefile.kup (added)
• src/VBox/Devices/Graphics/shaderlib/libWineStub/debug.c (modified) (1 diff)
• src/VBox/Devices/Graphics/shaderlib/libWineStub/include/wine/list.h (modified) (1 diff)
• src/VBox/Devices/Graphics/shaderlib/shaderapi.c (modified) (6 diffs)
• src/VBox/Devices/Graphics/shaderlib/wined3d_private.h (modified) (2 diffs)

trunk/include/iprt/win/objbase.h

@@ -30 +30 @@
 #pragma warning(push)
 #pragma warning(disable:4668) /* '__midl' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
+#if !defined(__cplusplus)
+# pragma warning(disable:4255) /* 'FARPROC' : no function prototype given: converting '()' to '(void)' */
+#endif
 
 #include <objbase.h>

trunk/src/VBox/Devices/Graphics/shaderlib/libWineStub/debug.c

@@ -32 +32 @@
 
 #include "initguid.h"
+#ifdef VBOX
+# include <iprt/win/objbase.h>
+# include <wine/wined3d.h>
+# include <iprt/win/windows.h>
+#else
 #include <objbase.h>
 #include <wine/wined3d.h>
 #include <windows.h>
+#endif
 
 #include <stdlib.h>

trunk/src/VBox/Devices/Graphics/shaderlib/libWineStub/include/wine/list.h

@@ -242 +242 @@
 #undef LIST_ENTRY
 #define LIST_ENTRY(elem, type, field) \
-    ((type *)((char *)(elem) - (unsigned long)(&((type *)0)->field)))
+    ((type *)((char *)(elem) - (uintptr_t)(&((type *)0)->field)))
 
 #endif  /* __WINE_SERVER_LIST_H */

trunk/src/VBox/Devices/Graphics/shaderlib/shaderapi.c

@@ -15 +15 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
+
 #include <iprt/err.h>
 #include <iprt/mem.h>
@@ -144 +145 @@
     /* Dynamically load all GL core functions. */
 #ifdef RT_OS_WINDOWS
-# define USE_GL_FUNC(pfn) pfn = (void*)GetProcAddress(GetModuleHandle("opengl32.dll"), #pfn);
+    HANDLE hOpenGl32 = GetModuleHandle("opengl32.dll");
+# define USE_GL_FUNC(pfn) *(FARPROC *)(&pfn) = GetProcAddress(hOpenGl32, #pfn);
 #else
-# define USE_GL_FUNC(pfn) pfn = (void*)OGLGETPROCADDRESS(#pfn);
+# define USE_GL_FUNC(pfn) pfn = (void *)OGLGETPROCADDRESS(#pfn);
 #endif
     GL_FUNCS_GEN;
@@ -154 +156 @@
 #define USE_GL_FUNC(type, pfn, ext, replace) \
 { \
-    gl_info->pfn = (void*)OGLGETPROCADDRESS(#pfn); \
+    gl_info->pfn = (type)OGLGETPROCADDRESS(#pfn); \
 }
     GL_EXT_FUNCS_GEN;
@@ -204 +206 @@
 struct wined3d_context *context_acquire(IWineD3DDeviceImpl *This, IWineD3DSurface *target, enum ContextUsage usage)
 {
+    RT_NOREF(This, target, usage);
     return g_pCurrentContext;
 }
@@ -322 +325 @@
     }
 
-    hr = vertexshader_init(object, This, pShaderData, NULL, NULL, NULL);
+    hr = vertexshader_init(object, This, (DWORD const *)pShaderData, NULL, NULL, NULL);
     if (FAILED(hr))
     {
@@ -356 +359 @@
     }
 
-    hr = pixelshader_init(object, This, pShaderData, NULL, NULL, NULL);
+    hr = pixelshader_init(object, This, (DWORD const *)pShaderData, NULL, NULL, NULL);
     if (FAILED(hr))
     {

trunk/src/VBox/Devices/Graphics/shaderlib/wined3d_private.h

@@ -47 +47 @@
 #include "winuser.h"
 #else
-#include <windows.h>
+#include <iprt/win/windows.h>
 #endif
 #include "wine/debug.h"
@@ -1333 +1333 @@
 void context_surface_update(struct wined3d_context *context, IWineD3DSurfaceImpl *surface) DECLSPEC_HIDDEN;
 #if defined(VBOX_WINE_WITH_SINGLE_CONTEXT) || defined(VBOX_WINE_WITH_SINGLE_SWAPCHAIN_CONTEXT)
-void context_clear_on_thread_detach();
+void context_clear_on_thread_detach(void);
 #endif
 /* Macros for doing basic GPU detection based on opengl capabilities */