Skip to content

Commit

Permalink
change default display attribute
Browse files Browse the repository at this point in the history
  • Loading branch information
@nathancorvussolis
nathancorvussolis committed Jan 11, 2016
1 parent 4e5c3b6 commit e90a1c4
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 21 deletions.
20 changes: 11 additions & 9 deletions common/common.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const TF_DISPLAYATTRIBUTE c_daDisplayAttributeInputText =

const TF_DISPLAYATTRIBUTE c_daDisplayAttributeInputOkuri =
{
{TF_CT_NONE, RGB(0x00, 0x80, 0xFF)}, // TF_DA_COLOR crText;
{TF_CT_NONE, RGB(0x00, 0x00, 0x00)}, // TF_DA_COLOR crText;
{TF_CT_NONE, RGB(0xFF, 0xFF, 0xFF)}, // TF_DA_COLOR crBk;
TF_LS_DASH, // TF_DA_LINESTYLE lsStyle;
FALSE, // BOOL fBoldLine;
Expand All @@ -65,8 +65,8 @@ const TF_DISPLAYATTRIBUTE c_daDisplayAttributeConvMark =

const TF_DISPLAYATTRIBUTE c_daDisplayAttributeConvText =
{
{TF_CT_COLORREF, RGB(0xFF, 0xFF, 0xFF)}, // TF_DA_COLOR crText;
{TF_CT_COLORREF, RGB(0x00, 0x80, 0xFF)}, // TF_DA_COLOR crBk;
{TF_CT_NONE, RGB(0x00, 0x00, 0x00)}, // TF_DA_COLOR crText;
{TF_CT_NONE, RGB(0xFF, 0xFF, 0xFF)}, // TF_DA_COLOR crBk;
TF_LS_NONE, // TF_DA_LINESTYLE lsStyle;
FALSE, // BOOL fBoldLine;
{TF_CT_NONE, 0}, // TF_DA_COLOR crLine;
Expand Down Expand Up @@ -255,11 +255,11 @@ BOOL GetLogonSessionData(PSECURITY_LOGON_SESSION_DATA *ppLogonSessionData)
{
if(tokenElevationType == TokenElevationTypeFull)
{
TOKEN_LINKED_TOKEN linkedToken;
if(GetTokenInformation(hToken, TokenLinkedToken, &linkedToken, sizeof(linkedToken), &dwLength))
TOKEN_LINKED_TOKEN tokenLinkedToken;
if(GetTokenInformation(hToken, TokenLinkedToken, &tokenLinkedToken, sizeof(tokenLinkedToken), &dwLength))
{
CloseHandle(hToken);
hToken = linkedToken.LinkedToken;
hToken = tokenLinkedToken.LinkedToken;
}
}
}
Expand Down Expand Up @@ -294,9 +294,11 @@ BOOL GetUserUUID(LPWSTR *ppszUUID)

if(GetLogonSessionData(&pLogonSessionData))
{
LARGE_INTEGER ldata[] = {
{pLogonSessionData->LogonId.LowPart, pLogonSessionData->LogonId.HighPart},
{pLogonSessionData->LogonTime.LowPart, pLogonSessionData->LogonTime.HighPart}
DWORD ldata[] = {
pLogonSessionData->LogonId.LowPart,
(DWORD)pLogonSessionData->LogonId.HighPart,
pLogonSessionData->LogonTime.LowPart,
(DWORD)pLogonSessionData->LogonTime.HighPart,
};
DWORD dwLogonInfoLen = sizeof(ldata) + GetLengthSid(pLogonSessionData->Sid);

Expand Down
4 changes: 2 additions & 2 deletions installer/config-sample/config - act.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@
<section name="displayattr">
<key name="inputmark" value="0,0,0x000000,0,0xFFFFFF,2,0,0,0x000000,0" />
<key name="inputtext" value="1,0,0x000000,0,0xFFFFFF,2,0,0,0x000000,0" />
<key name="inputokuri" value="0,0,0xFF8000,0,0xFFFFFF,3,0,0,0x000000,5" />
<key name="inputokuri" value="0,0,0x000000,0,0xFFFFFF,3,0,0,0x000000,5" />
<key name="convmark" value="0,0,0x000000,0,0xFFFFFF,1,0,0,0x000000,1" />
<key name="convtext" value="1,2,0xFFFFFF,2,0xFF8000,0,0,0,0x000000,1" />
<key name="convtext" value="1,0,0x000000,0,0xFFFFFF,0,0,0,0x000000,1" />
<key name="convokuri" value="1,0,0x000000,0,0xFFFFFF,1,0,0,0x000000,5" />
<key name="convannot" value="0,0,0x000000,0,0xFFFFFF,3,0,0,0x000000,2" />
</section>
Expand Down
4 changes: 2 additions & 2 deletions installer/config-sample/config - azik-jpkbd.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@
<section name="displayattr">
<key name="inputmark" value="0,0,0x000000,0,0xFFFFFF,2,0,0,0x000000,0" />
<key name="inputtext" value="1,0,0x000000,0,0xFFFFFF,2,0,0,0x000000,0" />
<key name="inputokuri" value="0,0,0xFF8000,0,0xFFFFFF,3,0,0,0x000000,5" />
<key name="inputokuri" value="0,0,0x000000,0,0xFFFFFF,3,0,0,0x000000,5" />
<key name="convmark" value="0,0,0x000000,0,0xFFFFFF,1,0,0,0x000000,1" />
<key name="convtext" value="1,2,0xFFFFFF,2,0xFF8000,0,0,0,0x000000,1" />
<key name="convtext" value="1,0,0x000000,0,0xFFFFFF,0,0,0,0x000000,1" />
<key name="convokuri" value="1,0,0x000000,0,0xFFFFFF,1,0,0,0x000000,5" />
<key name="convannot" value="0,0,0x000000,0,0xFFFFFF,3,0,0,0x000000,2" />
</section>
Expand Down
4 changes: 2 additions & 2 deletions installer/config-sample/config - azik-uskbd.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@
<section name="displayattr">
<key name="inputmark" value="0,0,0x000000,0,0xFFFFFF,2,0,0,0x000000,0" />
<key name="inputtext" value="1,0,0x000000,0,0xFFFFFF,2,0,0,0x000000,0" />
<key name="inputokuri" value="0,0,0xFF8000,0,0xFFFFFF,3,0,0,0x000000,5" />
<key name="inputokuri" value="0,0,0x000000,0,0xFFFFFF,3,0,0,0x000000,5" />
<key name="convmark" value="0,0,0x000000,0,0xFFFFFF,1,0,0,0x000000,1" />
<key name="convtext" value="1,2,0xFFFFFF,2,0xFF8000,0,0,0,0x000000,1" />
<key name="convtext" value="1,0,0x000000,0,0xFFFFFF,0,0,0,0x000000,1" />
<key name="convokuri" value="1,0,0x000000,0,0xFFFFFF,1,0,0,0x000000,5" />
<key name="convannot" value="0,0,0x000000,0,0xFFFFFF,3,0,0,0x000000,2" />
</section>
Expand Down
4 changes: 2 additions & 2 deletions installer/config-sample/config - gact10.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@
<section name="displayattr">
<key name="inputmark" value="0,0,0x000000,0,0xFFFFFF,2,0,0,0x000000,0" />
<key name="inputtext" value="1,0,0x000000,0,0xFFFFFF,2,0,0,0x000000,0" />
<key name="inputokuri" value="0,0,0xFF8000,0,0xFFFFFF,3,0,0,0x000000,5" />
<key name="inputokuri" value="0,0,0x000000,0,0xFFFFFF,3,0,0,0x000000,5" />
<key name="convmark" value="0,0,0x000000,0,0xFFFFFF,1,0,0,0x000000,1" />
<key name="convtext" value="1,2,0xFFFFFF,2,0xFF8000,0,0,0,0x000000,1" />
<key name="convtext" value="1,0,0x000000,0,0xFFFFFF,0,0,0,0x000000,1" />
<key name="convokuri" value="1,0,0x000000,0,0xFFFFFF,1,0,0,0x000000,5" />
<key name="convannot" value="0,0,0x000000,0,0xFFFFFF,3,0,0,0x000000,2" />
</section>
Expand Down
4 changes: 2 additions & 2 deletions installer/config-sample/config - kana.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@
<section name="displayattr">
<key name="inputmark" value="0,0,0x000000,0,0xFFFFFF,2,0,0,0x000000,0" />
<key name="inputtext" value="1,0,0x000000,0,0xFFFFFF,2,0,0,0x000000,0" />
<key name="inputokuri" value="0,0,0xFF8000,0,0xFFFFFF,3,0,0,0x000000,5" />
<key name="inputokuri" value="0,0,0x000000,0,0xFFFFFF,3,0,0,0x000000,5" />
<key name="convmark" value="0,0,0x000000,0,0xFFFFFF,1,0,0,0x000000,1" />
<key name="convtext" value="1,2,0xFFFFFF,2,0xFF8000,0,0,0,0x000000,1" />
<key name="convtext" value="1,0,0x000000,0,0xFFFFFF,0,0,0,0x000000,1" />
<key name="convokuri" value="1,0,0x000000,0,0xFFFFFF,1,0,0,0x000000,5" />
<key name="convannot" value="0,0,0x000000,0,0xFFFFFF,3,0,0,0x000000,2" />
</section>
Expand Down
4 changes: 2 additions & 2 deletions installer/config-sample/config - roman.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@
<section name="displayattr">
<key name="inputmark" value="0,0,0x000000,0,0xFFFFFF,2,0,0,0x000000,0" />
<key name="inputtext" value="1,0,0x000000,0,0xFFFFFF,2,0,0,0x000000,0" />
<key name="inputokuri" value="0,0,0xFF8000,0,0xFFFFFF,3,0,0,0x000000,5" />
<key name="inputokuri" value="0,0,0x000000,0,0xFFFFFF,3,0,0,0x000000,5" />
<key name="convmark" value="0,0,0x000000,0,0xFFFFFF,1,0,0,0x000000,1" />
<key name="convtext" value="1,2,0xFFFFFF,2,0xFF8000,0,0,0,0x000000,1" />
<key name="convtext" value="1,0,0x000000,0,0xFFFFFF,0,0,0,0x000000,1" />
<key name="convokuri" value="1,0,0x000000,0,0xFFFFFF,1,0,0,0x000000,5" />
<key name="convannot" value="0,0,0x000000,0,0xFFFFFF,3,0,0,0x000000,2" />
</section>
Expand Down

0 comments on commit e90a1c4

Please sign in to comment.