mirror of
https://github.com/keymanapp/keyman.git
synced 2026-08-05 00:15:32 +00:00
chore(common): move common cpp files and remove unused files
* Move the following files from common/windows/cpp/include/ to common/include/: * keymanversion.h * vkeys.h * Move the following file from common/windows/cpp/ to common/cpp/: * vkeys.cpp * Move crc32.cpp,crc32.h into kmcmplib, as they are only used there. * Remove unused ConvertUTF.c and ConvertUTF.h. * Update references to the above files. * Remove precompiled header refs from vkeys.cpp and change data type to `char*` for types in vkeys.cpp (unless `USE_CHAR16_T` is defined), so that it is more cross-platform accessible, update usages accordingly, fixup project definitions accordingly. * Remove unused define `KMN_KBP_EXPORTING` from kmcmplib/meson.build. Fixes: #15565 Test-bot: skip
This commit is contained in:
Marc Durdin
parent
d49ae4cddc
commit
94723ba556
59 changed files with 907 additions and 1511 deletions
|
|
@ -16,9 +16,12 @@
|
|||
History: 22 Mar 2010 - mcdurdin - Compiler fixup - tidy up
|
||||
*/
|
||||
|
||||
#include "pch.h"
|
||||
#include "../include/vkeys.h"
|
||||
|
||||
#ifndef USE_CHAR16_T
|
||||
#define lpuch(x) x
|
||||
#endif
|
||||
|
||||
const VKEY_CHAR* VKeyNames[256] = {
|
||||
// Key Codes
|
||||
lpuch("K_?00"), // &H0
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef _KEYMANVERSION_H
|
||||
#define _KEYMANVERSION_H
|
||||
|
||||
#include "../../../include/keymanversion_build.h"
|
||||
#include "./keymanversion_build.h"
|
||||
|
||||
// We should not need to add to these hard-coded version numbers for future versions, unless
|
||||
// we have a back-compat need to refer to a specific version.
|
||||
|
|
@ -4,8 +4,7 @@
|
|||
#include <km_types.h>
|
||||
#define VKEY_CHAR KMX_UCHAR
|
||||
#else
|
||||
#define VKEY_CHAR WCHAR
|
||||
#define lpuch(x) L ## x
|
||||
#define VKEY_CHAR char
|
||||
#endif
|
||||
|
||||
extern const VKEY_CHAR* VKeyNames[256];
|
||||
|
|
@ -1,149 +0,0 @@
|
|||
/*
|
||||
* Copyright 2001 Unicode, Inc.
|
||||
*
|
||||
* Disclaimer
|
||||
*
|
||||
* This source code is provided as is by Unicode, Inc. No claims are
|
||||
* made as to fitness for any particular purpose. No warranties of any
|
||||
* kind are expressed or implied. The recipient agrees to determine
|
||||
* applicability of information provided. If this file has been
|
||||
* purchased on magnetic or optical media from Unicode, Inc., the
|
||||
* sole remedy for any claim will be exchange of defective media
|
||||
* within 90 days of receipt.
|
||||
*
|
||||
* Limitations on Rights to Redistribute This Code
|
||||
*
|
||||
* Unicode, Inc. hereby grants the right to freely use the information
|
||||
* supplied in this file in the creation of products supporting the
|
||||
* Unicode Standard, and to make copies of this file in any form
|
||||
* for internal or external distribution as long as this notice
|
||||
* remains attached.
|
||||
*/
|
||||
|
||||
/* ---------------------------------------------------------------------
|
||||
|
||||
Conversions between UTF32, UTF-16, and UTF-8. Header file.
|
||||
|
||||
Several funtions are included here, forming a complete set of
|
||||
conversions between the three formats. UTF-7 is not included
|
||||
here, but is handled in a separate source file.
|
||||
|
||||
Each of these routines takes pointers to input buffers and output
|
||||
buffers. The input buffers are const.
|
||||
|
||||
Each routine converts the text between *sourceStart and sourceEnd,
|
||||
putting the result into the buffer between *targetStart and
|
||||
targetEnd. Note: the end pointers are *after* the last item: e.g.
|
||||
*(sourceEnd - 1) is the last item.
|
||||
|
||||
The return result indicates whether the conversion was successful,
|
||||
and if not, whether the problem was in the source or target buffers.
|
||||
(Only the first encountered problem is indicated.)
|
||||
|
||||
After the conversion, *sourceStart and *targetStart are both
|
||||
updated to point to the end of last text successfully converted in
|
||||
the respective buffers.
|
||||
|
||||
Input parameters:
|
||||
sourceStart - pointer to a pointer to the source buffer.
|
||||
The contents of this are modified on return so that
|
||||
it points at the next thing to be converted.
|
||||
targetStart - similarly, pointer to pointer to the target buffer.
|
||||
sourceEnd, targetEnd - respectively pointers to the ends of the
|
||||
two buffers, for overflow checking only.
|
||||
|
||||
These conversion functions take a ConversionFlags argument. When this
|
||||
flag is set to strict, both irregular sequences and isolated surrogates
|
||||
will cause an error. When the flag is set to lenient, both irregular
|
||||
sequences and isolated surrogates are converted.
|
||||
|
||||
Whether the flag is strict or lenient, all illegal sequences will cause
|
||||
an error return. This includes sequences such as: <F4 90 80 80>, <C0 80>,
|
||||
or <A0> in UTF-8, and values above 0x10FFFF in UTF-32. Conformant code
|
||||
must check for illegal sequences.
|
||||
|
||||
When the flag is set to lenient, characters over 0x10FFFF are converted
|
||||
to the replacement character; otherwise (when the flag is set to strict)
|
||||
they constitute an error.
|
||||
|
||||
Output parameters:
|
||||
The value "sourceIllegal" is returned from some routines if the input
|
||||
sequence is malformed. When "sourceIllegal" is returned, the source
|
||||
value will point to the illegal value that caused the problem. E.g.,
|
||||
in UTF-8 when a sequence is malformed, it points to the start of the
|
||||
malformed sequence.
|
||||
|
||||
Author: Mark E. Davis, 1994.
|
||||
Rev History: Rick McGowan, fixes & updates May 2001.
|
||||
|
||||
------------------------------------------------------------------------ */
|
||||
|
||||
/* ---------------------------------------------------------------------
|
||||
The following 4 definitions are compiler-specific.
|
||||
The C standard does not guarantee that wchar_t has at least
|
||||
16 bits, so wchar_t is no less portable than unsigned short!
|
||||
All should be unsigned values to avoid sign extension during
|
||||
bit mask & shift operations.
|
||||
------------------------------------------------------------------------ */
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
typedef unsigned long UTF32; /* at least 32 bits */
|
||||
typedef unsigned short UTF16; /* at least 16 bits */
|
||||
typedef unsigned char UTF8; /* typically 8 bits */
|
||||
typedef unsigned char Boolean; /* 0 or 1 */
|
||||
|
||||
/* Some fundamental constants */
|
||||
#define UNI_REPLACEMENT_CHAR (UTF32)0x0000FFFD
|
||||
#define UNI_MAX_BMP (UTF32)0x0000FFFF
|
||||
#define UNI_MAX_UTF16 (UTF32)0x0010FFFF
|
||||
#define UNI_MAX_UTF32 (UTF32)0x7FFFFFFF
|
||||
|
||||
#define UTF8Sig "\xEF\xBB\xBF"
|
||||
#define UTF16Sig "\xFF\xFE"
|
||||
|
||||
typedef enum {
|
||||
conversionOK, /* conversion successful */
|
||||
sourceExhausted, /* partial character in source, but hit end */
|
||||
targetExhausted, /* insuff. room in target for conversion */
|
||||
sourceIllegal /* source sequence is illegal/malformed */
|
||||
} ConversionResult;
|
||||
|
||||
typedef enum {
|
||||
strictConversion = 0,
|
||||
lenientConversion
|
||||
} ConversionFlags;
|
||||
|
||||
ConversionResult ConvertUTF32toUTF16 (
|
||||
UTF32** sourceStart, const UTF32* sourceEnd,
|
||||
UTF16** targetStart, const UTF16* targetEnd, const ConversionFlags flags);
|
||||
|
||||
ConversionResult ConvertUTF16toUTF32 (
|
||||
UTF16** sourceStart, UTF16* sourceEnd,
|
||||
UTF32** targetStart, const UTF32* targetEnd, const ConversionFlags flags);
|
||||
|
||||
ConversionResult ConvertUTF16toUTF8 (
|
||||
UTF16** sourceStart, const UTF16* sourceEnd,
|
||||
UTF8** targetStart, const UTF8* targetEnd, const ConversionFlags flags);
|
||||
|
||||
ConversionResult ConvertUTF8toUTF16 (
|
||||
UTF8** sourceStart, UTF8* sourceEnd,
|
||||
UTF16** targetStart, const UTF16* targetEnd, const ConversionFlags flags);
|
||||
|
||||
ConversionResult ConvertUTF32toUTF8 (
|
||||
UTF32** sourceStart, const UTF32* sourceEnd,
|
||||
UTF8** targetStart, const UTF8* targetEnd, const ConversionFlags flags);
|
||||
|
||||
ConversionResult ConvertUTF8toUTF32 (
|
||||
UTF8** sourceStart, UTF8* sourceEnd,
|
||||
UTF32** targetStart, const UTF32* targetEnd, const ConversionFlags flags);
|
||||
|
||||
Boolean isLegalUTF8Sequence(UTF8 *source, UTF8 *sourceEnd);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
/* --------------------------------------------------------------------- */
|
||||
|
|
@ -1,467 +0,0 @@
|
|||
/*
|
||||
* Copyright 2001 Unicode, Inc.
|
||||
*
|
||||
* Disclaimer
|
||||
*
|
||||
* This source code is provided as is by Unicode, Inc. No claims are
|
||||
* made as to fitness for any particular purpose. No warranties of any
|
||||
* kind are expressed or implied. The recipient agrees to determine
|
||||
* applicability of information provided. If this file has been
|
||||
* purchased on magnetic or optical media from Unicode, Inc., the
|
||||
* sole remedy for any claim will be exchange of defective media
|
||||
* within 90 days of receipt.
|
||||
*
|
||||
* Limitations on Rights to Redistribute This Code
|
||||
*
|
||||
* Unicode, Inc. hereby grants the right to freely use the information
|
||||
* supplied in this file in the creation of products supporting the
|
||||
* Unicode Standard, and to make copies of this file in any form
|
||||
* for internal or external distribution as long as this notice
|
||||
* remains attached.
|
||||
*/
|
||||
|
||||
/* ---------------------------------------------------------------------
|
||||
|
||||
Conversions between UTF32, UTF-16, and UTF-8. Source code file.
|
||||
Author: Mark E. Davis, 1994.
|
||||
Rev History: Rick McGowan, fixes & updates May 2001.
|
||||
|
||||
See the header file "ConvertUTF.h" for complete documentation.
|
||||
|
||||
------------------------------------------------------------------------ */
|
||||
|
||||
#include "../include/ConvertUTF.h"
|
||||
#ifdef CVTUTF_DEBUG
|
||||
#include <stdio.h>
|
||||
#endif
|
||||
|
||||
static const int halfShift = 10; /* used for shifting by 10 bits */
|
||||
|
||||
static const UTF32 halfBase = 0x0010000UL;
|
||||
static const UTF32 halfMask = 0x3FFUL;
|
||||
|
||||
#define UNI_SUR_HIGH_START (UTF32)0xD800
|
||||
#define UNI_SUR_HIGH_END (UTF32)0xDBFF
|
||||
#define UNI_SUR_LOW_START (UTF32)0xDC00
|
||||
#define UNI_SUR_LOW_END (UTF32)0xDFFF
|
||||
#define false 0
|
||||
#define true 1
|
||||
|
||||
/* --------------------------------------------------------------------- */
|
||||
|
||||
ConversionResult ConvertUTF32toUTF16 (
|
||||
UTF32** sourceStart, const UTF32* sourceEnd,
|
||||
UTF16** targetStart, const UTF16* targetEnd, const ConversionFlags flags) {
|
||||
ConversionResult result = conversionOK;
|
||||
UTF32* source = *sourceStart;
|
||||
UTF16* target = *targetStart;
|
||||
while (source < sourceEnd) {
|
||||
UTF32 ch;
|
||||
if (target >= targetEnd) {
|
||||
result = targetExhausted; break;
|
||||
}
|
||||
ch = *source++;
|
||||
if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */
|
||||
if ((flags == strictConversion) && (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END)) {
|
||||
--source; /* return to the illegal value itself */
|
||||
result = sourceIllegal;
|
||||
break;
|
||||
} else {
|
||||
*target++ = (UTF16) ch; /* normal case */
|
||||
}
|
||||
} else if (ch > UNI_MAX_UTF16) {
|
||||
if (flags == strictConversion) {
|
||||
result = sourceIllegal;
|
||||
} else {
|
||||
*target++ = UNI_REPLACEMENT_CHAR;
|
||||
}
|
||||
} else {
|
||||
/* target is a character in range 0xFFFF - 0x10FFFF. */
|
||||
if (target + 1 >= targetEnd) {
|
||||
result = targetExhausted; break;
|
||||
}
|
||||
ch -= halfBase;
|
||||
*target++ = (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START);
|
||||
*target++ = (UTF16)((ch & halfMask) + UNI_SUR_LOW_START);
|
||||
}
|
||||
}
|
||||
*sourceStart = source;
|
||||
*targetStart = target;
|
||||
return result;
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------- */
|
||||
|
||||
ConversionResult ConvertUTF16toUTF32 (
|
||||
UTF16** sourceStart, UTF16* sourceEnd,
|
||||
UTF32** targetStart, const UTF32* targetEnd, const ConversionFlags flags) {
|
||||
ConversionResult result = conversionOK;
|
||||
UTF16* source = *sourceStart;
|
||||
UTF32* target = *targetStart;
|
||||
UTF32 ch, ch2;
|
||||
while (source < sourceEnd) {
|
||||
ch = *source++;
|
||||
if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_HIGH_END && source < sourceEnd) {
|
||||
ch2 = *source;
|
||||
if (ch2 >= UNI_SUR_LOW_START && ch2 <= UNI_SUR_LOW_END) {
|
||||
ch = ((ch - UNI_SUR_HIGH_START) << halfShift)
|
||||
+ (ch2 - UNI_SUR_LOW_START) + halfBase;
|
||||
++source;
|
||||
} else if (flags == strictConversion) { /* it's an unpaired high surrogate */
|
||||
--source; /* return to the illegal value itself */
|
||||
result = sourceIllegal;
|
||||
break;
|
||||
}
|
||||
} else if ((flags == strictConversion) && (ch >= UNI_SUR_LOW_START && ch <= UNI_SUR_LOW_END)) {
|
||||
/* an unpaired low surrogate */
|
||||
--source; /* return to the illegal value itself */
|
||||
result = sourceIllegal;
|
||||
break;
|
||||
}
|
||||
if (target >= targetEnd) {
|
||||
result = targetExhausted; break;
|
||||
}
|
||||
*target++ = ch;
|
||||
}
|
||||
*sourceStart = source;
|
||||
*targetStart = target;
|
||||
#ifdef CVTUTF_DEBUG
|
||||
if (result == sourceIllegal) {
|
||||
fprintf(stderr, "ConvertUTF16toUTF32 illegal seq 0x%04x,%04x\n", ch, ch2);
|
||||
fflush(stderr);
|
||||
}
|
||||
#endif
|
||||
return result;
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------- */
|
||||
|
||||
/*
|
||||
* Index into the table below with the first byte of a UTF-8 sequence to
|
||||
* get the number of trailing bytes that are supposed to follow it.
|
||||
*/
|
||||
static const char trailingBytesForUTF8[256] = {
|
||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
|
||||
};
|
||||
|
||||
/*
|
||||
* Magic values subtracted from a buffer value during UTF8 conversion.
|
||||
* This table contains as many values as there might be trailing bytes
|
||||
* in a UTF-8 sequence.
|
||||
*/
|
||||
static const UTF32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL,
|
||||
0x03C82080UL, 0xFA082080UL, 0x82082080UL };
|
||||
|
||||
/*
|
||||
* Once the bits are split out into bytes of UTF-8, this is a mask OR-ed
|
||||
* into the first byte, depending on how many bytes follow. There are
|
||||
* as many entries in this table as there are UTF-8 sequence types.
|
||||
* (I.e., one byte sequence, two byte... six byte sequence.)
|
||||
*/
|
||||
static const UTF8 firstByteMark[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
|
||||
|
||||
/* --------------------------------------------------------------------- */
|
||||
|
||||
/* The interface converts a whole buffer to avoid function-call overhead.
|
||||
* Constants have been gathered. Loops & conditionals have been removed as
|
||||
* much as possible for efficiency, in favor of drop-through switches.
|
||||
* (See "Note A" at the bottom of the file for equivalent code.)
|
||||
* If your compiler supports it, the "isLegalUTF8" call can be turned
|
||||
* into an inline function.
|
||||
*/
|
||||
|
||||
/* --------------------------------------------------------------------- */
|
||||
|
||||
ConversionResult ConvertUTF16toUTF8 (
|
||||
UTF16** sourceStart, const UTF16* sourceEnd,
|
||||
UTF8** targetStart, const UTF8* targetEnd, const ConversionFlags flags) {
|
||||
ConversionResult result = conversionOK;
|
||||
UTF16* source = *sourceStart;
|
||||
UTF8* target = *targetStart;
|
||||
while (source < sourceEnd) {
|
||||
UTF32 ch;
|
||||
unsigned short bytesToWrite = 0;
|
||||
const UTF32 byteMask = 0xBF;
|
||||
const UTF32 byteMark = 0x80;
|
||||
ch = *source++;
|
||||
/* If we have a surrogate pair, convert to UTF32 first. */
|
||||
if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_HIGH_END && source < sourceEnd) {
|
||||
UTF32 ch2 = *source;
|
||||
if (ch2 >= UNI_SUR_LOW_START && ch2 <= UNI_SUR_LOW_END) {
|
||||
ch = ((ch - UNI_SUR_HIGH_START) << halfShift)
|
||||
+ (ch2 - UNI_SUR_LOW_START) + halfBase;
|
||||
++source;
|
||||
} else if (flags == strictConversion) { /* it's an unpaired high surrogate */
|
||||
--source; /* return to the illegal value itself */
|
||||
result = sourceIllegal;
|
||||
break;
|
||||
}
|
||||
} else if ((flags == strictConversion) && (ch >= UNI_SUR_LOW_START && ch <= UNI_SUR_LOW_END)) {
|
||||
--source; /* return to the illegal value itself */
|
||||
result = sourceIllegal;
|
||||
break;
|
||||
}
|
||||
/* Figure out how many bytes the result will require */
|
||||
if (ch < (UTF32)0x80) { bytesToWrite = 1;
|
||||
} else if (ch < (UTF32)0x800) { bytesToWrite = 2;
|
||||
} else if (ch < (UTF32)0x10000) { bytesToWrite = 3;
|
||||
} else if (ch < (UTF32)0x200000) { bytesToWrite = 4;
|
||||
} else { bytesToWrite = 2;
|
||||
ch = UNI_REPLACEMENT_CHAR;
|
||||
}
|
||||
|
||||
target += bytesToWrite;
|
||||
if (target > targetEnd) {
|
||||
target -= bytesToWrite; result = targetExhausted; break;
|
||||
}
|
||||
switch (bytesToWrite) { /* note: everything falls through. */
|
||||
case 4: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
|
||||
case 3: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
|
||||
case 2: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
|
||||
case 1: *--target = (UTF8)(ch | firstByteMark[bytesToWrite]);
|
||||
}
|
||||
target += bytesToWrite;
|
||||
}
|
||||
*sourceStart = source;
|
||||
*targetStart = target;
|
||||
return result;
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------- */
|
||||
|
||||
/*
|
||||
* Utility routine to tell whether a sequence of bytes is legal UTF-8.
|
||||
* This must be called with the length pre-determined by the first byte.
|
||||
* If not calling this from ConvertUTF8to*, then the length can be set by:
|
||||
* length = trailingBytesForUTF8[*source]+1;
|
||||
* and the sequence is illegal right away if there aren't that many bytes
|
||||
* available.
|
||||
* If presented with a length > 4, this returns false. The Unicode
|
||||
* definition of UTF-8 goes up to 4-byte sequences.
|
||||
*/
|
||||
|
||||
static Boolean isLegalUTF8(UTF8 *source, int length) {
|
||||
UTF8 a;
|
||||
UTF8 *srcptr = source+length;
|
||||
switch (length) {
|
||||
default: return false;
|
||||
/* Everything else falls through when "true"... */
|
||||
case 4: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
|
||||
case 3: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
|
||||
case 2: if ((a = (*--srcptr)) > 0xBF) return false;
|
||||
switch (*source) {
|
||||
/* no fall-through in this inner switch */
|
||||
case 0xE0: if (a < 0xA0) return false; break;
|
||||
case 0xF0: if (a < 0x90) return false; break;
|
||||
case 0xF4: if (a > 0x8F) return false; break;
|
||||
default: if (a < 0x80) return false;
|
||||
}
|
||||
case 1: if (*source >= 0x80 && *source < 0xC2) return false;
|
||||
if (*source > 0xF4) return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------- */
|
||||
|
||||
/*
|
||||
* Exported function to return whether a UTF-8 sequence is legal or not.
|
||||
* This is not used here; it's just exported.
|
||||
*/
|
||||
Boolean isLegalUTF8Sequence(UTF8 *source, UTF8 *sourceEnd) {
|
||||
int length = trailingBytesForUTF8[*source]+1;
|
||||
if (source+length > sourceEnd) {
|
||||
return false;
|
||||
}
|
||||
return isLegalUTF8(source, length);
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------- */
|
||||
|
||||
ConversionResult ConvertUTF8toUTF16 (
|
||||
UTF8** sourceStart, UTF8* sourceEnd,
|
||||
UTF16** targetStart, const UTF16* targetEnd, const ConversionFlags flags) {
|
||||
ConversionResult result = conversionOK;
|
||||
UTF8* source = *sourceStart;
|
||||
UTF16* target = *targetStart;
|
||||
while (source < sourceEnd) {
|
||||
UTF32 ch = 0;
|
||||
unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
|
||||
if (source + extraBytesToRead >= sourceEnd) {
|
||||
result = sourceExhausted; break;
|
||||
}
|
||||
/* Do this check whether lenient or strict */
|
||||
if (! isLegalUTF8(source, extraBytesToRead+1)) {
|
||||
result = sourceIllegal;
|
||||
break;
|
||||
}
|
||||
/*
|
||||
* The cases all fall through. See "Note A" below.
|
||||
*/
|
||||
switch (extraBytesToRead) {
|
||||
case 3: ch += *source++; ch <<= 6;
|
||||
case 2: ch += *source++; ch <<= 6;
|
||||
case 1: ch += *source++; ch <<= 6;
|
||||
case 0: ch += *source++;
|
||||
}
|
||||
ch -= offsetsFromUTF8[extraBytesToRead];
|
||||
|
||||
if (target >= targetEnd) {
|
||||
result = targetExhausted; break;
|
||||
}
|
||||
if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */
|
||||
if ((flags == strictConversion) && (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END)) {
|
||||
--source; /* return to the illegal value itself */
|
||||
result = sourceIllegal;
|
||||
break;
|
||||
} else {
|
||||
*target++ = (UTF16) ch; /* normal case */
|
||||
}
|
||||
} else if (ch > UNI_MAX_UTF16) {
|
||||
if (flags == strictConversion) {
|
||||
result = sourceIllegal;
|
||||
source -= extraBytesToRead; /* return to the start */
|
||||
} else {
|
||||
*target++ = UNI_REPLACEMENT_CHAR;
|
||||
}
|
||||
} else {
|
||||
/* target is a character in range 0xFFFF - 0x10FFFF. */
|
||||
if (target + 1 >= targetEnd) {
|
||||
result = targetExhausted; break;
|
||||
}
|
||||
ch -= halfBase;
|
||||
*target++ = (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START);
|
||||
*target++ = (UTF16)((ch & halfMask) + UNI_SUR_LOW_START);
|
||||
}
|
||||
}
|
||||
*sourceStart = source;
|
||||
*targetStart = target;
|
||||
return result;
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------- */
|
||||
|
||||
ConversionResult ConvertUTF32toUTF8 (
|
||||
UTF32** sourceStart, const UTF32* sourceEnd,
|
||||
UTF8** targetStart, const UTF8* targetEnd, const ConversionFlags flags) {
|
||||
ConversionResult result = conversionOK;
|
||||
UTF32* source = *sourceStart;
|
||||
UTF8* target = *targetStart;
|
||||
while (source < sourceEnd) {
|
||||
UTF32 ch;
|
||||
unsigned short bytesToWrite = 0;
|
||||
const UTF32 byteMask = 0xBF;
|
||||
const UTF32 byteMark = 0x80;
|
||||
ch = *source++;
|
||||
/* surrogates of any stripe are not legal UTF32 characters */
|
||||
if (flags == strictConversion ) {
|
||||
if ((ch >= UNI_SUR_HIGH_START) && (ch <= UNI_SUR_LOW_END)) {
|
||||
--source; /* return to the illegal value itself */
|
||||
result = sourceIllegal;
|
||||
break;
|
||||
}
|
||||
}
|
||||
/* Figure out how many bytes the result will require */
|
||||
if (ch < (UTF32)0x80) { bytesToWrite = 1;
|
||||
} else if (ch < (UTF32)0x800) { bytesToWrite = 2;
|
||||
} else if (ch < (UTF32)0x10000) { bytesToWrite = 3;
|
||||
} else if (ch < (UTF32)0x200000) { bytesToWrite = 4;
|
||||
} else { bytesToWrite = 2;
|
||||
ch = UNI_REPLACEMENT_CHAR;
|
||||
}
|
||||
|
||||
target += bytesToWrite;
|
||||
if (target > targetEnd) {
|
||||
target -= bytesToWrite; result = targetExhausted; break;
|
||||
}
|
||||
switch (bytesToWrite) { /* note: everything falls through. */
|
||||
case 4: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
|
||||
case 3: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
|
||||
case 2: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
|
||||
case 1: *--target = (UTF8)( ch | firstByteMark[bytesToWrite]);
|
||||
}
|
||||
target += bytesToWrite;
|
||||
}
|
||||
*sourceStart = source;
|
||||
*targetStart = target;
|
||||
return result;
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------- */
|
||||
|
||||
ConversionResult ConvertUTF8toUTF32 (
|
||||
UTF8** sourceStart, UTF8* sourceEnd,
|
||||
UTF32** targetStart, const UTF32* targetEnd, const ConversionFlags flags) {
|
||||
ConversionResult result = conversionOK;
|
||||
UTF8* source = *sourceStart;
|
||||
UTF32* target = *targetStart;
|
||||
while (source < sourceEnd) {
|
||||
UTF32 ch = 0;
|
||||
unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
|
||||
if (source + extraBytesToRead >= sourceEnd) {
|
||||
result = sourceExhausted; break;
|
||||
}
|
||||
/* Do this check whether lenient or strict */
|
||||
if (! isLegalUTF8(source, extraBytesToRead+1)) {
|
||||
result = sourceIllegal;
|
||||
break;
|
||||
}
|
||||
/*
|
||||
* The cases all fall through. See "Note A" below.
|
||||
*/
|
||||
switch (extraBytesToRead) {
|
||||
case 3: ch += *source++; ch <<= 6;
|
||||
case 2: ch += *source++; ch <<= 6;
|
||||
case 1: ch += *source++; ch <<= 6;
|
||||
case 0: ch += *source++;
|
||||
}
|
||||
ch -= offsetsFromUTF8[extraBytesToRead];
|
||||
|
||||
if (target >= targetEnd) {
|
||||
result = targetExhausted; break;
|
||||
}
|
||||
if (ch <= UNI_MAX_UTF32) {
|
||||
*target++ = ch;
|
||||
} else if (ch > UNI_MAX_UTF32) {
|
||||
*target++ = UNI_REPLACEMENT_CHAR;
|
||||
} else {
|
||||
if (target + 1 >= targetEnd) {
|
||||
result = targetExhausted; break;
|
||||
}
|
||||
ch -= halfBase;
|
||||
*target++ = (ch >> halfShift) + UNI_SUR_HIGH_START;
|
||||
*target++ = (ch & halfMask) + UNI_SUR_LOW_START;
|
||||
}
|
||||
}
|
||||
*sourceStart = source;
|
||||
*targetStart = target;
|
||||
return result;
|
||||
}
|
||||
|
||||
/* ---------------------------------------------------------------------
|
||||
|
||||
Note A.
|
||||
The fall-through switches in UTF-8 reading code save a
|
||||
temp variable, some decrements & conditionals. The switches
|
||||
are equivalent to the following loop:
|
||||
{
|
||||
int tmpBytesToRead = extraBytesToRead+1;
|
||||
do {
|
||||
ch += *source++;
|
||||
--tmpBytesToRead;
|
||||
if (tmpBytesToRead) ch <<= 6;
|
||||
} while (tmpBytesToRead > 0);
|
||||
}
|
||||
In UTF-8 writing code, the switches on "bytesToWrite" are
|
||||
similarly unrolled loops.
|
||||
|
||||
--------------------------------------------------------------------- */
|
||||
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
#include <Windows.h>
|
||||
#include "../include/keymansentry.h"
|
||||
#include "../include/keymanversion.h"
|
||||
#include "../../../include/keymanversion.h"
|
||||
#include <sentry.h>
|
||||
#include "../include/registry.h"
|
||||
#include <stdio.h>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
//
|
||||
|
||||
#include "pch.h"
|
||||
#include "../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../common/include/keymanversion.h"
|
||||
#include <iostream>
|
||||
#include <vector>
|
||||
#include <codecvt>
|
||||
|
|
@ -364,7 +364,7 @@ std::string unicode_escape(std::wstring s) {
|
|||
return r;
|
||||
}
|
||||
|
||||
#include "../../../common/windows/cpp/include/vkeys.h"
|
||||
#include "../../../common/include/vkeys.h"
|
||||
|
||||
std::wstring GetKeyName(UINT key) {
|
||||
WCHAR buf[64];
|
||||
|
|
|
|||
|
|
@ -179,7 +179,7 @@
|
|||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\vkeys.h" />
|
||||
<ClInclude Include="$(KEYMAN_ROOT)\common\include\vkeys.h" />
|
||||
<ClInclude Include="$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.h" />
|
||||
<ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\keymansentry.h" />
|
||||
<ClInclude Include="pch.h" />
|
||||
|
|
@ -192,7 +192,12 @@
|
|||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\xstring.cpp" />
|
||||
<ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\vkeys.cpp" />
|
||||
<ClCompile Include="$(KEYMAN_ROOT)\common\cpp\vkeys.cpp">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="kmanalyze.cpp" />
|
||||
<ClCompile Include="pch.cpp">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
<ClInclude Include="$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\vkeys.h">
|
||||
<ClInclude Include="$(KEYMAN_ROOT)\common\include\vkeys.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
<ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keymansentry.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\vkeys.cpp">
|
||||
<ClCompile Include="$(KEYMAN_ROOT)\common\cpp\vkeys.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
#include "pch.h"
|
||||
|
||||
#include "km_u16.h"
|
||||
#include "../../../../common/windows/cpp/include/vkeys.h"
|
||||
#include "../../../../common/include/vkeys.h"
|
||||
|
||||
#include "compfile.h"
|
||||
#include "kmn_compiler_errors.h"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
#include "DeprecationChecks.h"
|
||||
#include "versioning.h"
|
||||
#include "CompileKeyboardBuffer.h"
|
||||
#include "../../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../../common/include/keymanversion.h"
|
||||
|
||||
namespace kmcmp {
|
||||
void CopyExtraData(PFILE_KEYBOARD fk);
|
||||
|
|
|
|||
|
|
@ -70,7 +70,6 @@
|
|||
|
||||
#include "compfile.h"
|
||||
#include <kmn_compiler_errors.h>
|
||||
#include "../../../../common/windows/cpp/include/vkeys.h"
|
||||
#include <cuchar>
|
||||
#include "versioning.h"
|
||||
#include "kmcmplib.h"
|
||||
|
|
@ -78,11 +77,10 @@
|
|||
#include "cp1252.h"
|
||||
#include "virtualcharkeys.h"
|
||||
|
||||
// TODO: These three should be under common/cpp/include -- not windows specific
|
||||
#include "../../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../../common/windows/cpp/include/crc32.h"
|
||||
#include "../../../../common/windows/cpp/include/ConvertUTF.h"
|
||||
#include "../../../../common/include/vkeys.h"
|
||||
#include "../../../../common/include/keymanversion.h"
|
||||
|
||||
#include "crc32.h"
|
||||
#include "debugstore.h"
|
||||
#include "NamedCodeConstants.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -2,9 +2,11 @@
|
|||
#include <kmcmplibapi.h>
|
||||
#include <kmn_compiler_errors.h>
|
||||
#include "kmcmplib.h"
|
||||
#include "../../../../common/windows/cpp/include/ConvertUTF.h"
|
||||
#include "CompileKeyboardBuffer.h"
|
||||
|
||||
#define UTF8Sig "\xEF\xBB\xBF"
|
||||
#define UTF16Sig "\xFF\xFE"
|
||||
|
||||
EXTERN bool kmcmp_CompileKeyboard(
|
||||
const char* pszInfile,
|
||||
const KMCMP_COMPILER_OPTIONS& options,
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
#include "compfile.h"
|
||||
#include <kmn_compiler_errors.h>
|
||||
#include "../../../../common/windows/cpp/include/vkeys.h"
|
||||
#include "../../../../common/include/vkeys.h"
|
||||
#include "kmcmplib.h"
|
||||
|
||||
#include <unordered_map>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
|
||||
#include "pch.h"
|
||||
|
||||
#define CRC32_POLYNOMIAL 0xEDB88320
|
||||
|
||||
unsigned long CRCTable[256];
|
||||
|
|
@ -4,8 +4,7 @@
|
|||
# Cross platform build script to compile kmcompx
|
||||
#
|
||||
|
||||
# TODO: is this required? It should be Keyman Core only
|
||||
defns += ['-DKMN_KBP_EXPORTING']
|
||||
defns += ['-DUSE_CHAR16_T=']
|
||||
version_res = []
|
||||
lib_links = []
|
||||
|
||||
|
|
@ -85,11 +84,10 @@ lib = library('kmcmplib',
|
|||
'versioning.cpp',
|
||||
'virtualcharkeys.cpp',
|
||||
'xstring.cpp',
|
||||
'crc32.cpp',
|
||||
'../../../../common/cpp/km_u16.cpp',
|
||||
'../../../../common/cpp/utfcodec.cpp',
|
||||
'../../../../common/windows/cpp/src/ConvertUTF.c',
|
||||
'../../../../common/windows/cpp/src/crc32.cpp',
|
||||
'../../../../common/windows/cpp/src/vkeys.cpp',
|
||||
'../../../../common/cpp/vkeys.cpp',
|
||||
|
||||
version_res,
|
||||
cpp_args: defns + warns + flags,
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
#include <km_u16.h>
|
||||
#include <kmcompx.h>
|
||||
|
||||
#include "../../../../common/windows/cpp/include/crc32.h"
|
||||
#include "crc32.h"
|
||||
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include "../../../common/windows/cpp/include/keymansentry.h"
|
||||
#include "../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../common/include/keymanversion.h"
|
||||
#include "../../../common/windows/cpp/include/legacy_kmx_memory.h"
|
||||
#include "../../../common/windows/cpp/include/legacy_kmx_file.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -140,7 +140,10 @@
|
|||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\common\windows\cpp\src\vkeys.cpp" />
|
||||
<ClCompile Include="..\..\..\common\cpp\vkeys.cpp">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="kmdecomp.cpp">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
|
|
@ -162,7 +165,7 @@
|
|||
<ResourceCompile Include="version.rc" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\..\common\windows\cpp\include\vkeys.h" />
|
||||
<ClInclude Include="..\..\..\common\include\vkeys.h" />
|
||||
<ClInclude Include="pch.h" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
<ClCompile Include="$(KEYMAN_ROOT)\common\windows\cpp\src\keymansentry.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\common\windows\cpp\src\vkeys.cpp">
|
||||
<ClCompile Include="..\..\..\common\cpp\vkeys.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="pch.cpp">
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
</ResourceCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\..\common\windows\cpp\include\vkeys.h">
|
||||
<ClInclude Include="..\..\..\common\include\vkeys.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="pch.h">
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
#include "../../../common/windows/cpp/include/legacy_kmx_file.h"
|
||||
#include "../../../common/windows/cpp/include/legacy_kmx_memory.h"
|
||||
#include "../../../common/windows/cpp/include/vkeys.h"
|
||||
#include "../../../common/include/vkeys.h"
|
||||
|
||||
#define SSN__PREFIX L"&"
|
||||
|
||||
|
|
@ -158,13 +158,13 @@ PWCHAR flagstr(int flag)
|
|||
return buf;
|
||||
}
|
||||
|
||||
PCWCHAR GetVKeyName(LPKEY key) // I3438
|
||||
const char* GetVKeyName(LPKEY key) // I3438
|
||||
{
|
||||
static WCHAR buf[100];
|
||||
static char buf[100];
|
||||
if(key->Key <= VK__MAX)
|
||||
return VKeyNames[key->Key];
|
||||
|
||||
wsprintfW(buf, L"%d", key->Key - 256); //TODO: Support getting the key name from the VK Dictionary
|
||||
wsprintfA(buf, "%d", key->Key - 256); //TODO: Support getting the key name from the VK Dictionary
|
||||
return buf;
|
||||
}
|
||||
|
||||
|
|
@ -178,7 +178,7 @@ PWCHAR KeyString(LPKEY key)
|
|||
wsprintfW(buf, L"[%s%c%c%c] ", flagstr(key->ShiftFlags), key->Key == L'"' ? L'\'' : L'"',
|
||||
key->Key, key->Key == L'"' ? L'\'' : L'"');
|
||||
else
|
||||
wsprintfW(buf, L"[%s%s] ", flagstr(key->ShiftFlags), GetVKeyName(key));////; //, VKeyNames[key->Key]); // I3438
|
||||
wsprintfW(buf, L"[%s%hs] ", flagstr(key->ShiftFlags), GetVKeyName(key)); // I3438
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -261,7 +261,7 @@ PWCHAR ExtString(PWCHAR str)
|
|||
//TODO: Get extended key value
|
||||
wsprintfW(p, L"[%s %d] ", flagstr(*str), *(str+1)-VK__MAX-1);
|
||||
else
|
||||
wsprintfW(p, L"[%s%s] ", flagstr(*str), VKeyNames[*(str+1)]);
|
||||
wsprintfW(p, L"[%s%hs] ", flagstr(*str), VKeyNames[*(str+1)]);
|
||||
}
|
||||
str+=2; // skip UC_SENTINEL_EXTENDEDEND
|
||||
p = wcschr(p, 0);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -257,8 +257,6 @@ void keybd_shift(LPINPUT pInputs, int* n, BOOL isReset, LPBYTE const kbd);
|
|||
#include "..\..\..\..\common\windows\cpp\include\keynames.h"
|
||||
#include "..\..\..\include\kmtip_guids.h"
|
||||
|
||||
#include "..\..\..\..\common\windows\cpp\include\crc32.h"
|
||||
|
||||
#include "k32_tsf.h"
|
||||
#include "k32_visualkeyboardinterface.h"
|
||||
#include "LowLevelHookWatchDog.h"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
#include "pch.h"
|
||||
#include "kmtip.h"
|
||||
#include "../../../../common/windows/cpp/include/vkeys.h"
|
||||
#include "../../../../common/include/vkeys.h"
|
||||
|
||||
//#define _DEBUG_LOGKEY
|
||||
|
||||
|
|
@ -279,14 +279,14 @@ HRESULT CKMTipTextService::_PreserveAltKeys(ITfKeystrokeMgr *pKeystrokeMgr) //
|
|||
hr = pKeystrokeMgr->PreserveKey(_tfClientId, _PreservedKeys[i].guid, &_PreservedKeys[i].key, NULL, 0);
|
||||
if (hr != S_OK) {
|
||||
if(_PreservedKeys[i].key.uVKey < 256)
|
||||
SendDebugMessageFormat(L"Failed to preserve key %d: %s %x, %x", i, VKeyNames[_PreservedKeys[i].key.uVKey], _PreservedKeys[i].key.uModifiers, hr);
|
||||
SendDebugMessageFormat(L"Failed to preserve key %d: %hs %x, %x", i, VKeyNames[_PreservedKeys[i].key.uVKey], _PreservedKeys[i].key.uModifiers, hr);
|
||||
else
|
||||
SendDebugMessageFormat(L"Failed to preserve key %d: %x %x, %x", i, _PreservedKeys[i].key.uVKey, _PreservedKeys[i].key.uModifiers, hr);
|
||||
}
|
||||
#ifdef _DEBUG_LOGKEY
|
||||
else {
|
||||
if (_PreservedKeys[i].key.uVKey < 256)
|
||||
SendDebugMessageFormat(L"Preserved key %d: %s %x, %x", i, VKeyNames[_PreservedKeys[i].key.uVKey], _PreservedKeys[i].key.uModifiers, hr);
|
||||
SendDebugMessageFormat(L"Preserved key %d: %hs %x, %x", i, VKeyNames[_PreservedKeys[i].key.uVKey], _PreservedKeys[i].key.uModifiers, hr);
|
||||
else
|
||||
SendDebugMessageFormat(L"Preserved key %d: %x %x, %x", i, _PreservedKeys[i].key.uVKey, _PreservedKeys[i].key.uModifiers, hr);
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -72,7 +72,7 @@
|
|||
<ClCompile Include="..\..\global\cpp\kmtip_guids.cpp">
|
||||
<Filter>Source Files\Framework</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\common\windows\cpp\src\vkeys.cpp">
|
||||
<ClCompile Include="..\..\..\..\common\cpp\vkeys.cpp">
|
||||
<Filter>Source Files\Utility</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
|
|
@ -120,7 +120,7 @@
|
|||
<ClInclude Include="..\..\..\include\kmtip_guids.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\vkeys.h">
|
||||
<ClInclude Include="$(KEYMAN_ROOT)\common\include\vkeys.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#include <windows.h>
|
||||
|
||||
#include "../../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../../common/include/keymanversion.h"
|
||||
|
||||
#ifdef _WIN64
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
#include "mcompile.h"
|
||||
#include "mc_kmxfile.h"
|
||||
#include "mc_syskbd.h"
|
||||
#include "../../../../common/windows/cpp/include/crc32.h"
|
||||
#include "../../../../common/windows/cpp/include/legacy_kmx_file.h"
|
||||
#include "../../../../common/windows/cpp/include/xstring.h"
|
||||
#include "../../../../common/windows/cpp/include/keymansentry.h"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../../../../../../../common/windows/cpp/include/keymanversion.h"
|
||||
#include "../../../../../../../../common/include/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue