erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-05 00:15:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

chore(windows): move kmtip_guids.h and testkeymanfunctioning.h

Browse source
This commit is contained in:
Marc Durdin 2022-06-12 07:43:24 +10:00
parent 9e82542714
commit ae0810bc5e
11 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
windows/src/global/inc/kmtip_guids.h → windows/include/kmtip_guids.h
View file

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

@ -359,7 +359,7 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="keymanengine.h" />
<ClInclude Include="..\..\global\inc\kmtip_guids.h" />
<ClInclude Include="..\..\..\include\kmtip_guids.h" />
<ClInclude Include="addins.h" />
<ClInclude Include="appint\aiTIP.h" />
<ClInclude Include="appint\aiWin2000Unicode.h" />

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

@ -246,7 +246,7 @@
<ClInclude Include="kmprocessactions.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\global\inc\kmtip_guids.h">
<ClInclude Include="..\..\..\include\kmtip_guids.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>

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

@ -61,7 +61,7 @@
#include "serialkeyeventclient.h"
#include "SharedBuffers.h"
#include "kmtip_guids.h"
#include "..\..\..\include\kmtip_guids.h"
class Globals
{

2
windows/src/engine/keyman32/keymanengine.h
View file

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

0
windows/src/global/inc/testkeymanfunctioning.h → windows/src/engine/keyman32/testkeymanfunctioning.h
View file

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

@ -277,7 +277,7 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\keyman32\keymanengine.h" />
<ClInclude Include="..\..\global\inc\kmtip_guids.h" />
<ClInclude Include="..\..\..\include\kmtip_guids.h" />
<ClInclude Include="..\keyman32\addins.h" />
<ClInclude Include="..\keyman32\appint\aiTIP.h" />
<ClInclude Include="..\keyman32\appint\aiWin2000Unicode.h" />
@ -314,7 +314,7 @@
<ClInclude Include="..\keyman32\serialkeyeventserver.h" />
<ClInclude Include="..\keyman32\SharedBuffers.h" />
<ClInclude Include="..\keyman32\syskbd.h" />
<ClInclude Include="..\..\global\inc\testkeymanfunctioning.h" />
<ClInclude Include="..\keyman32\testkeymanfunctioning.h" />
<ClInclude Include="..\..\global\inc\unicode.h" />
<ClInclude Include="..\keyman32\vkscancodes.h" />
</ItemGroup>

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

@ -75,12 +75,12 @@
<ClInclude Include="..\keyman32\serialkeyeventserver.h" />
<ClInclude Include="..\keyman32\SharedBuffers.h" />
<ClInclude Include="..\keyman32\syskbd.h" />
<ClInclude Include="..\..\global\inc\testkeymanfunctioning.h" />
<ClInclude Include="..\keyman32\testkeymanfunctioning.h" />
<ClInclude Include="..\..\global\inc\unicode.h" />
<ClInclude Include="..\keyman32\vkscancodes.h" />
<ClInclude Include="..\keyman32\keymanengine.h" />
<ClInclude Include="..\keyman32\kmprocessactions.h" />
<ClInclude Include="..\..\global\inc\kmtip_guids.h" />
<ClInclude Include="..\..\..\include\kmtip_guids.h" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\keyman32\keyman-debug-etw.man" />

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

@ -1,18 +1,18 @@
/*
Name: globals
Copyright: Copyright (C) SIL International.
Documentation:
Description:
Documentation:
Description:
Create Date: 1 Aug 2006
Modified Date: 28 Mar 2016
Authors: mcdurdin
Related Files:
Dependencies:
Related Files:
Dependencies:
Bugs:
Todo:
Notes:
Bugs:
Todo:
Notes:
History: 01 Aug 2006 - mcdurdin - Removed ARRAYSIZE define
05 Nov 2007 - mcdurdin - CHange msctf reference
07 Sep 2009 - mcdurdin - I2095 - Threadsafe
@ -29,7 +29,7 @@
#ifndef GLOBALS_H
#define GLOBALS_H
#include "kmtip_guids.h"
#include "..\..\..\include\kmtip_guids.h"
#define assert(x)
//
@ -57,7 +57,7 @@ void Log(WCHAR *fmt, ...);
BOOL ShouldDebug();
int SendDebugMessage_1(char *file, int line, PWCHAR msg); // I4379
int SendDebugMessageFormat_1(char *file, int line, PWCHAR fmt, ...); // I4379
void DebugLastError_1(char *file, int line, char *func, PWCHAR msg, DWORD err);
void DebugLastError_1(char *file, int line, char *func, PWCHAR msg, DWORD err);
#define SendDebugMessage(msg) (SendDebugMessage_1(__FILE__, __LINE__, (msg)))
#define SendDebugMessageFormat(msg,...) (SendDebugMessageFormat_1(__FILE__, __LINE__, (msg),__VA_ARGS__))
@ -88,7 +88,7 @@ BOOL _LogSUCCEEDED(char *file, int line, PWSTR caller, PSTR callee, HRESULT hr);
{ \
(punk)->Release(); \
} \
}
}
#define SafeReleaseClear(punk) \
{ \
@ -97,7 +97,7 @@ BOOL _LogSUCCEEDED(char *file, int line, PWSTR caller, PSTR callee, HRESULT hr);
(punk)->Release(); \
(punk) = NULL; \
} \
}
}
extern HINSTANCE g_hInst;

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

@ -419,7 +419,7 @@
<ClInclude Include="..\..\..\..\common\windows\cpp\include\vkeys.h" />
<ClInclude Include="..\..\global\inc\certificate_check.h" />
<ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\legacy_kmx_file.h" />
<ClInclude Include="..\..\global\inc\kmtip_guids.h" />
<ClInclude Include="..\..\..\include\kmtip_guids.h" />
<ClInclude Include="editsess.h" />
<ClInclude Include="globals.h" />
<ClInclude Include="..\..\global\inc\KEYNAMES.H" />

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

@ -114,7 +114,7 @@
<ClInclude Include="pch.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\global\inc\kmtip_guids.h">
<ClInclude Include="..\..\..\include\kmtip_guids.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\common\windows\cpp\include\vkeys.h">