Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/activeqt/container/qaxselect.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the ActiveQt framework of the Qt Toolkit.
     
    5354    {
    5455        HKEY classes_key;
    55         QT_WA_INLINE(
    56             RegOpenKeyExW(HKEY_CLASSES_ROOT, L"CLSID", 0, KEY_READ, &classes_key),
    57             RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID", 0, KEY_READ, &classes_key));
     56        RegOpenKeyEx(HKEY_CLASSES_ROOT, L"CLSID", 0, KEY_READ, &classes_key);
    5857        if (!classes_key)
    5958            return;
     
    6160        DWORD index = 0;
    6261        LONG result = 0;
    63         TCHAR buffer[256];
    64         DWORD szBuffer = sizeof(buffer);
     62        buffer[256];
     63        DWORD szBuffer = sizeof(buffer);
    6564        FILETIME ft;
    6665        do {
    67             result = QT_WA_INLINE(
    68                 RegEnumKeyExW(classes_key, index, (wchar_t*)&buffer, &szBuffer, 0, 0, 0, &ft),
    69                 RegEnumKeyExA(classes_key, index, (char*)&buffer, &szBuffer, 0, 0, 0, &ft));
    70             szBuffer = sizeof(buffer);
     66            result = RegEnumKeyEx(classes_key, index, buffer, &szBuffer, 0, 0, 0, &ft);
     67            szBuffer = sizeof(buffer) / sizeof(wchar_t);
    7168            if (result == ERROR_SUCCESS) {
    7269                HKEY sub_key;
    73                 QString clsid = QT_WA_INLINE(QString::fromUtf16((ushort*)buffer), QString::fromLocal8Bit((char*)buffer));
    74                 result = QT_WA_INLINE(
    75                     RegOpenKeyExW(classes_key, reinterpret_cast<const wchar_t *>(QString(clsid + "\\Control").utf16()), 0, KEY_READ, &sub_key),
    76                     RegOpenKeyA(classes_key, QString(clsid + QLatin1String("\\Control")).toLocal8Bit(), &sub_key));
     70                QString clsid = QString::fromWCharArray(buffer);
     71                result = RegOpenKeyEx(classes_key, reinterpret_cast<const wchar_t *>(QString(clsid + "\\Control").utf16()), 0, KEY_READ, &sub_key);
    7772                if (result == ERROR_SUCCESS) {
    7873                    RegCloseKey(sub_key);
    79                     QT_WA_INLINE(
    80                         RegistryQueryValueW(classes_key, buffer, (LPBYTE)buffer, &szBuffer),
    81                         RegQueryValueA(classes_key, (char*)buffer, (char*)buffer, (LONG*)&szBuffer));
    82                     QString name = QT_WA_INLINE(QString::fromUtf16((ushort*)buffer, szBuffer / sizeof(TCHAR)) , QString::fromLocal8Bit((char*)buffer, szBuffer));
     74                    RegistryQueryValue(classes_key, buffer, (LPBYTE)buffer, &szBuffer);
     75                    QString name = QString::fromWCharArray(buffer);
    8376
    8477                    controls << name;
     
    8780                result = ERROR_SUCCESS;
    8881            }
    89             szBuffer = sizeof(buffer);
     82            szBuffer = sizeof(buffer);
    9083            ++index;
    9184        } while (result == ERROR_SUCCESS);
     
    9487    }
    9588
    96     LONG RegistryQueryValueW(HKEY hKey, LPCWSTR lpSubKey, LPBYTE lpData, LPDWORD lpcbData)
     89    LONG RegistryQueryValue(HKEY hKey, LPCWSTR lpSubKey, LPBYTE lpData, LPDWORD lpcbData)
    9790    {
    9891        LONG ret = ERROR_FILE_NOT_FOUND;
    9992        HKEY hSubKey = NULL;
    100         RegOpenKeyExW(hKey, lpSubKey, 0, KEY_READ, &hSubKey);
     93        RegOpenKeyEx(hKey, lpSubKey, 0, KEY_READ, &hSubKey);
    10194        if (hSubKey) {
    102             ret = RegQueryValueExW(hSubKey, 0, 0, 0, lpData, lpcbData);
     95            ret = RegQueryValueEx(hSubKey, 0, 0, 0, lpData, lpcbData);
    10396            RegCloseKey(hSubKey);
    10497        }
Note: See TracChangeset for help on using the changeset viewer.