Changeset 23

Timestamp:

Jun 8, 2009, 11:33:03 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Implemented OS/2 version of QSettings.

Location:

trunk

Files:

• qmake/Makefile.os2-g++ (modified) (2 diffs)
• src/corelib/io/qsettings_os2.cpp (copied) (copied from trunk/src/corelib/io/qsettings_win.cpp ) (5 diffs)

trunk/qmake/Makefile.os2-g++

@@ -79 +79 @@
         qurl.obj \
         qsettings.obj \
-        qsettings_pm.obj \
+        qsettings_os2.obj \
         qvariant.obj \
         qmetatype.obj \
@@ -145 +145 @@
         $(CXX) $(CXXFLAGS) $(BUILD_PATH)/src/corelib/global/qconfig.cpp
 
-qsettings_pm.obj: $(SOURCE_PATH)/src/corelib/io/qsettings_pm.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qsettings_pm.cpp
+qsettings_os2.obj: $(SOURCE_PATH)/src/corelib/io/qsettings_os2.cpp
+        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qsettings_os2.cpp
 
 qsettings.obj: $(SOURCE_PATH)/src/corelib/io/qsettings.cpp

trunk/src/corelib/io/qsettings_os2.cpp

@@ -3 +3 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** Copyright (C) 2009 netlabs.org. OS/2 parts.
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -47 +49 @@
 #include "qvector.h"
 #include "qmap.h"
-#include "qt_windows.h"
 #include "qdebug.h"
