erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-27 01:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(windows): create header for keyman guids

Browse source
This commit is contained in:
Ross 2022-03-21 14:58:43 +10:00
parent dbc950741a
commit 79fa9f8a86
13 changed files with 54 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
windows/src/engine/keyman32/Keyman32.vcxproj
View file

@ -173,6 +173,7 @@
</Manifest>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\global\vc\keymankeyboard_id.cpp" />
<ClCompile Include="..\..\global\vc\xstring.cpp" />
<ClCompile Include="addins.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -364,6 +365,7 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\global\inc\keymanengine.h" />
<ClInclude Include="..\..\global\inc\keymankeyboard_id.h" />
<ClInclude Include="addins.h" />
<ClInclude Include="appint\aiTIP.h" />
<ClInclude Include="appint\aiWin2000Unicode.h" />
@ -397,4 +399,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

8
windows/src/engine/keyman32/Keyman32.vcxproj.filters
View file

@ -138,6 +138,9 @@
<ClCompile Include="kmprocessactions.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\global\vc\keymankeyboard_id.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="KEYMAN32.DEF">
@ -249,8 +252,11 @@
<ClInclude Include="kmprocessactions.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\global\inc\keymankeyboard_id.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="keyman-debug-etw.man" />
</ItemGroup>
</Project>
</Project>

4
windows/src/engine/keyman32/globals.h
View file

