Wine-devel
Threads by month
- ----- 2026 -----
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2005 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2004 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2003 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2002 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2001 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
October 2020
- 82 participants
- 799 discussions
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
---
dlls/dssenh/main.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c
index 2d39884a21a..fb9c5be9328 100644
--- a/dlls/dssenh/main.c
+++ b/dlls/dssenh/main.c
@@ -285,10 +285,12 @@ BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags
switch (flags)
{
case 0:
+ case 0 | CRYPT_MACHINE_KEYSET:
ret = read_key_container( name, flags );
break;
case CRYPT_NEWKEYSET:
+ case CRYPT_NEWKEYSET | CRYPT_MACHINE_KEYSET:
if ((ret = read_key_container( name, flags )))
{
heap_free( ret );
@@ -299,10 +301,12 @@ BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags
break;
case CRYPT_VERIFYCONTEXT:
+ case CRYPT_VERIFYCONTEXT | CRYPT_MACHINE_KEYSET:
ret = create_key_container( "", flags );
break;
case CRYPT_DELETEKEYSET:
+ case CRYPT_DELETEKEYSET | CRYPT_MACHINE_KEYSET:
delete_key_container( name, flags );
*ret_prov = 0;
return TRUE;
--
2.28.0
1
0
20 Oct '20
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
---
dlls/dssenh/main.c | 147 +++++++++++++++++++++++++++++++++++++--------
1 file changed, 121 insertions(+), 26 deletions(-)
diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c
index ffd1db92da4..2d39884a21a 100644
--- a/dlls/dssenh/main.c
+++ b/dlls/dssenh/main.c
@@ -485,35 +485,18 @@ BOOL WINAPI CPDestroyKey( HCRYPTPROV hprov, HCRYPTKEY hkey )
#define MAGIC_DSS1 ('D' | ('S' << 8) | ('S' << 16) | ('1' << 24))
#define MAGIC_DSS2 ('D' | ('S' << 8) | ('S' << 16) | ('2' << 24))
+#define MAGIC_DSS3 ('D' | ('S' << 8) | ('S' << 16) | ('3' << 24))
-BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKEY hpubkey, DWORD flags,
- HCRYPTKEY *ret_key )
+static BOOL import_key_dss2( struct container *container, ALG_ID algid, const BYTE *data, DWORD len, DWORD flags,
+ HCRYPTKEY *ret_key )
{
- struct container *container = (struct container *)hprov;
- struct key *key, *exch_key, *sign_key;
- BLOBHEADER *hdr;
- DSSPUBKEY *pubkey;
+ const BLOBHEADER *hdr = (const BLOBHEADER *)data;
+ const DSSPUBKEY *pubkey = (const DSSPUBKEY *)(hdr + 1);
const WCHAR *type;
+ struct key *key, *exch_key, *sign_key;
NTSTATUS status;
- TRACE( "%p, %p, %u, %p, %08x, %p\n", (void *)hprov, data, len, (void *)hpubkey, flags, ret_key );
-
- if (container->magic != MAGIC_CONTAINER) return FALSE;
- if (len < sizeof(*hdr)) return FALSE;
-
- hdr = (BLOBHEADER *)data;
- if ((hdr->bType != PRIVATEKEYBLOB && hdr->bType != PUBLICKEYBLOB) || hdr->bVersion != 2 ||
- hdr->aiKeyAlg != CALG_DSS_SIGN)
- {
- FIXME( "bType %u\n", hdr->bType );
- FIXME( "bVersion %u\n", hdr->bVersion );
- FIXME( "reserved %u\n", hdr->reserved );
- FIXME( "aiKeyAlg %08x\n", hdr->aiKeyAlg );
- return FALSE;
- }
-
if (len < sizeof(*hdr) + sizeof(*pubkey)) return FALSE;
- pubkey = (DSSPUBKEY *)(hdr + 1);
switch (pubkey->magic)
{
@@ -530,7 +513,7 @@ BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKE
return FALSE;
}
- if (!(key = create_key( hdr->aiKeyAlg, flags ))) return FALSE;
+ if (!(key = create_key( CALG_DSS_SIGN, flags ))) return FALSE;
if ((status = BCryptImportKeyPair( key->alg_handle, NULL, type, &key->handle, (UCHAR *)data, len, 0 )))
{
@@ -541,7 +524,7 @@ BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKE
if (!wcscmp(type, LEGACY_DSA_V2_PRIVATE_BLOB))
{
- switch (hdr->aiKeyAlg)
+ switch (algid)
{
case AT_KEYEXCHANGE:
case CALG_DH_SF:
@@ -566,7 +549,7 @@ BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKE
break;
default:
- FIXME( "unhandled key algorithm %u\n", hdr->aiKeyAlg );
+ FIXME( "unhandled key algorithm %u\n", algid );
destroy_key( key );
return FALSE;
}
@@ -578,6 +561,118 @@ BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKE
return TRUE;
}
+static BOOL import_key_dss3( struct container *container, ALG_ID algid, const BYTE *data, DWORD len, DWORD flags,
+ HCRYPTKEY *ret_key )
+{
+ const BLOBHEADER *hdr = (const BLOBHEADER *)data;
+ const DSSPUBKEY_VER3 *pubkey = (const DSSPUBKEY_VER3 *)(hdr + 1);
+ BCRYPT_DSA_KEY_BLOB *blob;
+ struct key *key;
+ BYTE *src, *dst;
+ ULONG i, size, size_q;
+ NTSTATUS status;
+
+ if (len < sizeof(*hdr) + sizeof(*pubkey)) return FALSE;
+
+ switch (pubkey->magic)
+ {
+ case MAGIC_DSS3:
+ break;
+
+ default:
+ FIXME( "unsupported key magic %08x\n", pubkey->magic );
+ return FALSE;
+ }
+
+ if ((size_q = pubkey->bitlenQ / 8) > sizeof(blob->q))
+ {
+ FIXME( "q too large\n" );
+ return FALSE;
+ }
+
+ if (!(key = create_key( CALG_DSS_SIGN, flags ))) return FALSE;
+
+ size = sizeof(*blob) + (pubkey->bitlenP / 8) * 3;
+ if (!(blob = heap_alloc_zero( size )))
+ {
+ destroy_key( key );
+ return FALSE;
+ }
+ blob->dwMagic = BCRYPT_DSA_PUBLIC_MAGIC;
+ blob->cbKey = pubkey->bitlenP / 8;
+ memcpy( blob->Count, &pubkey->DSSSeed.counter, sizeof(blob->Count) );
+ memcpy( blob->Seed, pubkey->DSSSeed.seed, sizeof(blob->Seed) );
+
+ /* q */
+ src = (BYTE *)(pubkey + 1) + blob->cbKey;
+ for (i = 0; i < size_q; i++) blob->q[i] = src[size_q - i - 1];
+
+ /* p */
+ src -= blob->cbKey;
+ dst = (BYTE *)(blob + 1);
+ for (i = 0; i < blob->cbKey; i++) dst[i] = src[blob->cbKey - i - 1];
+
+ /* g */
+ src += blob->cbKey + size_q;
+ dst += blob->cbKey;
+ for (i = 0; i < blob->cbKey; i++) dst[i] = src[blob->cbKey - i - 1];
+
+ /* y */
+ src += blob->cbKey + pubkey->bitlenJ / 8;
+ dst += blob->cbKey;
+ for (i = 0; i < blob->cbKey; i++) dst[i] = src[blob->cbKey - i - 1];
+
+ if ((status = BCryptImportKeyPair( key->alg_handle, NULL, BCRYPT_DSA_PUBLIC_BLOB, &key->handle, (UCHAR *)blob,
+ size, 0 )))
+ {
+ WARN( "failed to import key %08x\n", status );
+ destroy_key( key );
+ heap_free( blob );
+ return FALSE;
+ }
+
+ heap_free( blob );
+ *ret_key = (HCRYPTKEY)key;
+ return TRUE;
+}
+
+BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKEY hpubkey, DWORD flags,
+ HCRYPTKEY *ret_key )
+{
+ struct container *container = (struct container *)hprov;
+ const BLOBHEADER *hdr;
+ BOOL ret;
+
+ TRACE( "%p, %p, %u, %p, %08x, %p\n", (void *)hprov, data, len, (void *)hpubkey, flags, ret_key );
+
+ if (container->magic != MAGIC_CONTAINER) return FALSE;
+ if (len < sizeof(*hdr)) return FALSE;
+
+ hdr = (const BLOBHEADER *)data;
+ if ((hdr->bType != PRIVATEKEYBLOB && hdr->bType != PUBLICKEYBLOB) || hdr->aiKeyAlg != CALG_DSS_SIGN)
+ {
+ FIXME( "bType %u aiKeyAlg %08x not supported\n", hdr->bType, hdr->aiKeyAlg );
+ return FALSE;
+ }
+
+ switch (hdr->bVersion)
+ {
+ case 2:
+ ret = import_key_dss2( container, hdr->aiKeyAlg, data, len, flags, ret_key );
+ break;
+
+ case 3:
+ ret = import_key_dss3( container, hdr->aiKeyAlg, data, len, flags, ret_key );
+ break;
+
+ default:
+ FIXME( "version %u not supported\n", hdr->bVersion );
+ return FALSE;
+ }
+
+ return ret;
+}
+
BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DWORD blobtype, DWORD flags,
BYTE *data, DWORD *len )
{
--
2.28.0
1
0
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
---
dlls/dssenh/main.c | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c
index e3771dc6f06..ffd1db92da4 100644
--- a/dlls/dssenh/main.c
+++ b/dlls/dssenh/main.c
@@ -433,11 +433,7 @@ static BOOL generate_key( struct container *container, ALG_ID algid, DWORD bitle
return FALSE;
}
- if (!store_key_container_keys( container ))
- {
- destroy_key( key );
- return FALSE;
- }
+ if (!store_key_container_keys( container )) return FALSE;
*ret_key = (HCRYPTKEY)key;
return TRUE;
@@ -494,7 +490,7 @@ BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKE
HCRYPTKEY *ret_key )
{
struct container *container = (struct container *)hprov;
- struct key *key;
+ struct key *key, *exch_key, *sign_key;
BLOBHEADER *hdr;
DSSPUBKEY *pubkey;
const WCHAR *type;
@@ -549,12 +545,24 @@ BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKE
{
case AT_KEYEXCHANGE:
case CALG_DH_SF:
- container->exch_key = key;
+ if (!(exch_key = duplicate_key( key )))
+ {
+ destroy_key( key );
+ return FALSE;
+ }
+ destroy_key( container->exch_key );
+ container->exch_key = exch_key;
break;
case AT_SIGNATURE:
case CALG_DSS_SIGN:
- container->sign_key = key;
+ if (!(sign_key = duplicate_key( key )))
+ {
+ destroy_key( key );
+ return FALSE;
+ }
+ destroy_key( container->sign_key );
+ container->sign_key = sign_key;
break;
default:
@@ -563,11 +571,7 @@ BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKE
return FALSE;
}
- if (!store_key_container_keys( container ))
- {
- destroy_key( key );
- return FALSE;
- }
+ if (!store_key_container_keys( container )) return FALSE;
}
*ret_key = (HCRYPTKEY)key;
--
2.28.0
1
0
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
---
dlls/dssenh/tests/dssenh.c | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c
index d3f3172230e..e9c62cb99de 100644
--- a/dlls/dssenh/tests/dssenh.c
+++ b/dlls/dssenh/tests/dssenh.c
@@ -1514,6 +1514,36 @@ static void test_userkey(void)
ok(!hprov, "got %08x\n", (DWORD)hprov);
}
+static void test_duplicate_key(void)
+{
+ HCRYPTPROV hprov;
+ HCRYPTKEY hkey, hkey2;
+ DWORD len;
+ BOOL result;
+ BYTE buf[512];
+
+ result = CryptAcquireContextA(&hprov, NULL, MS_DEF_DSS_PROV_A, PROV_DSS, CRYPT_VERIFYCONTEXT);
+ ok(result, "got %08x\n", GetLastError());
+
+ result = CryptImportKey(hprov, DSS_SIGN_PrivateKey, sizeof(DSS_SIGN_PrivateKey), 0, CRYPT_EXPORTABLE, &hkey);
+ ok(result, "got %08x\n", GetLastError());
+
+ result = CryptDuplicateKey(hkey, NULL, 0, &hkey2);
+ ok(result, "got %08x\n", GetLastError());
+
+ len = sizeof(buf);
+ result = CryptExportKey(hkey2, 0, PRIVATEKEYBLOB, 0, buf, &len);
+ ok(result, "got %08x\n", GetLastError());
+ ok(len == sizeof(DSS_SIGN_PrivateKey), "got %u\n", len);
+ ok(!memcmp(buf, DSS_SIGN_PrivateKey, sizeof(DSS_SIGN_PrivateKey)), "wrong data\n");
+
+ result = CryptDestroyKey(hkey2);
+ ok(result, "got %08x\n", GetLastError());
+
+ result = CryptDestroyKey(hkey);
+ ok(result, "got %08x\n", GetLastError());
+}
+
START_TEST(dssenh)
{
test_acquire_context();
@@ -1525,4 +1555,5 @@ START_TEST(dssenh)
test_key_exchange();
test_duplicate_hash();
test_userkey();
+ test_duplicate_key();
}
--
2.28.0
1
0
The yougest one, IsWow64Proces, is available since WinXP SP2 / Vista.
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
programs/taskmgr/perfdata.c | 12 ++----------
programs/taskmgr/perfdata.h | 3 ---
2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c
index a152415357e..bbd3327ab58 100644
--- a/programs/taskmgr/perfdata.c
+++ b/programs/taskmgr/perfdata.c
@@ -30,8 +30,6 @@
#include "taskmgr.h"
#include "perfdata.h"
-static PROCGPIC pGetProcessIoCounters = NULL;
-static PROCISW64 pIsWow64Process = NULL;
static CRITICAL_SECTION PerfDataCriticalSection;
static PPERFDATA pPerfDataOld = NULL; /* Older perf data (saved to establish delta values) */
static PPERFDATA pPerfData = NULL; /* Most recent copy of perf data */
@@ -57,11 +55,7 @@ static size_t size_diff(size_t x, size_t y)
BOOL PerfDataInitialize(void)
{
LONG status;
- static const WCHAR wszKernel32[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0};
- pGetProcessIoCounters = (PROCGPIC)GetProcAddress(GetModuleHandleW(wszKernel32), "GetProcessIoCounters");
- pIsWow64Process = (PROCISW64)GetProcAddress(GetModuleHandleW(wszKernel32), "IsWow64Process");
-
InitializeCriticalSection(&PerfDataCriticalSection);
/*
@@ -291,10 +285,8 @@ void PerfDataRefresh(void)
}
pPerfData[Idx].USERObjectCount = GetGuiResources(hProcess, GR_USEROBJECTS);
pPerfData[Idx].GDIObjectCount = GetGuiResources(hProcess, GR_GDIOBJECTS);
- if (pGetProcessIoCounters)
- pGetProcessIoCounters(hProcess, &pPerfData[Idx].IOCounters);
- if (pIsWow64Process)
- pIsWow64Process(hProcess, &pPerfData[Idx].Wow64Process);
+ GetProcessIoCounters(hProcess, &pPerfData[Idx].IOCounters);
+ IsWow64Process(hProcess, &pPerfData[Idx].Wow64Process);
CloseHandle(hProcess);
}
pPerfData[Idx].UserTime.QuadPart = pSPI->UserTime.QuadPart;
diff --git a/programs/taskmgr/perfdata.h b/programs/taskmgr/perfdata.h
index 0b06965d52e..615e7db2a64 100644
--- a/programs/taskmgr/perfdata.h
+++ b/programs/taskmgr/perfdata.h
@@ -66,9 +66,6 @@ struct _SYSTEM_PAGEFILE_INFORMATION
#define GR_GDIOBJECTS 0 /* Count of GDI objects */
#define GR_USEROBJECTS 1 /* Count of USER objects */
-typedef BOOL (WINAPI *PROCGPIC)(HANDLE,PIO_COUNTERS);
-typedef BOOL (WINAPI *PROCISW64)(HANDLE,PBOOL);
-
BOOL PerfDataInitialize(void);
void PerfDataRefresh(void);
--
2.26.2
1
0
19 Oct '20
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
programs/taskmgr/perfdata.c | 23 +++++++++--------------
programs/taskmgr/perfdata.h | 1 -
2 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c
index 67f0d934412..a152415357e 100644
--- a/programs/taskmgr/perfdata.c
+++ b/programs/taskmgr/perfdata.c
@@ -30,7 +30,6 @@
#include "taskmgr.h"
#include "perfdata.h"
-static PROCNTQSI pNtQuerySystemInformation = NULL;
static PROCGPIC pGetProcessIoCounters = NULL;
static PROCISW64 pIsWow64Process = NULL;
static CRITICAL_SECTION PerfDataCriticalSection;
@@ -58,22 +57,17 @@ static size_t size_diff(size_t x, size_t y)
BOOL PerfDataInitialize(void)
{
LONG status;
- static const WCHAR wszNtdll[] = {'n','t','d','l','l','.','d','l','l',0};
static const WCHAR wszKernel32[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0};
- pNtQuerySystemInformation = (PROCNTQSI)GetProcAddress(GetModuleHandleW(wszNtdll), "NtQuerySystemInformation");
pGetProcessIoCounters = (PROCGPIC)GetProcAddress(GetModuleHandleW(wszKernel32), "GetProcessIoCounters");
pIsWow64Process = (PROCISW64)GetProcAddress(GetModuleHandleW(wszKernel32), "IsWow64Process");
InitializeCriticalSection(&PerfDataCriticalSection);
- if (!pNtQuerySystemInformation)
- return FALSE;
-
/*
* Get number of processors in the system
*/
- status = pNtQuerySystemInformation(SystemBasicInformation, &SystemBasicInfo, sizeof(SystemBasicInfo), NULL);
+ status = NtQuerySystemInformation(SystemBasicInformation, &SystemBasicInfo, sizeof(SystemBasicInfo), NULL);
if (status != NO_ERROR)
return FALSE;
@@ -102,24 +96,25 @@ void PerfDataRefresh(void)
/* Get new system time */
- status = pNtQuerySystemInformation(SystemTimeOfDayInformation, &SysTimeInfo, sizeof(SysTimeInfo), 0);
+ status = NtQuerySystemInformation(SystemTimeOfDayInformation, &SysTimeInfo, sizeof(SysTimeInfo), 0);
if (status != NO_ERROR)
return;
/* Get new CPU's idle time */
- status = pNtQuerySystemInformation(SystemPerformanceInformation, &SysPerfInfo, sizeof(SysPerfInfo), NULL);
+ status = NtQuerySystemInformation(SystemPerformanceInformation, &SysPerfInfo, sizeof(SysPerfInfo), NULL);
if (status != NO_ERROR)
return;
/* Get system cache information */
- status = pNtQuerySystemInformation(SystemCacheInformation, &SysCacheInfo, sizeof(SysCacheInfo), NULL);
+ status = NtQuerySystemInformation(SystemCacheInformation, &SysCacheInfo, sizeof(SysCacheInfo), NULL);
if (status != NO_ERROR)
return;
/* Get processor time information */
SysProcessorTimeInfo = HeapAlloc(GetProcessHeap(), 0,
- sizeof(*SysProcessorTimeInfo) * SystemBasicInfo.NumberOfProcessors);
- status = pNtQuerySystemInformation(SystemProcessorPerformanceInformation, SysProcessorTimeInfo, sizeof(*SysProcessorTimeInfo) * SystemBasicInfo.NumberOfProcessors, &ulSize);
+ sizeof(*SysProcessorTimeInfo) * SystemBasicInfo.NumberOfProcessors);
+ status = NtQuerySystemInformation(SystemProcessorPerformanceInformation, SysProcessorTimeInfo,
+ sizeof(*SysProcessorTimeInfo) * SystemBasicInfo.NumberOfProcessors, &ulSize);
if (status != NO_ERROR) {
HeapFree(GetProcessHeap(), 0, SysProcessorTimeInfo);
return;
@@ -135,7 +130,7 @@ void PerfDataRefresh(void)
BufferSize += 0x10000;
SysHandleInfoData = HeapAlloc(GetProcessHeap(), 0, BufferSize);
- status = pNtQuerySystemInformation(SystemHandleInformation, SysHandleInfoData, BufferSize, &ulSize);
+ status = NtQuerySystemInformation(SystemHandleInformation, SysHandleInfoData, BufferSize, &ulSize);
if (status == 0xC0000004 /*STATUS_INFO_LENGTH_MISMATCH*/) {
HeapFree(GetProcessHeap(), 0, SysHandleInfoData);
@@ -153,7 +148,7 @@ void PerfDataRefresh(void)
BufferSize += 0x10000;
pBuffer = HeapAlloc(GetProcessHeap(), 0, BufferSize);
- status = pNtQuerySystemInformation(SystemProcessInformation, pBuffer, BufferSize, &ulSize);
+ status = NtQuerySystemInformation(SystemProcessInformation, pBuffer, BufferSize, &ulSize);
if (status == 0xC0000004 /*STATUS_INFO_LENGTH_MISMATCH*/) {
HeapFree(GetProcessHeap(), 0, pBuffer);
diff --git a/programs/taskmgr/perfdata.h b/programs/taskmgr/perfdata.h
index 8b9fabbd910..0b06965d52e 100644
--- a/programs/taskmgr/perfdata.h
+++ b/programs/taskmgr/perfdata.h
@@ -66,7 +66,6 @@ struct _SYSTEM_PAGEFILE_INFORMATION
#define GR_GDIOBJECTS 0 /* Count of GDI objects */
#define GR_USEROBJECTS 1 /* Count of USER objects */
-typedef LONG (WINAPI *PROCNTQSI)(UINT,PVOID,ULONG,PULONG);
typedef BOOL (WINAPI *PROCGPIC)(HANDLE,PIO_COUNTERS);
typedef BOOL (WINAPI *PROCISW64)(HANDLE,PBOOL);
--
2.26.2
1
0
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
dlls/uxtheme/draw.c | 3 +-
dlls/uxtheme/msstyles.c | 46 +++++------------
dlls/uxtheme/system.c | 107 +++++++++++++---------------------------
dlls/uxtheme/uxini.c | 6 +--
4 files changed, 49 insertions(+), 113 deletions(-)
diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c
index 3dcc58205b0..023b2dfd61b 100644
--- a/dlls/uxtheme/draw.c
+++ b/dlls/uxtheme/draw.c
@@ -49,7 +49,6 @@ extern ATOM atDialogThemeEnabled;
*/
HRESULT WINAPI EnableThemeDialogTexture(HWND hwnd, DWORD dwFlags)
{
- static const WCHAR szTab[] = { 'T','a','b',0 };
BOOL res;
TRACE("(%p,0x%08x\n", hwnd, dwFlags);
@@ -59,7 +58,7 @@ HRESULT WINAPI EnableThemeDialogTexture(HWND hwnd, DWORD dwFlags)
if (!res)
return HRESULT_FROM_WIN32(GetLastError());
if (dwFlags & ETDT_USETABTEXTURE)
- return SetWindowTheme (hwnd, NULL, szTab);
+ return SetWindowTheme (hwnd, NULL, L"Tab");
else
return SetWindowTheme (hwnd, NULL, NULL);
}
diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c
index cee5aaf054e..cd7677e5783 100644
--- a/dlls/uxtheme/msstyles.c
+++ b/dlls/uxtheme/msstyles.c
@@ -50,10 +50,6 @@ extern int alphaBlendMode;
#define MSSTYLES_VERSION 0x0003
-static const WCHAR szThemesIniResource[] = {
- 't','h','e','m','e','s','_','i','n','i','\0'
-};
-
static PTHEME_FILE tfActiveTheme;
/***********************************************************************/
@@ -78,15 +74,6 @@ HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWST
HMODULE hTheme;
HRSRC hrsc;
HRESULT hr = S_OK;
- static const WCHAR szPackThemVersionResource[] = {
- 'P','A','C','K','T','H','E','M','_','V','E','R','S','I','O','N', '\0'
- };
- static const WCHAR szColorNamesResource[] = {
- 'C','O','L','O','R','N','A','M','E','S','\0'
- };
- static const WCHAR szSizeNamesResource[] = {
- 'S','I','Z','E','N','A','M','E','S','\0'
- };
WORD version;
DWORD versize;
@@ -105,7 +92,7 @@ HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWST
hr = HRESULT_FROM_WIN32(GetLastError());
goto invalid_theme;
}
- if(!(hrsc = FindResourceW(hTheme, MAKEINTRESOURCEW(1), szPackThemVersionResource))) {
+ if(!(hrsc = FindResourceW(hTheme, MAKEINTRESOURCEW(1), L"PACKTHEM_VERSION"))) {
TRACE("No version resource found\n");
hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT);
goto invalid_theme;
@@ -124,14 +111,14 @@ HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWST
goto invalid_theme;
}
- if(!(hrsc = FindResourceW(hTheme, MAKEINTRESOURCEW(1), szColorNamesResource))) {
+ if(!(hrsc = FindResourceW(hTheme, MAKEINTRESOURCEW(1), L"COLORNAMES"))) {
TRACE("Color names resource not found\n");
hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT);
goto invalid_theme;
}
pszColors = LoadResource(hTheme, hrsc);
- if(!(hrsc = FindResourceW(hTheme, MAKEINTRESOURCEW(1), szSizeNamesResource))) {
+ if(!(hrsc = FindResourceW(hTheme, MAKEINTRESOURCEW(1), L"SIZENAMES"))) {
TRACE("Size names resource not found\n");
hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT);
goto invalid_theme;
@@ -259,7 +246,7 @@ HRESULT MSSTYLES_SetActiveTheme(PTHEME_FILE tf, BOOL setMetrics)
*/
PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf)
{
- return UXINI_LoadINI(tf->hTheme, szThemesIniResource);
+ return UXINI_LoadINI(tf->hTheme, L"themes_ini");
}
/***********************************************************************
@@ -269,9 +256,6 @@ PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf)
*/
static PUXINI_FILE MSSTYLES_GetActiveThemeIni(PTHEME_FILE tf)
{
- static const WCHAR szFileResNamesResource[] = {
- 'F','I','L','E','R','E','S','N','A','M','E','S','\0'
- };
DWORD dwColorCount = 0;
DWORD dwSizeCount = 0;
DWORD dwColorNum = 0;
@@ -299,7 +283,7 @@ static PUXINI_FILE MSSTYLES_GetActiveThemeIni(PTHEME_FILE tf)
dwSizeCount++;
}
- if(!(hrsc = FindResourceW(tf->hTheme, MAKEINTRESOURCEW(1), szFileResNamesResource))) {
+ if(!(hrsc = FindResourceW(tf->hTheme, MAKEINTRESOURCEW(1), L"FILERESNAMES"))) {
TRACE("FILERESNAMES map not found\n");
return NULL;
}
@@ -865,8 +849,6 @@ static void parse_apply_nonclient (struct PARSENONCLIENTSTATE* state)
*/
static void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics)
{
- static const WCHAR szSysMetrics[] = {'S','y','s','M','e','t','r','i','c','s','\0'};
- static const WCHAR szGlobals[] = {'g','l','o','b','a','l','s','\0'};
PTHEME_CLASS cls;
PTHEME_CLASS globals;
PTHEME_PARTSTATE ps;
@@ -886,7 +868,7 @@ static void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics)
ini = MSSTYLES_GetActiveThemeIni(tf);
while((lpName=UXINI_GetNextSection(ini, &dwLen))) {
- if(CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, lpName, dwLen, szSysMetrics, -1) == CSTR_EQUAL) {
+ if(CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, lpName, dwLen, L"SysMetrics", -1) == CSTR_EQUAL) {
struct PARSECOLORSTATE colorState;
struct PARSENONCLIENTSTATE nonClientState;
@@ -938,7 +920,7 @@ static void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics)
}
if(MSSTYLES_ParseIniSectionName(lpName, dwLen, szAppName, szClassName, &iPartId, &iStateId)) {
BOOL isGlobal = FALSE;
- if(!lstrcmpiW(szClassName, szGlobals)) {
+ if(!lstrcmpiW(szClassName, L"globals")) {
isGlobal = TRUE;
}
cls = MSSTYLES_AddClass(tf, szAppName, szClassName);
@@ -957,7 +939,7 @@ static void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics)
}
/* App/Class combos override values defined by the base class, map these overrides */
- globals = MSSTYLES_FindClass(tf, NULL, szGlobals);
+ globals = MSSTYLES_FindClass(tf, NULL, L"globals");
cls = tf->classes;
while(cls) {
if(*cls->szAppName) {
@@ -1250,10 +1232,6 @@ HRESULT MSSTYLES_GetPropertyColor(PTHEME_PROPERTY tp, COLORREF *pColor)
static HRESULT MSSTYLES_GetFont (LPCWSTR lpCur, LPCWSTR lpEnd,
LPCWSTR *lpValEnd, LOGFONTW* pFont)
{
- static const WCHAR szBold[] = {'b','o','l','d','\0'};
- static const WCHAR szItalic[] = {'i','t','a','l','i','c','\0'};
- static const WCHAR szUnderline[] = {'u','n','d','e','r','l','i','n','e','\0'};
- static const WCHAR szStrikeOut[] = {'s','t','r','i','k','e','o','u','t','\0'};
int pointSize;
WCHAR attr[32];
@@ -1271,10 +1249,10 @@ static HRESULT MSSTYLES_GetFont (LPCWSTR lpCur, LPCWSTR lpEnd,
pFont->lfWeight = FW_REGULAR;
pFont->lfCharSet = DEFAULT_CHARSET;
while(MSSTYLES_GetNextToken(lpCur, lpEnd, &lpCur, attr, ARRAY_SIZE(attr))) {
- if(!lstrcmpiW(szBold, attr)) pFont->lfWeight = FW_BOLD;
- else if(!lstrcmpiW(szItalic, attr)) pFont->lfItalic = TRUE;
- else if(!lstrcmpiW(szUnderline, attr)) pFont->lfUnderline = TRUE;
- else if(!lstrcmpiW(szStrikeOut, attr)) pFont->lfStrikeOut = TRUE;
+ if(!lstrcmpiW(L"bold", attr)) pFont->lfWeight = FW_BOLD;
+ else if(!lstrcmpiW(L"italic", attr)) pFont->lfItalic = TRUE;
+ else if(!lstrcmpiW(L"underline", attr)) pFont->lfUnderline = TRUE;
+ else if(!lstrcmpiW(L"strikeout", attr)) pFont->lfStrikeOut = TRUE;
}
*lpValEnd = lpCur;
return S_OK;
diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c
index 6e9c0f22369..a37e532500a 100644
--- a/dlls/uxtheme/system.c
+++ b/dlls/uxtheme/system.c
@@ -41,19 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);
* Defines and global variables
*/
-static const WCHAR szThemeManager[] = {
- 'S','o','f','t','w','a','r','e','\\',
- 'M','i','c','r','o','s','o','f','t','\\',
- 'W','i','n','d','o','w','s','\\',
- 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\',
- 'T','h','e','m','e','M','a','n','a','g','e','r','\0'
-};
-static const WCHAR szThemeActive[] = {'T','h','e','m','e','A','c','t','i','v','e','\0'};
-static const WCHAR szSizeName[] = {'S','i','z','e','N','a','m','e','\0'};
-static const WCHAR szColorName[] = {'C','o','l','o','r','N','a','m','e','\0'};
-static const WCHAR szDllName[] = {'D','l','l','N','a','m','e','\0'};
-
-static const WCHAR szIniDocumentation[] = {'d','o','c','u','m','e','n','t','a','t','i','o','n','\0'};
+static const WCHAR szThemeManager[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\ThemeManager";
DECLSPEC_HIDDEN ATOM atDialogThemeEnabled;
@@ -116,12 +104,12 @@ static DWORD query_reg_path (HKEY hKey, LPCWSTR lpszValue,
*/
if (dwRet == ERROR_MORE_DATA)
{
- WCHAR cNull = '\0';
+ WCHAR emptyW[] = L"";
nBytesToAlloc = dwUnExpDataLen;
szData = LocalAlloc(LMEM_ZEROINIT, nBytesToAlloc);
RegQueryValueExW (hKey, lpszValue, 0, NULL, (LPBYTE)szData, &nBytesToAlloc);
- dwExpDataLen = ExpandEnvironmentStringsW(szData, &cNull, 1);
+ dwExpDataLen = ExpandEnvironmentStringsW(szData, emptyW, 1);
dwUnExpDataLen = max(nBytesToAlloc, dwExpDataLen);
LocalFree(szData);
}
@@ -158,7 +146,7 @@ static void UXTHEME_LoadTheme(void)
if(!RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey)) {
TRACE("Loading theme config\n");
buffsize = ARRAY_SIZE(tmp);
- if(!RegQueryValueExW(hKey, szThemeActive, NULL, NULL, (LPBYTE)tmp, &buffsize)) {
+ if (!RegQueryValueExW(hKey, L"ThemeActive", NULL, NULL, (BYTE*)tmp, &buffsize)) {
bThemeActive = (tmp[0] != '0');
}
else {
@@ -166,12 +154,12 @@ static void UXTHEME_LoadTheme(void)
TRACE("Failed to get ThemeActive: %d\n", GetLastError());
}
buffsize = ARRAY_SIZE(szCurrentColor);
- if(RegQueryValueExW(hKey, szColorName, NULL, NULL, (LPBYTE)szCurrentColor, &buffsize))
+ if (RegQueryValueExW(hKey, L"ColorName", NULL, NULL, (BYTE*)szCurrentColor, &buffsize))
szCurrentColor[0] = '\0';
buffsize = ARRAY_SIZE(szCurrentSize);
- if(RegQueryValueExW(hKey, szSizeName, NULL, NULL, (LPBYTE)szCurrentSize, &buffsize))
+ if (RegQueryValueExW(hKey, L"SizeName", NULL, NULL, (BYTE*)szCurrentSize, &buffsize))
szCurrentSize[0] = '\0';
- if (query_reg_path (hKey, szDllName, szCurrentTheme))
+ if (query_reg_path (hKey, L"DllName", szCurrentTheme))
szCurrentTheme[0] = '\0';
RegCloseKey(hKey);
}
@@ -243,16 +231,8 @@ static const char * const SysColorsNames[] =
"MenuHilight", /* COLOR_MENUHILIGHT */
"MenuBar", /* COLOR_MENUBAR */
};
-static const WCHAR strColorKey[] =
- { 'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\',
- 'C','o','l','o','r','s',0 };
-static const WCHAR keyFlatMenus[] = { 'F','l','a','t','M','e','n','u', 0};
-static const WCHAR keyGradientCaption[] = { 'G','r','a','d','i','e','n','t',
- 'C','a','p','t','i','o','n', 0 };
-static const WCHAR keyNonClientMetrics[] = { 'N','o','n','C','l','i','e','n','t',
- 'M','e','t','r','i','c','s',0 };
-static const WCHAR keyIconTitleFont[] = { 'I','c','o','n','T','i','t','l','e',
- 'F','o','n','t',0 };
+
+static const WCHAR strColorKey[] = L"Control Panel\\Colors";
static const struct BackupSysParam
{
@@ -260,8 +240,8 @@ static const struct BackupSysParam
const WCHAR* keyName;
} backupSysParams[] =
{
- {SPI_GETFLATMENU, SPI_SETFLATMENU, keyFlatMenus},
- {SPI_GETGRADIENTCAPTIONS, SPI_SETGRADIENTCAPTIONS, keyGradientCaption},
+ {SPI_GETFLATMENU, SPI_SETFLATMENU, L"FlatMenu"},
+ {SPI_GETGRADIENTCAPTIONS, SPI_SETGRADIENTCAPTIONS, L"GradientCaption"},
{-1, -1, 0}
};
@@ -325,12 +305,12 @@ static void UXTHEME_BackupSystemMetrics(void)
memset (&ncm, 0, sizeof (ncm));
ncm.cbSize = sizeof (ncm);
SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, sizeof (ncm), &ncm, 0);
- RegSetValueExW (hKey, keyNonClientMetrics, 0, REG_BINARY, (LPBYTE)&ncm,
+ RegSetValueExW (hKey, L"NonClientMetrics", 0, REG_BINARY, (BYTE*)&ncm,
sizeof (ncm));
memset (&iconTitleFont, 0, sizeof (iconTitleFont));
SystemParametersInfoW (SPI_GETICONTITLELOGFONT, sizeof (iconTitleFont),
&iconTitleFont, 0);
- RegSetValueExW (hKey, keyIconTitleFont, 0, REG_BINARY,
+ RegSetValueExW (hKey, L"IconTitleFont", 0, REG_BINARY,
(LPBYTE)&iconTitleFont, sizeof (iconTitleFont));
RegCloseKey (hKey);
@@ -402,8 +382,8 @@ static void UXTHEME_RestoreSystemMetrics(void)
LOGFONTW iconTitleFont;
DWORD count = sizeof(ncm);
DWORD type;
-
- if (RegQueryValueExW (hKey, keyNonClientMetrics, 0,
+
+ if (RegQueryValueExW (hKey, L"NonClientMetrics", 0,
&type, (LPBYTE)&ncm, &count) == ERROR_SUCCESS)
{
SystemParametersInfoW (SPI_SETNONCLIENTMETRICS,
@@ -411,8 +391,8 @@ static void UXTHEME_RestoreSystemMetrics(void)
}
count = sizeof(iconTitleFont);
-
- if (RegQueryValueExW (hKey, keyIconTitleFont, 0,
+
+ if (RegQueryValueExW (hKey, L"IconTitleFont", 0,
&type, (LPBYTE)&iconTitleFont, &count) == ERROR_SUCCESS)
{
SystemParametersInfoW (SPI_SETICONTITLELOGFONT,
@@ -491,19 +471,19 @@ static HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf)
if(!RegCreateKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey)) {
tmp[0] = bThemeActive?'1':'0';
tmp[1] = '\0';
- RegSetValueExW(hKey, szThemeActive, 0, REG_SZ, (const BYTE*)tmp, sizeof(WCHAR)*2);
+ RegSetValueExW(hKey, L"ThemeActive", 0, REG_SZ, (const BYTE*)tmp, sizeof(WCHAR)*2);
if(bThemeActive) {
- RegSetValueExW(hKey, szColorName, 0, REG_SZ, (const BYTE*)szCurrentColor,
+ RegSetValueExW(hKey, L"ColorName", 0, REG_SZ, (const BYTE*)szCurrentColor,
(lstrlenW(szCurrentColor)+1)*sizeof(WCHAR));
- RegSetValueExW(hKey, szSizeName, 0, REG_SZ, (const BYTE*)szCurrentSize,
+ RegSetValueExW(hKey, L"SizeName", 0, REG_SZ, (const BYTE*)szCurrentSize,
(lstrlenW(szCurrentSize)+1)*sizeof(WCHAR));
- RegSetValueExW(hKey, szDllName, 0, REG_SZ, (const BYTE*)szCurrentTheme,
+ RegSetValueExW(hKey, L"DllName", 0, REG_SZ, (const BYTE*)szCurrentTheme,
(lstrlenW(szCurrentTheme)+1)*sizeof(WCHAR));
}
else {
- RegDeleteValueW(hKey, szColorName);
- RegDeleteValueW(hKey, szSizeName);
- RegDeleteValueW(hKey, szDllName);
+ RegDeleteValueW(hKey, L"ColorName");
+ RegDeleteValueW(hKey, L"SizeName");
+ RegDeleteValueW(hKey, L"DllName");
}
RegCloseKey(hKey);
@@ -521,23 +501,10 @@ static HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf)
*/
void UXTHEME_InitSystem(HINSTANCE hInst)
{
- static const WCHAR szWindowTheme[] = {
- 'u','x','_','t','h','e','m','e','\0'
- };
- static const WCHAR szSubAppName[] = {
- 'u','x','_','s','u','b','a','p','p','\0'
- };
- static const WCHAR szSubIdList[] = {
- 'u','x','_','s','u','b','i','d','l','s','t','\0'
- };
- static const WCHAR szDialogThemeEnabled[] = {
- 'u','x','_','d','i','a','l','o','g','t','h','e','m','e','\0'
- };
-
- atWindowTheme = GlobalAddAtomW(szWindowTheme);
- atSubAppName = GlobalAddAtomW(szSubAppName);
- atSubIdList = GlobalAddAtomW(szSubIdList);
- atDialogThemeEnabled = GlobalAddAtomW(szDialogThemeEnabled);
+ atWindowTheme = GlobalAddAtomW(L"ux_theme");
+ atSubAppName = GlobalAddAtomW(L"ux_subapp");
+ atSubIdList = GlobalAddAtomW(L"ux_subidlst");
+ atDialogThemeEnabled = GlobalAddAtomW(L"ux_dialogtheme");
UXTHEME_LoadTheme();
}
@@ -581,7 +548,7 @@ BOOL WINAPI IsCompositionActive(void)
HRESULT WINAPI EnableTheming(BOOL fEnable)
{
HKEY hKey;
- WCHAR szEnabled[] = {'0','\0'};
+ WCHAR szEnabled[] = L"0";
TRACE("(%d)\n", fEnable);
@@ -594,7 +561,7 @@ HRESULT WINAPI EnableTheming(BOOL fEnable)
bThemeActive = fEnable;
if(bThemeActive) szEnabled[0] = '1';
if(!RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey)) {
- RegSetValueExW(hKey, szThemeActive, 0, REG_SZ, (LPBYTE)szEnabled, sizeof(WCHAR));
+ RegSetValueExW(hKey, L"ThemeActive", 0, REG_SZ, (BYTE*)szEnabled, sizeof(WCHAR));
RegCloseKey(hKey);
}
UXTHEME_broadcast_msg (NULL, WM_THEMECHANGED);
@@ -847,7 +814,7 @@ HRESULT WINAPI GetThemeDocumentationProperty(LPCWSTR pszThemeName,
/* If loading from string resource failed, try getting it from the theme.ini */
if(FAILED(hr)) {
PUXINI_FILE uf = MSSTYLES_GetThemeIni(pt);
- if(UXINI_FindSection(uf, szIniDocumentation)) {
+ if(UXINI_FindSection(uf, L"documentation")) {
LPCWSTR lpValue;
DWORD dwLen;
if(UXINI_FindValue(uf, pszPropertyName, &lpValue, &dwLen)) {
@@ -1012,10 +979,6 @@ HRESULT WINAPI EnumThemes(LPCWSTR pszThemePath, EnumThemeProc callback,
{
WCHAR szDir[MAX_PATH];
WCHAR szPath[MAX_PATH];
- static const WCHAR szStar[] = {'*','.','*','\0'};
- static const WCHAR szFormat[] = {'%','s','%','s','\\','%','s','.','m','s','s','t','y','l','e','s','\0'};
- static const WCHAR szDisplayName[] = {'d','i','s','p','l','a','y','n','a','m','e','\0'};
- static const WCHAR szTooltip[] = {'t','o','o','l','t','i','p','\0'};
WCHAR szName[60];
WCHAR szTip[60];
HANDLE hFind;
@@ -1037,7 +1000,7 @@ HRESULT WINAPI EnumThemes(LPCWSTR pszThemePath, EnumThemeProc callback,
}
lstrcpyW(szPath, szDir);
- lstrcatW(szPath, szStar);
+ lstrcatW(szPath, L"*.*");
TRACE("searching %s\n", debugstr_w(szPath));
hFind = FindFirstFileW(szPath, &wfd);
@@ -1045,11 +1008,11 @@ HRESULT WINAPI EnumThemes(LPCWSTR pszThemePath, EnumThemeProc callback,
do {
if(wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY
&& !(wfd.cFileName[0] == '.' && ((wfd.cFileName[1] == '.' && wfd.cFileName[2] == 0) || wfd.cFileName[1] == 0))) {
- wsprintfW(szPath, szFormat, szDir, wfd.cFileName, wfd.cFileName);
+ wsprintfW(szPath, L"%s%s\\%s.msstyles", szDir, wfd.cFileName, wfd.cFileName);
- hr = GetThemeDocumentationProperty(szPath, szDisplayName, szName, ARRAY_SIZE(szName));
+ hr = GetThemeDocumentationProperty(szPath, L"displayname", szName, ARRAY_SIZE(szName));
if(SUCCEEDED(hr))
- hr = GetThemeDocumentationProperty(szPath, szTooltip, szTip, ARRAY_SIZE(szTip));
+ hr = GetThemeDocumentationProperty(szPath, L"tooltip", szTip, ARRAY_SIZE(szTip));
if(SUCCEEDED(hr)) {
TRACE("callback(%s,%s,%s,%p)\n", debugstr_w(szPath), debugstr_w(szName), debugstr_w(szTip), lpData);
if(!callback(NULL, szPath, szName, szTip, NULL, lpData)) {
diff --git a/dlls/uxtheme/uxini.c b/dlls/uxtheme/uxini.c
index 361e7f13fa5..41a0551f82b 100644
--- a/dlls/uxtheme/uxini.c
+++ b/dlls/uxtheme/uxini.c
@@ -33,10 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);
* Defines and global variables
*/
-static const WCHAR szTextFileResource[] = {
- 'T','E','X','T','F','I','L','E','\0'
-};
-
typedef struct _UXINI_FILE {
LPCWSTR lpIni;
LPCWSTR lpCurLoc;
@@ -66,7 +62,7 @@ PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, LPCWSTR lpName) {
TRACE("Loading resource INI %s\n", debugstr_w(lpName));
- if((hrsc = FindResourceW(hTheme, lpName, szTextFileResource))) {
+ if((hrsc = FindResourceW(hTheme, lpName, L"TEXTFILE"))) {
if(!(lpThemesIni = LoadResource(hTheme, hrsc))) {
TRACE("%s resource not found\n", debugstr_w(lpName));
return NULL;
--
2.26.2
1
0
[PATCH] uxtheme: Use wide-char string literals in struct initialization.
by Michael Stefaniuc 19 Oct '20
by Michael Stefaniuc 19 Oct '20
19 Oct '20
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
Huge but trivial to validate as the exact same object files are generated.
dlls/uxtheme/stylemap.c | 1776 +++++++++++++++++++--------------------
1 file changed, 888 insertions(+), 888 deletions(-)
diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c
index 149ee0eb524..b38b18b623d 100644
--- a/dlls/uxtheme/stylemap.c
+++ b/dlls/uxtheme/stylemap.c
@@ -55,199 +55,199 @@ typedef struct _MSSTYLES_CLASS_NAME {
* PrimitiveType,PropertyID,PropertyName
*/
static const MSSTYLES_PROPERTY_MAP mapProperty[] = {
- {TMT_STRING,TMT_STRING,{'S','T','R','I','N','G','\0'}},
- {TMT_INT,TMT_INT,{'I','N','T','\0'}},
- {TMT_BOOL,TMT_BOOL,{'B','O','O','L','\0'}},
- {TMT_COLOR,TMT_COLOR,{'C','O','L','O','R','\0'}},
- {TMT_MARGINS,TMT_MARGINS,{'M','A','R','G','I','N','S','\0'}},
- {TMT_FILENAME,TMT_FILENAME,{'F','I','L','E','N','A','M','E','\0'}},
- {TMT_SIZE,TMT_SIZE,{'S','I','Z','E','\0'}},
- {TMT_POSITION,TMT_POSITION,{'P','O','S','I','T','I','O','N','\0'}},
- {TMT_RECT,TMT_RECT,{'R','E','C','T','\0'}},
- {TMT_FONT,TMT_FONT,{'F','O','N','T','\0'}},
- {TMT_INTLIST,TMT_INTLIST,{'I','N','T','L','I','S','T','\0'}},
- {TMT_STRING,TMT_COLORSCHEMES,{'C','O','L','O','R','S','C','H','E','M','E','S','\0'}},
- {TMT_STRING,TMT_SIZES,{'S','I','Z','E','S','\0'}},
- {TMT_INT,TMT_CHARSET,{'C','H','A','R','S','E','T','\0'}},
- {TMT_STRING,TMT_DISPLAYNAME,{'D','I','S','P','L','A','Y','N','A','M','E','\0'}},
- {TMT_STRING,TMT_TOOLTIP,{'T','O','O','L','T','I','P','\0'}},
- {TMT_STRING,TMT_COMPANY,{'C','O','M','P','A','N','Y','\0'}},
- {TMT_STRING,TMT_AUTHOR,{'A','U','T','H','O','R','\0'}},
- {TMT_STRING,TMT_COPYRIGHT,{'C','O','P','Y','R','I','G','H','T','\0'}},
- {TMT_STRING,TMT_URL,{'U','R','L','\0'}},
- {TMT_STRING,TMT_VERSION,{'V','E','R','S','I','O','N','\0'}},
- {TMT_STRING,TMT_DESCRIPTION,{'D','E','S','C','R','I','P','T','I','O','N','\0'}},
- {TMT_FONT,TMT_CAPTIONFONT,{'C','A','P','T','I','O','N','F','O','N','T','\0'}},
- {TMT_FONT,TMT_SMALLCAPTIONFONT,{'S','M','A','L','L','C','A','P','T','I','O','N','F','O','N','T','\0'}},
- {TMT_FONT,TMT_MENUFONT,{'M','E','N','U','F','O','N','T','\0'}},
- {TMT_FONT,TMT_STATUSFONT,{'S','T','A','T','U','S','F','O','N','T','\0'}},
- {TMT_FONT,TMT_MSGBOXFONT,{'M','S','G','B','O','X','F','O','N','T','\0'}},
- {TMT_FONT,TMT_ICONTITLEFONT,{'I','C','O','N','T','I','T','L','E','F','O','N','T','\0'}},
- {TMT_BOOL,TMT_FLATMENUS,{'F','L','A','T','M','E','N','U','S','\0'}},
- {TMT_SIZE,TMT_SIZINGBORDERWIDTH,{'S','I','Z','I','N','G','B','O','R','D','E','R','W','I','D','T','H','\0'}},
- {TMT_SIZE,TMT_SCROLLBARWIDTH,{'S','C','R','O','L','L','B','A','R','W','I','D','T','H','\0'}},
- {TMT_SIZE,TMT_SCROLLBARHEIGHT,{'S','C','R','O','L','L','B','A','R','H','E','I','G','H','T','\0'}},
- {TMT_SIZE,TMT_CAPTIONBARWIDTH,{'C','A','P','T','I','O','N','B','A','R','W','I','D','T','H','\0'}},
- {TMT_SIZE,TMT_CAPTIONBARHEIGHT,{'C','A','P','T','I','O','N','B','A','R','H','E','I','G','H','T','\0'}},
- {TMT_SIZE,TMT_SMCAPTIONBARWIDTH,{'S','M','C','A','P','T','I','O','N','B','A','R','W','I','D','T','H','\0'}},
- {TMT_SIZE,TMT_SMCAPTIONBARHEIGHT,{'S','M','C','A','P','T','I','O','N','B','A','R','H','E','I','G','H','T','\0'}},
- {TMT_SIZE,TMT_MENUBARWIDTH,{'M','E','N','U','B','A','R','W','I','D','T','H','\0'}},
- {TMT_SIZE,TMT_MENUBARHEIGHT,{'M','E','N','U','B','A','R','H','E','I','G','H','T','\0'}},
- {TMT_INT,TMT_MINCOLORDEPTH,{'M','I','N','C','O','L','O','R','D','E','P','T','H','\0'}},
- {TMT_STRING,TMT_CSSNAME,{'C','S','S','N','A','M','E','\0'}},
- {TMT_STRING,TMT_XMLNAME,{'X','M','L','N','A','M','E','\0'}},
- {TMT_COLOR,TMT_SCROLLBAR,{'S','C','R','O','L','L','B','A','R','\0'}},
- {TMT_COLOR,TMT_BACKGROUND,{'B','A','C','K','G','R','O','U','N','D','\0'}},
- {TMT_COLOR,TMT_ACTIVECAPTION,{'A','C','T','I','V','E','C','A','P','T','I','O','N','\0'}},
- {TMT_COLOR,TMT_INACTIVECAPTION,{'I','N','A','C','T','I','V','E','C','A','P','T','I','O','N','\0'}},
- {TMT_COLOR,TMT_MENU,{'M','E','N','U','\0'}},
- {TMT_COLOR,TMT_WINDOW,{'W','I','N','D','O','W','\0'}},
- {TMT_COLOR,TMT_WINDOWFRAME,{'W','I','N','D','O','W','F','R','A','M','E','\0'}},
- {TMT_COLOR,TMT_MENUTEXT,{'M','E','N','U','T','E','X','T','\0'}},
- {TMT_COLOR,TMT_WINDOWTEXT,{'W','I','N','D','O','W','T','E','X','T','\0'}},
- {TMT_COLOR,TMT_CAPTIONTEXT,{'C','A','P','T','I','O','N','T','E','X','T','\0'}},
- {TMT_COLOR,TMT_ACTIVEBORDER,{'A','C','T','I','V','E','B','O','R','D','E','R','\0'}},
- {TMT_COLOR,TMT_INACTIVEBORDER,{'I','N','A','C','T','I','V','E','B','O','R','D','E','R','\0'}},
- {TMT_COLOR,TMT_APPWORKSPACE,{'A','P','P','W','O','R','K','S','P','A','C','E','\0'}},
- {TMT_COLOR,TMT_HIGHLIGHT,{'H','I','G','H','L','I','G','H','T','\0'}},
- {TMT_COLOR,TMT_HIGHLIGHTTEXT,{'H','I','G','H','L','I','G','H','T','T','E','X','T','\0'}},
- {TMT_COLOR,TMT_BTNFACE,{'B','T','N','F','A','C','E','\0'}},
- {TMT_COLOR,TMT_BTNSHADOW,{'B','T','N','S','H','A','D','O','W','\0'}},
- {TMT_COLOR,TMT_GRAYTEXT,{'G','R','A','Y','T','E','X','T','\0'}},
- {TMT_COLOR,TMT_BTNTEXT,{'B','T','N','T','E','X','T','\0'}},
- {TMT_COLOR,TMT_INACTIVECAPTIONTEXT,{'I','N','A','C','T','I','V','E','C','A','P','T','I','O','N','T','E','X','T','\0'}},
- {TMT_COLOR,TMT_BTNHIGHLIGHT,{'B','T','N','H','I','G','H','L','I','G','H','T','\0'}},
- {TMT_COLOR,TMT_DKSHADOW3D,{'D','K','S','H','A','D','O','W','3','D','\0'}},
- {TMT_COLOR,TMT_LIGHT3D,{'L','I','G','H','T','3','D','\0'}},
- {TMT_COLOR,TMT_INFOTEXT,{'I','N','F','O','T','E','X','T','\0'}},
- {TMT_COLOR,TMT_INFOBK,{'I','N','F','O','B','K','\0'}},
- {TMT_COLOR,TMT_BUTTONALTERNATEFACE,{'B','U','T','T','O','N','A','L','T','E','R','N','A','T','E','F','A','C','E','\0'}},
- {TMT_COLOR,TMT_HOTTRACKING,{'H','O','T','T','R','A','C','K','I','N','G','\0'}},
- {TMT_COLOR,TMT_GRADIENTACTIVECAPTION,{'G','R','A','D','I','E','N','T','A','C','T','I','V','E','C','A','P','T','I','O','N','\0'}},
- {TMT_COLOR,TMT_GRADIENTINACTIVECAPTION,{'G','R','A','D','I','E','N','T','I','N','A','C','T','I','V','E','C','A','P','T','I','O','N','\0'}},
- {TMT_COLOR,TMT_MENUHILIGHT,{'M','E','N','U','H','I','L','I','G','H','T','\0'}},
- {TMT_COLOR,TMT_MENUBAR,{'M','E','N','U','B','A','R','\0'}},
- {TMT_INT,TMT_FROMHUE1,{'F','R','O','M','H','U','E','1','\0'}},
- {TMT_INT,TMT_FROMHUE2,{'F','R','O','M','H','U','E','2','\0'}},
- {TMT_INT,TMT_FROMHUE3,{'F','R','O','M','H','U','E','3','\0'}},
- {TMT_INT,TMT_FROMHUE4,{'F','R','O','M','H','U','E','4','\0'}},
- {TMT_INT,TMT_FROMHUE5,{'F','R','O','M','H','U','E','5','\0'}},
- {TMT_INT,TMT_TOHUE1,{'T','O','H','U','E','1','\0'}},
- {TMT_INT,TMT_TOHUE2,{'T','O','H','U','E','2','\0'}},
- {TMT_INT,TMT_TOHUE3,{'T','O','H','U','E','3','\0'}},
- {TMT_INT,TMT_TOHUE4,{'T','O','H','U','E','4','\0'}},
- {TMT_INT,TMT_TOHUE5,{'T','O','H','U','E','5','\0'}},
- {TMT_COLOR,TMT_FROMCOLOR1,{'F','R','O','M','C','O','L','O','R','1','\0'}},
- {TMT_COLOR,TMT_FROMCOLOR2,{'F','R','O','M','C','O','L','O','R','2','\0'}},
- {TMT_COLOR,TMT_FROMCOLOR3,{'F','R','O','M','C','O','L','O','R','3','\0'}},
- {TMT_COLOR,TMT_FROMCOLOR4,{'F','R','O','M','C','O','L','O','R','4','\0'}},
- {TMT_COLOR,TMT_FROMCOLOR5,{'F','R','O','M','C','O','L','O','R','5','\0'}},
- {TMT_COLOR,TMT_TOCOLOR1,{'T','O','C','O','L','O','R','1','\0'}},
- {TMT_COLOR,TMT_TOCOLOR2,{'T','O','C','O','L','O','R','2','\0'}},
- {TMT_COLOR,TMT_TOCOLOR3,{'T','O','C','O','L','O','R','3','\0'}},
- {TMT_COLOR,TMT_TOCOLOR4,{'T','O','C','O','L','O','R','4','\0'}},
- {TMT_COLOR,TMT_TOCOLOR5,{'T','O','C','O','L','O','R','5','\0'}},
- {TMT_BOOL,TMT_TRANSPARENT,{'T','R','A','N','S','P','A','R','E','N','T','\0'}},
- {TMT_BOOL,TMT_AUTOSIZE,{'A','U','T','O','S','I','Z','E','\0'}},
- {TMT_BOOL,TMT_BORDERONLY,{'B','O','R','D','E','R','O','N','L','Y','\0'}},
- {TMT_BOOL,TMT_COMPOSITED,{'C','O','M','P','O','S','I','T','E','D','\0'}},
- {TMT_BOOL,TMT_BGFILL,{'B','G','F','I','L','L','\0'}},
- {TMT_BOOL,TMT_GLYPHTRANSPARENT,{'G','L','Y','P','H','T','R','A','N','S','P','A','R','E','N','T','\0'}},
- {TMT_BOOL,TMT_GLYPHONLY,{'G','L','Y','P','H','O','N','L','Y','\0'}},
- {TMT_BOOL,TMT_ALWAYSSHOWSIZINGBAR,{'A','L','W','A','Y','S','S','H','O','W','S','I','Z','I','N','G','B','A','R','\0'}},
- {TMT_BOOL,TMT_MIRRORIMAGE,{'M','I','R','R','O','R','I','M','A','G','E','\0'}},
- {TMT_BOOL,TMT_UNIFORMSIZING,{'U','N','I','F','O','R','M','S','I','Z','I','N','G','\0'}},
- {TMT_BOOL,TMT_INTEGRALSIZING,{'I','N','T','E','G','R','A','L','S','I','Z','I','N','G','\0'}},
- {TMT_BOOL,TMT_SOURCEGROW,{'S','O','U','R','C','E','G','R','O','W','\0'}},
- {TMT_BOOL,TMT_SOURCESHRINK,{'S','O','U','R','C','E','S','H','R','I','N','K','\0'}},
- {TMT_INT,TMT_IMAGECOUNT,{'I','M','A','G','E','C','O','U','N','T','\0'}},
- {TMT_INT,TMT_ALPHALEVEL,{'A','L','P','H','A','L','E','V','E','L','\0'}},
- {TMT_INT,TMT_BORDERSIZE,{'B','O','R','D','E','R','S','I','Z','E','\0'}},
- {TMT_INT,TMT_ROUNDCORNERWIDTH,{'R','O','U','N','D','C','O','R','N','E','R','W','I','D','T','H','\0'}},
- {TMT_INT,TMT_ROUNDCORNERHEIGHT,{'R','O','U','N','D','C','O','R','N','E','R','H','E','I','G','H','T','\0'}},
- {TMT_INT,TMT_GRADIENTRATIO1,{'G','R','A','D','I','E','N','T','R','A','T','I','O','1','\0'}},
- {TMT_INT,TMT_GRADIENTRATIO2,{'G','R','A','D','I','E','N','T','R','A','T','I','O','2','\0'}},
- {TMT_INT,TMT_GRADIENTRATIO3,{'G','R','A','D','I','E','N','T','R','A','T','I','O','3','\0'}},
- {TMT_INT,TMT_GRADIENTRATIO4,{'G','R','A','D','I','E','N','T','R','A','T','I','O','4','\0'}},
- {TMT_INT,TMT_GRADIENTRATIO5,{'G','R','A','D','I','E','N','T','R','A','T','I','O','5','\0'}},
- {TMT_INT,TMT_PROGRESSCHUNKSIZE,{'P','R','O','G','R','E','S','S','C','H','U','N','K','S','I','Z','E','\0'}},
- {TMT_INT,TMT_PROGRESSSPACESIZE,{'P','R','O','G','R','E','S','S','S','P','A','C','E','S','I','Z','E','\0'}},
- {TMT_INT,TMT_SATURATION,{'S','A','T','U','R','A','T','I','O','N','\0'}},
- {TMT_INT,TMT_TEXTBORDERSIZE,{'T','E','X','T','B','O','R','D','E','R','S','I','Z','E','\0'}},
- {TMT_INT,TMT_ALPHATHRESHOLD,{'A','L','P','H','A','T','H','R','E','S','H','O','L','D','\0'}},
- {TMT_SIZE,TMT_WIDTH,{'W','I','D','T','H','\0'}},
- {TMT_SIZE,TMT_HEIGHT,{'H','E','I','G','H','T','\0'}},
- {TMT_INT,TMT_GLYPHINDEX,{'G','L','Y','P','H','I','N','D','E','X','\0'}},
- {TMT_INT,TMT_TRUESIZESTRETCHMARK,{'T','R','U','E','S','I','Z','E','S','T','R','E','T','C','H','M','A','R','K','\0'}},
- {TMT_INT,TMT_MINDPI1,{'M','I','N','D','P','I','1','\0'}},
- {TMT_INT,TMT_MINDPI2,{'M','I','N','D','P','I','2','\0'}},
- {TMT_INT,TMT_MINDPI3,{'M','I','N','D','P','I','3','\0'}},
- {TMT_INT,TMT_MINDPI4,{'M','I','N','D','P','I','4','\0'}},
- {TMT_INT,TMT_MINDPI5,{'M','I','N','D','P','I','5','\0'}},
- {TMT_FONT,TMT_GLYPHFONT,{'G','L','Y','P','H','F','O','N','T','\0'}},
- {TMT_FILENAME,TMT_IMAGEFILE,{'I','M','A','G','E','F','I','L','E','\0'}},
- {TMT_FILENAME,TMT_IMAGEFILE1,{'I','M','A','G','E','F','I','L','E','1','\0'}},
- {TMT_FILENAME,TMT_IMAGEFILE2,{'I','M','A','G','E','F','I','L','E','2','\0'}},
- {TMT_FILENAME,TMT_IMAGEFILE3,{'I','M','A','G','E','F','I','L','E','3','\0'}},
- {TMT_FILENAME,TMT_IMAGEFILE4,{'I','M','A','G','E','F','I','L','E','4','\0'}},
- {TMT_FILENAME,TMT_IMAGEFILE5,{'I','M','A','G','E','F','I','L','E','5','\0'}},
- {TMT_FILENAME,TMT_STOCKIMAGEFILE,{'S','T','O','C','K','I','M','A','G','E','F','I','L','E','\0'}},
- {TMT_FILENAME,TMT_GLYPHIMAGEFILE,{'G','L','Y','P','H','I','M','A','G','E','F','I','L','E','\0'}},
- {TMT_STRING,TMT_TEXT,{'T','E','X','T','\0'}},
- {TMT_POSITION,TMT_OFFSET,{'O','F','F','S','E','T','\0'}},
- {TMT_POSITION,TMT_TEXTSHADOWOFFSET,{'T','E','X','T','S','H','A','D','O','W','O','F','F','S','E','T','\0'}},
- {TMT_POSITION,TMT_MINSIZE,{'M','I','N','S','I','Z','E','\0'}},
- {TMT_POSITION,TMT_MINSIZE1,{'M','I','N','S','I','Z','E','1','\0'}},
- {TMT_POSITION,TMT_MINSIZE2,{'M','I','N','S','I','Z','E','2','\0'}},
- {TMT_POSITION,TMT_MINSIZE3,{'M','I','N','S','I','Z','E','3','\0'}},
- {TMT_POSITION,TMT_MINSIZE4,{'M','I','N','S','I','Z','E','4','\0'}},
- {TMT_POSITION,TMT_MINSIZE5,{'M','I','N','S','I','Z','E','5','\0'}},
- {TMT_POSITION,TMT_NORMALSIZE,{'N','O','R','M','A','L','S','I','Z','E','\0'}},
- {TMT_MARGINS,TMT_SIZINGMARGINS,{'S','I','Z','I','N','G','M','A','R','G','I','N','S','\0'}},
- {TMT_MARGINS,TMT_CONTENTMARGINS,{'C','O','N','T','E','N','T','M','A','R','G','I','N','S','\0'}},
- {TMT_MARGINS,TMT_CAPTIONMARGINS,{'C','A','P','T','I','O','N','M','A','R','G','I','N','S','\0'}},
- {TMT_COLOR,TMT_BORDERCOLOR,{'B','O','R','D','E','R','C','O','L','O','R','\0'}},
- {TMT_COLOR,TMT_FILLCOLOR,{'F','I','L','L','C','O','L','O','R','\0'}},
- {TMT_COLOR,TMT_TEXTCOLOR,{'T','E','X','T','C','O','L','O','R','\0'}},
- {TMT_COLOR,TMT_EDGELIGHTCOLOR,{'E','D','G','E','L','I','G','H','T','C','O','L','O','R','\0'}},
- {TMT_COLOR,TMT_EDGEHIGHLIGHTCOLOR,{'E','D','G','E','H','I','G','H','L','I','G','H','T','C','O','L','O','R','\0'}},
- {TMT_COLOR,TMT_EDGESHADOWCOLOR,{'E','D','G','E','S','H','A','D','O','W','C','O','L','O','R','\0'}},
- {TMT_COLOR,TMT_EDGEDKSHADOWCOLOR,{'E','D','G','E','D','K','S','H','A','D','O','W','C','O','L','O','R','\0'}},
- {TMT_COLOR,TMT_EDGEFILLCOLOR,{'E','D','G','E','F','I','L','L','C','O','L','O','R','\0'}},
- {TMT_COLOR,TMT_TRANSPARENTCOLOR,{'T','R','A','N','S','P','A','R','E','N','T','C','O','L','O','R','\0'}},
- {TMT_COLOR,TMT_GRADIENTCOLOR1,{'G','R','A','D','I','E','N','T','C','O','L','O','R','1','\0'}},
- {TMT_COLOR,TMT_GRADIENTCOLOR2,{'G','R','A','D','I','E','N','T','C','O','L','O','R','2','\0'}},
- {TMT_COLOR,TMT_GRADIENTCOLOR3,{'G','R','A','D','I','E','N','T','C','O','L','O','R','3','\0'}},
- {TMT_COLOR,TMT_GRADIENTCOLOR4,{'G','R','A','D','I','E','N','T','C','O','L','O','R','4','\0'}},
- {TMT_COLOR,TMT_GRADIENTCOLOR5,{'G','R','A','D','I','E','N','T','C','O','L','O','R','5','\0'}},
- {TMT_COLOR,TMT_SHADOWCOLOR,{'S','H','A','D','O','W','C','O','L','O','R','\0'}},
- {TMT_COLOR,TMT_GLOWCOLOR,{'G','L','O','W','C','O','L','O','R','\0'}},
- {TMT_COLOR,TMT_TEXTBORDERCOLOR,{'T','E','X','T','B','O','R','D','E','R','C','O','L','O','R','\0'}},
- {TMT_COLOR,TMT_TEXTSHADOWCOLOR,{'T','E','X','T','S','H','A','D','O','W','C','O','L','O','R','\0'}},
- {TMT_COLOR,TMT_GLYPHTEXTCOLOR,{'G','L','Y','P','H','T','E','X','T','C','O','L','O','R','\0'}},
- {TMT_COLOR,TMT_GLYPHTRANSPARENTCOLOR,{'G','L','Y','P','H','T','R','A','N','S','P','A','R','E','N','T','C','O','L','O','R','\0'}},
- {TMT_COLOR,TMT_FILLCOLORHINT,{'F','I','L','L','C','O','L','O','R','H','I','N','T','\0'}},
- {TMT_COLOR,TMT_BORDERCOLORHINT,{'B','O','R','D','E','R','C','O','L','O','R','H','I','N','T','\0'}},
- {TMT_COLOR,TMT_ACCENTCOLORHINT,{'A','C','C','E','N','T','C','O','L','O','R','H','I','N','T','\0'}},
- {TMT_ENUM,TMT_BGTYPE,{'B','G','T','Y','P','E','\0'}},
- {TMT_ENUM,TMT_BORDERTYPE,{'B','O','R','D','E','R','T','Y','P','E','\0'}},
- {TMT_ENUM,TMT_FILLTYPE,{'F','I','L','L','T','Y','P','E','\0'}},
- {TMT_ENUM,TMT_SIZINGTYPE,{'S','I','Z','I','N','G','T','Y','P','E','\0'}},
- {TMT_ENUM,TMT_HALIGN,{'H','A','L','I','G','N','\0'}},
- {TMT_ENUM,TMT_CONTENTALIGNMENT,{'C','O','N','T','E','N','T','A','L','I','G','N','M','E','N','T','\0'}},
- {TMT_ENUM,TMT_VALIGN,{'V','A','L','I','G','N','\0'}},
- {TMT_ENUM,TMT_OFFSETTYPE,{'O','F','F','S','E','T','T','Y','P','E','\0'}},
- {TMT_ENUM,TMT_ICONEFFECT,{'I','C','O','N','E','F','F','E','C','T','\0'}},
- {TMT_ENUM,TMT_TEXTSHADOWTYPE,{'T','E','X','T','S','H','A','D','O','W','T','Y','P','E','\0'}},
- {TMT_ENUM,TMT_IMAGELAYOUT,{'I','M','A','G','E','L','A','Y','O','U','T','\0'}},
- {TMT_ENUM,TMT_GLYPHTYPE,{'G','L','Y','P','H','T','Y','P','E','\0'}},
- {TMT_ENUM,TMT_IMAGESELECTTYPE,{'I','M','A','G','E','S','E','L','E','C','T','T','Y','P','E','\0'}},
- {TMT_ENUM,TMT_GLYPHFONTSIZINGTYPE,{'G','L','Y','P','H','F','O','N','T','S','I','Z','I','N','G','T','Y','P','E','\0'}},
- {TMT_ENUM,TMT_TRUESIZESCALINGTYPE,{'T','R','U','E','S','I','Z','E','S','C','A','L','I','N','G','T','Y','P','E','\0'}},
- {TMT_BOOL,TMT_USERPICTURE,{'U','S','E','R','P','I','C','T','U','R','E','\0'}},
- {TMT_RECT,TMT_DEFAULTPANESIZE,{'D','E','F','A','U','L','T','P','A','N','E','S','I','Z','E','\0'}},
- {TMT_COLOR,TMT_BLENDCOLOR,{'B','L','E','N','D','C','O','L','O','R','\0'}},
- {0,0,{'\0'}}
+ {TMT_STRING, TMT_STRING, L"STRING"},
+ {TMT_INT, TMT_INT, L"INT"},
+ {TMT_BOOL, TMT_BOOL, L"BOOL"},
+ {TMT_COLOR, TMT_COLOR, L"COLOR"},
+ {TMT_MARGINS, TMT_MARGINS, L"MARGINS"},
+ {TMT_FILENAME, TMT_FILENAME, L"FILENAME"},
+ {TMT_SIZE, TMT_SIZE, L"SIZE"},
+ {TMT_POSITION, TMT_POSITION, L"POSITION"},
+ {TMT_RECT, TMT_RECT, L"RECT"},
+ {TMT_FONT, TMT_FONT, L"FONT"},
+ {TMT_INTLIST, TMT_INTLIST, L"INTLIST"},
+ {TMT_STRING, TMT_COLORSCHEMES, L"COLORSCHEMES"},
+ {TMT_STRING, TMT_SIZES, L"SIZES"},
+ {TMT_INT, TMT_CHARSET, L"CHARSET"},
+ {TMT_STRING, TMT_DISPLAYNAME, L"DISPLAYNAME"},
+ {TMT_STRING, TMT_TOOLTIP, L"TOOLTIP"},
+ {TMT_STRING, TMT_COMPANY, L"COMPANY"},
+ {TMT_STRING, TMT_AUTHOR, L"AUTHOR"},
+ {TMT_STRING, TMT_COPYRIGHT, L"COPYRIGHT"},
+ {TMT_STRING, TMT_URL, L"URL"},
+ {TMT_STRING, TMT_VERSION, L"VERSION"},
+ {TMT_STRING, TMT_DESCRIPTION, L"DESCRIPTION"},
+ {TMT_FONT, TMT_CAPTIONFONT, L"CAPTIONFONT"},
+ {TMT_FONT, TMT_SMALLCAPTIONFONT, L"SMALLCAPTIONFONT"},
+ {TMT_FONT, TMT_MENUFONT, L"MENUFONT"},
+ {TMT_FONT, TMT_STATUSFONT, L"STATUSFONT"},
+ {TMT_FONT, TMT_MSGBOXFONT, L"MSGBOXFONT"},
+ {TMT_FONT, TMT_ICONTITLEFONT, L"ICONTITLEFONT"},
+ {TMT_BOOL, TMT_FLATMENUS, L"FLATMENUS"},
+ {TMT_SIZE, TMT_SIZINGBORDERWIDTH, L"SIZINGBORDERWIDTH"},
+ {TMT_SIZE, TMT_SCROLLBARWIDTH, L"SCROLLBARWIDTH"},
+ {TMT_SIZE, TMT_SCROLLBARHEIGHT, L"SCROLLBARHEIGHT"},
+ {TMT_SIZE, TMT_CAPTIONBARWIDTH, L"CAPTIONBARWIDTH"},
+ {TMT_SIZE, TMT_CAPTIONBARHEIGHT, L"CAPTIONBARHEIGHT"},
+ {TMT_SIZE, TMT_SMCAPTIONBARWIDTH, L"SMCAPTIONBARWIDTH"},
+ {TMT_SIZE, TMT_SMCAPTIONBARHEIGHT, L"SMCAPTIONBARHEIGHT"},
+ {TMT_SIZE, TMT_MENUBARWIDTH, L"MENUBARWIDTH"},
+ {TMT_SIZE, TMT_MENUBARHEIGHT, L"MENUBARHEIGHT"},
+ {TMT_INT, TMT_MINCOLORDEPTH, L"MINCOLORDEPTH"},
+ {TMT_STRING, TMT_CSSNAME, L"CSSNAME"},
+ {TMT_STRING, TMT_XMLNAME, L"XMLNAME"},
+ {TMT_COLOR, TMT_SCROLLBAR, L"SCROLLBAR"},
+ {TMT_COLOR, TMT_BACKGROUND, L"BACKGROUND"},
+ {TMT_COLOR, TMT_ACTIVECAPTION, L"ACTIVECAPTION"},
+ {TMT_COLOR, TMT_INACTIVECAPTION, L"INACTIVECAPTION"},
+ {TMT_COLOR, TMT_MENU, L"MENU"},
+ {TMT_COLOR, TMT_WINDOW, L"WINDOW"},
+ {TMT_COLOR, TMT_WINDOWFRAME, L"WINDOWFRAME"},
+ {TMT_COLOR, TMT_MENUTEXT, L"MENUTEXT"},
+ {TMT_COLOR, TMT_WINDOWTEXT, L"WINDOWTEXT"},
+ {TMT_COLOR, TMT_CAPTIONTEXT, L"CAPTIONTEXT"},
+ {TMT_COLOR, TMT_ACTIVEBORDER, L"ACTIVEBORDER"},
+ {TMT_COLOR, TMT_INACTIVEBORDER, L"INACTIVEBORDER"},
+ {TMT_COLOR, TMT_APPWORKSPACE, L"APPWORKSPACE"},
+ {TMT_COLOR, TMT_HIGHLIGHT, L"HIGHLIGHT"},
+ {TMT_COLOR, TMT_HIGHLIGHTTEXT, L"HIGHLIGHTTEXT"},
+ {TMT_COLOR, TMT_BTNFACE, L"BTNFACE"},
+ {TMT_COLOR, TMT_BTNSHADOW, L"BTNSHADOW"},
+ {TMT_COLOR, TMT_GRAYTEXT, L"GRAYTEXT"},
+ {TMT_COLOR, TMT_BTNTEXT, L"BTNTEXT"},
+ {TMT_COLOR, TMT_INACTIVECAPTIONTEXT, L"INACTIVECAPTIONTEXT"},
+ {TMT_COLOR, TMT_BTNHIGHLIGHT, L"BTNHIGHLIGHT"},
+ {TMT_COLOR, TMT_DKSHADOW3D, L"DKSHADOW3D"},
+ {TMT_COLOR, TMT_LIGHT3D, L"LIGHT3D"},
+ {TMT_COLOR, TMT_INFOTEXT, L"INFOTEXT"},
+ {TMT_COLOR, TMT_INFOBK, L"INFOBK"},
+ {TMT_COLOR, TMT_BUTTONALTERNATEFACE, L"BUTTONALTERNATEFACE"},
+ {TMT_COLOR, TMT_HOTTRACKING, L"HOTTRACKING"},
+ {TMT_COLOR, TMT_GRADIENTACTIVECAPTION, L"GRADIENTACTIVECAPTION"},
+ {TMT_COLOR, TMT_GRADIENTINACTIVECAPTION, L"GRADIENTINACTIVECAPTION"},
+ {TMT_COLOR, TMT_MENUHILIGHT, L"MENUHILIGHT"},
+ {TMT_COLOR, TMT_MENUBAR, L"MENUBAR"},
+ {TMT_INT, TMT_FROMHUE1, L"FROMHUE1"},
+ {TMT_INT, TMT_FROMHUE2, L"FROMHUE2"},
+ {TMT_INT, TMT_FROMHUE3, L"FROMHUE3"},
+ {TMT_INT, TMT_FROMHUE4, L"FROMHUE4"},
+ {TMT_INT, TMT_FROMHUE5, L"FROMHUE5"},
+ {TMT_INT, TMT_TOHUE1, L"TOHUE1"},
+ {TMT_INT, TMT_TOHUE2, L"TOHUE2"},
+ {TMT_INT, TMT_TOHUE3, L"TOHUE3"},
+ {TMT_INT, TMT_TOHUE4, L"TOHUE4"},
+ {TMT_INT, TMT_TOHUE5, L"TOHUE5"},
+ {TMT_COLOR, TMT_FROMCOLOR1, L"FROMCOLOR1"},
+ {TMT_COLOR, TMT_FROMCOLOR2, L"FROMCOLOR2"},
+ {TMT_COLOR, TMT_FROMCOLOR3, L"FROMCOLOR3"},
+ {TMT_COLOR, TMT_FROMCOLOR4, L"FROMCOLOR4"},
+ {TMT_COLOR, TMT_FROMCOLOR5, L"FROMCOLOR5"},
+ {TMT_COLOR, TMT_TOCOLOR1, L"TOCOLOR1"},
+ {TMT_COLOR, TMT_TOCOLOR2, L"TOCOLOR2"},
+ {TMT_COLOR, TMT_TOCOLOR3, L"TOCOLOR3"},
+ {TMT_COLOR, TMT_TOCOLOR4, L"TOCOLOR4"},
+ {TMT_COLOR, TMT_TOCOLOR5, L"TOCOLOR5"},
+ {TMT_BOOL, TMT_TRANSPARENT, L"TRANSPARENT"},
+ {TMT_BOOL, TMT_AUTOSIZE, L"AUTOSIZE"},
+ {TMT_BOOL, TMT_BORDERONLY, L"BORDERONLY"},
+ {TMT_BOOL, TMT_COMPOSITED, L"COMPOSITED"},
+ {TMT_BOOL, TMT_BGFILL, L"BGFILL"},
+ {TMT_BOOL, TMT_GLYPHTRANSPARENT, L"GLYPHTRANSPARENT"},
+ {TMT_BOOL, TMT_GLYPHONLY, L"GLYPHONLY"},
+ {TMT_BOOL, TMT_ALWAYSSHOWSIZINGBAR, L"ALWAYSSHOWSIZINGBAR"},
+ {TMT_BOOL, TMT_MIRRORIMAGE, L"MIRRORIMAGE"},
+ {TMT_BOOL, TMT_UNIFORMSIZING, L"UNIFORMSIZING"},
+ {TMT_BOOL, TMT_INTEGRALSIZING, L"INTEGRALSIZING"},
+ {TMT_BOOL, TMT_SOURCEGROW, L"SOURCEGROW"},
+ {TMT_BOOL, TMT_SOURCESHRINK, L"SOURCESHRINK"},
+ {TMT_INT, TMT_IMAGECOUNT, L"IMAGECOUNT"},
+ {TMT_INT, TMT_ALPHALEVEL, L"ALPHALEVEL"},
+ {TMT_INT, TMT_BORDERSIZE, L"BORDERSIZE"},
+ {TMT_INT, TMT_ROUNDCORNERWIDTH, L"ROUNDCORNERWIDTH"},
+ {TMT_INT, TMT_ROUNDCORNERHEIGHT, L"ROUNDCORNERHEIGHT"},
+ {TMT_INT, TMT_GRADIENTRATIO1, L"GRADIENTRATIO1"},
+ {TMT_INT, TMT_GRADIENTRATIO2, L"GRADIENTRATIO2"},
+ {TMT_INT, TMT_GRADIENTRATIO3, L"GRADIENTRATIO3"},
+ {TMT_INT, TMT_GRADIENTRATIO4, L"GRADIENTRATIO4"},
+ {TMT_INT, TMT_GRADIENTRATIO5, L"GRADIENTRATIO5"},
+ {TMT_INT, TMT_PROGRESSCHUNKSIZE, L"PROGRESSCHUNKSIZE"},
+ {TMT_INT, TMT_PROGRESSSPACESIZE, L"PROGRESSSPACESIZE"},
+ {TMT_INT, TMT_SATURATION, L"SATURATION"},
+ {TMT_INT, TMT_TEXTBORDERSIZE, L"TEXTBORDERSIZE"},
+ {TMT_INT, TMT_ALPHATHRESHOLD, L"ALPHATHRESHOLD"},
+ {TMT_SIZE, TMT_WIDTH, L"WIDTH"},
+ {TMT_SIZE, TMT_HEIGHT, L"HEIGHT"},
+ {TMT_INT, TMT_GLYPHINDEX, L"GLYPHINDEX"},
+ {TMT_INT, TMT_TRUESIZESTRETCHMARK, L"TRUESIZESTRETCHMARK"},
+ {TMT_INT, TMT_MINDPI1, L"MINDPI1"},
+ {TMT_INT, TMT_MINDPI2, L"MINDPI2"},
+ {TMT_INT, TMT_MINDPI3, L"MINDPI3"},
+ {TMT_INT, TMT_MINDPI4, L"MINDPI4"},
+ {TMT_INT, TMT_MINDPI5, L"MINDPI5"},
+ {TMT_FONT, TMT_GLYPHFONT, L"GLYPHFONT"},
+ {TMT_FILENAME, TMT_IMAGEFILE, L"IMAGEFILE"},
+ {TMT_FILENAME, TMT_IMAGEFILE1, L"IMAGEFILE1"},
+ {TMT_FILENAME, TMT_IMAGEFILE2, L"IMAGEFILE2"},
+ {TMT_FILENAME, TMT_IMAGEFILE3, L"IMAGEFILE3"},
+ {TMT_FILENAME, TMT_IMAGEFILE4, L"IMAGEFILE4"},
+ {TMT_FILENAME, TMT_IMAGEFILE5, L"IMAGEFILE5"},
+ {TMT_FILENAME, TMT_STOCKIMAGEFILE, L"STOCKIMAGEFILE"},
+ {TMT_FILENAME, TMT_GLYPHIMAGEFILE, L"GLYPHIMAGEFILE"},
+ {TMT_STRING, TMT_TEXT, L"TEXT"},
+ {TMT_POSITION, TMT_OFFSET, L"OFFSET"},
+ {TMT_POSITION, TMT_TEXTSHADOWOFFSET, L"TEXTSHADOWOFFSET"},
+ {TMT_POSITION, TMT_MINSIZE, L"MINSIZE"},
+ {TMT_POSITION, TMT_MINSIZE1, L"MINSIZE1"},
+ {TMT_POSITION, TMT_MINSIZE2, L"MINSIZE2"},
+ {TMT_POSITION, TMT_MINSIZE3, L"MINSIZE3"},
+ {TMT_POSITION, TMT_MINSIZE4, L"MINSIZE4"},
+ {TMT_POSITION, TMT_MINSIZE5, L"MINSIZE5"},
+ {TMT_POSITION, TMT_NORMALSIZE, L"NORMALSIZE"},
+ {TMT_MARGINS, TMT_SIZINGMARGINS, L"SIZINGMARGINS"},
+ {TMT_MARGINS, TMT_CONTENTMARGINS, L"CONTENTMARGINS"},
+ {TMT_MARGINS, TMT_CAPTIONMARGINS, L"CAPTIONMARGINS"},
+ {TMT_COLOR, TMT_BORDERCOLOR, L"BORDERCOLOR"},
+ {TMT_COLOR, TMT_FILLCOLOR, L"FILLCOLOR"},
+ {TMT_COLOR, TMT_TEXTCOLOR, L"TEXTCOLOR"},
+ {TMT_COLOR, TMT_EDGELIGHTCOLOR, L"EDGELIGHTCOLOR"},
+ {TMT_COLOR, TMT_EDGEHIGHLIGHTCOLOR, L"EDGEHIGHLIGHTCOLOR"},
+ {TMT_COLOR, TMT_EDGESHADOWCOLOR, L"EDGESHADOWCOLOR"},
+ {TMT_COLOR, TMT_EDGEDKSHADOWCOLOR, L"EDGEDKSHADOWCOLOR"},
+ {TMT_COLOR, TMT_EDGEFILLCOLOR, L"EDGEFILLCOLOR"},
+ {TMT_COLOR, TMT_TRANSPARENTCOLOR, L"TRANSPARENTCOLOR"},
+ {TMT_COLOR, TMT_GRADIENTCOLOR1, L"GRADIENTCOLOR1"},
+ {TMT_COLOR, TMT_GRADIENTCOLOR2, L"GRADIENTCOLOR2"},
+ {TMT_COLOR, TMT_GRADIENTCOLOR3, L"GRADIENTCOLOR3"},
+ {TMT_COLOR, TMT_GRADIENTCOLOR4, L"GRADIENTCOLOR4"},
+ {TMT_COLOR, TMT_GRADIENTCOLOR5, L"GRADIENTCOLOR5"},
+ {TMT_COLOR, TMT_SHADOWCOLOR, L"SHADOWCOLOR"},
+ {TMT_COLOR, TMT_GLOWCOLOR, L"GLOWCOLOR"},
+ {TMT_COLOR, TMT_TEXTBORDERCOLOR, L"TEXTBORDERCOLOR"},
+ {TMT_COLOR, TMT_TEXTSHADOWCOLOR, L"TEXTSHADOWCOLOR"},
+ {TMT_COLOR, TMT_GLYPHTEXTCOLOR, L"GLYPHTEXTCOLOR"},
+ {TMT_COLOR, TMT_GLYPHTRANSPARENTCOLOR, L"GLYPHTRANSPARENTCOLOR"},
+ {TMT_COLOR, TMT_FILLCOLORHINT, L"FILLCOLORHINT"},
+ {TMT_COLOR, TMT_BORDERCOLORHINT, L"BORDERCOLORHINT"},
+ {TMT_COLOR, TMT_ACCENTCOLORHINT, L"ACCENTCOLORHINT"},
+ {TMT_ENUM, TMT_BGTYPE, L"BGTYPE"},
+ {TMT_ENUM, TMT_BORDERTYPE, L"BORDERTYPE"},
+ {TMT_ENUM, TMT_FILLTYPE, L"FILLTYPE"},
+ {TMT_ENUM, TMT_SIZINGTYPE, L"SIZINGTYPE"},
+ {TMT_ENUM, TMT_HALIGN, L"HALIGN"},
+ {TMT_ENUM, TMT_CONTENTALIGNMENT, L"CONTENTALIGNMENT"},
+ {TMT_ENUM, TMT_VALIGN, L"VALIGN"},
+ {TMT_ENUM, TMT_OFFSETTYPE, L"OFFSETTYPE"},
+ {TMT_ENUM, TMT_ICONEFFECT, L"ICONEFFECT"},
+ {TMT_ENUM, TMT_TEXTSHADOWTYPE, L"TEXTSHADOWTYPE"},
+ {TMT_ENUM, TMT_IMAGELAYOUT, L"IMAGELAYOUT"},
+ {TMT_ENUM, TMT_GLYPHTYPE, L"GLYPHTYPE"},
+ {TMT_ENUM, TMT_IMAGESELECTTYPE, L"IMAGESELECTTYPE"},
+ {TMT_ENUM, TMT_GLYPHFONTSIZINGTYPE, L"GLYPHFONTSIZINGTYPE"},
+ {TMT_ENUM, TMT_TRUESIZESCALINGTYPE, L"TRUESIZESCALINGTYPE"},
+ {TMT_BOOL, TMT_USERPICTURE, L"USERPICTURE"},
+ {TMT_RECT, TMT_DEFAULTPANESIZE, L"DEFAULTPANESIZE"},
+ {TMT_COLOR, TMT_BLENDCOLOR, L"BLENDCOLOR"},
+ {0, 0, L""}
};
/***********************************************************************
@@ -255,66 +255,66 @@ static const MSSTYLES_PROPERTY_MAP mapProperty[] = {
* Enum,Value,ValueName
*/
static const MSSTYLES_ENUM_MAP mapEnum[] = {
- {TMT_BGTYPE,BT_IMAGEFILE,{'I','M','A','G','E','F','I','L','E','\0'}},
- {TMT_BGTYPE,BT_BORDERFILL,{'B','O','R','D','E','R','F','I','L','L','\0'}},
- {TMT_BGTYPE,BT_NONE,{'N','O','N','E','\0'}},
- {TMT_IMAGELAYOUT,IL_VERTICAL,{'V','E','R','T','I','C','A','L','\0'}},
- {TMT_IMAGELAYOUT,IL_HORIZONTAL,{'H','O','R','I','Z','O','N','T','A','L','\0'}},
- {TMT_BORDERTYPE,BT_RECT,{'R','E','C','T','\0'}},
- {TMT_BORDERTYPE,BT_ROUNDRECT,{'R','O','U','N','D','R','E','C','T','\0'}},
- {TMT_BORDERTYPE,BT_ELLIPSE,{'E','L','L','I','P','S','E','\0'}},
- {TMT_FILLTYPE,FT_SOLID,{'S','O','L','I','D','\0'}},
- {TMT_FILLTYPE,FT_VERTGRADIENT,{'V','E','R','T','G','R','A','D','I','E','N','T','\0'}},
- {TMT_FILLTYPE,FT_HORZGRADIENT,{'H','O','R','Z','G','R','A','D','I','E','N','T','\0'}},
- {TMT_FILLTYPE,FT_RADIALGRADIENT,{'R','A','D','I','A','L','G','R','A','D','I','E','N','T','\0'}},
- {TMT_FILLTYPE,FT_TILEIMAGE,{'T','I','L','E','I','M','A','G','E','\0'}},
- {TMT_SIZINGTYPE,ST_TRUESIZE,{'T','R','U','E','S','I','Z','E','\0'}},
- {TMT_SIZINGTYPE,ST_STRETCH,{'S','T','R','E','T','C','H','\0'}},
- {TMT_SIZINGTYPE,ST_TILE,{'T','I','L','E','\0'}},
- {TMT_HALIGN,HA_LEFT,{'L','E','F','T','\0'}},
- {TMT_HALIGN,HA_CENTER,{'C','E','N','T','E','R','\0'}},
- {TMT_HALIGN,HA_RIGHT,{'R','I','G','H','T','\0'}},
- {TMT_CONTENTALIGNMENT,CA_LEFT,{'L','E','F','T','\0'}},
- {TMT_CONTENTALIGNMENT,CA_CENTER,{'C','E','N','T','E','R','\0'}},
- {TMT_CONTENTALIGNMENT,CA_RIGHT,{'R','I','G','H','T','\0'}},
- {TMT_VALIGN,VA_TOP,{'T','O','P','\0'}},
- {TMT_VALIGN,VA_CENTER,{'C','E','N','T','E','R','\0'}},
- {TMT_VALIGN,VA_BOTTOM,{'B','O','T','T','O','M','\0'}},
- {TMT_OFFSETTYPE,OT_TOPLEFT,{'T','O','P','L','E','F','T','\0'}},
- {TMT_OFFSETTYPE,OT_TOPRIGHT,{'T','O','P','R','I','G','H','T','\0'}},
- {TMT_OFFSETTYPE,OT_TOPMIDDLE,{'T','O','P','M','I','D','D','L','E','\0'}},
- {TMT_OFFSETTYPE,OT_BOTTOMLEFT,{'B','O','T','T','O','M','L','E','F','T','\0'}},
- {TMT_OFFSETTYPE,OT_BOTTOMRIGHT,{'B','O','T','T','O','M','R','I','G','H','T','\0'}},
- {TMT_OFFSETTYPE,OT_BOTTOMMIDDLE,{'B','O','T','T','O','M','M','I','D','D','L','E','\0'}},
- {TMT_OFFSETTYPE,OT_MIDDLELEFT,{'M','I','D','D','L','E','L','E','F','T','\0'}},
- {TMT_OFFSETTYPE,OT_MIDDLERIGHT,{'M','I','D','D','L','E','R','I','G','H','T','\0'}},
- {TMT_OFFSETTYPE,OT_LEFTOFCAPTION,{'L','E','F','T','O','F','C','A','P','T','I','O','N','\0'}},
- {TMT_OFFSETTYPE,OT_RIGHTOFCAPTION,{'R','I','G','H','T','O','F','C','A','P','T','I','O','N','\0'}},
- {TMT_OFFSETTYPE,OT_LEFTOFLASTBUTTON,{'L','E','F','T','O','F','L','A','S','T','B','U','T','T','O','N','\0'}},
- {TMT_OFFSETTYPE,OT_RIGHTOFLASTBUTTON,{'R','I','G','H','T','O','F','L','A','S','T','B','U','T','T','O','N','\0'}},
- {TMT_OFFSETTYPE,OT_ABOVELASTBUTTON,{'A','B','O','V','E','L','A','S','T','B','U','T','T','O','N','\0'}},
- {TMT_OFFSETTYPE,OT_BELOWLASTBUTTON,{'B','E','L','O','W','L','A','S','T','B','U','T','T','O','N','\0'}},
- {TMT_ICONEFFECT,ICE_NONE,{'N','O','N','E','\0'}},
- {TMT_ICONEFFECT,ICE_GLOW,{'G','L','O','W','\0'}},
- {TMT_ICONEFFECT,ICE_SHADOW,{'S','H','A','D','O','W','\0'}},
- {TMT_ICONEFFECT,ICE_PULSE,{'P','U','L','S','E','\0'}},
- {TMT_ICONEFFECT,ICE_ALPHA,{'A','L','P','H','A','\0'}},
- {TMT_TEXTSHADOWTYPE,TST_NONE,{'N','O','N','E','\0'}},
- {TMT_TEXTSHADOWTYPE,TST_SINGLE,{'S','I','N','G','L','E','\0'}},
- {TMT_TEXTSHADOWTYPE,TST_CONTINUOUS,{'C','O','N','T','I','N','U','O','U','S','\0'}},
- {TMT_GLYPHTYPE,GT_NONE,{'N','O','N','E','\0'}},
- {TMT_GLYPHTYPE,GT_IMAGEGLYPH,{'I','M','A','G','E','G','L','Y','P','H','\0'}},
- {TMT_GLYPHTYPE,GT_FONTGLYPH,{'F','O','N','T','G','L','Y','P','H','\0'}},
- {TMT_IMAGESELECTTYPE,IST_NONE,{'N','O','N','E','\0'}},
- {TMT_IMAGESELECTTYPE,IST_SIZE,{'S','I','Z','E','\0'}},
- {TMT_IMAGESELECTTYPE,IST_DPI,{'D','P','I','\0'}},
- {TMT_TRUESIZESCALINGTYPE,TSST_NONE,{'N','O','N','E','\0'}},
- {TMT_TRUESIZESCALINGTYPE,TSST_SIZE,{'S','I','Z','E','\0'}},
- {TMT_TRUESIZESCALINGTYPE,TSST_DPI,{'D','P','I','\0'}},
- {TMT_GLYPHFONTSIZINGTYPE,GFST_NONE,{'N','O','N','E','\0'}},
- {TMT_GLYPHFONTSIZINGTYPE,GFST_SIZE,{'S','I','Z','E','\0'}},
- {TMT_GLYPHFONTSIZINGTYPE,GFST_DPI,{'D','P','I','\0'}},
- {0,0,{'\0'}}
+ {TMT_BGTYPE, BT_IMAGEFILE, L"IMAGEFILE"},
+ {TMT_BGTYPE, BT_BORDERFILL, L"BORDERFILL"},
+ {TMT_BGTYPE, BT_NONE, L"NONE"},
+ {TMT_IMAGELAYOUT, IL_VERTICAL, L"VERTICAL"},
+ {TMT_IMAGELAYOUT, IL_HORIZONTAL, L"HORIZONTAL"},
+ {TMT_BORDERTYPE, BT_RECT, L"RECT"},
+ {TMT_BORDERTYPE, BT_ROUNDRECT, L"ROUNDRECT"},
+ {TMT_BORDERTYPE, BT_ELLIPSE, L"ELLIPSE"},
+ {TMT_FILLTYPE, FT_SOLID, L"SOLID"},
+ {TMT_FILLTYPE, FT_VERTGRADIENT, L"VERTGRADIENT"},
+ {TMT_FILLTYPE, FT_HORZGRADIENT, L"HORZGRADIENT"},
+ {TMT_FILLTYPE, FT_RADIALGRADIENT, L"RADIALGRADIENT"},
+ {TMT_FILLTYPE, FT_TILEIMAGE, L"TILEIMAGE"},
+ {TMT_SIZINGTYPE, ST_TRUESIZE, L"TRUESIZE"},
+ {TMT_SIZINGTYPE, ST_STRETCH, L"STRETCH"},
+ {TMT_SIZINGTYPE, ST_TILE, L"TILE"},
+ {TMT_HALIGN, HA_LEFT, L"LEFT"},
+ {TMT_HALIGN, HA_CENTER, L"CENTER"},
+ {TMT_HALIGN, HA_RIGHT, L"RIGHT"},
+ {TMT_CONTENTALIGNMENT, CA_LEFT, L"LEFT"},
+ {TMT_CONTENTALIGNMENT, CA_CENTER, L"CENTER"},
+ {TMT_CONTENTALIGNMENT, CA_RIGHT, L"RIGHT"},
+ {TMT_VALIGN, VA_TOP, L"TOP"},
+ {TMT_VALIGN, VA_CENTER, L"CENTER"},
+ {TMT_VALIGN, VA_BOTTOM, L"BOTTOM"},
+ {TMT_OFFSETTYPE, OT_TOPLEFT, L"TOPLEFT"},
+ {TMT_OFFSETTYPE, OT_TOPRIGHT, L"TOPRIGHT"},
+ {TMT_OFFSETTYPE, OT_TOPMIDDLE, L"TOPMIDDLE"},
+ {TMT_OFFSETTYPE, OT_BOTTOMLEFT, L"BOTTOMLEFT"},
+ {TMT_OFFSETTYPE, OT_BOTTOMRIGHT, L"BOTTOMRIGHT"},
+ {TMT_OFFSETTYPE, OT_BOTTOMMIDDLE, L"BOTTOMMIDDLE"},
+ {TMT_OFFSETTYPE, OT_MIDDLELEFT, L"MIDDLELEFT"},
+ {TMT_OFFSETTYPE, OT_MIDDLERIGHT, L"MIDDLERIGHT"},
+ {TMT_OFFSETTYPE, OT_LEFTOFCAPTION, L"LEFTOFCAPTION"},
+ {TMT_OFFSETTYPE, OT_RIGHTOFCAPTION, L"RIGHTOFCAPTION"},
+ {TMT_OFFSETTYPE, OT_LEFTOFLASTBUTTON, L"LEFTOFLASTBUTTON"},
+ {TMT_OFFSETTYPE, OT_RIGHTOFLASTBUTTON, L"RIGHTOFLASTBUTTON"},
+ {TMT_OFFSETTYPE, OT_ABOVELASTBUTTON, L"ABOVELASTBUTTON"},
+ {TMT_OFFSETTYPE, OT_BELOWLASTBUTTON, L"BELOWLASTBUTTON"},
+ {TMT_ICONEFFECT, ICE_NONE, L"NONE"},
+ {TMT_ICONEFFECT, ICE_GLOW, L"GLOW"},
+ {TMT_ICONEFFECT, ICE_SHADOW, L"SHADOW"},
+ {TMT_ICONEFFECT, ICE_PULSE, L"PULSE"},
+ {TMT_ICONEFFECT, ICE_ALPHA, L"ALPHA"},
+ {TMT_TEXTSHADOWTYPE, TST_NONE, L"NONE"},
+ {TMT_TEXTSHADOWTYPE, TST_SINGLE, L"SINGLE"},
+ {TMT_TEXTSHADOWTYPE, TST_CONTINUOUS, L"CONTINUOUS"},
+ {TMT_GLYPHTYPE, GT_NONE, L"NONE"},
+ {TMT_GLYPHTYPE, GT_IMAGEGLYPH, L"IMAGEGLYPH"},
+ {TMT_GLYPHTYPE, GT_FONTGLYPH, L"FONTGLYPH"},
+ {TMT_IMAGESELECTTYPE, IST_NONE, L"NONE"},
+ {TMT_IMAGESELECTTYPE, IST_SIZE, L"SIZE"},
+ {TMT_IMAGESELECTTYPE, IST_DPI, L"DPI"},
+ {TMT_TRUESIZESCALINGTYPE, TSST_NONE, L"NONE"},
+ {TMT_TRUESIZESCALINGTYPE, TSST_SIZE, L"SIZE"},
+ {TMT_TRUESIZESCALINGTYPE, TSST_DPI, L"DPI"},
+ {TMT_GLYPHFONTSIZINGTYPE, GFST_NONE, L"NONE"},
+ {TMT_GLYPHFONTSIZINGTYPE, GFST_SIZE, L"SIZE"},
+ {TMT_GLYPHFONTSIZINGTYPE, GFST_DPI, L"DPI"},
+ {0, 0, L""}
};
@@ -326,720 +326,720 @@ static const MSSTYLES_ENUM_MAP mapEnum[] = {
/* These are globals to all classes, but its treated as a separate class */
static const MSSTYLES_CLASS_MAP classGlobals[] = {
- {GP_BORDER,0,{'B','O','R','D','E','R','\0'}},
- {GP_BORDER,BSS_FLAT,{'F','L','A','T','\0'}},
- {GP_BORDER,BSS_RAISED,{'R','A','I','S','E','D','\0'}},
- {GP_BORDER,BSS_SUNKEN,{'S','U','N','K','E','N','\0'}},
- {GP_LINEHORZ,0,{'L','I','N','E','H','O','R','Z','\0'}},
- {GP_LINEHORZ,LHS_FLAT,{'F','L','A','T','\0'}},
- {GP_LINEHORZ,LHS_RAISED,{'R','A','I','S','E','D','\0'}},
- {GP_LINEHORZ,LHS_SUNKEN,{'S','U','N','K','E','N','\0'}},
- {GP_LINEVERT,0,{'L','I','N','E','V','E','R','T','\0'}},
- {GP_LINEVERT,LVS_FLAT,{'F','L','A','T','\0'}},
- {GP_LINEVERT,LVS_RAISED,{'R','A','I','S','E','D','\0'}},
- {GP_LINEVERT,LVS_SUNKEN,{'S','U','N','K','E','N','\0'}},
- {0,0,{'\0'}}
+ {GP_BORDER, 0, L"BORDER"},
+ {GP_BORDER, BSS_FLAT, L"FLAT"},
+ {GP_BORDER, BSS_RAISED, L"RAISED"},
+ {GP_BORDER, BSS_SUNKEN, L"SUNKEN"},
+ {GP_LINEHORZ, 0, L"LINEHORZ"},
+ {GP_LINEHORZ, LHS_FLAT, L"FLAT"},
+ {GP_LINEHORZ, LHS_RAISED, L"RAISED"},
+ {GP_LINEHORZ, LHS_SUNKEN, L"SUNKEN"},
+ {GP_LINEVERT, 0, L"LINEVERT"},
+ {GP_LINEVERT, LVS_FLAT, L"FLAT"},
+ {GP_LINEVERT, LVS_RAISED, L"RAISED"},
+ {GP_LINEVERT, LVS_SUNKEN, L"SUNKEN"},
+ {0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classButton[] = {
- {BP_PUSHBUTTON,0,{'P','U','S','H','B','U','T','T','O','N','\0'}},
- {BP_PUSHBUTTON,PBS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {BP_PUSHBUTTON,PBS_HOT,{'H','O','T','\0'}},
- {BP_PUSHBUTTON,PBS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {BP_PUSHBUTTON,PBS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {BP_PUSHBUTTON,PBS_DEFAULTED,{'D','E','F','A','U','L','T','E','D','\0'}},
- {BP_RADIOBUTTON,0,{'R','A','D','I','O','B','U','T','T','O','N','\0'}},
- {BP_RADIOBUTTON,RBS_UNCHECKEDNORMAL,{'U','N','C','H','E','C','K','E','D','N','O','R','M','A','L','\0'}},
- {BP_RADIOBUTTON,RBS_UNCHECKEDHOT,{'U','N','C','H','E','C','K','E','D','H','O','T','\0'}},
- {BP_RADIOBUTTON,RBS_UNCHECKEDPRESSED,{'U','N','C','H','E','C','K','E','D','P','R','E','S','S','E','D','\0'}},
- {BP_RADIOBUTTON,RBS_UNCHECKEDDISABLED,{'U','N','C','H','E','C','K','E','D','D','I','S','A','B','L','E','D','\0'}},
- {BP_RADIOBUTTON,RBS_CHECKEDNORMAL,{'C','H','E','C','K','E','D','N','O','R','M','A','L','\0'}},
- {BP_RADIOBUTTON,RBS_CHECKEDHOT,{'C','H','E','C','K','E','D','H','O','T','\0'}},
- {BP_RADIOBUTTON,RBS_CHECKEDPRESSED,{'C','H','E','C','K','E','D','P','R','E','S','S','E','D','\0'}},
- {BP_RADIOBUTTON,RBS_CHECKEDDISABLED,{'C','H','E','C','K','E','D','D','I','S','A','B','L','E','D','\0'}},
- {BP_CHECKBOX,0,{'C','H','E','C','K','B','O','X','\0'}},
- {BP_RADIOBUTTON,CBS_UNCHECKEDNORMAL,{'U','N','C','H','E','C','K','E','D','N','O','R','M','A','L','\0'}},
- {BP_RADIOBUTTON,CBS_UNCHECKEDHOT,{'U','N','C','H','E','C','K','E','D','H','O','T','\0'}},
- {BP_RADIOBUTTON,CBS_UNCHECKEDPRESSED,{'U','N','C','H','E','C','K','E','D','P','R','E','S','S','E','D','\0'}},
- {BP_RADIOBUTTON,CBS_UNCHECKEDDISABLED,{'U','N','C','H','E','C','K','E','D','D','I','S','A','B','L','E','D','\0'}},
- {BP_RADIOBUTTON,CBS_CHECKEDNORMAL,{'C','H','E','C','K','E','D','N','O','R','M','A','L','\0'}},
- {BP_RADIOBUTTON,CBS_CHECKEDHOT,{'C','H','E','C','K','E','D','H','O','T','\0'}},
- {BP_RADIOBUTTON,CBS_CHECKEDPRESSED,{'C','H','E','C','K','E','D','P','R','E','S','S','E','D','\0'}},
- {BP_RADIOBUTTON,CBS_CHECKEDDISABLED,{'C','H','E','C','K','E','D','D','I','S','A','B','L','E','D','\0'}},
- {BP_RADIOBUTTON,CBS_MIXEDNORMAL,{'M','I','X','E','D','N','O','R','M','A','L','\0'}},
- {BP_RADIOBUTTON,CBS_MIXEDHOT,{'M','I','X','E','D','H','O','T','\0'}},
- {BP_RADIOBUTTON,CBS_MIXEDPRESSED,{'M','I','X','E','D','P','R','E','S','S','E','D','\0'}},
- {BP_RADIOBUTTON,CBS_MIXEDDISABLED,{'M','I','X','E','D','D','I','S','A','B','L','E','D','\0'}},
- {BP_GROUPBOX,0,{'G','R','O','U','P','B','O','X','\0'}},
- {BP_RADIOBUTTON,GBS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {BP_RADIOBUTTON,GBS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {BP_USERBUTTON,0,{'U','S','E','R','B','U','T','T','O','N','\0'}},
- {0,0,{'\0'}}
+ {BP_PUSHBUTTON, 0, L"PUSHBUTTON"},
+ {BP_PUSHBUTTON, PBS_NORMAL, L"NORMAL"},
+ {BP_PUSHBUTTON, PBS_HOT, L"HOT"},
+ {BP_PUSHBUTTON, PBS_PRESSED, L"PRESSED"},
+ {BP_PUSHBUTTON, PBS_DISABLED, L"DISABLED"},
+ {BP_PUSHBUTTON, PBS_DEFAULTED, L"DEFAULTED"},
+ {BP_RADIOBUTTON, 0, L"RADIOBUTTON"},
+ {BP_RADIOBUTTON, RBS_UNCHECKEDNORMAL, L"UNCHECKEDNORMAL"},
+ {BP_RADIOBUTTON, RBS_UNCHECKEDHOT, L"UNCHECKEDHOT"},
+ {BP_RADIOBUTTON, RBS_UNCHECKEDPRESSED, L"UNCHECKEDPRESSED"},
+ {BP_RADIOBUTTON, RBS_UNCHECKEDDISABLED, L"UNCHECKEDDISABLED"},
+ {BP_RADIOBUTTON, RBS_CHECKEDNORMAL, L"CHECKEDNORMAL"},
+ {BP_RADIOBUTTON, RBS_CHECKEDHOT, L"CHECKEDHOT"},
+ {BP_RADIOBUTTON, RBS_CHECKEDPRESSED, L"CHECKEDPRESSED"},
+ {BP_RADIOBUTTON, RBS_CHECKEDDISABLED, L"CHECKEDDISABLED"},
+ {BP_CHECKBOX, 0, L"CHECKBOX"},
+ {BP_RADIOBUTTON, CBS_UNCHECKEDNORMAL, L"UNCHECKEDNORMAL"},
+ {BP_RADIOBUTTON, CBS_UNCHECKEDHOT, L"UNCHECKEDHOT"},
+ {BP_RADIOBUTTON, CBS_UNCHECKEDPRESSED, L"UNCHECKEDPRESSED"},
+ {BP_RADIOBUTTON, CBS_UNCHECKEDDISABLED, L"UNCHECKEDDISABLED"},
+ {BP_RADIOBUTTON, CBS_CHECKEDNORMAL, L"CHECKEDNORMAL"},
+ {BP_RADIOBUTTON, CBS_CHECKEDHOT, L"CHECKEDHOT"},
+ {BP_RADIOBUTTON, CBS_CHECKEDPRESSED, L"CHECKEDPRESSED"},
+ {BP_RADIOBUTTON, CBS_CHECKEDDISABLED, L"CHECKEDDISABLED"},
+ {BP_RADIOBUTTON, CBS_MIXEDNORMAL, L"MIXEDNORMAL"},
+ {BP_RADIOBUTTON, CBS_MIXEDHOT, L"MIXEDHOT"},
+ {BP_RADIOBUTTON, CBS_MIXEDPRESSED, L"MIXEDPRESSED"},
+ {BP_RADIOBUTTON, CBS_MIXEDDISABLED, L"MIXEDDISABLED"},
+ {BP_GROUPBOX, 0, L"GROUPBOX"},
+ {BP_RADIOBUTTON, GBS_NORMAL, L"NORMAL"},
+ {BP_RADIOBUTTON, GBS_DISABLED, L"DISABLED"},
+ {BP_USERBUTTON, 0, L"USERBUTTON"},
+ {0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classClock[] = {
- {CLP_TIME,0,{'T','I','M','E','\0'}},
- {CLP_TIME,CLS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {0,0,{'\0'}}
+ {CLP_TIME, 0, L"TIME"},
+ {CLP_TIME, CLS_NORMAL, L"NORMAL"},
+ {0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classCombobox[] = {
- {CP_DROPDOWNBUTTON,0,{'D','R','O','P','D','O','W','N','B','U','T','T','O','N','\0'}},
- {CP_DROPDOWNBUTTON,CBXS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {CP_DROPDOWNBUTTON,CBXS_HOT,{'H','O','T','\0'}},
- {CP_DROPDOWNBUTTON,CBXS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {CP_DROPDOWNBUTTON,CBXS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {0,0,{'\0'}}
+ {CP_DROPDOWNBUTTON, 0, L"DROPDOWNBUTTON"},
+ {CP_DROPDOWNBUTTON, CBXS_NORMAL, L"NORMAL"},
+ {CP_DROPDOWNBUTTON, CBXS_HOT, L"HOT"},
+ {CP_DROPDOWNBUTTON, CBXS_PRESSED, L"PRESSED"},
+ {CP_DROPDOWNBUTTON, CBXS_DISABLED, L"DISABLED"},
+ {0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classEdit[] = {
- {EP_EDITTEXT,0,{'E','D','I','T','T','E','X','T','\0'}},
- {EP_EDITTEXT,ETS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {EP_EDITTEXT,ETS_HOT,{'H','O','T','\0'}},
- {EP_EDITTEXT,ETS_SELECTED,{'S','E','L','E','C','T','E','D','\0'}},
- {EP_EDITTEXT,ETS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {EP_EDITTEXT,ETS_FOCUSED,{'F','O','C','U','S','E','D','\0'}},
- {EP_EDITTEXT,ETS_READONLY,{'R','E','A','D','O','N','L','Y','\0'}},
- {EP_EDITTEXT,ETS_ASSIST,{'A','S','S','I','S','T','\0'}},
- {EP_CARET,0,{'C','A','R','E','T','\0'}},
- {0,0,{'\0'}}
+ {EP_EDITTEXT, 0, L"EDITTEXT"},
+ {EP_EDITTEXT, ETS_NORMAL, L"NORMAL"},
+ {EP_EDITTEXT, ETS_HOT, L"HOT"},
+ {EP_EDITTEXT, ETS_SELECTED, L"SELECTED"},
+ {EP_EDITTEXT, ETS_DISABLED, L"DISABLED"},
+ {EP_EDITTEXT, ETS_FOCUSED, L"FOCUSED"},
+ {EP_EDITTEXT, ETS_READONLY, L"READONLY"},
+ {EP_EDITTEXT, ETS_ASSIST, L"ASSIST"},
+ {EP_CARET, 0, L"CARET"},
+ {0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classExplorerbar[] = {
- {EBP_HEADERBACKGROUND,0,{'H','E','A','D','E','R','B','A','C','K','G','R','O','U','N','D','\0'}},
- {EBP_HEADERCLOSE,0,{'H','E','A','D','E','R','C','L','O','S','E','\0'}},
- {EBP_HEADERCLOSE,EBHC_NORMAL,{'N','O','R','M','A','L','\0'}},
- {EBP_HEADERCLOSE,EBHC_HOT,{'H','O','T','\0'}},
- {EBP_HEADERCLOSE,EBHC_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {EBP_HEADERPIN,0,{'H','E','A','D','E','R','P','I','N','\0'}},
- {EBP_HEADERPIN,EBHP_NORMAL,{'N','O','R','M','A','L','\0'}},
- {EBP_HEADERPIN,EBHP_HOT,{'H','O','T','\0'}},
- {EBP_HEADERPIN,EBHP_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {EBP_HEADERPIN,EBHP_SELECTEDNORMAL,{'S','E','L','E','C','T','E','D','N','O','R','M','A','L','\0'}},
- {EBP_HEADERPIN,EBHP_SELECTEDHOT,{'S','E','L','E','C','T','E','D','H','O','T','\0'}},
- {EBP_HEADERPIN,EBHP_SELECTEDPRESSED,{'S','E','L','E','C','T','E','D','P','R','E','S','S','E','D','\0'}},
- {EBP_IEBARMENU,0,{'I','E','B','A','R','M','E','N','U','\0'}},
- {EBP_IEBARMENU,EBM_NORMAL,{'N','O','R','M','A','L','\0'}},
- {EBP_IEBARMENU,EBM_HOT,{'H','O','T','\0'}},
- {EBP_IEBARMENU,EBM_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {EBP_NORMALGROUPBACKGROUND,0,{'N','O','R','M','A','L','G','R','O','U','P','B','A','C','K','G','R','O','U','N','D','\0'}},
- {EBP_NORMALGROUPCOLLAPSE,0,{'N','O','R','M','A','L','G','R','O','U','P','C','O','L','L','A','P','S','E','\0'}},
- {EBP_NORMALGROUPCOLLAPSE,EBNGC_NORMAL,{'N','O','R','M','A','L','\0'}},
- {EBP_NORMALGROUPCOLLAPSE,EBNGC_HOT,{'H','O','T','\0'}},
- {EBP_NORMALGROUPCOLLAPSE,EBNGC_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {EBP_NORMALGROUPEXPAND,0,{'N','O','R','M','A','L','G','R','O','U','P','E','X','P','A','N','D','\0'}},
- {EBP_NORMALGROUPEXPAND,EBNGE_NORMAL,{'N','O','R','M','A','L','\0'}},
- {EBP_NORMALGROUPEXPAND,EBNGE_HOT,{'H','O','T','\0'}},
- {EBP_NORMALGROUPEXPAND,EBNGE_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {EBP_NORMALGROUPHEAD,0,{'N','O','R','M','A','L','G','R','O','U','P','H','E','A','D','\0'}},
- {EBP_SPECIALGROUPBACKGROUND,0,{'S','P','E','C','I','A','L','G','R','O','U','P','B','A','C','K','G','R','O','U','N','D','\0'}},
- {EBP_SPECIALGROUPCOLLAPSE,0,{'S','P','E','C','I','A','L','G','R','O','U','P','C','O','L','L','A','P','S','E','\0'}},
- {EBP_SPECIALGROUPCOLLAPSE,EBSGC_NORMAL,{'N','O','R','M','A','L','\0'}},
- {EBP_SPECIALGROUPCOLLAPSE,EBSGC_HOT,{'H','O','T','\0'}},
- {EBP_SPECIALGROUPCOLLAPSE,EBSGC_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {EBP_SPECIALGROUPEXPAND,0,{'S','P','E','C','I','A','L','G','R','O','U','P','E','X','P','A','N','D','\0'}},
- {EBP_SPECIALGROUPEXPAND,EBSGE_NORMAL,{'N','O','R','M','A','L','\0'}},
- {EBP_SPECIALGROUPEXPAND,EBSGE_HOT,{'H','O','T','\0'}},
- {EBP_SPECIALGROUPEXPAND,EBSGE_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {EBP_SPECIALGROUPHEAD,0,{'S','P','E','C','I','A','L','G','R','O','U','P','H','E','A','D','\0'}},
- {0,0,{'\0'}}
+ {EBP_HEADERBACKGROUND, 0, L"HEADERBACKGROUND"},
+ {EBP_HEADERCLOSE, 0, L"HEADERCLOSE"},
+ {EBP_HEADERCLOSE, EBHC_NORMAL, L"NORMAL"},
+ {EBP_HEADERCLOSE, EBHC_HOT, L"HOT"},
+ {EBP_HEADERCLOSE, EBHC_PRESSED, L"PRESSED"},
+ {EBP_HEADERPIN, 0, L"HEADERPIN"},
+ {EBP_HEADERPIN, EBHP_NORMAL, L"NORMAL"},
+ {EBP_HEADERPIN, EBHP_HOT, L"HOT"},
+ {EBP_HEADERPIN, EBHP_PRESSED, L"PRESSED"},
+ {EBP_HEADERPIN, EBHP_SELECTEDNORMAL, L"SELECTEDNORMAL"},
+ {EBP_HEADERPIN, EBHP_SELECTEDHOT, L"SELECTEDHOT"},
+ {EBP_HEADERPIN, EBHP_SELECTEDPRESSED, L"SELECTEDPRESSED"},
+ {EBP_IEBARMENU, 0, L"IEBARMENU"},
+ {EBP_IEBARMENU, EBM_NORMAL, L"NORMAL"},
+ {EBP_IEBARMENU, EBM_HOT, L"HOT"},
+ {EBP_IEBARMENU, EBM_PRESSED, L"PRESSED"},
+ {EBP_NORMALGROUPBACKGROUND, 0, L"NORMALGROUPBACKGROUND"},
+ {EBP_NORMALGROUPCOLLAPSE, 0, L"NORMALGROUPCOLLAPSE"},
+ {EBP_NORMALGROUPCOLLAPSE, EBNGC_NORMAL, L"NORMAL"},
+ {EBP_NORMALGROUPCOLLAPSE, EBNGC_HOT, L"HOT"},
+ {EBP_NORMALGROUPCOLLAPSE, EBNGC_PRESSED, L"PRESSED"},
+ {EBP_NORMALGROUPEXPAND, 0, L"NORMALGROUPEXPAND"},
+ {EBP_NORMALGROUPEXPAND, EBNGE_NORMAL, L"NORMAL"},
+ {EBP_NORMALGROUPEXPAND, EBNGE_HOT, L"HOT"},
+ {EBP_NORMALGROUPEXPAND, EBNGE_PRESSED, L"PRESSED"},
+ {EBP_NORMALGROUPHEAD, 0, L"NORMALGROUPHEAD"},
+ {EBP_SPECIALGROUPBACKGROUND, 0, L"SPECIALGROUPBACKGROUND"},
+ {EBP_SPECIALGROUPCOLLAPSE, 0, L"SPECIALGROUPCOLLAPSE"},
+ {EBP_SPECIALGROUPCOLLAPSE, EBSGC_NORMAL, L"NORMAL"},
+ {EBP_SPECIALGROUPCOLLAPSE, EBSGC_HOT, L"HOT"},
+ {EBP_SPECIALGROUPCOLLAPSE, EBSGC_PRESSED, L"PRESSED"},
+ {EBP_SPECIALGROUPEXPAND, 0, L"SPECIALGROUPEXPAND"},
+ {EBP_SPECIALGROUPEXPAND, EBSGE_NORMAL, L"NORMAL"},
+ {EBP_SPECIALGROUPEXPAND, EBSGE_HOT, L"HOT"},
+ {EBP_SPECIALGROUPEXPAND, EBSGE_PRESSED, L"PRESSED"},
+ {EBP_SPECIALGROUPHEAD, 0, L"SPECIALGROUPHEAD"},
+ {0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classHeader[] = {
- {HP_HEADERITEM,0,{'H','E','A','D','E','R','I','T','E','M','\0'}},
- {HP_HEADERITEM,HIS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {HP_HEADERITEM,HIS_HOT,{'H','O','T','\0'}},
- {HP_HEADERITEM,HIS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {HP_HEADERITEMLEFT,0,{'H','E','A','D','E','R','I','T','E','M','L','E','F','T','\0'}},
- {HP_HEADERITEMLEFT,HILS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {HP_HEADERITEMLEFT,HILS_HOT,{'H','O','T','\0'}},
- {HP_HEADERITEMLEFT,HILS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {HP_HEADERITEMRIGHT,0,{'H','E','A','D','E','R','I','T','E','M','R','I','G','H','T','\0'}},
- {HP_HEADERITEMRIGHT,HIRS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {HP_HEADERITEMRIGHT,HIRS_HOT,{'H','O','T','\0'}},
- {HP_HEADERITEMRIGHT,HIRS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {HP_HEADERSORTARROW,0,{'H','E','A','D','E','R','S','O','R','T','A','R','R','O','W','\0'}},
- {HP_HEADERSORTARROW,HSAS_SORTEDUP,{'S','O','R','T','E','D','U','P','\0'}},
- {HP_HEADERSORTARROW,HSAS_SORTEDDOWN,{'S','O','R','T','E','D','D','O','W','N','\0'}},
- {0,0,{'\0'}}
+ {HP_HEADERITEM, 0, L"HEADERITEM"},
+ {HP_HEADERITEM, HIS_NORMAL, L"NORMAL"},
+ {HP_HEADERITEM, HIS_HOT, L"HOT"},
+ {HP_HEADERITEM, HIS_PRESSED, L"PRESSED"},
+ {HP_HEADERITEMLEFT, 0, L"HEADERITEMLEFT"},
+ {HP_HEADERITEMLEFT, HILS_NORMAL, L"NORMAL"},
+ {HP_HEADERITEMLEFT, HILS_HOT, L"HOT"},
+ {HP_HEADERITEMLEFT, HILS_PRESSED, L"PRESSED"},
+ {HP_HEADERITEMRIGHT, 0, L"HEADERITEMRIGHT"},
+ {HP_HEADERITEMRIGHT, HIRS_NORMAL, L"NORMAL"},
+ {HP_HEADERITEMRIGHT, HIRS_HOT, L"HOT"},
+ {HP_HEADERITEMRIGHT, HIRS_PRESSED, L"PRESSED"},
+ {HP_HEADERSORTARROW, 0, L"HEADERSORTARROW"},
+ {HP_HEADERSORTARROW, HSAS_SORTEDUP, L"SORTEDUP"},
+ {HP_HEADERSORTARROW, HSAS_SORTEDDOWN, L"SORTEDDOWN"},
+ {0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classListview[] = {
- {LVP_LISTITEM,0,{'L','I','S','T','I','T','E','M','\0'}},
- {LVP_LISTITEM,LIS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {LVP_LISTITEM,LIS_HOT,{'H','O','T','\0'}},
- {LVP_LISTITEM,LIS_SELECTED,{'S','E','L','E','C','T','E','D','\0'}},
- {LVP_LISTITEM,LIS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {LVP_LISTITEM,LIS_SELECTEDNOTFOCUS,{'S','E','L','E','C','T','E','D','N','O','T','F','O','C','U','S','\0'}},
- {LVP_LISTGROUP,0,{'L','I','S','T','G','R','O','U','P','\0'}},
- {LVP_LISTDETAIL,0,{'L','I','S','T','D','E','T','A','I','L','\0'}},
- {LVP_LISTSORTEDDETAIL,0,{'L','I','S','T','S','O','R','T','E','D','D','E','T','A','I','L','\0'}},
- {LVP_EMPTYTEXT,0,{'E','M','P','T','Y','T','E','X','T','\0'}},
- {0,0,{'\0'}}
+ {LVP_LISTITEM, 0, L"LISTITEM"},
+ {LVP_LISTITEM, LIS_NORMAL, L"NORMAL"},
+ {LVP_LISTITEM, LIS_HOT, L"HOT"},
+ {LVP_LISTITEM, LIS_SELECTED, L"SELECTED"},
+ {LVP_LISTITEM, LIS_DISABLED, L"DISABLED"},
+ {LVP_LISTITEM, LIS_SELECTEDNOTFOCUS, L"SELECTEDNOTFOCUS"},
+ {LVP_LISTGROUP, 0, L"LISTGROUP"},
+ {LVP_LISTDETAIL, 0, L"LISTDETAIL"},
+ {LVP_LISTSORTEDDETAIL, 0, L"LISTSORTEDDETAIL"},
+ {LVP_EMPTYTEXT, 0, L"EMPTYTEXT"},
+ {0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classMenu[] = {
- {MP_MENUITEM,0,{'M','E','N','U','I','T','E','M','\0'}},
- {MP_MENUITEM,MS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {MP_MENUITEM,MS_SELECTED,{'S','E','L','E','C','T','E','D','\0'}},
- {MP_MENUITEM,MS_DEMOTED,{'D','E','M','O','T','E','D','\0'}},
- {MP_MENUDROPDOWN,0,{'M','E','N','U','D','R','O','P','D','O','W','N','\0'}},
- {MP_MENUDROPDOWN,MS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {MP_MENUDROPDOWN,MS_SELECTED,{'S','E','L','E','C','T','E','D','\0'}},
- {MP_MENUDROPDOWN,MS_DEMOTED,{'D','E','M','O','T','E','D','\0'}},
- {MP_MENUBARITEM,0,{'M','E','N','U','B','A','R','I','T','E','M','\0'}},
- {MP_MENUBARITEM,MS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {MP_MENUBARITEM,MS_SELECTED,{'S','E','L','E','C','T','E','D','\0'}},
- {MP_MENUBARITEM,MS_DEMOTED,{'D','E','M','O','T','E','D','\0'}},
- {MP_MENUBARDROPDOWN,0,{'M','E','N','U','B','A','R','D','R','O','P','D','O','W','N','\0'}},
- {MP_MENUBARDROPDOWN,MS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {MP_MENUBARDROPDOWN,MS_SELECTED,{'S','E','L','E','C','T','E','D','\0'}},
- {MP_MENUBARDROPDOWN,MS_DEMOTED,{'D','E','M','O','T','E','D','\0'}},
- {MP_CHEVRON,0,{'C','H','E','V','R','O','N','\0'}},
- {MP_CHEVRON,MS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {MP_CHEVRON,MS_SELECTED,{'S','E','L','E','C','T','E','D','\0'}},
- {MP_CHEVRON,MS_DEMOTED,{'D','E','M','O','T','E','D','\0'}},
- {MP_SEPARATOR,0,{'S','E','P','A','R','A','T','O','R','\0'}},
- {MP_SEPARATOR,MS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {MP_SEPARATOR,MS_SELECTED,{'S','E','L','E','C','T','E','D','\0'}},
- {MP_SEPARATOR,MS_DEMOTED,{'D','E','M','O','T','E','D','\0'}},
- {0,0,{'\0'}}
+ {MP_MENUITEM, 0, L"MENUITEM"},
+ {MP_MENUITEM, MS_NORMAL, L"NORMAL"},
+ {MP_MENUITEM, MS_SELECTED, L"SELECTED"},
+ {MP_MENUITEM, MS_DEMOTED, L"DEMOTED"},
+ {MP_MENUDROPDOWN, 0, L"MENUDROPDOWN"},
+ {MP_MENUDROPDOWN, MS_NORMAL, L"NORMAL"},
+ {MP_MENUDROPDOWN, MS_SELECTED, L"SELECTED"},
+ {MP_MENUDROPDOWN, MS_DEMOTED, L"DEMOTED"},
+ {MP_MENUBARITEM, 0, L"MENUBARITEM"},
+ {MP_MENUBARITEM, MS_NORMAL, L"NORMAL"},
+ {MP_MENUBARITEM, MS_SELECTED, L"SELECTED"},
+ {MP_MENUBARITEM, MS_DEMOTED, L"DEMOTED"},
+ {MP_MENUBARDROPDOWN, 0, L"MENUBARDROPDOWN"},
+ {MP_MENUBARDROPDOWN, MS_NORMAL, L"NORMAL"},
+ {MP_MENUBARDROPDOWN, MS_SELECTED, L"SELECTED"},
+ {MP_MENUBARDROPDOWN, MS_DEMOTED, L"DEMOTED"},
+ {MP_CHEVRON, 0, L"CHEVRON"},
+ {MP_CHEVRON, MS_NORMAL, L"NORMAL"},
+ {MP_CHEVRON, MS_SELECTED, L"SELECTED"},
+ {MP_CHEVRON, MS_DEMOTED, L"DEMOTED"},
+ {MP_SEPARATOR, 0, L"SEPARATOR"},
+ {MP_SEPARATOR, MS_NORMAL, L"NORMAL"},
+ {MP_SEPARATOR, MS_SELECTED, L"SELECTED"},
+ {MP_SEPARATOR, MS_DEMOTED, L"DEMOTED"},
+ {0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classMenuband[] = {
- {MDP_NEWAPPBUTTON,0,{'N','E','W','A','P','P','B','U','T','T','O','N','\0'}},
- {MDP_NEWAPPBUTTON,MDS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {MDP_NEWAPPBUTTON,MDS_HOT,{'H','O','T','\0'}},
- {MDP_NEWAPPBUTTON,MDS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {MDP_NEWAPPBUTTON,MDS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {MDP_NEWAPPBUTTON,MDS_CHECKED,{'C','H','E','C','K','E','D','\0'}},
- {MDP_NEWAPPBUTTON,MDS_HOTCHECKED,{'H','O','T','C','H','E','C','K','E','D','\0'}},
- {MDP_SEPERATOR,0,{'S','E','P','E','R','A','T','O','R','\0'}},
- {0,0,{'\0'}}
+ {MDP_NEWAPPBUTTON, 0, L"NEWAPPBUTTON"},
+ {MDP_NEWAPPBUTTON, MDS_NORMAL, L"NORMAL"},
+ {MDP_NEWAPPBUTTON, MDS_HOT, L"HOT"},
+ {MDP_NEWAPPBUTTON, MDS_PRESSED, L"PRESSED"},
+ {MDP_NEWAPPBUTTON, MDS_DISABLED, L"DISABLED"},
+ {MDP_NEWAPPBUTTON, MDS_CHECKED, L"CHECKED"},
+ {MDP_NEWAPPBUTTON, MDS_HOTCHECKED, L"HOTCHECKED"},
+ {MDP_SEPERATOR, 0, L"SEPERATOR"},
+ {0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classPage[] = {
- {PGRP_UP,0,{'U','P','\0'}},
- {PGRP_UP,UPS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {PGRP_UP,UPS_HOT,{'H','O','T','\0'}},
- {PGRP_UP,UPS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {PGRP_UP,UPS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {PGRP_DOWN,0,{'D','O','W','N','\0'}},
- {PGRP_DOWN,DNS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {PGRP_DOWN,DNS_HOT,{'H','O','T','\0'}},
- {PGRP_DOWN,DNS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {PGRP_DOWN,DNS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {PGRP_UPHORZ,0,{'U','P','H','O','R','Z','\0'}},
- {PGRP_UPHORZ,UPHZS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {PGRP_UPHORZ,UPHZS_HOT,{'H','O','T','\0'}},
- {PGRP_UPHORZ,UPHZS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {PGRP_UPHORZ,UPHZS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {PGRP_DOWNHORZ,0,{'D','O','W','N','H','O','R','Z','\0'}},
- {PGRP_DOWNHORZ,DNHZS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {PGRP_DOWNHORZ,DNHZS_HOT,{'H','O','T','\0'}},
- {PGRP_DOWNHORZ,DNHZS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {PGRP_DOWNHORZ,DNHZS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {0,0,{'\0'}}
+ {PGRP_UP, 0, L"UP"},
+ {PGRP_UP, UPS_NORMAL, L"NORMAL"},
+ {PGRP_UP, UPS_HOT, L"HOT"},
+ {PGRP_UP, UPS_PRESSED, L"PRESSED"},
+ {PGRP_UP, UPS_DISABLED, L"DISABLED"},
+ {PGRP_DOWN, 0, L"DOWN"},
+ {PGRP_DOWN, DNS_NORMAL, L"NORMAL"},
+ {PGRP_DOWN, DNS_HOT, L"HOT"},
+ {PGRP_DOWN, DNS_PRESSED, L"PRESSED"},
+ {PGRP_DOWN, DNS_DISABLED, L"DISABLED"},
+ {PGRP_UPHORZ, 0, L"UPHORZ"},
+ {PGRP_UPHORZ, UPHZS_NORMAL, L"NORMAL"},
+ {PGRP_UPHORZ, UPHZS_HOT, L"HOT"},
+ {PGRP_UPHORZ, UPHZS_PRESSED, L"PRESSED"},
+ {PGRP_UPHORZ, UPHZS_DISABLED, L"DISABLED"},
+ {PGRP_DOWNHORZ, 0, L"DOWNHORZ"},
+ {PGRP_DOWNHORZ, DNHZS_NORMAL, L"NORMAL"},
+ {PGRP_DOWNHORZ, DNHZS_HOT, L"HOT"},
+ {PGRP_DOWNHORZ, DNHZS_PRESSED, L"PRESSED"},
+ {PGRP_DOWNHORZ, DNHZS_DISABLED, L"DISABLED"},
+ {0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classProgress[] = {
- {PP_BAR,0,{'B','A','R','\0'}},
- {PP_BARVERT,0,{'B','A','R','V','E','R','T','\0'}},
- {PP_CHUNK,0,{'C','H','U','N','K','\0'}},
- {PP_CHUNKVERT,0,{'C','H','U','N','K','V','E','R','T','\0'}},
- {0,0,{'\0'}}
+ {PP_BAR, 0, L"BAR"},
+ {PP_BARVERT, 0, L"BARVERT"},
+ {PP_CHUNK, 0, L"CHUNK"},
+ {PP_CHUNKVERT, 0, L"CHUNKVERT"},
+ {0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classRebar[] = {
- {RP_GRIPPER,0,{'G','R','I','P','P','E','R','\0'}},
- {RP_GRIPPERVERT,0,{'G','R','I','P','P','E','R','V','E','R','T','\0'}},
- {RP_BAND,0,{'B','A','N','D','\0'}},
- {RP_CHEVRON,0,{'C','H','E','V','R','O','N','\0'}},
- {RP_CHEVRON,CHEVS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {RP_CHEVRON,CHEVS_HOT,{'H','O','T','\0'}},
- {RP_CHEVRON,CHEVS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {RP_CHEVRONVERT,0,{'C','H','E','V','R','O','N','V','E','R','T','\0'}},
- {0,0,{'\0'}}
+ {RP_GRIPPER, 0, L"GRIPPER"},
+ {RP_GRIPPERVERT, 0, L"GRIPPERVERT"},
+ {RP_BAND, 0, L"BAND"},
+ {RP_CHEVRON, 0, L"CHEVRON"},
+ {RP_CHEVRON, CHEVS_NORMAL, L"NORMAL"},
+ {RP_CHEVRON, CHEVS_HOT, L"HOT"},
+ {RP_CHEVRON, CHEVS_PRESSED, L"PRESSED"},
+ {RP_CHEVRONVERT, 0, L"CHEVRONVERT"},
+ {0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classScrollbar[] = {
- {SBP_ARROWBTN,0,{'A','R','R','O','W','B','T','N','\0'}},
- {SBP_ARROWBTN,ABS_UPNORMAL,{'U','P','N','O','R','M','A','L','\0'}},
- {SBP_ARROWBTN,ABS_UPHOT,{'U','P','H','O','T','\0'}},
- {SBP_ARROWBTN,ABS_UPPRESSED,{'U','P','P','R','E','S','S','E','D','\0'}},
- {SBP_ARROWBTN,ABS_UPDISABLED,{'U','P','D','I','S','A','B','L','E','D','\0'}},
- {SBP_ARROWBTN,ABS_DOWNNORMAL,{'D','O','W','N','N','O','R','M','A','L','\0'}},
- {SBP_ARROWBTN,ABS_DOWNHOT,{'D','O','W','N','H','O','T','\0'}},
- {SBP_ARROWBTN,ABS_DOWNPRESSED,{'D','O','W','N','P','R','E','S','S','E','D','\0'}},
- {SBP_ARROWBTN,ABS_DOWNDISABLED,{'D','O','W','N','D','I','S','A','B','L','E','D','\0'}},
- {SBP_ARROWBTN,ABS_LEFTNORMAL,{'L','E','F','T','N','O','R','M','A','L','\0'}},
- {SBP_ARROWBTN,ABS_LEFTHOT,{'L','E','F','T','H','O','T','\0'}},
- {SBP_ARROWBTN,ABS_LEFTPRESSED,{'L','E','F','T','P','R','E','S','S','E','D','\0'}},
- {SBP_ARROWBTN,ABS_LEFTDISABLED,{'L','E','F','T','D','I','S','A','B','L','E','D','\0'}},
- {SBP_ARROWBTN,ABS_RIGHTNORMAL,{'R','I','G','H','T','N','O','R','M','A','L','\0'}},
- {SBP_ARROWBTN,ABS_RIGHTHOT,{'R','I','G','H','T','H','O','T','\0'}},
- {SBP_ARROWBTN,ABS_RIGHTPRESSED,{'R','I','G','H','T','P','R','E','S','S','E','D','\0'}},
- {SBP_ARROWBTN,ABS_RIGHTDISABLED,{'R','I','G','H','T','D','I','S','A','B','L','E','D','\0'}},
- {SBP_THUMBBTNHORZ,0,{'T','H','U','M','B','B','T','N','H','O','R','Z','\0'}},
- {SBP_THUMBBTNHORZ,SCRBS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {SBP_THUMBBTNHORZ,SCRBS_HOT,{'H','O','T','\0'}},
- {SBP_THUMBBTNHORZ,SCRBS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {SBP_THUMBBTNHORZ,SCRBS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {SBP_THUMBBTNVERT,0,{'T','H','U','M','B','B','T','N','V','E','R','T','\0'}},
- {SBP_THUMBBTNVERT,SCRBS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {SBP_THUMBBTNVERT,SCRBS_HOT,{'H','O','T','\0'}},
- {SBP_THUMBBTNVERT,SCRBS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {SBP_THUMBBTNVERT,SCRBS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {SBP_LOWERTRACKHORZ,0,{'L','O','W','E','R','T','R','A','C','K','H','O','R','Z','\0'}},
- {SBP_LOWERTRACKHORZ,SCRBS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {SBP_LOWERTRACKHORZ,SCRBS_HOT,{'H','O','T','\0'}},
- {SBP_LOWERTRACKHORZ,SCRBS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {SBP_LOWERTRACKHORZ,SCRBS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {SBP_UPPERTRACKHORZ,0,{'U','P','P','E','R','T','R','A','C','K','H','O','R','Z','\0'}},
- {SBP_UPPERTRACKHORZ,SCRBS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {SBP_UPPERTRACKHORZ,SCRBS_HOT,{'H','O','T','\0'}},
- {SBP_UPPERTRACKHORZ,SCRBS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {SBP_UPPERTRACKHORZ,SCRBS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {SBP_LOWERTRACKVERT,0,{'L','O','W','E','R','T','R','A','C','K','V','E','R','T','\0'}},
- {SBP_LOWERTRACKVERT,SCRBS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {SBP_LOWERTRACKVERT,SCRBS_HOT,{'H','O','T','\0'}},
- {SBP_LOWERTRACKVERT,SCRBS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {SBP_LOWERTRACKVERT,SCRBS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {SBP_UPPERTRACKVERT,0,{'U','P','P','E','R','T','R','A','C','K','V','E','R','T','\0'}},
- {SBP_UPPERTRACKVERT,SCRBS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {SBP_UPPERTRACKVERT,SCRBS_HOT,{'H','O','T','\0'}},
- {SBP_UPPERTRACKVERT,SCRBS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {SBP_UPPERTRACKVERT,SCRBS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {SBP_GRIPPERHORZ,0,{'G','R','I','P','P','E','R','H','O','R','Z','\0'}},
- {SBP_GRIPPERVERT,0,{'G','R','I','P','P','E','R','V','E','R','T','\0'}},
- {SBP_SIZEBOX,0,{'S','I','Z','E','B','O','X','\0'}},
- {SBP_SIZEBOX,SZB_RIGHTALIGN,{'R','I','G','H','T','A','L','I','G','N','\0'}},
- {SBP_SIZEBOX,SZB_LEFTALIGN,{'L','E','F','T','A','L','I','G','N','\0'}},
- {0,0,{'\0'}}
+ {SBP_ARROWBTN, 0, L"ARROWBTN"},
+ {SBP_ARROWBTN, ABS_UPNORMAL, L"UPNORMAL"},
+ {SBP_ARROWBTN, ABS_UPHOT, L"UPHOT"},
+ {SBP_ARROWBTN, ABS_UPPRESSED, L"UPPRESSED"},
+ {SBP_ARROWBTN, ABS_UPDISABLED, L"UPDISABLED"},
+ {SBP_ARROWBTN, ABS_DOWNNORMAL, L"DOWNNORMAL"},
+ {SBP_ARROWBTN, ABS_DOWNHOT, L"DOWNHOT"},
+ {SBP_ARROWBTN, ABS_DOWNPRESSED, L"DOWNPRESSED"},
+ {SBP_ARROWBTN, ABS_DOWNDISABLED, L"DOWNDISABLED"},
+ {SBP_ARROWBTN, ABS_LEFTNORMAL, L"LEFTNORMAL"},
+ {SBP_ARROWBTN, ABS_LEFTHOT, L"LEFTHOT"},
+ {SBP_ARROWBTN, ABS_LEFTPRESSED, L"LEFTPRESSED"},
+ {SBP_ARROWBTN, ABS_LEFTDISABLED, L"LEFTDISABLED"},
+ {SBP_ARROWBTN, ABS_RIGHTNORMAL, L"RIGHTNORMAL"},
+ {SBP_ARROWBTN, ABS_RIGHTHOT, L"RIGHTHOT"},
+ {SBP_ARROWBTN, ABS_RIGHTPRESSED, L"RIGHTPRESSED"},
+ {SBP_ARROWBTN, ABS_RIGHTDISABLED, L"RIGHTDISABLED"},
+ {SBP_THUMBBTNHORZ, 0, L"THUMBBTNHORZ"},
+ {SBP_THUMBBTNHORZ, SCRBS_NORMAL, L"NORMAL"},
+ {SBP_THUMBBTNHORZ, SCRBS_HOT, L"HOT"},
+ {SBP_THUMBBTNHORZ, SCRBS_PRESSED, L"PRESSED"},
+ {SBP_THUMBBTNHORZ, SCRBS_DISABLED, L"DISABLED"},
+ {SBP_THUMBBTNVERT, 0, L"THUMBBTNVERT"},
+ {SBP_THUMBBTNVERT, SCRBS_NORMAL, L"NORMAL"},
+ {SBP_THUMBBTNVERT, SCRBS_HOT, L"HOT"},
+ {SBP_THUMBBTNVERT, SCRBS_PRESSED, L"PRESSED"},
+ {SBP_THUMBBTNVERT, SCRBS_DISABLED, L"DISABLED"},
+ {SBP_LOWERTRACKHORZ, 0, L"LOWERTRACKHORZ"},
+ {SBP_LOWERTRACKHORZ, SCRBS_NORMAL, L"NORMAL"},
+ {SBP_LOWERTRACKHORZ, SCRBS_HOT, L"HOT"},
+ {SBP_LOWERTRACKHORZ, SCRBS_PRESSED, L"PRESSED"},
+ {SBP_LOWERTRACKHORZ, SCRBS_DISABLED, L"DISABLED"},
+ {SBP_UPPERTRACKHORZ, 0, L"UPPERTRACKHORZ"},
+ {SBP_UPPERTRACKHORZ, SCRBS_NORMAL, L"NORMAL"},
+ {SBP_UPPERTRACKHORZ, SCRBS_HOT, L"HOT"},
+ {SBP_UPPERTRACKHORZ, SCRBS_PRESSED, L"PRESSED"},
+ {SBP_UPPERTRACKHORZ, SCRBS_DISABLED, L"DISABLED"},
+ {SBP_LOWERTRACKVERT, 0, L"LOWERTRACKVERT"},
+ {SBP_LOWERTRACKVERT, SCRBS_NORMAL, L"NORMAL"},
+ {SBP_LOWERTRACKVERT, SCRBS_HOT, L"HOT"},
+ {SBP_LOWERTRACKVERT, SCRBS_PRESSED, L"PRESSED"},
+ {SBP_LOWERTRACKVERT, SCRBS_DISABLED, L"DISABLED"},
+ {SBP_UPPERTRACKVERT, 0, L"UPPERTRACKVERT"},
+ {SBP_UPPERTRACKVERT, SCRBS_NORMAL, L"NORMAL"},
+ {SBP_UPPERTRACKVERT, SCRBS_HOT, L"HOT"},
+ {SBP_UPPERTRACKVERT, SCRBS_PRESSED, L"PRESSED"},
+ {SBP_UPPERTRACKVERT, SCRBS_DISABLED, L"DISABLED"},
+ {SBP_GRIPPERHORZ, 0, L"GRIPPERHORZ"},
+ {SBP_GRIPPERVERT, 0, L"GRIPPERVERT"},
+ {SBP_SIZEBOX, 0, L"SIZEBOX"},
+ {SBP_SIZEBOX, SZB_RIGHTALIGN, L"RIGHTALIGN"},
+ {SBP_SIZEBOX, SZB_LEFTALIGN, L"LEFTALIGN"},
+ {0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classSpin[] = {
- {SPNP_UP,0,{'U','P','\0'}},
- {SPNP_UP,UPS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {SPNP_UP,UPS_HOT,{'H','O','T','\0'}},
- {SPNP_UP,UPS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {SPNP_UP,UPS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {SPNP_DOWN,0,{'D','O','W','N','\0'}},
- {SPNP_DOWN,DNS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {SPNP_DOWN,DNS_HOT,{'H','O','T','\0'}},
- {SPNP_DOWN,DNS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {SPNP_DOWN,DNS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {SPNP_UPHORZ,0,{'U','P','H','O','R','Z','\0'}},
- {SPNP_UPHORZ,UPHZS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {SPNP_UPHORZ,UPHZS_HOT,{'H','O','T','\0'}},
- {SPNP_UPHORZ,UPHZS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {SPNP_UPHORZ,UPHZS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {SPNP_DOWNHORZ,0,{'D','O','W','N','H','O','R','Z','\0'}},
- {SPNP_DOWNHORZ,DNHZS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {SPNP_DOWNHORZ,DNHZS_HOT,{'H','O','T','\0'}},
- {SPNP_DOWNHORZ,DNHZS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {SPNP_DOWNHORZ,DNHZS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {0,0,{'\0'}}
+ {SPNP_UP, 0, L"UP"},
+ {SPNP_UP, UPS_NORMAL, L"NORMAL"},
+ {SPNP_UP, UPS_HOT, L"HOT"},
+ {SPNP_UP, UPS_PRESSED, L"PRESSED"},
+ {SPNP_UP, UPS_DISABLED, L"DISABLED"},
+ {SPNP_DOWN, 0, L"DOWN"},
+ {SPNP_DOWN, DNS_NORMAL, L"NORMAL"},
+ {SPNP_DOWN, DNS_HOT, L"HOT"},
+ {SPNP_DOWN, DNS_PRESSED, L"PRESSED"},
+ {SPNP_DOWN, DNS_DISABLED, L"DISABLED"},
+ {SPNP_UPHORZ, 0, L"UPHORZ"},
+ {SPNP_UPHORZ, UPHZS_NORMAL, L"NORMAL"},
+ {SPNP_UPHORZ, UPHZS_HOT, L"HOT"},
+ {SPNP_UPHORZ, UPHZS_PRESSED, L"PRESSED"},
+ {SPNP_UPHORZ, UPHZS_DISABLED, L"DISABLED"},
+ {SPNP_DOWNHORZ, 0, L"DOWNHORZ"},
+ {SPNP_DOWNHORZ, DNHZS_NORMAL, L"NORMAL"},
+ {SPNP_DOWNHORZ, DNHZS_HOT, L"HOT"},
+ {SPNP_DOWNHORZ, DNHZS_PRESSED, L"PRESSED"},
+ {SPNP_DOWNHORZ, DNHZS_DISABLED, L"DISABLED"},
+ {0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classStartpanel[] = {
- {SPP_USERPANE,0,{'U','S','E','R','P','A','N','E','\0'}},
- {SPP_MOREPROGRAMS,0,{'M','O','R','E','P','R','O','G','R','A','M','S','\0'}},
- {SPP_MOREPROGRAMSARROW,0,{'M','O','R','E','P','R','O','G','R','A','M','S','A','R','R','O','W','\0'}},
- {SPP_MOREPROGRAMSARROW,SPS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {SPP_MOREPROGRAMSARROW,SPS_HOT,{'H','O','T','\0'}},
- {SPP_MOREPROGRAMSARROW,SPS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {SPP_PROGLIST,0,{'P','R','O','G','L','I','S','T','\0'}},
- {SPP_PROGLISTSEPARATOR,0,{'P','R','O','G','L','I','S','T','S','E','P','A','R','A','T','O','R','\0'}},
- {SPP_PLACESLIST,0,{'P','L','A','C','E','S','L','I','S','T','\0'}},
- {SPP_PLACESLISTSEPARATOR,0,{'P','L','A','C','E','S','L','I','S','T','S','E','P','A','R','A','T','O','R','\0'}},
- {SPP_LOGOFF,0,{'L','O','G','O','F','F','\0'}},
- {SPP_LOGOFFBUTTONS,0,{'L','O','G','O','F','F','B','U','T','T','O','N','S','\0'}},
- {SPP_LOGOFFBUTTONS,SPLS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {SPP_LOGOFFBUTTONS,SPLS_HOT,{'H','O','T','\0'}},
- {SPP_LOGOFFBUTTONS,SPLS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {SPP_USERPICTURE,0,{'U','S','E','R','P','I','C','T','U','R','E','\0'}},
- {SPP_PREVIEW,0,{'P','R','E','V','I','E','W','\0'}},
- {0,0,{'\0'}}
+ {SPP_USERPANE, 0, L"USERPANE"},
+ {SPP_MOREPROGRAMS, 0, L"MOREPROGRAMS"},
+ {SPP_MOREPROGRAMSARROW, 0, L"MOREPROGRAMSARROW"},
+ {SPP_MOREPROGRAMSARROW, SPS_NORMAL, L"NORMAL"},
+ {SPP_MOREPROGRAMSARROW, SPS_HOT, L"HOT"},
+ {SPP_MOREPROGRAMSARROW, SPS_PRESSED, L"PRESSED"},
+ {SPP_PROGLIST, 0, L"PROGLIST"},
+ {SPP_PROGLISTSEPARATOR, 0, L"PROGLISTSEPARATOR"},
+ {SPP_PLACESLIST, 0, L"PLACESLIST"},
+ {SPP_PLACESLISTSEPARATOR, 0, L"PLACESLISTSEPARATOR"},
+ {SPP_LOGOFF, 0, L"LOGOFF"},
+ {SPP_LOGOFFBUTTONS, 0, L"LOGOFFBUTTONS"},
+ {SPP_LOGOFFBUTTONS, SPLS_NORMAL, L"NORMAL"},
+ {SPP_LOGOFFBUTTONS, SPLS_HOT, L"HOT"},
+ {SPP_LOGOFFBUTTONS, SPLS_PRESSED, L"PRESSED"},
+ {SPP_USERPICTURE, 0, L"USERPICTURE"},
+ {SPP_PREVIEW, 0, L"PREVIEW"},
+ {0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classStatus[] = {
- {SP_PANE,0,{'P','A','N','E','\0'}},
- {SP_GRIPPERPANE,0,{'G','R','I','P','P','E','R','P','A','N','E','\0'}},
- {SP_GRIPPER,0,{'G','R','I','P','P','E','R','\0'}},
- {0,0,{'\0'}}
+ {SP_PANE, 0, L"PANE"},
+ {SP_GRIPPERPANE, 0, L"GRIPPERPANE"},
+ {SP_GRIPPER, 0, L"GRIPPER"},
+ {0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classTab[] = {
- {TABP_TABITEM,0,{'T','A','B','I','T','E','M','\0'}},
- {TABP_TABITEM,TIS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TABP_TABITEM,TIS_HOT,{'H','O','T','\0'}},
- {TABP_TABITEM,TIS_SELECTED,{'S','E','L','E','C','T','E','D','\0'}},
- {TABP_TABITEM,TIS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {TABP_TABITEM,TIS_FOCUSED,{'F','O','C','U','S','E','D','\0'}},
- {TABP_TABITEMLEFTEDGE,0,{'T','A','B','I','T','E','M','L','E','F','T','E','D','G','E','\0'}},
- {TABP_TABITEMLEFTEDGE,TILES_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TABP_TABITEMLEFTEDGE,TILES_HOT,{'H','O','T','\0'}},
- {TABP_TABITEMLEFTEDGE,TILES_SELECTED,{'S','E','L','E','C','T','E','D','\0'}},
- {TABP_TABITEMLEFTEDGE,TILES_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {TABP_TABITEMLEFTEDGE,TILES_FOCUSED,{'F','O','C','U','S','E','D','\0'}},
- {TABP_TABITEMRIGHTEDGE,0,{'T','A','B','I','T','E','M','R','I','G','H','T','E','D','G','E','\0'}},
- {TABP_TABITEMRIGHTEDGE,TIRES_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TABP_TABITEMRIGHTEDGE,TIRES_HOT,{'H','O','T','\0'}},
- {TABP_TABITEMRIGHTEDGE,TIRES_SELECTED,{'S','E','L','E','C','T','E','D','\0'}},
- {TABP_TABITEMRIGHTEDGE,TIRES_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {TABP_TABITEMRIGHTEDGE,TIRES_FOCUSED,{'F','O','C','U','S','E','D','\0'}},
- {TABP_TABITEMBOTHEDGE,0,{'T','A','B','I','T','E','M','B','O','T','H','E','D','G','E','\0'}},
- {TABP_TABITEMBOTHEDGE,TIBES_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TABP_TABITEMBOTHEDGE,TIBES_HOT,{'H','O','T','\0'}},
- {TABP_TABITEMBOTHEDGE,TIBES_SELECTED,{'S','E','L','E','C','T','E','D','\0'}},
- {TABP_TABITEMBOTHEDGE,TIBES_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {TABP_TABITEMBOTHEDGE,TIBES_FOCUSED,{'F','O','C','U','S','E','D','\0'}},
- {TABP_TOPTABITEM,0,{'T','O','P','T','A','B','I','T','E','M','\0'}},
- {TABP_TOPTABITEM,TTIS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TABP_TOPTABITEM,TTIS_HOT,{'H','O','T','\0'}},
- {TABP_TOPTABITEM,TTIS_SELECTED,{'S','E','L','E','C','T','E','D','\0'}},
- {TABP_TOPTABITEM,TTIS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {TABP_TOPTABITEM,TTIS_FOCUSED,{'F','O','C','U','S','E','D','\0'}},
- {TABP_TOPTABITEMLEFTEDGE,0,{'T','O','P','T','A','B','I','T','E','M','L','E','F','T','E','D','G','E','\0'}},
- {TABP_TOPTABITEMLEFTEDGE,TTILES_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TABP_TOPTABITEMLEFTEDGE,TTILES_HOT,{'H','O','T','\0'}},
- {TABP_TOPTABITEMLEFTEDGE,TTILES_SELECTED,{'S','E','L','E','C','T','E','D','\0'}},
- {TABP_TOPTABITEMLEFTEDGE,TTILES_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {TABP_TOPTABITEMLEFTEDGE,TTILES_FOCUSED,{'F','O','C','U','S','E','D','\0'}},
- {TABP_TOPTABITEMRIGHTEDGE,0,{'T','O','P','T','A','B','I','T','E','M','R','I','G','H','T','E','D','G','E','\0'}},
- {TABP_TOPTABITEMRIGHTEDGE,TTIRES_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TABP_TOPTABITEMRIGHTEDGE,TTIRES_HOT,{'H','O','T','\0'}},
- {TABP_TOPTABITEMRIGHTEDGE,TTIRES_SELECTED,{'S','E','L','E','C','T','E','D','\0'}},
- {TABP_TOPTABITEMRIGHTEDGE,TTIRES_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {TABP_TOPTABITEMRIGHTEDGE,TTIRES_FOCUSED,{'F','O','C','U','S','E','D','\0'}},
- {TABP_TOPTABITEMBOTHEDGE,0,{'T','O','P','T','A','B','I','T','E','M','B','O','T','H','E','D','G','E','\0'}},
- {TABP_TOPTABITEMBOTHEDGE,TTIBES_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TABP_TOPTABITEMBOTHEDGE,TTIBES_HOT,{'H','O','T','\0'}},
- {TABP_TOPTABITEMBOTHEDGE,TTIBES_SELECTED,{'S','E','L','E','C','T','E','D','\0'}},
- {TABP_TOPTABITEMBOTHEDGE,TTIBES_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {TABP_TOPTABITEMBOTHEDGE,TTIBES_FOCUSED,{'F','O','C','U','S','E','D','\0'}},
- {TABP_PANE,0,{'P','A','N','E','\0'}},
- {TABP_BODY,0,{'B','O','D','Y','\0'}},
- {0,0,{'\0'}}
+ {TABP_TABITEM, 0, L"TABITEM"},
+ {TABP_TABITEM, TIS_NORMAL, L"NORMAL"},
+ {TABP_TABITEM, TIS_HOT, L"HOT"},
+ {TABP_TABITEM, TIS_SELECTED, L"SELECTED"},
+ {TABP_TABITEM, TIS_DISABLED, L"DISABLED"},
+ {TABP_TABITEM, TIS_FOCUSED, L"FOCUSED"},
+ {TABP_TABITEMLEFTEDGE, 0, L"TABITEMLEFTEDGE"},
+ {TABP_TABITEMLEFTEDGE, TILES_NORMAL, L"NORMAL"},
+ {TABP_TABITEMLEFTEDGE, TILES_HOT, L"HOT"},
+ {TABP_TABITEMLEFTEDGE, TILES_SELECTED, L"SELECTED"},
+ {TABP_TABITEMLEFTEDGE, TILES_DISABLED, L"DISABLED"},
+ {TABP_TABITEMLEFTEDGE, TILES_FOCUSED, L"FOCUSED"},
+ {TABP_TABITEMRIGHTEDGE, 0, L"TABITEMRIGHTEDGE"},
+ {TABP_TABITEMRIGHTEDGE, TIRES_NORMAL, L"NORMAL"},
+ {TABP_TABITEMRIGHTEDGE, TIRES_HOT, L"HOT"},
+ {TABP_TABITEMRIGHTEDGE, TIRES_SELECTED, L"SELECTED"},
+ {TABP_TABITEMRIGHTEDGE, TIRES_DISABLED, L"DISABLED"},
+ {TABP_TABITEMRIGHTEDGE, TIRES_FOCUSED, L"FOCUSED"},
+ {TABP_TABITEMBOTHEDGE, 0, L"TABITEMBOTHEDGE"},
+ {TABP_TABITEMBOTHEDGE, TIBES_NORMAL, L"NORMAL"},
+ {TABP_TABITEMBOTHEDGE, TIBES_HOT, L"HOT"},
+ {TABP_TABITEMBOTHEDGE, TIBES_SELECTED, L"SELECTED"},
+ {TABP_TABITEMBOTHEDGE, TIBES_DISABLED, L"DISABLED"},
+ {TABP_TABITEMBOTHEDGE, TIBES_FOCUSED, L"FOCUSED"},
+ {TABP_TOPTABITEM, 0, L"TOPTABITEM"},
+ {TABP_TOPTABITEM, TTIS_NORMAL, L"NORMAL"},
+ {TABP_TOPTABITEM, TTIS_HOT, L"HOT"},
+ {TABP_TOPTABITEM, TTIS_SELECTED, L"SELECTED"},
+ {TABP_TOPTABITEM, TTIS_DISABLED, L"DISABLED"},
+ {TABP_TOPTABITEM, TTIS_FOCUSED, L"FOCUSED"},
+ {TABP_TOPTABITEMLEFTEDGE, 0, L"TOPTABITEMLEFTEDGE"},
+ {TABP_TOPTABITEMLEFTEDGE, TTILES_NORMAL, L"NORMAL"},
+ {TABP_TOPTABITEMLEFTEDGE, TTILES_HOT, L"HOT"},
+ {TABP_TOPTABITEMLEFTEDGE, TTILES_SELECTED, L"SELECTED"},
+ {TABP_TOPTABITEMLEFTEDGE, TTILES_DISABLED, L"DISABLED"},
+ {TABP_TOPTABITEMLEFTEDGE, TTILES_FOCUSED, L"FOCUSED"},
+ {TABP_TOPTABITEMRIGHTEDGE, 0, L"TOPTABITEMRIGHTEDGE"},
+ {TABP_TOPTABITEMRIGHTEDGE, TTIRES_NORMAL, L"NORMAL"},
+ {TABP_TOPTABITEMRIGHTEDGE, TTIRES_HOT, L"HOT"},
+ {TABP_TOPTABITEMRIGHTEDGE, TTIRES_SELECTED, L"SELECTED"},
+ {TABP_TOPTABITEMRIGHTEDGE, TTIRES_DISABLED, L"DISABLED"},
+ {TABP_TOPTABITEMRIGHTEDGE, TTIRES_FOCUSED, L"FOCUSED"},
+ {TABP_TOPTABITEMBOTHEDGE, 0, L"TOPTABITEMBOTHEDGE"},
+ {TABP_TOPTABITEMBOTHEDGE, TTIBES_NORMAL, L"NORMAL"},
+ {TABP_TOPTABITEMBOTHEDGE, TTIBES_HOT, L"HOT"},
+ {TABP_TOPTABITEMBOTHEDGE, TTIBES_SELECTED, L"SELECTED"},
+ {TABP_TOPTABITEMBOTHEDGE, TTIBES_DISABLED, L"DISABLED"},
+ {TABP_TOPTABITEMBOTHEDGE, TTIBES_FOCUSED, L"FOCUSED"},
+ {TABP_PANE, 0, L"PANE"},
+ {TABP_BODY, 0, L"BODY"},
+ {0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classTaskband[] = {
- {TDP_GROUPCOUNT,0,{'G','R','O','U','P','C','O','U','N','T','\0'}},
- {TDP_FLASHBUTTON,0,{'F','L','A','S','H','B','U','T','T','O','N','\0'}},
- {TDP_FLASHBUTTONGROUPMENU,0,{'F','L','A','S','H','B','U','T','T','O','N','G','R','O','U','P','M','E','N','U','\0'}},
- {0,0,{'\0'}}
+ {TDP_GROUPCOUNT, 0, L"GROUPCOUNT"},
+ {TDP_FLASHBUTTON, 0, L"FLASHBUTTON"},
+ {TDP_FLASHBUTTONGROUPMENU, 0, L"FLASHBUTTONGROUPMENU"},
+ {0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classTaskbar[] = {
- {TBP_BACKGROUNDBOTTOM,0,{'B','A','C','K','G','R','O','U','N','D','B','O','T','T','O','M','\0'}},
- {TBP_BACKGROUNDRIGHT,0,{'B','A','C','K','G','R','O','U','N','D','R','I','G','H','T','\0'}},
- {TBP_BACKGROUNDTOP,0,{'B','A','C','K','G','R','O','U','N','D','T','O','P','\0'}},
- {TBP_BACKGROUNDLEFT,0,{'B','A','C','K','G','R','O','U','N','D','L','E','F','T','\0'}},
- {TBP_SIZINGBARBOTTOM,0,{'S','I','Z','I','N','G','B','A','R','B','O','T','T','O','M','\0'}},
- {TBP_SIZINGBARRIGHT,0,{'S','I','Z','I','N','G','B','A','R','R','I','G','H','T','\0'}},
- {TBP_SIZINGBARTOP,0,{'S','I','Z','I','N','G','B','A','R','T','O','P','\0'}},
- {TBP_SIZINGBARLEFT,0,{'S','I','Z','I','N','G','B','A','R','L','E','F','T','\0'}},
- {0,0,{'\0'}}
+ {TBP_BACKGROUNDBOTTOM, 0, L"BACKGROUNDBOTTOM"},
+ {TBP_BACKGROUNDRIGHT, 0, L"BACKGROUNDRIGHT"},
+ {TBP_BACKGROUNDTOP, 0, L"BACKGROUNDTOP"},
+ {TBP_BACKGROUNDLEFT, 0, L"BACKGROUNDLEFT"},
+ {TBP_SIZINGBARBOTTOM, 0, L"SIZINGBARBOTTOM"},
+ {TBP_SIZINGBARRIGHT, 0, L"SIZINGBARRIGHT"},
+ {TBP_SIZINGBARTOP, 0, L"SIZINGBARTOP"},
+ {TBP_SIZINGBARLEFT, 0, L"SIZINGBARLEFT"},
+ {0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classToolbar[] = {
- {TP_BUTTON,0,{'B','U','T','T','O','N','\0'}},
- {TP_BUTTON,TS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TP_BUTTON,TS_HOT,{'H','O','T','\0'}},
- {TP_BUTTON,TS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {TP_BUTTON,TS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {TP_BUTTON,TS_CHECKED,{'C','H','E','C','K','E','D','\0'}},
- {TP_BUTTON,TS_HOTCHECKED,{'H','O','T','C','H','E','C','K','E','D','\0'}},
- {TP_DROPDOWNBUTTON,0,{'D','R','O','P','D','O','W','N','B','U','T','T','O','N','\0'}},
- {TP_DROPDOWNBUTTON,TS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TP_DROPDOWNBUTTON,TS_HOT,{'H','O','T','\0'}},
- {TP_DROPDOWNBUTTON,TS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {TP_DROPDOWNBUTTON,TS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {TP_DROPDOWNBUTTON,TS_CHECKED,{'C','H','E','C','K','E','D','\0'}},
- {TP_DROPDOWNBUTTON,TS_HOTCHECKED,{'H','O','T','C','H','E','C','K','E','D','\0'}},
- {TP_SPLITBUTTON,0,{'S','P','L','I','T','B','U','T','T','O','N','\0'}},
- {TP_SPLITBUTTON,TS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TP_SPLITBUTTON,TS_HOT,{'H','O','T','\0'}},
- {TP_SPLITBUTTON,TS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {TP_SPLITBUTTON,TS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {TP_SPLITBUTTON,TS_CHECKED,{'C','H','E','C','K','E','D','\0'}},
- {TP_SPLITBUTTON,TS_HOTCHECKED,{'H','O','T','C','H','E','C','K','E','D','\0'}},
- {TP_SPLITBUTTONDROPDOWN,0,{'S','P','L','I','T','B','U','T','T','O','N','D','R','O','P','D','O','W','N','\0'}},
- {TP_SPLITBUTTONDROPDOWN,TS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TP_SPLITBUTTONDROPDOWN,TS_HOT,{'H','O','T','\0'}},
- {TP_SPLITBUTTONDROPDOWN,TS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {TP_SPLITBUTTONDROPDOWN,TS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {TP_SPLITBUTTONDROPDOWN,TS_CHECKED,{'C','H','E','C','K','E','D','\0'}},
- {TP_SPLITBUTTONDROPDOWN,TS_HOTCHECKED,{'H','O','T','C','H','E','C','K','E','D','\0'}},
- {TP_SEPARATOR,0,{'S','E','P','A','R','A','T','O','R','\0'}},
- {TP_SEPARATOR,TS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TP_SEPARATOR,TS_HOT,{'H','O','T','\0'}},
- {TP_SEPARATOR,TS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {TP_SEPARATOR,TS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {TP_SEPARATOR,TS_CHECKED,{'C','H','E','C','K','E','D','\0'}},
- {TP_SEPARATOR,TS_HOTCHECKED,{'H','O','T','C','H','E','C','K','E','D','\0'}},
- {TP_SEPARATORVERT,0,{'S','E','P','A','R','A','T','O','R','V','E','R','T','\0'}},
- {TP_SEPARATORVERT,TS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TP_SEPARATORVERT,TS_HOT,{'H','O','T','\0'}},
- {TP_SEPARATORVERT,TS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {TP_SEPARATORVERT,TS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {TP_SEPARATORVERT,TS_CHECKED,{'C','H','E','C','K','E','D','\0'}},
- {TP_SEPARATORVERT,TS_HOTCHECKED,{'H','O','T','C','H','E','C','K','E','D','\0'}},
- {0,0,{'\0'}}
+ {TP_BUTTON, 0, L"BUTTON"},
+ {TP_BUTTON, TS_NORMAL, L"NORMAL"},
+ {TP_BUTTON, TS_HOT, L"HOT"},
+ {TP_BUTTON, TS_PRESSED, L"PRESSED"},
+ {TP_BUTTON, TS_DISABLED, L"DISABLED"},
+ {TP_BUTTON, TS_CHECKED, L"CHECKED"},
+ {TP_BUTTON, TS_HOTCHECKED, L"HOTCHECKED"},
+ {TP_DROPDOWNBUTTON, 0, L"DROPDOWNBUTTON"},
+ {TP_DROPDOWNBUTTON, TS_NORMAL, L"NORMAL"},
+ {TP_DROPDOWNBUTTON, TS_HOT, L"HOT"},
+ {TP_DROPDOWNBUTTON, TS_PRESSED, L"PRESSED"},
+ {TP_DROPDOWNBUTTON, TS_DISABLED, L"DISABLED"},
+ {TP_DROPDOWNBUTTON, TS_CHECKED, L"CHECKED"},
+ {TP_DROPDOWNBUTTON, TS_HOTCHECKED, L"HOTCHECKED"},
+ {TP_SPLITBUTTON, 0, L"SPLITBUTTON"},
+ {TP_SPLITBUTTON, TS_NORMAL, L"NORMAL"},
+ {TP_SPLITBUTTON, TS_HOT, L"HOT"},
+ {TP_SPLITBUTTON, TS_PRESSED, L"PRESSED"},
+ {TP_SPLITBUTTON, TS_DISABLED, L"DISABLED"},
+ {TP_SPLITBUTTON, TS_CHECKED, L"CHECKED"},
+ {TP_SPLITBUTTON, TS_HOTCHECKED, L"HOTCHECKED"},
+ {TP_SPLITBUTTONDROPDOWN, 0, L"SPLITBUTTONDROPDOWN"},
+ {TP_SPLITBUTTONDROPDOWN, TS_NORMAL, L"NORMAL"},
+ {TP_SPLITBUTTONDROPDOWN, TS_HOT, L"HOT"},
+ {TP_SPLITBUTTONDROPDOWN, TS_PRESSED, L"PRESSED"},
+ {TP_SPLITBUTTONDROPDOWN, TS_DISABLED, L"DISABLED"},
+ {TP_SPLITBUTTONDROPDOWN, TS_CHECKED, L"CHECKED"},
+ {TP_SPLITBUTTONDROPDOWN, TS_HOTCHECKED, L"HOTCHECKED"},
+ {TP_SEPARATOR, 0, L"SEPARATOR"},
+ {TP_SEPARATOR, TS_NORMAL, L"NORMAL"},
+ {TP_SEPARATOR, TS_HOT, L"HOT"},
+ {TP_SEPARATOR, TS_PRESSED, L"PRESSED"},
+ {TP_SEPARATOR, TS_DISABLED, L"DISABLED"},
+ {TP_SEPARATOR, TS_CHECKED, L"CHECKED"},
+ {TP_SEPARATOR, TS_HOTCHECKED, L"HOTCHECKED"},
+ {TP_SEPARATORVERT, 0, L"SEPARATORVERT"},
+ {TP_SEPARATORVERT, TS_NORMAL, L"NORMAL"},
+ {TP_SEPARATORVERT, TS_HOT, L"HOT"},
+ {TP_SEPARATORVERT, TS_PRESSED, L"PRESSED"},
+ {TP_SEPARATORVERT, TS_DISABLED, L"DISABLED"},
+ {TP_SEPARATORVERT, TS_CHECKED, L"CHECKED"},
+ {TP_SEPARATORVERT, TS_HOTCHECKED, L"HOTCHECKED"},
+ {0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classTooltip[] = {
- {TTP_STANDARD,0,{'S','T','A','N','D','A','R','D','\0'}},
- {TTP_STANDARD,TTSS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TTP_STANDARD,TTSS_LINK,{'L','I','N','K','\0'}},
- {TTP_STANDARDTITLE,0,{'S','T','A','N','D','A','R','D','T','I','T','L','E','\0'}},
- {TTP_STANDARDTITLE,TTSS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TTP_STANDARDTITLE,TTSS_LINK,{'L','I','N','K','\0'}},
- {TTP_BALLOON,0,{'B','A','L','L','O','O','N','\0'}},
- {TTP_BALLOON,TTBS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TTP_BALLOON,TTBS_LINK,{'L','I','N','K','\0'}},
- {TTP_BALLOONTITLE,0,{'B','A','L','L','O','O','N','T','I','T','L','E','\0'}},
- {TTP_BALLOONTITLE,TTBS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TTP_BALLOONTITLE,TTBS_LINK,{'L','I','N','K','\0'}},
- {TTP_CLOSE,0,{'C','L','O','S','E','\0'}},
- {TTP_CLOSE,TTCS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TTP_CLOSE,TTCS_HOT,{'H','O','T','\0'}},
- {TTP_CLOSE,TTCS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {0,0,{'\0'}}
+ {TTP_STANDARD, 0, L"STANDARD"},
+ {TTP_STANDARD, TTSS_NORMAL, L"NORMAL"},
+ {TTP_STANDARD, TTSS_LINK, L"LINK"},
+ {TTP_STANDARDTITLE, 0, L"STANDARDTITLE"},
+ {TTP_STANDARDTITLE, TTSS_NORMAL, L"NORMAL"},
+ {TTP_STANDARDTITLE, TTSS_LINK, L"LINK"},
+ {TTP_BALLOON, 0, L"BALLOON"},
+ {TTP_BALLOON, TTBS_NORMAL, L"NORMAL"},
+ {TTP_BALLOON, TTBS_LINK, L"LINK"},
+ {TTP_BALLOONTITLE, 0, L"BALLOONTITLE"},
+ {TTP_BALLOONTITLE, TTBS_NORMAL, L"NORMAL"},
+ {TTP_BALLOONTITLE, TTBS_LINK, L"LINK"},
+ {TTP_CLOSE, 0, L"CLOSE"},
+ {TTP_CLOSE, TTCS_NORMAL, L"NORMAL"},
+ {TTP_CLOSE, TTCS_HOT, L"HOT"},
+ {TTP_CLOSE, TTCS_PRESSED, L"PRESSED"},
+ {0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classTrackbar[] = {
- {TKP_TRACK,0,{'T','R','A','C','K','\0'}},
- {TKP_TRACK,TRS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TKP_TRACKVERT,0,{'T','R','A','C','K','V','E','R','T','\0'}},
- {TKP_TRACKVERT,TRVS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TKP_THUMB,0,{'T','H','U','M','B','\0'}},
- {TKP_THUMB,TUS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TKP_THUMB,TUS_HOT,{'H','O','T','\0'}},
- {TKP_THUMB,TUS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {TKP_THUMB,TUS_FOCUSED,{'F','O','C','U','S','E','D','\0'}},
- {TKP_THUMB,TUS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {TKP_THUMBBOTTOM,0,{'T','H','U','M','B','B','O','T','T','O','M','\0'}},
- {TKP_THUMBBOTTOM,TUBS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TKP_THUMBBOTTOM,TUBS_HOT,{'H','O','T','\0'}},
- {TKP_THUMBBOTTOM,TUBS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {TKP_THUMBBOTTOM,TUBS_FOCUSED,{'F','O','C','U','S','E','D','\0'}},
- {TKP_THUMBBOTTOM,TUBS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {TKP_THUMBTOP,0,{'T','H','U','M','B','T','O','P','\0'}},
- {TKP_THUMBTOP,TUTS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TKP_THUMBTOP,TUTS_HOT,{'H','O','T','\0'}},
- {TKP_THUMBTOP,TUTS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {TKP_THUMBTOP,TUTS_FOCUSED,{'F','O','C','U','S','E','D','\0'}},
- {TKP_THUMBTOP,TUTS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {TKP_THUMBVERT,0,{'T','H','U','M','B','V','E','R','T','\0'}},
- {TKP_THUMBVERT,TUVS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TKP_THUMBVERT,TUVS_HOT,{'H','O','T','\0'}},
- {TKP_THUMBVERT,TUVS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {TKP_THUMBVERT,TUVS_FOCUSED,{'F','O','C','U','S','E','D','\0'}},
- {TKP_THUMBVERT,TUVS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {TKP_THUMBLEFT,0,{'T','H','U','M','B','L','E','F','T','\0'}},
- {TKP_THUMBLEFT,TUVLS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TKP_THUMBLEFT,TUVLS_HOT,{'H','O','T','\0'}},
- {TKP_THUMBLEFT,TUVLS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {TKP_THUMBLEFT,TUVLS_FOCUSED,{'F','O','C','U','S','E','D','\0'}},
- {TKP_THUMBLEFT,TUVLS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {TKP_THUMBRIGHT,0,{'T','H','U','M','B','R','I','G','H','T','\0'}},
- {TKP_THUMBRIGHT,TUVRS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TKP_THUMBRIGHT,TUVRS_HOT,{'H','O','T','\0'}},
- {TKP_THUMBRIGHT,TUVRS_PRESSED,{'P','R','E','S','S','E','D','\0'}},
- {TKP_THUMBRIGHT,TUVRS_FOCUSED,{'F','O','C','U','S','E','D','\0'}},
- {TKP_THUMBRIGHT,TUVRS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {TKP_TICS,0,{'T','I','C','S','\0'}},
- {TKP_TICS,TSS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TKP_TICSVERT,0,{'T','I','C','S','V','E','R','T','\0'}},
- {TKP_TICSVERT,TSVS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {0,0,{'\0'}}
+ {TKP_TRACK, 0, L"TRACK"},
+ {TKP_TRACK, TRS_NORMAL, L"NORMAL"},
+ {TKP_TRACKVERT, 0, L"TRACKVERT"},
+ {TKP_TRACKVERT, TRVS_NORMAL, L"NORMAL"},
+ {TKP_THUMB, 0, L"THUMB"},
+ {TKP_THUMB, TUS_NORMAL, L"NORMAL"},
+ {TKP_THUMB, TUS_HOT, L"HOT"},
+ {TKP_THUMB, TUS_PRESSED, L"PRESSED"},
+ {TKP_THUMB, TUS_FOCUSED, L"FOCUSED"},
+ {TKP_THUMB, TUS_DISABLED, L"DISABLED"},
+ {TKP_THUMBBOTTOM, 0, L"THUMBBOTTOM"},
+ {TKP_THUMBBOTTOM, TUBS_NORMAL, L"NORMAL"},
+ {TKP_THUMBBOTTOM, TUBS_HOT, L"HOT"},
+ {TKP_THUMBBOTTOM, TUBS_PRESSED, L"PRESSED"},
+ {TKP_THUMBBOTTOM, TUBS_FOCUSED, L"FOCUSED"},
+ {TKP_THUMBBOTTOM, TUBS_DISABLED, L"DISABLED"},
+ {TKP_THUMBTOP, 0, L"THUMBTOP"},
+ {TKP_THUMBTOP, TUTS_NORMAL, L"NORMAL"},
+ {TKP_THUMBTOP, TUTS_HOT, L"HOT"},
+ {TKP_THUMBTOP, TUTS_PRESSED, L"PRESSED"},
+ {TKP_THUMBTOP, TUTS_FOCUSED, L"FOCUSED"},
+ {TKP_THUMBTOP, TUTS_DISABLED, L"DISABLED"},
+ {TKP_THUMBVERT, 0, L"THUMBVERT"},
+ {TKP_THUMBVERT, TUVS_NORMAL, L"NORMAL"},
+ {TKP_THUMBVERT, TUVS_HOT, L"HOT"},
+ {TKP_THUMBVERT, TUVS_PRESSED, L"PRESSED"},
+ {TKP_THUMBVERT, TUVS_FOCUSED, L"FOCUSED"},
+ {TKP_THUMBVERT, TUVS_DISABLED, L"DISABLED"},
+ {TKP_THUMBLEFT, 0, L"THUMBLEFT"},
+ {TKP_THUMBLEFT, TUVLS_NORMAL, L"NORMAL"},
+ {TKP_THUMBLEFT, TUVLS_HOT, L"HOT"},
+ {TKP_THUMBLEFT, TUVLS_PRESSED, L"PRESSED"},
+ {TKP_THUMBLEFT, TUVLS_FOCUSED, L"FOCUSED"},
+ {TKP_THUMBLEFT, TUVLS_DISABLED, L"DISABLED"},
+ {TKP_THUMBRIGHT, 0, L"THUMBRIGHT"},
+ {TKP_THUMBRIGHT, TUVRS_NORMAL, L"NORMAL"},
+ {TKP_THUMBRIGHT, TUVRS_HOT, L"HOT"},
+ {TKP_THUMBRIGHT, TUVRS_PRESSED, L"PRESSED"},
+ {TKP_THUMBRIGHT, TUVRS_FOCUSED, L"FOCUSED"},
+ {TKP_THUMBRIGHT, TUVRS_DISABLED, L"DISABLED"},
+ {TKP_TICS, 0, L"TICS"},
+ {TKP_TICS, TSS_NORMAL, L"NORMAL"},
+ {TKP_TICSVERT, 0, L"TICSVERT"},
+ {TKP_TICSVERT, TSVS_NORMAL, L"NORMAL"},
+ {0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classTraynotify[] = {
- {TNP_BACKGROUND,0,{'B','A','C','K','G','R','O','U','N','D','\0'}},
- {TNP_ANIMBACKGROUND,0,{'A','N','I','M','B','A','C','K','G','R','O','U','N','D','\0'}},
- {0,0,{'\0'}}
+ {TNP_BACKGROUND, 0, L"BACKGROUND"},
+ {TNP_ANIMBACKGROUND, 0, L"ANIMBACKGROUND"},
+ {0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classTreeview[] = {
- {TVP_TREEITEM,0,{'T','R','E','E','I','T','E','M','\0'}},
- {TVP_TREEITEM,TREIS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {TVP_TREEITEM,TREIS_HOT,{'H','O','T','\0'}},
- {TVP_TREEITEM,TREIS_SELECTED,{'S','E','L','E','C','T','E','D','\0'}},
- {TVP_TREEITEM,TREIS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {TVP_TREEITEM,TREIS_SELECTEDNOTFOCUS,{'S','E','L','E','C','T','E','D','N','O','T','F','O','C','U','S','\0'}},
- {TVP_GLYPH,0,{'G','L','Y','P','H','\0'}},
- {TVP_GLYPH,GLPS_CLOSED,{'C','L','O','S','E','D','\0'}},
- {TVP_GLYPH,GLPS_OPENED,{'O','P','E','N','E','D','\0'}},
- {TVP_BRANCH,0,{'B','R','A','N','C','H','\0'}},
- {0,0,{'\0'}}
+ {TVP_TREEITEM, 0, L"TREEITEM"},
+ {TVP_TREEITEM, TREIS_NORMAL, L"NORMAL"},
+ {TVP_TREEITEM, TREIS_HOT, L"HOT"},
+ {TVP_TREEITEM, TREIS_SELECTED, L"SELECTED"},
+ {TVP_TREEITEM, TREIS_DISABLED, L"DISABLED"},
+ {TVP_TREEITEM, TREIS_SELECTEDNOTFOCUS, L"SELECTEDNOTFOCUS"},
+ {TVP_GLYPH, 0, L"GLYPH"},
+ {TVP_GLYPH, GLPS_CLOSED, L"CLOSED"},
+ {TVP_GLYPH, GLPS_OPENED, L"OPENED"},
+ {TVP_BRANCH, 0, L"BRANCH"},
+ {0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classWindow[] = {
- {WP_CAPTION,0,{'C','A','P','T','I','O','N','\0'}},
- {WP_CAPTION,CS_ACTIVE,{'A','C','T','I','V','E','\0'}},
- {WP_CAPTION,CS_INACTIVE,{'I','N','A','C','T','I','V','E','\0'}},
- {WP_CAPTION,CS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {WP_SMALLCAPTION,0,{'S','M','A','L','L','C','A','P','T','I','O','N','\0'}},
- {WP_SMALLCAPTION,CS_ACTIVE,{'A','C','T','I','V','E','\0'}},
- {WP_SMALLCAPTION,CS_INACTIVE,{'I','N','A','C','T','I','V','E','\0'}},
- {WP_SMALLCAPTION,CS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {WP_MINCAPTION,0,{'M','I','N','C','A','P','T','I','O','N','\0'}},
- {WP_MINCAPTION,MNCS_ACTIVE,{'A','C','T','I','V','E','\0'}},
- {WP_MINCAPTION,MNCS_INACTIVE,{'I','N','A','C','T','I','V','E','\0'}},
- {WP_MINCAPTION,MNCS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {WP_SMALLMINCAPTION,0,{'S','M','A','L','L','M','I','N','C','A','P','T','I','O','N','\0'}},
- {WP_SMALLMINCAPTION,MNCS_ACTIVE,{'A','C','T','I','V','E','\0'}},
- {WP_SMALLMINCAPTION,MNCS_INACTIVE,{'I','N','A','C','T','I','V','E','\0'}},
- {WP_SMALLMINCAPTION,MNCS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {WP_MAXCAPTION,0,{'M','A','X','C','A','P','T','I','O','N','\0'}},
- {WP_MAXCAPTION,MXCS_ACTIVE,{'A','C','T','I','V','E','\0'}},
- {WP_MAXCAPTION,MXCS_INACTIVE,{'I','N','A','C','T','I','V','E','\0'}},
- {WP_MAXCAPTION,MXCS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {WP_SMALLMAXCAPTION,0,{'S','M','A','L','L','M','A','X','C','A','P','T','I','O','N','\0'}},
- {WP_SMALLMAXCAPTION,MXCS_ACTIVE,{'A','C','T','I','V','E','\0'}},
- {WP_SMALLMAXCAPTION,MXCS_INACTIVE,{'I','N','A','C','T','I','V','E','\0'}},
- {WP_SMALLMAXCAPTION,MXCS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {WP_FRAMELEFT,0,{'F','R','A','M','E','L','E','F','T','\0'}},
- {WP_FRAMELEFT,FS_ACTIVE,{'A','C','T','I','V','E','\0'}},
- {WP_FRAMELEFT,FS_INACTIVE,{'I','N','A','C','T','I','V','E','\0'}},
- {WP_FRAMERIGHT,0,{'F','R','A','M','E','R','I','G','H','T','\0'}},
- {WP_FRAMERIGHT,FS_ACTIVE,{'A','C','T','I','V','E','\0'}},
- {WP_FRAMERIGHT,FS_INACTIVE,{'I','N','A','C','T','I','V','E','\0'}},
- {WP_FRAMEBOTTOM,0,{'F','R','A','M','E','B','O','T','T','O','M','\0'}},
- {WP_FRAMEBOTTOM,FS_ACTIVE,{'A','C','T','I','V','E','\0'}},
- {WP_FRAMEBOTTOM,FS_INACTIVE,{'I','N','A','C','T','I','V','E','\0'}},
- {WP_SMALLFRAMELEFT,0,{'S','M','A','L','L','F','R','A','M','E','L','E','F','T','\0'}},
- {WP_SMALLFRAMELEFT,FS_ACTIVE,{'A','C','T','I','V','E','\0'}},
- {WP_SMALLFRAMELEFT,FS_INACTIVE,{'I','N','A','C','T','I','V','E','\0'}},
- {WP_SMALLFRAMERIGHT,0,{'S','M','A','L','L','F','R','A','M','E','R','I','G','H','T','\0'}},
- {WP_SMALLFRAMERIGHT,FS_ACTIVE,{'A','C','T','I','V','E','\0'}},
- {WP_SMALLFRAMERIGHT,FS_INACTIVE,{'I','N','A','C','T','I','V','E','\0'}},
- {WP_SMALLFRAMEBOTTOM,0,{'S','M','A','L','L','F','R','A','M','E','B','O','T','T','O','M','\0'}},
- {WP_SMALLFRAMEBOTTOM,FS_ACTIVE,{'A','C','T','I','V','E','\0'}},
- {WP_SMALLFRAMEBOTTOM,FS_INACTIVE,{'I','N','A','C','T','I','V','E','\0'}},
- {WP_SYSBUTTON,0,{'S','Y','S','B','U','T','T','O','N','\0'}},
- {WP_SYSBUTTON,SBS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {WP_SYSBUTTON,SBS_HOT,{'H','O','T','\0'}},
- {WP_SYSBUTTON,SBS_PUSHED,{'P','U','S','H','E','D','\0'}},
- {WP_SYSBUTTON,SBS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {WP_MDISYSBUTTON,0,{'M','D','I','S','Y','S','B','U','T','T','O','N','\0'}},
- {WP_MDISYSBUTTON,SBS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {WP_MDISYSBUTTON,SBS_HOT,{'H','O','T','\0'}},
- {WP_MDISYSBUTTON,SBS_PUSHED,{'P','U','S','H','E','D','\0'}},
- {WP_MDISYSBUTTON,SBS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {WP_MINBUTTON,0,{'M','I','N','B','U','T','T','O','N','\0'}},
- {WP_MINBUTTON,MINBS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {WP_MINBUTTON,MINBS_HOT,{'H','O','T','\0'}},
- {WP_MINBUTTON,MINBS_PUSHED,{'P','U','S','H','E','D','\0'}},
- {WP_MINBUTTON,MINBS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {WP_MDIMINBUTTON,0,{'M','D','I','M','I','N','B','U','T','T','O','N','\0'}},
- {WP_MDIMINBUTTON,MINBS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {WP_MDIMINBUTTON,MINBS_HOT,{'H','O','T','\0'}},
- {WP_MDIMINBUTTON,MINBS_PUSHED,{'P','U','S','H','E','D','\0'}},
- {WP_MDIMINBUTTON,MINBS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {WP_MAXBUTTON,0,{'M','A','X','B','U','T','T','O','N','\0'}},
- {WP_MAXBUTTON,MAXBS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {WP_MAXBUTTON,MAXBS_HOT,{'H','O','T','\0'}},
- {WP_MAXBUTTON,MAXBS_PUSHED,{'P','U','S','H','E','D','\0'}},
- {WP_MAXBUTTON,MAXBS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {WP_CLOSEBUTTON,0,{'C','L','O','S','E','B','U','T','T','O','N','\0'}},
- {WP_CLOSEBUTTON,CBS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {WP_CLOSEBUTTON,CBS_HOT,{'H','O','T','\0'}},
- {WP_CLOSEBUTTON,CBS_PUSHED,{'P','U','S','H','E','D','\0'}},
- {WP_CLOSEBUTTON,CBS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {WP_SMALLCLOSEBUTTON,0,{'S','M','A','L','L','C','L','O','S','E','B','U','T','T','O','N','\0'}},
- {WP_SMALLCLOSEBUTTON,CBS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {WP_SMALLCLOSEBUTTON,CBS_HOT,{'H','O','T','\0'}},
- {WP_SMALLCLOSEBUTTON,CBS_PUSHED,{'P','U','S','H','E','D','\0'}},
- {WP_SMALLCLOSEBUTTON,CBS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {WP_MDICLOSEBUTTON,0,{'M','D','I','C','L','O','S','E','B','U','T','T','O','N','\0'}},
- {WP_MDICLOSEBUTTON,CBS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {WP_MDICLOSEBUTTON,CBS_HOT,{'H','O','T','\0'}},
- {WP_MDICLOSEBUTTON,CBS_PUSHED,{'P','U','S','H','E','D','\0'}},
- {WP_MDICLOSEBUTTON,CBS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {WP_RESTOREBUTTON,0,{'R','E','S','T','O','R','E','B','U','T','T','O','N','\0'}},
- {WP_RESTOREBUTTON,RBS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {WP_RESTOREBUTTON,RBS_HOT,{'H','O','T','\0'}},
- {WP_RESTOREBUTTON,RBS_PUSHED,{'P','U','S','H','E','D','\0'}},
- {WP_RESTOREBUTTON,RBS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {WP_MDIRESTOREBUTTON,0,{'M','D','I','R','E','S','T','O','R','E','B','U','T','T','O','N','\0'}},
- {WP_MDIRESTOREBUTTON,RBS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {WP_MDIRESTOREBUTTON,RBS_HOT,{'H','O','T','\0'}},
- {WP_MDIRESTOREBUTTON,RBS_PUSHED,{'P','U','S','H','E','D','\0'}},
- {WP_MDIRESTOREBUTTON,RBS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {WP_HELPBUTTON,0,{'H','E','L','P','B','U','T','T','O','N','\0'}},
- {WP_HELPBUTTON,HBS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {WP_HELPBUTTON,HBS_HOT,{'H','O','T','\0'}},
- {WP_HELPBUTTON,HBS_PUSHED,{'P','U','S','H','E','D','\0'}},
- {WP_HELPBUTTON,HBS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {WP_MDIHELPBUTTON,0,{'M','D','I','H','E','L','P','B','U','T','T','O','N','\0'}},
- {WP_MDIHELPBUTTON,HBS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {WP_MDIHELPBUTTON,HBS_HOT,{'H','O','T','\0'}},
- {WP_MDIHELPBUTTON,HBS_PUSHED,{'P','U','S','H','E','D','\0'}},
- {WP_MDIHELPBUTTON,HBS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {WP_HORZSCROLL,0,{'H','O','R','Z','S','C','R','O','L','L','\0'}},
- {WP_HORZSCROLL,HSS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {WP_HORZSCROLL,HSS_HOT,{'H','O','T','\0'}},
- {WP_HORZSCROLL,HSS_PUSHED,{'P','U','S','H','E','D','\0'}},
- {WP_HORZSCROLL,HSS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {WP_HORZTHUMB,0,{'H','O','R','Z','T','H','U','M','B','\0'}},
- {WP_HORZTHUMB,HTS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {WP_HORZTHUMB,HTS_HOT,{'H','O','T','\0'}},
- {WP_HORZTHUMB,HTS_PUSHED,{'P','U','S','H','E','D','\0'}},
- {WP_HORZTHUMB,HTS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {WP_VERTSCROLL,0,{'V','E','R','T','S','C','R','O','L','L','\0'}},
- {WP_VERTSCROLL,VSS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {WP_VERTSCROLL,VSS_HOT,{'H','O','T','\0'}},
- {WP_VERTSCROLL,VSS_PUSHED,{'P','U','S','H','E','D','\0'}},
- {WP_VERTSCROLL,VSS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {WP_VERTTHUMB,0,{'V','E','R','T','T','H','U','M','B','\0'}},
- {WP_VERTTHUMB,VTS_NORMAL,{'N','O','R','M','A','L','\0'}},
- {WP_VERTTHUMB,VTS_HOT,{'H','O','T','\0'}},
- {WP_VERTTHUMB,VTS_PUSHED,{'P','U','S','H','E','D','\0'}},
- {WP_VERTTHUMB,VTS_DISABLED,{'D','I','S','A','B','L','E','D','\0'}},
- {WP_DIALOG,0,{'D','I','A','L','O','G','\0'}},
- {WP_CAPTIONSIZINGTEMPLATE,0,{'C','A','P','T','I','O','N','S','I','Z','I','N','G','T','E','M','P','L','A','T','E','\0'}},
- {WP_SMALLCAPTIONSIZINGTEMPLATE,0,{'S','M','A','L','L','C','A','P','T','I','O','N','S','I','Z','I','N','G','T','E','M','P','L','A','T','E','\0'}},
- {WP_FRAMELEFTSIZINGTEMPLATE,0,{'F','R','A','M','E','L','E','F','T','S','I','Z','I','N','G','T','E','M','P','L','A','T','E','\0'}},
- {WP_SMALLFRAMELEFTSIZINGTEMPLATE,0,{'S','M','A','L','L','F','R','A','M','E','L','E','F','T','S','I','Z','I','N','G','T','E','M','P','L','A','T','E','\0'}},
- {WP_FRAMERIGHTSIZINGTEMPLATE,0,{'F','R','A','M','E','R','I','G','H','T','S','I','Z','I','N','G','T','E','M','P','L','A','T','E','\0'}},
- {WP_SMALLFRAMERIGHTSIZINGTEMPLATE,0,{'S','M','A','L','L','F','R','A','M','E','R','I','G','H','T','S','I','Z','I','N','G','T','E','M','P','L','A','T','E','\0'}},
- {WP_FRAMEBOTTOMSIZINGTEMPLATE,0,{'F','R','A','M','E','B','O','T','T','O','M','S','I','Z','I','N','G','T','E','M','P','L','A','T','E','\0'}},
- {WP_SMALLFRAMEBOTTOMSIZINGTEMPLATE,0,{'S','M','A','L','L','F','R','A','M','E','B','O','T','T','O','M','S','I','Z','I','N','G','T','E','M','P','L','A','T','E','\0'}},
- {0,0,{'\0'}}
+ {WP_CAPTION, 0, L"CAPTION"},
+ {WP_CAPTION, CS_ACTIVE, L"ACTIVE"},
+ {WP_CAPTION, CS_INACTIVE, L"INACTIVE"},
+ {WP_CAPTION, CS_DISABLED, L"DISABLED"},
+ {WP_SMALLCAPTION, 0, L"SMALLCAPTION"},
+ {WP_SMALLCAPTION, CS_ACTIVE, L"ACTIVE"},
+ {WP_SMALLCAPTION, CS_INACTIVE, L"INACTIVE"},
+ {WP_SMALLCAPTION, CS_DISABLED, L"DISABLED"},
+ {WP_MINCAPTION, 0, L"MINCAPTION"},
+ {WP_MINCAPTION, MNCS_ACTIVE, L"ACTIVE"},
+ {WP_MINCAPTION, MNCS_INACTIVE, L"INACTIVE"},
+ {WP_MINCAPTION, MNCS_DISABLED, L"DISABLED"},
+ {WP_SMALLMINCAPTION, 0, L"SMALLMINCAPTION"},
+ {WP_SMALLMINCAPTION, MNCS_ACTIVE, L"ACTIVE"},
+ {WP_SMALLMINCAPTION, MNCS_INACTIVE, L"INACTIVE"},
+ {WP_SMALLMINCAPTION, MNCS_DISABLED, L"DISABLED"},
+ {WP_MAXCAPTION, 0, L"MAXCAPTION"},
+ {WP_MAXCAPTION, MXCS_ACTIVE, L"ACTIVE"},
+ {WP_MAXCAPTION, MXCS_INACTIVE, L"INACTIVE"},
+ {WP_MAXCAPTION, MXCS_DISABLED, L"DISABLED"},
+ {WP_SMALLMAXCAPTION, 0, L"SMALLMAXCAPTION"},
+ {WP_SMALLMAXCAPTION, MXCS_ACTIVE, L"ACTIVE"},
+ {WP_SMALLMAXCAPTION, MXCS_INACTIVE, L"INACTIVE"},
+ {WP_SMALLMAXCAPTION, MXCS_DISABLED, L"DISABLED"},
+ {WP_FRAMELEFT, 0, L"FRAMELEFT"},
+ {WP_FRAMELEFT, FS_ACTIVE, L"ACTIVE"},
+ {WP_FRAMELEFT, FS_INACTIVE, L"INACTIVE"},
+ {WP_FRAMERIGHT, 0, L"FRAMERIGHT"},
+ {WP_FRAMERIGHT, FS_ACTIVE, L"ACTIVE"},
+ {WP_FRAMERIGHT, FS_INACTIVE, L"INACTIVE"},
+ {WP_FRAMEBOTTOM, 0, L"FRAMEBOTTOM"},
+ {WP_FRAMEBOTTOM, FS_ACTIVE, L"ACTIVE"},
+ {WP_FRAMEBOTTOM, FS_INACTIVE, L"INACTIVE"},
+ {WP_SMALLFRAMELEFT, 0, L"SMALLFRAMELEFT"},
+ {WP_SMALLFRAMELEFT, FS_ACTIVE, L"ACTIVE"},
+ {WP_SMALLFRAMELEFT, FS_INACTIVE, L"INACTIVE"},
+ {WP_SMALLFRAMERIGHT, 0, L"SMALLFRAMERIGHT"},
+ {WP_SMALLFRAMERIGHT, FS_ACTIVE, L"ACTIVE"},
+ {WP_SMALLFRAMERIGHT, FS_INACTIVE, L"INACTIVE"},
+ {WP_SMALLFRAMEBOTTOM, 0, L"SMALLFRAMEBOTTOM"},
+ {WP_SMALLFRAMEBOTTOM, FS_ACTIVE, L"ACTIVE"},
+ {WP_SMALLFRAMEBOTTOM, FS_INACTIVE, L"INACTIVE"},
+ {WP_SYSBUTTON, 0, L"SYSBUTTON"},
+ {WP_SYSBUTTON, SBS_NORMAL, L"NORMAL"},
+ {WP_SYSBUTTON, SBS_HOT, L"HOT"},
+ {WP_SYSBUTTON, SBS_PUSHED, L"PUSHED"},
+ {WP_SYSBUTTON, SBS_DISABLED, L"DISABLED"},
+ {WP_MDISYSBUTTON, 0, L"MDISYSBUTTON"},
+ {WP_MDISYSBUTTON, SBS_NORMAL, L"NORMAL"},
+ {WP_MDISYSBUTTON, SBS_HOT, L"HOT"},
+ {WP_MDISYSBUTTON, SBS_PUSHED, L"PUSHED"},
+ {WP_MDISYSBUTTON, SBS_DISABLED, L"DISABLED"},
+ {WP_MINBUTTON, 0, L"MINBUTTON"},
+ {WP_MINBUTTON, MINBS_NORMAL, L"NORMAL"},
+ {WP_MINBUTTON, MINBS_HOT, L"HOT"},
+ {WP_MINBUTTON, MINBS_PUSHED, L"PUSHED"},
+ {WP_MINBUTTON, MINBS_DISABLED, L"DISABLED"},
+ {WP_MDIMINBUTTON, 0, L"MDIMINBUTTON"},
+ {WP_MDIMINBUTTON, MINBS_NORMAL, L"NORMAL"},
+ {WP_MDIMINBUTTON, MINBS_HOT, L"HOT"},
+ {WP_MDIMINBUTTON, MINBS_PUSHED, L"PUSHED"},
+ {WP_MDIMINBUTTON, MINBS_DISABLED, L"DISABLED"},
+ {WP_MAXBUTTON, 0, L"MAXBUTTON"},
+ {WP_MAXBUTTON, MAXBS_NORMAL, L"NORMAL"},
+ {WP_MAXBUTTON, MAXBS_HOT, L"HOT"},
+ {WP_MAXBUTTON, MAXBS_PUSHED, L"PUSHED"},
+ {WP_MAXBUTTON, MAXBS_DISABLED, L"DISABLED"},
+ {WP_CLOSEBUTTON, 0, L"CLOSEBUTTON"},
+ {WP_CLOSEBUTTON, CBS_NORMAL, L"NORMAL"},
+ {WP_CLOSEBUTTON, CBS_HOT, L"HOT"},
+ {WP_CLOSEBUTTON, CBS_PUSHED, L"PUSHED"},
+ {WP_CLOSEBUTTON, CBS_DISABLED, L"DISABLED"},
+ {WP_SMALLCLOSEBUTTON, 0, L"SMALLCLOSEBUTTON"},
+ {WP_SMALLCLOSEBUTTON, CBS_NORMAL, L"NORMAL"},
+ {WP_SMALLCLOSEBUTTON, CBS_HOT, L"HOT"},
+ {WP_SMALLCLOSEBUTTON, CBS_PUSHED, L"PUSHED"},
+ {WP_SMALLCLOSEBUTTON, CBS_DISABLED, L"DISABLED"},
+ {WP_MDICLOSEBUTTON, 0, L"MDICLOSEBUTTON"},
+ {WP_MDICLOSEBUTTON, CBS_NORMAL, L"NORMAL"},
+ {WP_MDICLOSEBUTTON, CBS_HOT, L"HOT"},
+ {WP_MDICLOSEBUTTON, CBS_PUSHED, L"PUSHED"},
+ {WP_MDICLOSEBUTTON, CBS_DISABLED, L"DISABLED"},
+ {WP_RESTOREBUTTON, 0, L"RESTOREBUTTON"},
+ {WP_RESTOREBUTTON, RBS_NORMAL, L"NORMAL"},
+ {WP_RESTOREBUTTON, RBS_HOT, L"HOT"},
+ {WP_RESTOREBUTTON, RBS_PUSHED, L"PUSHED"},
+ {WP_RESTOREBUTTON, RBS_DISABLED, L"DISABLED"},
+ {WP_MDIRESTOREBUTTON, 0, L"MDIRESTOREBUTTON"},
+ {WP_MDIRESTOREBUTTON, RBS_NORMAL, L"NORMAL"},
+ {WP_MDIRESTOREBUTTON, RBS_HOT, L"HOT"},
+ {WP_MDIRESTOREBUTTON, RBS_PUSHED, L"PUSHED"},
+ {WP_MDIRESTOREBUTTON, RBS_DISABLED, L"DISABLED"},
+ {WP_HELPBUTTON, 0, L"HELPBUTTON"},
+ {WP_HELPBUTTON, HBS_NORMAL, L"NORMAL"},
+ {WP_HELPBUTTON, HBS_HOT, L"HOT"},
+ {WP_HELPBUTTON, HBS_PUSHED, L"PUSHED"},
+ {WP_HELPBUTTON, HBS_DISABLED, L"DISABLED"},
+ {WP_MDIHELPBUTTON, 0, L"MDIHELPBUTTON"},
+ {WP_MDIHELPBUTTON, HBS_NORMAL, L"NORMAL"},
+ {WP_MDIHELPBUTTON, HBS_HOT, L"HOT"},
+ {WP_MDIHELPBUTTON, HBS_PUSHED, L"PUSHED"},
+ {WP_MDIHELPBUTTON, HBS_DISABLED, L"DISABLED"},
+ {WP_HORZSCROLL, 0, L"HORZSCROLL"},
+ {WP_HORZSCROLL, HSS_NORMAL, L"NORMAL"},
+ {WP_HORZSCROLL, HSS_HOT, L"HOT"},
+ {WP_HORZSCROLL, HSS_PUSHED, L"PUSHED"},
+ {WP_HORZSCROLL, HSS_DISABLED, L"DISABLED"},
+ {WP_HORZTHUMB, 0, L"HORZTHUMB"},
+ {WP_HORZTHUMB, HTS_NORMAL, L"NORMAL"},
+ {WP_HORZTHUMB, HTS_HOT, L"HOT"},
+ {WP_HORZTHUMB, HTS_PUSHED, L"PUSHED"},
+ {WP_HORZTHUMB, HTS_DISABLED, L"DISABLED"},
+ {WP_VERTSCROLL, 0, L"VERTSCROLL"},
+ {WP_VERTSCROLL, VSS_NORMAL, L"NORMAL"},
+ {WP_VERTSCROLL, VSS_HOT, L"HOT"},
+ {WP_VERTSCROLL, VSS_PUSHED, L"PUSHED"},
+ {WP_VERTSCROLL, VSS_DISABLED, L"DISABLED"},
+ {WP_VERTTHUMB, 0, L"VERTTHUMB"},
+ {WP_VERTTHUMB, VTS_NORMAL, L"NORMAL"},
+ {WP_VERTTHUMB, VTS_HOT, L"HOT"},
+ {WP_VERTTHUMB, VTS_PUSHED, L"PUSHED"},
+ {WP_VERTTHUMB, VTS_DISABLED, L"DISABLED"},
+ {WP_DIALOG, 0, L"DIALOG"},
+ {WP_CAPTIONSIZINGTEMPLATE, 0, L"CAPTIONSIZINGTEMPLATE"},
+ {WP_SMALLCAPTIONSIZINGTEMPLATE, 0, L"SMALLCAPTIONSIZINGTEMPLATE"},
+ {WP_FRAMELEFTSIZINGTEMPLATE, 0, L"FRAMELEFTSIZINGTEMPLATE"},
+ {WP_SMALLFRAMELEFTSIZINGTEMPLATE, 0, L"SMALLFRAMELEFTSIZINGTEMPLATE"},
+ {WP_FRAMERIGHTSIZINGTEMPLATE, 0, L"FRAMERIGHTSIZINGTEMPLATE"},
+ {WP_SMALLFRAMERIGHTSIZINGTEMPLATE, 0, L"SMALLFRAMERIGHTSIZINGTEMPLATE"},
+ {WP_FRAMEBOTTOMSIZINGTEMPLATE, 0, L"FRAMEBOTTOMSIZINGTEMPLATE"},
+ {WP_SMALLFRAMEBOTTOMSIZINGTEMPLATE, 0, L"SMALLFRAMEBOTTOMSIZINGTEMPLATE"},
+ {0, 0, L""}
};
/* Map class names to part/state maps */
static const MSSTYLES_CLASS_NAME mapClass[] = {
- {classGlobals, {'G','L','O','B','A','L','S','\0'}},
- {classButton, {'B','U','T','T','O','N','\0'}},
- {classClock, {'C','L','O','C','K','\0'}},
- {classCombobox, {'C','O','M','B','O','B','O','X','\0'}},
- {classEdit, {'E','D','I','T','\0'}},
- {classExplorerbar, {'E','X','P','L','O','R','E','R','B','A','R','\0'}},
- {classHeader, {'H','E','A','D','E','R','\0'}},
- {classListview, {'L','I','S','T','V','I','E','W','\0'}},
- {classMenu, {'M','E','N','U','\0'}},
- {classMenuband, {'M','E','N','U','B','A','N','D','\0'}},
- {classPage, {'P','A','G','E','\0'}},
- {classProgress, {'P','R','O','G','R','E','S','S','\0'}},
- {classRebar, {'R','E','B','A','R','\0'}},
- {classScrollbar, {'S','C','R','O','L','L','B','A','R','\0'}},
- {classSpin, {'S','P','I','N','\0'}},
- {classStartpanel, {'S','T','A','R','T','P','A','N','E','L','\0'}},
- {classStatus, {'S','T','A','T','U','S','\0'}},
- {classTab, {'T','A','B','\0'}},
- {classTaskband, {'T','A','S','K','B','A','N','D','\0'}},
- {classTaskbar, {'T','A','S','K','B','A','R','\0'}},
- {classToolbar, {'T','O','O','L','B','A','R','\0'}},
- {classTooltip, {'T','O','O','L','T','I','P','\0'}},
- {classTrackbar, {'T','R','A','C','K','B','A','R','\0'}},
- {classTraynotify, {'T','R','A','Y','N','O','T','I','F','Y','\0'}},
- {classTreeview, {'T','R','E','E','V','I','E','W','\0'}},
- {classWindow, {'W','I','N','D','O','W','\0'}}
+ {classGlobals, L"GLOBALS"},
+ {classButton, L"BUTTON"},
+ {classClock, L"CLOCK"},
+ {classCombobox, L"COMBOBOX"},
+ {classEdit, L"EDIT"},
+ {classExplorerbar, L"EXPLORERBAR"},
+ {classHeader, L"HEADER"},
+ {classListview, L"LISTVIEW"},
+ {classMenu, L"MENU"},
+ {classMenuband, L"MENUBAND"},
+ {classPage, L"PAGE"},
+ {classProgress, L"PROGRESS"},
+ {classRebar, L"REBAR"},
+ {classScrollbar, L"SCROLLBAR"},
+ {classSpin, L"SPIN"},
+ {classStartpanel, L"STARTPANEL"},
+ {classStatus, L"STATUS"},
+ {classTab, L"TAB"},
+ {classTaskband, L"TASKBAND"},
+ {classTaskbar, L"TASKBAR"},
+ {classToolbar, L"TOOLBAR"},
+ {classTooltip, L"TOOLTIP"},
+ {classTrackbar, L"TRACKBAR"},
+ {classTraynotify, L"TRAYNOTIFY"},
+ {classTreeview, L"TREEVIEW"},
+ {classWindow, L"WINDOW"}
};
BOOL MSSTYLES_LookupPartState(LPCWSTR pszClass, LPCWSTR pszPart, LPCWSTR pszState, int *iPartId, int *iStateId)
--
2.26.2
1
0
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
dlls/uxtheme/tests/system.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c
index b3a861eaa6b..5b6c91dc481 100644
--- a/dlls/uxtheme/tests/system.c
+++ b/dlls/uxtheme/tests/system.c
@@ -127,10 +127,10 @@ static void test_OpenThemeData(void)
HRESULT hRes;
BOOL bTPDefined;
- WCHAR szInvalidClassList[] = {'D','E','A','D','B','E','E','F', 0 };
- WCHAR szButtonClassList[] = {'B','u','t','t','o','n', 0 };
- WCHAR szButtonClassList2[] = {'b','U','t','T','o','N', 0 };
- WCHAR szClassList[] = {'B','u','t','t','o','n',';','L','i','s','t','B','o','x', 0 };
+ const WCHAR szInvalidClassList[] = L"DEADBEEF";
+ const WCHAR szButtonClassList[] = L"Button";
+ const WCHAR szButtonClassList2[] = L"bUtToN";
+ const WCHAR szClassList[] = L"Button;ListBox";
bThemeActive = IsThemeActive();
@@ -274,10 +274,10 @@ static void test_OpenThemeDataEx(void)
HWND hWnd;
BOOL bThemeActive;
- WCHAR szInvalidClassList[] = {'D','E','A','D','B','E','E','F', 0 };
- WCHAR szButtonClassList[] = {'B','u','t','t','o','n', 0 };
- WCHAR szButtonClassList2[] = {'b','U','t','T','o','N', 0 };
- WCHAR szClassList[] = {'B','u','t','t','o','n',';','L','i','s','t','B','o','x', 0 };
+ const WCHAR szInvalidClassList[] = L"DEADBEEF";
+ const WCHAR szButtonClassList[] = L"Button";
+ const WCHAR szButtonClassList2[] = L"bUtToN";
+ const WCHAR szClassList[] = L"Button;ListBox";
if (!pOpenThemeDataEx)
{
--
2.26.2
1
0
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
programs/find/find.c | 3 +--
programs/find/tests/find.c | 5 ++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/programs/find/find.c b/programs/find/find.c
index 2eeb1ce2120..7d178874b4d 100644
--- a/programs/find/find.c
+++ b/programs/find/find.c
@@ -117,7 +117,6 @@ static void write_to_stdout(const WCHAR *str)
static BOOL run_find_for_line(const WCHAR *line, const WCHAR *tofind)
{
void *found;
- WCHAR lineending[] = {'\r', '\n', 0};
if (lstrlenW(line) == 0 || lstrlenW(tofind) == 0)
return FALSE;
@@ -127,7 +126,7 @@ static BOOL run_find_for_line(const WCHAR *line, const WCHAR *tofind)
if (found)
{
write_to_stdout(line);
- write_to_stdout(lineending);
+ write_to_stdout(L"\r\n");
return TRUE;
}
diff --git a/programs/find/tests/find.c b/programs/find/tests/find.c
index d50dcdd36ae..b7c2d7b77c4 100644
--- a/programs/find/tests/find.c
+++ b/programs/find/tests/find.c
@@ -128,7 +128,6 @@ static void mangle_text(const BYTE *input, int input_len, BYTE *output, int outp
static void run_find_stdin_(const WCHAR *commandline, const BYTE *input, int input_len, const BYTE *out_expected, int out_expected_len, int exitcode_expected, const char *file, int line)
{
- static const WCHAR find_exe[] = { 'f','i','n','d','.','e','x','e',' ','%','s',0 };
HANDLE child_stdin_read;
HANDLE child_stdout_write;
HANDLE parent_stdin_write;
@@ -157,7 +156,7 @@ static void run_find_stdin_(const WCHAR *commandline, const BYTE *input, int inp
startup_info.hStdError = NULL;
startup_info.dwFlags |= STARTF_USESTDHANDLES;
- wsprintfW(cmd, find_exe, commandline);
+ wsprintfW(cmd, L"find.exe %s", commandline);
CreateProcessW(NULL, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &startup_info, &process_info);
CloseHandle(child_stdin_read);
@@ -243,7 +242,7 @@ static void run_find_str_(const char *commandline, const char *input, const char
static void run_find_unicode_(const BYTE *input, int input_len, const BYTE *out_expected, int out_expected_len, int exitcode_expected, BOOL is_file, const char *file, int line)
{
/* Need "test" as char and quoted wchar */
- static const WCHAR wstr_quoted_test[] = { '"','t', 'e', 's', 't','"',0 };
+ static const WCHAR wstr_quoted_test[] = L"\"test\"";
static const char str_test[] = "test";
BYTE out_expected_mangled[200] = {0};
--
2.26.2
1
0