Changeset 561 for trunk/src/activeqt/control/qaxservermain.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/activeqt/control/qaxservermain.cpp (modified) (5 diffs)

trunk/src/activeqt/control/qaxservermain.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the ActiveQt framework of the Qt Toolkit.
@@ -67 +68 @@
 extern bool qAxIsServer;
 extern bool qAxOutProcServer;
-extern char qAxModuleFilename[MAX_PATH];
+extern wchar_t qAxModuleFilename[MAX_PATH];
 extern QString qAxInit();
 extern void qAxCleanup();
@@ -106 +107 @@
 {
     dwThreadID = GetCurrentThreadId();
-    hEventShutdown = CreateEventA(0, false, false, 0);
+    hEventShutdown = CreateEvent(0, false, false, 0);
     if (hEventShutdown == 0)
         return false;
@@ -204 +205 @@
 
     qAxOutProcServer = true;
-    GetModuleFileNameA(0, qAxModuleFilename, MAX_PATH-1);
+    GetModuleFileName(0, qAxModuleFilename, MAX_PATH);
     qAxInstance = hInstance;
 
-    QByteArray cmdParam;
-    QT_WA({
-        LPTSTR cmdline = GetCommandLineW();
-        cmdParam = QString::fromUtf16((const ushort *)cmdline).toLocal8Bit();
-    }, {
-        cmdParam = GetCommandLineA();
-    });
-    
+    QByteArray cmdParam = QString::fromWCharArray(GetCommandLine()).toLocal8Bit();
     QList<QByteArray> cmds = cmdParam.split(' ');
     QByteArray unprocessed;
@@ -254 +248 @@
             break;
         } else {
-            unprocessed += cmds.at(i) + " ";
+            unprocessed += cmds.at(i) + ' ';
         }
     }