summaryrefslogtreecommitdiffstats
path: root/src/activeqt/control/qaxserverdll.cpp
diff options
context:
space:
mode:
authorminiak <milan.burda@gmail.com>2009-07-01 09:50:07 (GMT)
committerMarius Storm-Olsen <marius@trolltech.com>2009-07-01 09:51:18 (GMT)
commit22ab94871c4a924e37eca720a1620da2e1a7259d (patch)
tree2a8a065b1fb7db76e2651a0340071dc8d8b666a8 /src/activeqt/control/qaxserverdll.cpp
parent5db6c3b72d3c28f55f14883767d29db3441b1b66 (diff)
downloadQt-22ab94871c4a924e37eca720a1620da2e1a7259d.zip
Qt-22ab94871c4a924e37eca720a1620da2e1a7259d.tar.gz
Qt-22ab94871c4a924e37eca720a1620da2e1a7259d.tar.bz2
src/activeqt: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT support
Also, buffer sizes passed to Registry APIs were incorrect. Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
Diffstat (limited to 'src/activeqt/control/qaxserverdll.cpp')
-rw-r--r--src/activeqt/control/qaxserverdll.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/activeqt/control/qaxserverdll.cpp b/src/activeqt/control/qaxserverdll.cpp
index 375028d..512c408 100644
--- a/src/activeqt/control/qaxserverdll.cpp
+++ b/src/activeqt/control/qaxserverdll.cpp
@@ -50,7 +50,7 @@ bool qax_ownQApp = false;
HHOOK qax_hhook = 0;
// in qaxserver.cpp
-extern char qAxModuleFilename[MAX_PATH];
+extern wchar_t qAxModuleFilename[MAX_PATH];
extern bool qAxIsServer;
extern ITypeLib *qAxTypeLibrary;
extern unsigned long qAxLockCount();
@@ -120,7 +120,7 @@ STDAPI DllCanUnloadNow()
EXTERN_C BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpvReserved)
{
- GetModuleFileNameA(hInstance, qAxModuleFilename, MAX_PATH-1);
+ GetModuleFileName(hInstance, qAxModuleFilename, MAX_PATH);
qAxInstance = hInstance;
qAxIsServer = true;