Changeset 561 for trunk/src/activeqt/container/qaxselect.cpp
- Timestamp:
- Feb 11, 2010, 11:19:06 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/vendor/nokia/qt/4.6.1 merged eligible /branches/vendor/nokia/qt/current merged eligible /branches/vendor/trolltech/qt/current 3-149
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/src/activeqt/container/qaxselect.cpp
r2 r561 2 2 ** 3 3 ** 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]) 5 6 ** 6 7 ** This file is part of the ActiveQt framework of the Qt Toolkit. … … 53 54 { 54 55 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); 58 57 if (!classes_key) 59 58 return; … … 61 60 DWORD index = 0; 62 61 LONG result = 0; 63 TCHARbuffer[256];64 DWORD szBuffer = sizeof(buffer) ;62 buffer[256]; 63 DWORD szBuffer = sizeof(buffer); 65 64 FILETIME ft; 66 65 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); 71 68 if (result == ERROR_SUCCESS) { 72 69 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); 77 72 if (result == ERROR_SUCCESS) { 78 73 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); 83 76 84 77 controls << name; … … 87 80 result = ERROR_SUCCESS; 88 81 } 89 szBuffer = sizeof(buffer) ;82 szBuffer = sizeof(buffer); 90 83 ++index; 91 84 } while (result == ERROR_SUCCESS); … … 94 87 } 95 88 96 LONG RegistryQueryValue W(HKEY hKey, LPCWSTR lpSubKey, LPBYTE lpData, LPDWORD lpcbData)89 LONG RegistryQueryValue(HKEY hKey, LPCWSTR lpSubKey, LPBYTE lpData, LPDWORD lpcbData) 97 90 { 98 91 LONG ret = ERROR_FILE_NOT_FOUND; 99 92 HKEY hSubKey = NULL; 100 RegOpenKeyEx W(hKey, lpSubKey, 0, KEY_READ, &hSubKey);93 RegOpenKeyEx(hKey, lpSubKey, 0, KEY_READ, &hSubKey); 101 94 if (hSubKey) { 102 ret = RegQueryValueEx W(hSubKey, 0, 0, 0, lpData, lpcbData);95 ret = RegQueryValueEx(hSubKey, 0, 0, 0, lpData, lpcbData); 103 96 RegCloseKey(hSubKey); 104 97 }
Note:
See TracChangeset
for help on using the changeset viewer.