Changeset 98139 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video

Timestamp:

Jan 19, 2023 1:50:46 PM (2 years ago)

Author:

vboxsync

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

155310

Message:

Add/WinNT: Made an disabled opengl test build again and use VBoxR3Static instead of VBOXR3STATIC. bugref:10348

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/gallium/ogltest

Files:

• Makefile.kmk (modified) (1 diff)
• ogltest.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/gallium/ogltest/Makefile.kmk

@@ -34 +34 @@
         ogltest-x86
 
-ogltest_TEMPLATE = VBOXR3STATIC
+ogltest_TEMPLATE = VBoxR3Static
 ogltest_INCS = \
         $(PATH_ROOT)/src/VBox/Devices/Graphics/vmsvga_glext

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/gallium/ogltest/ogltest.cpp

@@ -27 +27 @@
 
 #include "oglrender.h"
+#include <iprt/string.h>
 
 PFNGLBINDBUFFERPROC                             glBindBuffer;
@@ -60 +61 @@
     ~OGLTest();
 
-    HRESULT Init(HINSTANCE hInstance, LPSTR lpCmdLine, int nCmdShow);
+    HRESULT Init(HINSTANCE hInstance, int argc, char **argv, int nCmdShow);
     int Run();
 
@@ -66 +67 @@
     HRESULT initWindow(HINSTANCE hInstance, int nCmdShow);
     HRESULT initOGL();
-    void parseCmdLine(LPSTR lpCmdLine);
+    void parseCmdLine(int argc, char **argv);
     static LRESULT CALLBACK wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
 
@@ -257 +258 @@
 }
 
-void OGLTest::parseCmdLine(LPSTR lpCmdLine)
+void OGLTest::parseCmdLine(int argc, char **argv)
 {
     /* Very simple: test number followed by step flag.
      * Default is test 0, step mode: 1
      */
-    if (!lpCmdLine)
-        return;
-
-    char *p = lpCmdLine;
-
-    while (*p == ' ')
-        ++p;
-
-    if (!*p)
-         return;
 
     /* First number is the render id. */
-    miRenderId = atoi(p);
-
-    while (*p == ' ' || ('0' <= *p && *p <= '9'))
-        ++p;
-
-    if (!*p)
-         return;
+    if (argc >= 2)
+        miRenderId = RTStrToInt32(argv[1]);
 
     /* Second number is the step mode. */
-    miRenderStep = atoi(p);
-}
-
-HRESULT OGLTest::Init(HINSTANCE hInstance,
-                      LPSTR lpCmdLine,
-                      int nCmdShow)
-{
-    parseCmdLine(lpCmdLine);
+    if (argc >= 3)
+        miRenderStep = RTStrToInt32(argv[2]);
+}
+
+HRESULT OGLTest::Init(HINSTANCE hInstance, int argc, char **argv, int nCmdShow)
+{
+    parseCmdLine(argc, argv);
 
     HRESULT hr = initWindow(hInstance, nCmdShow);
@@ -381 +366 @@
 }
 
-int WINAPI WinMain(HINSTANCE hInstance,
-                   HINSTANCE hPrevInstance,
-                   LPSTR lpCmdLine,
-                   int nCmdShow)
-{
-    (void)hPrevInstance;
-
-    int result = 0;
+int main(int argc, char **argv)
+{
+    int      rcExit = RTEXITCODE_FAILURE;
+
     OGLTest test;
-
-    HRESULT hr = test.Init(hInstance, lpCmdLine, nCmdShow);
+    HRESULT hr = test.Init(GetModuleHandleW(NULL), argc, argv, SW_SHOWDEFAULT);
     if (SUCCEEDED(hr))
-    {
-        result = test.Run();
-    }
-
-    return result;
-}
+        rcExit = test.Run();
+
+    return rcExit;
+}