@ -61,6 +61,8 @@
#include "serialkeyeventclient.h"
#include "SharedBuffers.h"
#include "keymankeyboard_id.h"
class Globals
{
public:
@ -307,7 +309,5 @@ void WINAPI SetCustomPostKeyCallback(CUSTOMPOSTKEYCALLBACKPROC proc);
extern BOOL isKeymanKeyboardActive; // is the active keyboard a Keyman keyboard
/* FE0420F1-38D1-4B4C-96BF-E7E20A74CFB7 Keyman keyboard guid */
extern const CLSID c_clsidKMTipTextService;
#endif

2
windows/src/engine/keyman32/k32_globals.cpp
View file

@ -96,8 +96,6 @@ BOOL
BOOL isKeymanKeyboardActive = FALSE;
const CLSID c_clsidKMTipTextService = {0xFE0420F1, 0x38D1, 0x4B4C, {0x96, 0xBF, 0xE7, 0xE2, 0x0A, 0x74, 0xCF, 0xB7}};
static DWORD dwTlsIndex = TLS_OUT_OF_INDEXES;
static CRITICAL_SECTION csGlobals;

4
windows/src/engine/keyman64/keyman64.vcxproj
View file

@ -175,6 +175,7 @@
</Bscmake>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\global\vc\keymankeyboard_id.cpp" />
<ClCompile Include="..\..\global\vc\xstring.cpp" />
<ClCompile Include="..\keyman32\addins.cpp" />
<ClCompile Include="..\keyman32\appint\aiTIP.cpp" />
@ -282,6 +283,7 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\global\inc\keymanengine.h" />
<ClInclude Include="..\..\global\inc\keymankeyboard_id.h" />
<ClInclude Include="..\keyman32\addins.h" />
<ClInclude Include="..\keyman32\appint\aiTIP.h" />
<ClInclude Include="..\keyman32\appint\aiWin2000Unicode.h" />
@ -346,4 +348,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

2
windows/src/engine/keyman64/keyman64.vcxproj.filters
View file

@ -38,6 +38,7 @@
<ClCompile Include="..\keyman32\VKScanCodes.cpp" />
<ClCompile Include="..\keyman32\DebugEventTrace.cpp" />
<ClCompile Include="..\keyman32\kmprocessactions.cpp" />
<ClCompile Include="..\..\global\vc\keymankeyboard_id.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\keyman32\addins.h" />
@ -86,6 +87,7 @@
<ClInclude Include="..\keyman32\vkscancodes.h" />
<ClInclude Include="..\..\global\inc\keymanengine.h" />
<ClInclude Include="..\keyman32\kmprocessactions.h" />
<ClInclude Include="..\..\global\inc\keymankeyboard_id.h" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\keyman32\keyman-debug-etw.man" />

16
windows/src/engine/kmtip/globals.cpp
View file

@ -1,18 +1,18 @@
/*
Name: globals
Copyright: Copyright (C) SIL International.
Documentation:
Description:
Documentation:
Description:
Create Date: 19 Jun 2007
Modified Date: 14 Aug 2014
Authors: mcdurdin
Related Files:
Dependencies:
Related Files:
Dependencies:
Bugs:
Todo:
Notes:
Bugs:
Todo:
Notes:
History: 19 Jun 2007 - mcdurdin - Initial comments
24 Oct 2012 - mcdurdin - I3481 - V9.0 - Eliminate unsafe calls in C++
17 Nov 2012 - mcdurdin - I3563 - V9.0 - Add output to debug window for KMTIP logging
@ -33,8 +33,6 @@ LONG g_cRefDll = -1; // -1 /w no refs, for win95 InterlockedIncrement/Decrement
CRITICAL_SECTION g_cs;
/* FE0420F1-38D1-4B4C-96BF-E7E20A74CFB7 */
const CLSID c_clsidKMTipTextService = { 0xFE0420F1, 0x38D1, 0x4B4C, { 0x96, 0xBF, 0xE7, 0xE2, 0x0A, 0x74, 0xCF, 0xB7 } };
/*
LOGGING

3
windows/src/engine/kmtip/globals.h
View file

@ -29,6 +29,7 @@
#ifndef GLOBALS_H
#define GLOBALS_H
#include "keymankeyboard_id.h"
#define assert(x)
//
@ -106,7 +107,7 @@ extern CRITICAL_SECTION g_cs;
extern DWORD g_dwDeepIntegration; // I4375
extern const CLSID c_clsidKMTipTextService;
//extern const CLSID c_clsidKMTipTextService;
extern const GUID c_guidKeymanDeadkeysProp;

3
windows/src/engine/kmtip/kmtip.vcxproj
View file

@ -104,7 +104,6 @@
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">kmtip64</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">kmtip64</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -276,6 +275,7 @@
</Bscmake>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\global\vc\keymankeyboard_id.cpp" />
<ClCompile Include="debug.cpp" />
<ClCompile Include="keyman32interface.cpp" />
<ClCompile Include="keys.cpp">
@ -417,6 +417,7 @@
<ItemGroup>
<ClInclude Include="..\..\global\inc\certificate_check.h" />
<ClInclude Include="..\..\global\inc\Compiler.h" />
<ClInclude Include="..\..\global\inc\keymankeyboard_id.h" />
<ClInclude Include="editsess.h" />
<ClInclude Include="globals.h" />
<ClInclude Include="..\..\global\inc\KEYNAMES.H" />

6
windows/src/engine/kmtip/kmtip.vcxproj.filters
View file

@ -69,6 +69,9 @@
<ClCompile Include="keyman32interface.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\global\vc\keymankeyboard_id.cpp">
<Filter>Source Files\Framework</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="kmtip.def">
@ -108,5 +111,8 @@
<ClInclude Include="pch.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\global\inc\keymankeyboard_id.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>

1
windows/src/global/inc/keymanengine.h
View file

@ -265,6 +265,7 @@ void keybd_shift(LPINPUT pInputs, int* n, BOOL isReset, LPBYTE const kbd);
#include "testkeymanfunctioning.h"
#include "keynames.h"
#include "keymankeyboard_id.h"
#include "crc32.h"

16
windows/src/global/inc/keymankeyboard_id.h Normal file
View file

@ -0,0 +1,16 @@
/*
* Keyman is copyright (C) SIL International. MIT License.
*
* Name: KeymanKeyboardIID
* Description: Header file to include the keyman keyboard GUIDs
*/
#ifndef _keymankeyboard_id_h
#define _keymankeyboard_id_h
//const c_clsidKMTipTextService: TGUID = '{FE0420F1-38D1-4B4C-96BF-E7E20A74CFB7}'; // version 10.0
//const c_clsidKMTipTextService_90: TGUID = '{487EB753-DB93-48C5-9E6A-4398E777C61D}'; // I3663 // I4248
//const c_clsidTextServicesFramework: TGUID = '{529A9E6B-6587-4F23-AB9E-9C7D683E3C50}';
/* FE0420F1-38D1-4B4C-96BF-E7E20A74CFB7 Keyman keyboard guid */
extern const CLSID c_clsidKMTipTextService;
#endif

3
windows/src/global/vc/keymankeyboard_id.cpp Normal file
View file

@ -0,0 +1,3 @@
#include "pch.h"
const CLSID c_clsidKMTipTextService = {0xFE0420F1, 0x38D1, 0x4B4C, {0x96, 0xBF, 0xE7, 0xE2, 0x0A, 0x74, 0xCF, 0xB7}};