Changeset 561 for trunk/src/activeqt/control/qaxserverdll.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/qaxserverdll.cpp (modified) (3 diffs)

trunk/src/activeqt/control/qaxserverdll.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the ActiveQt framework of the Qt Toolkit.
@@ -51 +52 @@
 
 // in qaxserver.cpp
-extern char qAxModuleFilename[MAX_PATH];
+extern  qAxModuleFilename[MAX_PATH];
 extern bool qAxIsServer;
 extern ITypeLib *qAxTypeLibrary;
@@ -121 +122 @@
 EXTERN_C BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpvReserved)
 {
-    GetModuleFileNameA(hInstance, qAxModuleFilename, MAX_PATH-1);
+    GetModuleFileName);
     qAxInstance = hInstance;
     qAxIsServer = true;