+
+/*******************************************************************************
+** Define some Win32 stuff to use Open32 Reg* functions from REGISTRY.DLL
+*/
+
+extern "C" {
+
+/* No UNICODE support on OS/2 */
+#define QT_WA( uni, ansi ) ansi
+
+typedef wchar_t WCHAR;
+typedef WCHAR TCHAR;
+
+/* These definitions come from os2wdef.h in the OS/2 Toolkit */
+
+#define APIENTRY    _System
+
+typedef char                CHAR ,   *PCHAR ,  *LPCHAR;
+typedef int                 INT,     *PINT,    *LPINT;
+typedef long                LONG,    *PLONG,   *LPLONG;
+typedef unsigned char       UCHAR ,  *PUCHAR,  *LPUCHAR;
+typedef unsigned long       ULONG ,  *PULONG , *LPULONG;
+typedef void                VOID,    *PVOID,   *LPVOID;
+
+typedef UCHAR               BYTE,    *PBYTE,   *LPBYTE;
+typedef ULONG               DWORD,   *PDWORD,  *LPDWORD;
+
+typedef INT                 BOOL,    *PBOOL,   *LPBOOL;
+
+typedef WCHAR               *LPWSTR, *PWSTR;
+typedef const WCHAR         *LPCWSTR, *PCWSTR;
+
+typedef CHAR                *LPSTR,  *PSTR;
+typedef const CHAR          *LPCSTR, *PCSTR;
+
+#define CONST       const
+
+/* These definitions come from os2win.h in the OS/2 Toolkit */
+
+typedef DWORD       ACCESS_MASK;
+typedef ACCESS_MASK REGSAM;
+
+typedef DWORD       HKEY, *PHKEY;
+
+typedef struct _tagSECURITY_ATTRIBUTES {
+    DWORD                            nLength;
+    LPVOID                           lpSecurityDescriptor;
+    BOOL                             bInheritHandle;
+} SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES;
+
+typedef struct _tagFILETIME {
+    DWORD dwLowDateTime;
+    DWORD dwHighDateTime;
+} FILETIME, *PFILETIME, *LPFILETIME;
+
+#define HKEY_LOCAL_MACHINE      0xFFFFFFEFL
+#define HKEY_CURRENT_USER       0xFFFFFFEEL
+#define HKEY_USERS              0xFFFFFFEDL
+#define HKEY_CLASSES_ROOT       0xFFFFFFECL
+
+//#define DELETE                       0x00010000
+#define READ_CONTROL                 0x00020000
+//#define WRITE_DAC                    0x00040000
+//#define WRITE_OWNER                  0x00080000
+//#define SYNCHRONIZE                  0x00100000
+
+//#define SPECIFIC_RIGHTS_ALL          0x0000FFFF
+//#define STANDARD_RIGHTS_READ         (READ_CONTROL)
+//#define STANDARD_RIGHTS_WRITE        (READ_CONTROL)
+//#define STANDARD_RIGHTS_EXECUTE      (READ_CONTROL)
+//#define STANDARD_RIGHTS_REQUIRED     0x000F0000
+#define STANDARD_RIGHTS_ALL          0x001F0000
+
+#define KEY_QUERY_VALUE         0x0001
+#define KEY_SET_VALUE           0x0002
+#define KEY_CREATE_SUB_KEY      0x0004
+#define KEY_ENUMERATE_SUB_KEYS  0x0008
+#define KEY_NOTIFY              0x0010
+#define KEY_CREATE_LINK         0x0020
+
+#define REG_OPTION_NON_VOLATILE 0x00000000L
+#define REG_OPTION_VOLATILE     0x00000001L
+#define REG_CREATED_NEW_KEY     0x00000001L
+#define REG_OPENED_EXISTING_KEY 0x00000002L
+
+#define KEY_READ         READ_CONTROL | KEY_QUERY_VALUE |\
+                           KEY_ENUMERATE_SUB_KEYS | KEY_NOTIFY
+
+#define KEY_WRITE        READ_CONTROL | KEY_SET_VALUE | KEY_CREATE_SUB_KEY
+
+#define KEY_EXECUTE      KEY_READ
+
+#define KEY_ALL_ACCESS   STANDARD_RIGHTS_ALL | KEY_QUERY_VALUE |\
+                           KEY_SET_VALUE | KEY_CREATE_SUB_KEY |\
+                           KEY_ENUMERATE_SUB_KEYS | KEY_NOTIFY |\
+                           KEY_CREATE_LINK
+
+#define REG_NONE                  0
+#define REG_SZ                    1
+#define REG_EXPAND_SZ             2
+#define REG_BINARY                3
+#define REG_DWORD                 4
+#define REG_DWORD_LITTLE_ENDIAN   4
+#define REG_DWORD_BIG_ENDIAN      5
+#define REG_LINK                  6
+#define REG_MULTI_SZ              7
+#define REG_RESOURCE_LIST         8
+
+/* These definitions come from winreg.h from MSVC 6.0 */
+LONG APIENTRY RegCloseKey( HKEY hKey );
+LONG APIENTRY RegCreateKeyExA( HKEY hKey, LPCSTR lpSubKey, DWORD Reserved, LPSTR lpClass, DWORD dwOptions, REGSAM samDesired, LPSECURITY_ATTRIBUTES lpSecurityAttributes, PHKEY phkResult, LPDWORD lpdwDisposition );
+LONG APIENTRY RegCreateKeyExW( HKEY hKey,LPCWSTR lpSubKey, DWORD Reserved, LPWSTR lpClass, DWORD dwOptions, REGSAM samDesired, LPSECURITY_ATTRIBUTES lpSecurityAttributes, PHKEY phkResult, LPDWORD lpdwDisposition );
+LONG APIENTRY RegDeleteKeyA( HKEY hKey, LPCSTR lpSubKey);
+LONG APIENTRY RegDeleteKeyW( HKEY hKey, LPCWSTR lpSubKey);
+LONG APIENTRY RegDeleteValueA( HKEY hKey, LPCSTR lpValueName );
+LONG APIENTRY RegDeleteValueW( HKEY hKey, LPCWSTR lpValueName );
+LONG APIENTRY RegEnumKeyExA( HKEY hKey, DWORD dwIndex, LPSTR lpName, LPDWORD lpcbName, LPDWORD lpReserved, LPSTR lpClass, LPDWORD lpcbClass, PFILETIME lpftLastWriteTime );
+LONG APIENTRY RegEnumKeyExW( HKEY hKey, DWORD dwIndex, LPWSTR lpName, LPDWORD lpcbName, LPDWORD lpReserved, LPWSTR lpClass, LPDWORD lpcbClass, PFILETIME lpftLastWriteTime);
+LONG APIENTRY RegEnumValueA( HKEY hKey, DWORD dwIndex, LPSTR lpValueName, LPDWORD lpcbValueName, LPDWORD lpReserved, LPDWORD lpType, LPBYTE lpData, LPDWORD lpcbData );
+LONG APIENTRY RegEnumValueW( HKEY hKey, DWORD dwIndex, LPWSTR lpValueName, LPDWORD lpcbValueName, LPDWORD lpReserved, LPDWORD lpType, LPBYTE lpData, LPDWORD lpcbData );
+LONG APIENTRY RegFlushKey( HKEY hKey );
+LONG APIENTRY RegOpenKeyExA( HKEY hKey, LPCSTR lpSubKey, DWORD ulOptions, REGSAM samDesired, PHKEY phkResult );
+LONG APIENTRY RegOpenKeyExW( HKEY hKey, LPCWSTR lpSubKey, DWORD ulOptions, REGSAM samDesired, PHKEY phkResult );
+LONG APIENTRY RegQueryInfoKeyA( HKEY hKey, LPSTR lpClass, LPDWORD lpcbClass, LPDWORD lpReserved, LPDWORD lpcSubKeys, LPDWORD lpcbMaxSubKeyLen, LPDWORD lpcbMaxClassLen, LPDWORD lpcValues, LPDWORD lpcbMaxValueNameLen, LPDWORD lpcbMaxValueLen, LPDWORD lpcbSecurityDescriptor, PFILETIME lpftLastWriteTime );
+LONG APIENTRY RegQueryInfoKeyW( HKEY hKey, LPWSTR lpClass, LPDWORD lpcbClass, LPDWORD lpReserved, LPDWORD lpcSubKeys, LPDWORD lpcbMaxSubKeyLen, LPDWORD lpcbMaxClassLen, LPDWORD lpcValues, LPDWORD lpcbMaxValueNameLen, LPDWORD lpcbMaxValueLen, LPDWORD lpcbSecurityDescriptor, PFILETIME lpftLastWriteTime );
+LONG APIENTRY RegQueryValueExA( HKEY hKey, LPCSTR lpValueName, LPDWORD lpReserved, LPDWORD lpType, LPBYTE lpData, LPDWORD lpcbData );
+LONG APIENTRY RegQueryValueExW( HKEY hKey, LPCWSTR lpValueName, LPDWORD lpReserved, LPDWORD lpType, LPBYTE lpData, LPDWORD lpcbData );
+LONG APIENTRY RegSetValueExA( HKEY hKey, LPCSTR lpValueName, DWORD Reserved, DWORD dwType, CONST BYTE* lpData, DWORD cbData );
+LONG APIENTRY RegSetValueExW( HKEY hKey, LPCWSTR lpValueName, DWORD Reserved, DWORD dwType, CONST BYTE* lpData, DWORD cbData );
+
+/* These definitions come from winerror.h from MSVC 6.0 */
+#define ERROR_SUCCESS                    0L
+#define ERROR_FILE_NOT_FOUND             2L
+#define ERROR_ACCESS_DENIED              5L
+#define ERROR_NO_MORE_ITEMS              259L
+
+} /* extern "C" */
+
+/* End of Win32 definitions */
 
 QT_BEGIN_NAMESPACE
@@ -132 +272 @@
 {
     QString result;
-        QT_WA({
-                wchar_t *data = 0;
-                FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-                        0, errorCode, 0,
-                        data, 0, 0);
-                result = QString::fromUtf16(reinterpret_cast<const ushort *> (data));
-                if (data != 0)
-                        LocalFree(data);
-        },      {
-                char *data = 0;
-                FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-                        0, errorCode, 0,
-                        (char *)&data, 0, 0);
-                result = QString::fromLocal8Bit(data);
-                if (data != 0)
-                        LocalFree(data);
-        })
-    if (result.endsWith(QLatin1String("\n")))
-        result.truncate(result.length() - 1);
+    switch (errorCode) {
+        case ERROR_FILE_NOT_FOUND:
+            result = "ERROR_FILE_NOT_FOUND"; break;
+        case ERROR_ACCESS_DENIED:
+            result = "ERROR_ACCESS_DENIED"; break;
+        case ERROR_NO_MORE_ITEMS:
+            result = "ERROR_NO_MORE_ITEMS"; break;
+    default:
+        result = QString().sprintf("Error %lu", errorCode);
+            break;
+    }
 
     return result;
@@ -634 +766 @@
     if (deleteWriteHandleOnExit && writeHandle() != 0) {
 #if defined(Q_OS_WINCE)
-        remove(regList.at(0).key()); 
+        remove(regList.at(0).key());
 #else
         DWORD res;
@@ -795 +927 @@
 
         case QVariant::ByteArray:
-            // On Win95/98/Me QString::toLocal8Bit() fails to handle chars > 0x7F. So we don't go through variantToString() at all.
-            if (QSysInfo::WindowsVersion & QSysInfo::WV_DOS_based) {
-                QByteArray ba = value.toByteArray();
-                regValueBuff = "@ByteArray(";
-                regValueBuff += ba;
-                regValueBuff += ')';
-                if (ba.contains('\0')) {
-                    type = REG_BINARY;
-                } else {
-                    type = REG_SZ;
-                    regValueBuff += '\0';
-                }
-                    
-                break;
-            }
             // fallthrough intended