Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 74193: [USP10] Sync with Wine Staging 2.2. CORE-12823 d00f731 usp10: Itemise ZWSP like ZWNJ and ZWJ. 721fbf6 usp10: Explicitly check for zero-width control characters in ScriptShapeOpenTy...
by akhaldi＠svn.reactos.org 19 Mar '17

19 Mar '17

Author: akhaldi Date: Sun Mar 19 16:53:04 2017 New Revision: 74193 URL: http://svn.reactos.org/svn/reactos?rev=74193&view=rev Log: [USP10] Sync with Wine Staging 2.2. CORE-12823 d00f731 usp10: Itemise ZWSP like ZWNJ and ZWJ. 721fbf6 usp10: Explicitly check for zero-width control characters in ScriptShapeOpenType(). 7e6a4b2 usp10: Fix LB27 rule that should check for prefix, not suffix. c4626bb usp10: Fixed LB30 condition, breaking after CP class. 0c14195 usp10: Apply 'ccmp' before Arabic contextual shaping. e2d4cf9 usp10: Fix next index for RTL MultipleSubst. 0401bdf usp10: Change GSUB_E_NOGLYPH value. 10e9adf usp10: Fix Contextual Shaping for Languages with RTL write order. 961e1e6 usp10: Fix ScriptRecordDigitSubstitution spec file entry. aae5a83 usp10: Implement Chaining Context Substitution Format 2: Class-based Chaining Context Glyph Substitution. b98a70a usp10: Implement Contextual Positioning Subtable: Format 2. 5e6b2c0 usp10: Implement GSUB Context Substitution types 1 and 2. c705eca usp10: A spelling fix in a comment. Modified: trunk/reactos/dll/win32/usp10/breaking.c trunk/reactos/dll/win32/usp10/opentype.c trunk/reactos/dll/win32/usp10/shape.c trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/dll/win32/usp10/usp10.spec trunk/reactos/dll/win32/usp10/usp10_internal.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/usp10/breaking.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/breaking.c… ============================================================================== --- trunk/reactos/dll/win32/usp10/breaking.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/breaking.c [iso-8859-1] Sun Mar 19 16:53:04 2017 @@ -371,7 +371,7 @@ if (break_class[i+1] == b_IN || break_class[i+1] == b_PO) else_break(&break_before[i+1],b_x); } - if (break_class[i] == b_PO) + if (break_class[i] == b_PR) { switch (break_class[i+1]) { @@ -401,7 +401,7 @@ break_class[i+1] == b_OP) else_break(&break_before[i+1],b_x); if (break_class[i] == b_CP && - (break_class[i+1] == b_AL || break_class[i] == b_HL || break_class[i] == b_NU)) + (break_class[i+1] == b_AL || break_class[i+1] == b_HL || break_class[i+1] == b_NU)) else_break(&break_before[i+1],b_x); /* LB30a */ Modified: trunk/reactos/dll/win32/usp10/opentype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/opentype.c… ============================================================================== --- trunk/reactos/dll/win32/usp10/opentype.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/opentype.c [iso-8859-1] Sun Mar 19 16:53:04 2017 @@ -228,11 +228,91 @@ }GSUB_SubstLookupRecord; typedef struct{ + WORD SubstFormat; + WORD Coverage; + WORD SubRuleSetCount; + WORD SubRuleSet[1]; +}GSUB_ContextSubstFormat1; + +typedef struct{ + WORD SubRuleCount; + WORD SubRule[1]; +}GSUB_SubRuleSet; + +typedef struct { + WORD GlyphCount; + WORD SubstCount; + WORD Input[1]; +}GSUB_SubRule_1; + +typedef struct { + GSUB_SubstLookupRecord SubstLookupRecord[1]; +}GSUB_SubRule_2; + +typedef struct { + WORD SubstFormat; + WORD Coverage; + WORD ClassDef; + WORD SubClassSetCnt; + WORD SubClassSet[1]; +}GSUB_ContextSubstFormat2; + +typedef struct { + WORD SubClassRuleCnt; + WORD SubClassRule[1]; +}GSUB_SubClassSet; + +typedef struct { + WORD GlyphCount; + WORD SubstCount; + WORD Class[1]; +}GSUB_SubClassRule_1; + +typedef struct { + GSUB_SubstLookupRecord SubstLookupRecord[1]; +}GSUB_SubClassRule_2; + +typedef struct{ WORD SubstFormat; /* = 1 */ WORD Coverage; WORD ChainSubRuleSetCount; WORD ChainSubRuleSet[1]; }GSUB_ChainContextSubstFormat1; + +typedef struct { + WORD SubstFormat; /* = 2 */ + WORD Coverage; + WORD BacktrackClassDef; + WORD InputClassDef; + WORD LookaheadClassDef; + WORD ChainSubClassSetCnt; + WORD ChainSubClassSet[1]; +}GSUB_ChainContextSubstFormat2; + +typedef struct { + WORD ChainSubClassRuleCnt; + WORD ChainSubClassRule[1]; +}GSUB_ChainSubClassSet; + +typedef struct { + WORD BacktrackGlyphCount; + WORD Backtrack[1]; +}GSUB_ChainSubClassRule_1; + +typedef struct { + WORD InputGlyphCount; + WORD Input[1]; +}GSUB_ChainSubClassRule_2; + +typedef struct { + WORD LookaheadGlyphCount; + WORD LookAhead[1]; +}GSUB_ChainSubClassRule_3; + +typedef struct { + WORD SubstCount; + GSUB_SubstLookupRecord SubstLookupRecord[1]; +}GSUB_ChainSubClassRule_4; typedef struct { WORD SubstFormat; /* = 3 */ @@ -453,6 +533,29 @@ WORD SequenceIndex; WORD LookupListIndex; } GPOS_PosLookupRecord; + +typedef struct { + WORD PosFormat; + WORD Coverage; + WORD ClassDef; + WORD PosClassSetCnt; + WORD PosClassSet[1]; +} GPOS_ContextPosFormat2; + +typedef struct { + WORD PosClassRuleCnt; + WORD PosClassRule[1]; +} GPOS_PosClassSet; + +typedef struct { + WORD GlyphCount; + WORD PosCount; + WORD Class[1]; +} GPOS_PosClassRule_1; + +typedef struct { + GPOS_PosLookupRecord PosLookupRecord[1]; +} GPOS_PosClassRule_2; typedef struct { WORD PosFormat; @@ -827,7 +930,10 @@ TRACE("\n"); } - return glyph_index + (sub_count * write_dir); + if (write_dir > 0) + return glyph_index + sub_count; + else + return glyph_index - 1; } } return GSUB_E_NOGLYPH; @@ -930,6 +1036,151 @@ return GSUB_E_NOGLYPH; } +static INT GSUB_apply_ContextSubst(const OT_LookupList* lookup, const OT_LookupTable *look, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) +{ + int j; + TRACE("Context Substitution Subtable\n"); + for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) + { + const GSUB_ContextSubstFormat1 *csf1; + + csf1 = (const GSUB_ContextSubstFormat1*)GSUB_get_subtable(look, j); + if (GET_BE_WORD(csf1->SubstFormat) == 1) + { + int offset, index; + TRACE("Context Substitution Subtable: Class 1\n"); + offset = GET_BE_WORD(csf1->Coverage); + index = GSUB_is_glyph_covered((const BYTE*)csf1+offset, glyphs[glyph_index]); + TRACE(" Coverage index %i\n",index); + if (index != -1) + { + int k, count; + const GSUB_SubRuleSet *srs; + offset = GET_BE_WORD(csf1->SubRuleSet[index]); + srs = (const GSUB_SubRuleSet*)((const BYTE*)csf1+offset); + count = GET_BE_WORD(srs->SubRuleCount); + TRACE(" SubRuleSet has %i members\n",count); + for (k = 0; k < count; k++) + { + const GSUB_SubRule_1 *sr; + const GSUB_SubRule_2 *sr_2; + int g_count, l; + int newIndex = glyph_index; + + offset = GET_BE_WORD(srs->SubRule[k]); + sr = (const GSUB_SubRule_1*)((const BYTE*)srs+offset); + g_count = GET_BE_WORD(sr->GlyphCount); + TRACE(" SubRule has %i glyphs\n",g_count); + for (l = 0; l < g_count-1; l++) + if (glyphs[glyph_index + (write_dir * (l+1))] != GET_BE_WORD(sr->Input[l])) break; + + if (l < g_count-1) + { + TRACE(" Rule does not match\n"); + continue; + } + + TRACE(" Rule matches\n"); + sr_2 = (const GSUB_SubRule_2*)((const BYTE*)sr+ + FIELD_OFFSET(GSUB_SubRule_1, Input[g_count-1])); + + for (l = 0; l < GET_BE_WORD(sr->SubstCount); l++) + { + int lookupIndex = GET_BE_WORD(sr_2->SubstLookupRecord[l].LookupListIndex); + int SequenceIndex = GET_BE_WORD(sr_2->SubstLookupRecord[l].SequenceIndex) * write_dir; + + TRACE(" SUBST: %i -> %i %i\n",l, SequenceIndex, lookupIndex); + newIndex = GSUB_apply_lookup(lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, write_dir, glyph_count); + if (newIndex == GSUB_E_NOGLYPH) + { + ERR(" Chain failed to generate a glyph\n"); + continue; + } + } + return newIndex; + } + } + } + else if (GET_BE_WORD(csf1->SubstFormat) == 2) + { + const GSUB_ContextSubstFormat2 *csf2; + const void *glyph_class_table; + int offset, index; + + csf2 = (const GSUB_ContextSubstFormat2*)csf1; + TRACE("Context Substitution Subtable: Class 2\n"); + offset = GET_BE_WORD(csf2->Coverage); + index = GSUB_is_glyph_covered((const BYTE*)csf2+offset, glyphs[glyph_index]); + TRACE(" Coverage index %i\n",index); + if (index != -1) + { + int k, count, class; + const GSUB_SubClassSet *scs; + + offset = GET_BE_WORD(csf2->ClassDef); + glyph_class_table = (const BYTE *)csf2 + offset; + + class = OT_get_glyph_class(glyph_class_table,glyphs[glyph_index]); + + offset = GET_BE_WORD(csf2->SubClassSet[class]); + if (offset == 0) + { + TRACE(" No class rule table for class %i\n",class); + continue; + } + scs = (const GSUB_SubClassSet*)((const BYTE*)csf2+offset); + count = GET_BE_WORD(scs->SubClassRuleCnt); + TRACE(" SubClassSet has %i members\n",count); + for (k = 0; k < count; k++) + { + const GSUB_SubClassRule_1 *sr; + const GSUB_SubClassRule_2 *sr_2; + int g_count, l; + int newIndex = glyph_index; + + offset = GET_BE_WORD(scs->SubClassRule[k]); + sr = (const GSUB_SubClassRule_1*)((const BYTE*)scs+offset); + g_count = GET_BE_WORD(sr->GlyphCount); + TRACE(" SubClassRule has %i glyphs classes\n",g_count); + for (l = 0; l < g_count-1; l++) + { + int g_class = OT_get_glyph_class(glyph_class_table, glyphs[glyph_index + (write_dir * (l+1))]); + if (g_class != GET_BE_WORD(sr->Class[l])) break; + } + + if (l < g_count-1) + { + TRACE(" Rule does not match\n"); + continue; + } + + TRACE(" Rule matches\n"); + sr_2 = (const GSUB_SubClassRule_2*)((const BYTE*)sr+ + FIELD_OFFSET(GSUB_SubClassRule_1, Class[g_count-1])); + + for (l = 0; l < GET_BE_WORD(sr->SubstCount); l++) + { + int lookupIndex = GET_BE_WORD(sr_2->SubstLookupRecord[l].LookupListIndex); + int SequenceIndex = GET_BE_WORD(sr_2->SubstLookupRecord[l].SequenceIndex) * write_dir; + + TRACE(" SUBST: %i -> %i %i\n",l, SequenceIndex, lookupIndex); + newIndex = GSUB_apply_lookup(lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, write_dir, glyph_count); + if (newIndex == GSUB_E_NOGLYPH) + { + ERR(" Chain failed to generate a glyph\n"); + continue; + } + } + return newIndex; + } + } + } + else + FIXME("Unhandled Context Substitution Format %i\n", GET_BE_WORD(csf1->SubstFormat)); + } + return GSUB_E_NOGLYPH; +} + static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_LookupTable *look, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) { int j; @@ -952,10 +1203,122 @@ } else if (GET_BE_WORD(ccsf1->SubstFormat) == 2) { - static int once; - if (!once++) - FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Substitution)\n"); - continue; + int newIndex = glyph_index; + WORD offset, count; + const void *backtrack_class_table; + const void *input_class_table; + const void *lookahead_class_table; + int i; + WORD class; + + const GSUB_ChainContextSubstFormat2 *ccsf2 = (const GSUB_ChainContextSubstFormat2*)ccsf1; + const GSUB_ChainSubClassSet *csc; + + TRACE(" subtype 2 (Class-based Chaining Context Glyph Substitution)\n"); + + offset = GET_BE_WORD(ccsf2->Coverage); + + if (GSUB_is_glyph_covered((const BYTE*)ccsf2+offset, glyphs[glyph_index]) == -1) + { + TRACE("Glyph not covered\n"); + continue; + } + offset = GET_BE_WORD(ccsf2->BacktrackClassDef); + backtrack_class_table = (const BYTE*)ccsf2+offset; + offset = GET_BE_WORD(ccsf2->InputClassDef); + input_class_table = (const BYTE*)ccsf2+offset; + offset = GET_BE_WORD(ccsf2->LookaheadClassDef); + lookahead_class_table = (const BYTE*)ccsf2+offset; + count = GET_BE_WORD(ccsf2->ChainSubClassSetCnt); + + class = OT_get_glyph_class(input_class_table, glyphs[glyph_index]); + offset = GET_BE_WORD(ccsf2->ChainSubClassSet[class]); + + if (offset == 0) + { + TRACE("No rules for class\n"); + continue; + } + + csc = (const GSUB_ChainSubClassSet*)((BYTE*)ccsf2+offset); + count = GET_BE_WORD(csc->ChainSubClassRuleCnt); + + TRACE("%i rules to check\n",count); + + for (i = 0; i < count; i++) + { + int k; + int indexGlyphs; + const GSUB_ChainSubClassRule_1 *cscr_1; + const GSUB_ChainSubClassRule_2 *cscr_2; + const GSUB_ChainSubClassRule_3 *cscr_3; + const GSUB_ChainSubClassRule_4 *cscr_4; + + offset = GET_BE_WORD(csc->ChainSubClassRule[i]); + cscr_1 = (const GSUB_ChainSubClassRule_1*)((BYTE*)csc+offset); + + for (k = 0; k < GET_BE_WORD(cscr_1->BacktrackGlyphCount); k++) + { + WORD target_class = GET_BE_WORD(cscr_1->Backtrack[k]); + WORD glyph_class = OT_get_glyph_class(backtrack_class_table, glyphs[glyph_index + (dirBacktrack * (k+1))]); + if (target_class != glyph_class) + break; + } + if (k != GET_BE_WORD(cscr_1->BacktrackGlyphCount)) + continue; + TRACE("Matched Backtrack\n"); + + cscr_2 = (const GSUB_ChainSubClassRule_2*)((BYTE *)cscr_1 + + FIELD_OFFSET(GSUB_ChainSubClassRule_1, Backtrack[GET_BE_WORD(cscr_1->BacktrackGlyphCount)])); + + indexGlyphs = GET_BE_WORD(cscr_2->InputGlyphCount); + for (k = 0; k < indexGlyphs - 1; k++) + { + WORD target_class = GET_BE_WORD(cscr_2->Input[k]); + WORD glyph_class = OT_get_glyph_class(input_class_table, glyphs[glyph_index + (write_dir * (k+1))]); + if (target_class != glyph_class) + break; + } + if (k != indexGlyphs-1) + continue; + TRACE("Matched IndexGlyphs\n"); + + cscr_3 = (const GSUB_ChainSubClassRule_3*)((BYTE *)cscr_2 + + FIELD_OFFSET(GSUB_ChainSubClassRule_2, Input[GET_BE_WORD(cscr_2->InputGlyphCount)-1])); + + for (k = 0; k < GET_BE_WORD(cscr_3->LookaheadGlyphCount); k++) + { + WORD target_class = GET_BE_WORD(cscr_3->LookAhead[k]); + WORD glyph_class = OT_get_glyph_class(lookahead_class_table, glyphs[glyph_index + (dirLookahead * (indexGlyphs+k))]); + if (target_class != glyph_class) + break; + } + if (k != GET_BE_WORD(cscr_3->LookaheadGlyphCount)) + continue; + TRACE("Matched LookAhead\n"); + + cscr_4 = (const GSUB_ChainSubClassRule_4*)((BYTE *)cscr_3 + + FIELD_OFFSET(GSUB_ChainSubClassRule_3, LookAhead[GET_BE_WORD(cscr_3->LookaheadGlyphCount)])); + + if (GET_BE_WORD(cscr_4->SubstCount)) + { + for (k = 0; k < GET_BE_WORD(cscr_4->SubstCount); k++) + { + int lookupIndex = GET_BE_WORD(cscr_4->SubstLookupRecord[k].LookupListIndex); + int SequenceIndex = GET_BE_WORD(cscr_4->SubstLookupRecord[k].SequenceIndex) * write_dir; + + TRACE("SUBST: %i -> %i %i\n",k, SequenceIndex, lookupIndex); + newIndex = GSUB_apply_lookup(lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, write_dir, glyph_count); + if (newIndex == GSUB_E_NOGLYPH) + { + ERR("Chain failed to generate a glyph\n"); + continue; + } + } + return newIndex; + } + else return GSUB_E_NOGLYPH; + } } else if (GET_BE_WORD(ccsf1->SubstFormat) == 3) { @@ -1020,7 +1383,7 @@ TRACE("SUBST: %i -> %i %i\n",k, SequenceIndex, lookupIndex); newIndex = GSUB_apply_lookup(lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, write_dir, glyph_count); - if (newIndex == -1) + if (newIndex == GSUB_E_NOGLYPH) { ERR("Chain failed to generate a glyph\n"); continue; @@ -1031,7 +1394,7 @@ else return GSUB_E_NOGLYPH; } } - return -1; + return GSUB_E_NOGLYPH; } static INT GSUB_apply_lookup(const OT_LookupList* lookup, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) @@ -1074,6 +1437,8 @@ return GSUB_apply_AlternateSubst(look, glyphs, glyph_index, write_dir, glyph_count); case 4: return GSUB_apply_LigatureSubst(look, glyphs, glyph_index, write_dir, glyph_count); + case 5: + return GSUB_apply_ContextSubst(lookup, look, glyphs, glyph_index, write_dir, glyph_count); case 6: return GSUB_apply_ChainContextSubst(lookup, look, glyphs, glyph_index, write_dir, glyph_count); case 7: @@ -1667,6 +2032,109 @@ return rc; } +static INT GPOS_apply_ContextPos(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, const SCRIPT_ANALYSIS *analysis, INT* piAdvance, + const OT_LookupList *lookup, const OT_LookupTable *look, const WORD *glyphs, INT glyph_index, + INT glyph_count, INT ppem, GOFFSET *pGoffset) +{ + int j; + int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; + + TRACE("Contextual Positioning Subtable\n"); + + for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) + { + const GPOS_ContextPosFormat2 *cpf2 = (GPOS_ContextPosFormat2*)GPOS_get_subtable(look, j); + + if (GET_BE_WORD(cpf2->PosFormat) == 1) + { + static int once; + if (!once++) + FIXME(" TODO: subtype 1\n"); + continue; + } + else if (GET_BE_WORD(cpf2->PosFormat) == 2) + { + WORD offset = GET_BE_WORD(cpf2->Coverage); + int index; + + TRACE("Contextual Positioning Subtable: Format 2\n"); + + index = GSUB_is_glyph_covered((const BYTE*)cpf2+offset, glyphs[glyph_index]); + TRACE("Coverage index %i\n",index); + if (index != -1) + { + int k, count, class; + const GPOS_PosClassSet *pcs; + const void *glyph_class_table = NULL; + + offset = GET_BE_WORD(cpf2->ClassDef); + glyph_class_table = (const BYTE *)cpf2 + offset; + + class = OT_get_glyph_class(glyph_class_table,glyphs[glyph_index]); + + offset = GET_BE_WORD(cpf2->PosClassSet[class]); + if (offset == 0) + { + TRACE("No class rule table for class %i\n",class); + continue; + } + pcs = (const GPOS_PosClassSet*)((const BYTE*)cpf2+offset); + count = GET_BE_WORD(pcs->PosClassRuleCnt); + TRACE("PosClassSet has %i members\n",count); + for (k = 0; k < count; k++) + { + const GPOS_PosClassRule_1 *pr; + const GPOS_PosClassRule_2 *pr_2; + int g_count, l; + + offset = GET_BE_WORD(pcs->PosClassRule[k]); + pr = (const GPOS_PosClassRule_1*)((const BYTE*)pcs+offset); + g_count = GET_BE_WORD(pr->GlyphCount); + TRACE("PosClassRule has %i glyphs classes\n",g_count); + for (l = 0; l < g_count-1; l++) + { + int g_class = OT_get_glyph_class(glyph_class_table, glyphs[glyph_index + (write_dir * (l+1))]); + if (g_class != GET_BE_WORD(pr->Class[l])) break; + } + + if (l < g_count-1) + { + TRACE("Rule does not match\n"); + continue; + } + + TRACE("Rule matches\n"); + pr_2 = (const GPOS_PosClassRule_2*)((const BYTE*)pr+ + FIELD_OFFSET(GPOS_PosClassRule_1, Class[g_count-1])); + + for (l = 0; l < GET_BE_WORD(pr->PosCount); l++) + { + int lookupIndex = GET_BE_WORD(pr_2->PosLookupRecord[l].LookupListIndex); + int SequenceIndex = GET_BE_WORD(pr_2->PosLookupRecord[l].SequenceIndex) * write_dir; + + TRACE("Position: %i -> %i %i\n",l, SequenceIndex, lookupIndex); + GPOS_apply_lookup(psc, lpotm, lplogfont, analysis, piAdvance, lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, glyph_count, pGoffset); + } + return glyph_index + 1; + } + } + + TRACE("Not covered\n"); + continue; + } + else if (GET_BE_WORD(cpf2->PosFormat) == 3) + { + static int once; + if (!once++) + FIXME(" TODO: subtype 3\n"); + continue; + } + else + FIXME("Unhandled Contextual Positioning Format %i\n",GET_BE_WORD(cpf2->PosFormat)); + } + return glyph_index + 1; +} + static INT GPOS_apply_ChainContextPos(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, const SCRIPT_ANALYSIS *analysis, INT* piAdvance, const OT_LookupList *lookup, const OT_LookupTable *look, const WORD *glyphs, INT glyph_index, INT glyph_count, INT ppem, GOFFSET *pGoffset) @@ -1915,6 +2383,8 @@ } break; } + case 7: + return GPOS_apply_ContextPos(psc, lpotm, lplogfont, analysis, piAdvance, lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); case 8: { return GPOS_apply_ChainContextPos(psc, lpotm, lplogfont, analysis, piAdvance, lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); Modified: trunk/reactos/dll/win32/usp10/shape.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shape.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/shape.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/shape.c [iso-8859-1] Sun Mar 19 16:53:04 2017 @@ -1060,6 +1060,8 @@ INT *context_shape; INT dirR, dirL; int i; + int char_index; + int glyph_index; if (*pcGlyphs != cChars) { @@ -1103,38 +1105,63 @@ } /* Contextual Shaping */ - i = 0; - while(i < *pcGlyphs) + if (dirL > 0) + char_index = glyph_index = 0; + else + char_index = glyph_index = cChars-1; + + while(char_index < cChars && char_index >= 0) { BOOL shaped = FALSE; if (psc->GSUB_Table) { - INT nextIndex; + INT nextIndex, offset = 0; INT prevCount = *pcGlyphs; - nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, i, dirL, pcGlyphs, contextual_features[context_shape[i]]); + + /* Apply CCMP first */ + apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, "ccmp"); + + if (prevCount != *pcGlyphs) + { + offset = *pcGlyphs - prevCount; + if (dirL < 0) + glyph_index -= offset * dirL; + } + + /* Apply the contextual feature */ + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, contextual_features[context_shape[char_index]]); + if (nextIndex > GSUB_E_NOGLYPH) { - i = nextIndex; - UpdateClusters(nextIndex, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); + UpdateClusters(glyph_index, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); + char_index += dirL; + if (!offset) + glyph_index = nextIndex; + else + { + offset = *pcGlyphs - prevCount; + glyph_index += dirL * (offset + 1); + } } shaped = (nextIndex > GSUB_E_NOGLYPH); } if (!shaped) { - if (context_shape[i] == Xn) + if (context_shape[char_index] == Xn) { - WORD newGlyph = pwOutGlyphs[i]; - if (pwcChars[i] >= FIRST_ARABIC_CHAR && pwcChars[i] <= LAST_ARABIC_CHAR) + WORD newGlyph = pwOutGlyphs[glyph_index]; + if (pwcChars[char_index] >= FIRST_ARABIC_CHAR && pwcChars[char_index] <= LAST_ARABIC_CHAR) { /* fall back to presentation form B */ - WCHAR context_char = wine_shaping_forms[pwcChars[i] - FIRST_ARABIC_CHAR][context_shape[i]]; - if (context_char != pwcChars[i] && GetGlyphIndicesW(hdc, &context_char, 1, &newGlyph, 0) != GDI_ERROR && newGlyph != 0x0000) - pwOutGlyphs[i] = newGlyph; + WCHAR context_char = wine_shaping_forms[pwcChars[char_index] - FIRST_ARABIC_CHAR][context_shape[char_index]]; + if (context_char != pwcChars[char_index] && GetGlyphIndicesW(hdc, &context_char, 1, &newGlyph, 0) != GDI_ERROR && newGlyph != 0x0000) + pwOutGlyphs[glyph_index] = newGlyph; } } - i++; + char_index += dirL; + glyph_index += dirL; } } @@ -1281,6 +1308,8 @@ INT *context_shape; INT dirR, dirL; int i; + int char_index; + int glyph_index; if (*pcGlyphs != cChars) { @@ -1343,19 +1372,45 @@ } /* Contextual Shaping */ - i = 0; - while(i < *pcGlyphs) - { - INT nextIndex; + if (dirL > 0) + char_index = glyph_index = 0; + else + char_index = glyph_index = cChars-1; + + while(char_index < cChars && char_index >= 0) + { + INT nextIndex, offset = 0; INT prevCount = *pcGlyphs; - nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, i, dirL, pcGlyphs, contextual_features[context_shape[i]]); + + /* Apply CCMP first */ + apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, "ccmp"); + + if (prevCount != *pcGlyphs) + { + offset = *pcGlyphs - prevCount; + if (dirL < 0) + glyph_index -= offset * dirL; + } + + /* Apply the contextual feature */ + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, contextual_features[context_shape[char_index]]); if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); - i = nextIndex; + char_index += dirL; + if (!offset) + glyph_index = nextIndex; + else + { + offset = *pcGlyphs - prevCount; + glyph_index += dirL * (offset + 1); + } } else - i++; + { + char_index += dirL; + glyph_index += dirL; + } } HeapFree(GetProcessHeap(),0,context_shape); @@ -1415,6 +1470,8 @@ INT *context_shape; INT dirR, dirL; int i; + int char_index; + int glyph_index; if (*pcGlyphs != cChars) { @@ -1463,24 +1520,36 @@ } /* Contextual Shaping */ - i = 0; - while(i < *pcGlyphs) - { - if (context_shape[i] >= 0) + if (dirL > 0) + char_index = glyph_index = 0; + else + char_index = glyph_index = cChars-1; + + while(char_index < cChars && char_index >= 0) + { + if (context_shape[char_index] >= 0) { INT nextIndex; INT prevCount = *pcGlyphs; - nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, i, dirL, pcGlyphs, contextual_features[context_shape[i]]); + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, contextual_features[context_shape[char_index]]); + if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); - i = nextIndex; + glyph_index = nextIndex; + char_index += dirL; } else - i++; + { + char_index += dirL; + glyph_index += dirL; + } } else - i++; + { + char_index += dirL; + glyph_index += dirL; + } } HeapFree(GetProcessHeap(),0,context_shape); @@ -2143,7 +2212,7 @@ switch( type ) { case 0x0d07: /* Unknown */ - case 0x0e07: /* Unknwon */ + case 0x0e07: /* Unknown */ default: return lex_Generic; case 0x0001: case 0x0002: @@ -2757,6 +2826,8 @@ INT *context_shape; INT dirL; int i; + int char_index; + int glyph_index; if (*pcGlyphs != cChars) { @@ -2793,19 +2864,28 @@ } /* Contextual Shaping */ - i = 0; - while(i < *pcGlyphs) + if (dirL > 0) + char_index = glyph_index = 0; + else + char_index = glyph_index = cChars-1; + + while(char_index < cChars && char_index >= 0) { INT nextIndex; INT prevCount = *pcGlyphs; - nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, i, dirL, pcGlyphs, contextual_features[context_shape[i]]); + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, contextual_features[context_shape[char_index]]); + if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); - i = nextIndex; + glyph_index = nextIndex; + char_index += dirL; } else - i++; + { + char_index += dirL; + glyph_index += dirL; + } } HeapFree(GetProcessHeap(),0,context_shape); Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Sun Mar 19 16:53:04 2017 @@ -1352,7 +1352,7 @@ for (i = 0; i < cInChars; i++) { /* Joiners get merged preferencially right */ - if (i > 0 && (pwcInChars[i] == ZWJ || pwcInChars[i] == ZWNJ)) + if (i > 0 && (pwcInChars[i] == ZWJ || pwcInChars[i] == ZWNJ || pwcInChars[i] == ZWSP)) { int j; if (i+1 == cInChars) @@ -1361,7 +1361,8 @@ { for (j = i+1; j < cInChars; j++) { - if (pwcInChars[j] != ZWJ && pwcInChars[j] != ZWNJ && pwcInChars[j] != Numeric_space) + if (pwcInChars[j] != ZWJ && pwcInChars[j] != ZWNJ + && pwcInChars[j] != ZWSP && pwcInChars[j] != Numeric_space) { scripts[i] = scripts[j]; break; @@ -1486,14 +1487,15 @@ } /* Joiners get merged preferencially right */ - if (i > 0 && (pwcInChars[i] == ZWJ || pwcInChars[i] == ZWNJ)) + if (i > 0 && (pwcInChars[i] == ZWJ || pwcInChars[i] == ZWNJ || pwcInChars[i] == ZWSP)) { int j; if (i+1 == cInChars && levels[i-1] == levels[i]) strength[i] = strength[i-1]; else for (j = i+1; j < cInChars && levels[i] == levels[j]; j++) - if (pwcInChars[j] != ZWJ && pwcInChars[j] != ZWNJ && pwcInChars[j] != Numeric_space) + if (pwcInChars[j] != ZWJ && pwcInChars[j] != ZWNJ + && pwcInChars[j] != ZWSP && pwcInChars[j] != Numeric_space) { strength[i] = strength[j]; break; @@ -3112,9 +3114,6 @@ chInput = mirror_char(pwcChars[idx]); else chInput = pwcChars[idx]; - /* special case for tabs */ - if (chInput == 0x0009) - chInput = 0x0020; rChars[i] = chInput; } else @@ -3154,6 +3153,20 @@ SHAPE_ContextualShaping(hdc, (ScriptCache *)*psc, psa, rChars, cChars, pwOutGlyphs, pcGlyphs, cMaxGlyphs, pwLogClust); SHAPE_ApplyDefaultOpentypeFeatures(hdc, (ScriptCache *)*psc, psa, pwOutGlyphs, pcGlyphs, cMaxGlyphs, cChars, pwLogClust); SHAPE_CharGlyphProp(hdc, (ScriptCache *)*psc, psa, pwcChars, cChars, pwOutGlyphs, *pcGlyphs, pwLogClust, pCharProps, pOutGlyphProps); + + for (i = 0; i < cChars; ++i) + { + /* Special case for tabs and joiners. As control characters, ZWNJ + * and ZWJ would in principle get handled by the corresponding + * shaping functions. However, since ZWNJ and ZWJ can get merged + * into adjoining runs during itemisation, these don't generally + * get classified as Script_Control. */ + if (pwcChars[i] == 0x0009 || pwcChars[i] == ZWSP || pwcChars[i] == ZWNJ || pwcChars[i] == ZWJ) + { + pwOutGlyphs[pwLogClust[i]] = ((ScriptCache *)*psc)->sfp.wgBlank; + pOutGlyphProps[pwLogClust[i]].sva.fZeroWidth = 1; + } + } heap_free(rChars); } else @@ -3178,7 +3191,8 @@ pOutGlyphProps[i].sva.fZeroWidth = 1; } } - else if (psa->eScript == Script_Control) + else if (psa->eScript == Script_Control || pwcChars[idx] == ZWSP + || pwcChars[idx] == ZWNJ || pwcChars[idx] == ZWJ) { if (pwcChars[idx] == 0x0009 || pwcChars[idx] == 0x000A || pwcChars[idx] == 0x000D || pwcChars[idx] >= 0x001C) Modified: trunk/reactos/dll/win32/usp10/usp10.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.spec… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.spec [iso-8859-1] Sun Mar 19 16:53:04 2017 @@ -22,7 +22,7 @@ @ stdcall ScriptPlace(ptr ptr ptr long ptr ptr ptr ptr ptr) @ stdcall ScriptPlaceOpenType(ptr ptr ptr long long ptr ptr long wstr ptr ptr long ptr ptr long ptr ptr ptr) @ stub ScriptPositionSingleGlyph -@ stdcall ScriptRecordDigitSubstitution(ptr ptr) +@ stdcall ScriptRecordDigitSubstitution(long ptr) @ stdcall ScriptShape(ptr ptr ptr long long ptr ptr ptr ptr ptr) @ stdcall ScriptShapeOpenType(ptr ptr ptr long long ptr ptr long wstr long long ptr ptr ptr ptr ptr) @ stdcall ScriptStringAnalyse(ptr ptr long long long long long ptr ptr ptr ptr ptr ptr) Modified: trunk/reactos/dll/win32/usp10/usp10_internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10_inte… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10_internal.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10_internal.h [iso-8859-1] Sun Mar 19 16:53:04 2017 @@ -147,8 +147,8 @@ #define NUM_PAGES 17 -#define GSUB_E_NOFEATURE -2 -#define GSUB_E_NOGLYPH -1 +#define GSUB_E_NOFEATURE -20 +#define GSUB_E_NOGLYPH -10 #define FEATURE_ALL_TABLES 0 #define FEATURE_GSUB_TABLE 1 Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Mar 19 16:53:04 2017 @@ -189,7 +189,7 @@ reactos/dll/win32/updspapi # Synced to WineStaging-1.9.11 reactos/dll/win32/url # Synced to WineStaging-1.9.11 reactos/dll/win32/urlmon # Synced to WineStaging-1.9.23 -reactos/dll/win32/usp10 # Synced to WineStaging-1.9.23 +reactos/dll/win32/usp10 # Synced to WineStaging-2.2 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to WineStaging-1.9.23 reactos/dll/win32/version # Synced to WineStaging-1.9.11

1 0

[ekohl] 74192: [AT] Fix duplicate resource string.
by ekohl＠svn.reactos.org 19 Mar '17

19 Mar '17

Author: ekohl Date: Sun Mar 19 00:43:26 2017 New Revision: 74192 URL: http://svn.reactos.org/svn/reactos?rev=74192&view=rev Log: [AT] Fix duplicate resource string. Modified: trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc Modified: trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc [iso-8859-1] Sun Mar 19 00:43:26 2017 @@ -29,7 +29,6 @@ IDS_CONFIRM_DELETE "This operation will delete all seduled jobs.\nDo you want to continue this operation? (Y/N) [N]: " IDS_NEW_JOB "Added a new job with job ID = %lu\n" - IDS_JOBS_LIST "Statuskenn. Tag Zeit Befehlszeile\n" IDS_JOBS_LIST "Status ID Day Time Command Line\n" IDS_NO_ENTRIES "There are no entries in the list.\n"

1 0

[sgasiorek] 74191: import EGA palette fix from Wine
by sgasiorek＠svn.reactos.org 19 Mar '17

19 Mar '17

Author: sgasiorek Date: Sun Mar 19 00:35:48 2017 New Revision: 74191 URL: http://svn.reactos.org/svn/reactos?rev=74191&view=rev Log: import EGA palette fix from Wine Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Sun Mar 19 00:35:48 2017 @@ -10,27 +10,6 @@ #define NDEBUG #include <debug.h> - -static const RGBQUAD EGAColorsQuads[16] = -{ - /* rgbBlue, rgbGreen, rgbRed, rgbReserved */ - { 0x00, 0x00, 0x00, 0x00 }, - { 0x00, 0x00, 0x80, 0x00 }, - { 0x00, 0x80, 0x00, 0x00 }, - { 0x00, 0x80, 0x80, 0x00 }, - { 0x80, 0x00, 0x00, 0x00 }, - { 0x80, 0x00, 0x80, 0x00 }, - { 0x80, 0x80, 0x00, 0x00 }, - { 0x80, 0x80, 0x80, 0x00 }, - { 0xc0, 0xc0, 0xc0, 0x00 }, - { 0x00, 0x00, 0xff, 0x00 }, - { 0x00, 0xff, 0x00, 0x00 }, - { 0x00, 0xff, 0xff, 0x00 }, - { 0xff, 0x00, 0x00, 0x00 }, - { 0xff, 0x00, 0xff, 0x00 }, - { 0xff, 0xff, 0x00, 0x00 }, - { 0xff, 0xff, 0xff, 0x00 } -}; static const RGBQUAD DefLogPaletteQuads[20] = /* Copy of Default Logical Palette */ { @@ -883,7 +862,12 @@ break; case 4: - RtlCopyMemory(rgbQuads, EGAColorsQuads, sizeof(EGAColorsQuads)); + /* The EGA palette is the first and last 8 colours of the default palette + with the innermost pair swapped */ + RtlCopyMemory(rgbQuads, DefLogPaletteQuads, 7 * sizeof(RGBQUAD)); + RtlCopyMemory(rgbQuads + 7, DefLogPaletteQuads + 12, 1 * sizeof(RGBQUAD)); + RtlCopyMemory(rgbQuads + 8, DefLogPaletteQuads + 7, 1 * sizeof(RGBQUAD)); + RtlCopyMemory(rgbQuads + 9, DefLogPaletteQuads + 13, 7 * sizeof(RGBQUAD)); break; case 8:

1 0

[ekohl] 74190: [AT] Implement the AT command: - The /every and /next options are not supported yet. - The 12 hour time format cannot be parsed yet.
by ekohl＠svn.reactos.org 19 Mar '17

19 Mar '17

Author: ekohl Date: Sun Mar 19 00:11:31 2017 New Revision: 74190 URL: http://svn.reactos.org/svn/reactos?rev=74190&view=rev Log: [AT] Implement the AT command: - The /every and /next options are not supported yet. - The 12 hour time format cannot be parsed yet. Added: trunk/reactos/base/applications/cmdutils/at/ (with props) trunk/reactos/base/applications/cmdutils/at/CMakeLists.txt (with props) trunk/reactos/base/applications/cmdutils/at/at.c (with props) trunk/reactos/base/applications/cmdutils/at/at.rc (with props) trunk/reactos/base/applications/cmdutils/at/lang/ (with props) trunk/reactos/base/applications/cmdutils/at/lang/de-DE.rc (with props) trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc (with props) trunk/reactos/base/applications/cmdutils/at/resource.h (with props) Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] Sun Mar 19 00:11:31 2017 @@ -1,3 +1,4 @@ +add_subdirectory(at) add_subdirectory(clip) add_subdirectory(comp) add_subdirectory(cscript) Propchange: trunk/reactos/base/applications/cmdutils/at/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Mar 19 00:11:31 2017 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/base/applications/cmdutils/at/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/base/applications/cmdutils/at/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/base/applications/cmdutils/at/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/applications/cmdutils/at/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/CMakeLists.txt (added) +++ trunk/reactos/base/applications/cmdutils/at/CMakeLists.txt [iso-8859-1] Sun Mar 19 00:11:31 2017 @@ -0,0 +1,8 @@ + +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils) + +add_executable(at at.c at.rc) +set_module_type(at win32cui UNICODE) +target_link_libraries(at conutils ${PSEH_LIB}) +add_importlibs(at msvcrt kernel32 user32 netapi32) +add_cd_file(TARGET at DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/base/applications/cmdutils/at/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/at/at.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/at.c (added) +++ trunk/reactos/base/applications/cmdutils/at/at.c [iso-8859-1] Sun Mar 19 00:11:31 2017 @@ -0,0 +1,515 @@ +/* + * PROJECT: ReactOS AT utility + * COPYRIGHT: See COPYING in the top level directory + * FILE: base/applications/cmdutils/at/at.c + * PURPOSE: ReactOS AT utility + * PROGRAMMERS: Eric Kohl <eric.kohl(a)reactos.org> + */ + +#include <stdlib.h> +#include <stdio.h> + +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <wincon.h> +#include <winnls.h> +#include <lm.h> + +#include <conutils.h> + +#include "resource.h" + + +static +BOOL +ParseTime( + PWSTR pszTime, + PULONG pulJobHour, + PULONG pulJobMinute) +{ + PWSTR startPtr, endPtr; + ULONG ulHour = 0, ulMinute = 0; + BOOL bResult = FALSE; + + startPtr = pszTime; + endPtr = NULL; + ulHour = wcstoul(startPtr, &endPtr, 10); + if (ulHour < 24 && endPtr != NULL && *endPtr == L':') + { + startPtr = endPtr + 1; + endPtr = NULL; + ulMinute = wcstoul(startPtr, &endPtr, 10); + if (ulMinute < 60 && endPtr != NULL && *endPtr == UNICODE_NULL) + { + bResult = TRUE; + + if (pulJobHour != NULL) + *pulJobHour = ulHour; + + if (pulJobMinute != NULL) + *pulJobMinute = ulMinute; + } + } + + return bResult; +} + + +static +BOOL +ParseId( + PWSTR pszId, + PULONG pulId) +{ + PWSTR startPtr, endPtr; + ULONG ulId = 0; + BOOL bResult = FALSE; + + startPtr = pszId; + endPtr = NULL; + ulId = wcstoul(startPtr, &endPtr, 10); + if (endPtr != NULL && *endPtr == UNICODE_NULL) + { + bResult = TRUE; + + if (pulId != NULL) + *pulId = ulId; + } + + return bResult; +} + + +static +VOID +PrintErrorMessage( + DWORD dwError) +{ + PWSTR pszBuffer = NULL; + + FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + dwError, + 0, + (PWSTR)&pszBuffer, + 0, + NULL); + + ConPuts(StdErr, pszBuffer); + LocalFree(pszBuffer); +} + + +static +VOID +PrintHorizontalLine(VOID) +{ + WCHAR szBuffer[80]; + INT i; + + for (i = 0; i < 79; i++) + szBuffer[i] = L'-'; + szBuffer[79] = UNICODE_NULL; + + ConPuts(StdOut, szBuffer); +} + + +static +DWORD_PTR +GetTimeAsJobTime(VOID) +{ + SYSTEMTIME Time; + DWORD_PTR JobTime; + + GetLocalTime(&Time); + + JobTime = (DWORD_PTR)Time.wHour * 3600000 + + (DWORD_PTR)Time.wMinute * 60000; + + return JobTime; +} + + +static +VOID +JobTimeToTimeString( + PWSTR pszBuffer, + INT cchBuffer, + WORD wHour, + WORD wMinute) +{ + SYSTEMTIME Time = {0, 0, 0, 0, 0, 0, 0, 0}; + + Time.wHour = wHour; + Time.wMinute = wMinute; + + GetTimeFormat(LOCALE_USER_DEFAULT, + TIME_NOSECONDS, + &Time, + NULL, + pszBuffer, + cchBuffer); +} + +static +INT +PrintJobDetails( + PWSTR pszComputerName, + ULONG ulJobId) +{ + AT_INFO *pBuffer = NULL; + DWORD_PTR CurrentTime; + WCHAR szStatusBuffer[16]; + WCHAR szDayBuffer[32]; + WCHAR szTimeBuffer[16]; + WCHAR szInteractiveBuffer[16]; + HINSTANCE hInstance; + NET_API_STATUS Status; + + hInstance = GetModuleHandle(NULL); + + Status = NetScheduleJobGetInfo(pszComputerName, + ulJobId, + (PBYTE *)&pBuffer); + if (Status != NERR_Success) + { + PrintErrorMessage(Status); + return 1; + } + + if (pBuffer->Flags & JOB_EXEC_ERROR) + LoadStringW(hInstance, IDS_ERROR, szStatusBuffer, ARRAYSIZE(szStatusBuffer)); + else + LoadStringW(hInstance, IDS_OK, szStatusBuffer, ARRAYSIZE(szStatusBuffer)); + + if (pBuffer->DaysOfMonth != 0) + { + wcscpy(szDayBuffer, L"TODO: DaysOfMonth!"); + } + else if (pBuffer->DaysOfWeek != 0) + { + wcscpy(szDayBuffer, L"TODO: DaysOfWeek!"); + } + else + { + CurrentTime = GetTimeAsJobTime(); + if (CurrentTime > pBuffer->JobTime) + LoadStringW(hInstance, IDS_TOMORROW, szDayBuffer, ARRAYSIZE(szDayBuffer)); + else + LoadStringW(hInstance, IDS_TODAY, szDayBuffer, ARRAYSIZE(szDayBuffer)); + } + + JobTimeToTimeString(szTimeBuffer, + ARRAYSIZE(szTimeBuffer), + (WORD)(pBuffer->JobTime / 3600000), + (WORD)((pBuffer->JobTime % 3600000) / 60000)); + + if (pBuffer->Flags & JOB_NONINTERACTIVE) + LoadStringW(hInstance, IDS_NO, szInteractiveBuffer, ARRAYSIZE(szInteractiveBuffer)); + else + LoadStringW(hInstance, IDS_YES, szInteractiveBuffer, ARRAYSIZE(szInteractiveBuffer)); + + ConResPrintf(StdOut, IDS_TASKID, ulJobId); + ConResPrintf(StdOut, IDS_STATUS, szStatusBuffer); + ConResPrintf(StdOut, IDS_SCHEDULE, szDayBuffer); + ConResPrintf(StdOut, IDS_TIME, szTimeBuffer); + ConResPrintf(StdOut, IDS_INTERACTIVE, szInteractiveBuffer); + ConResPrintf(StdOut, IDS_COMMAND, pBuffer->Command); + + NetApiBufferFree(pBuffer); + + return 0; +} + + +static +INT +PrintAllJobs( + PWSTR pszComputerName) +{ + PAT_ENUM pBuffer = NULL; + DWORD dwRead = 0, dwTotal = 0; + DWORD dwResume = 0, i; + DWORD_PTR CurrentTime; + NET_API_STATUS Status; + + WCHAR szDayBuffer[32]; + WCHAR szTimeBuffer[16]; + HINSTANCE hInstance; + + Status = NetScheduleJobEnum(pszComputerName, + (PBYTE *)&pBuffer, + MAX_PREFERRED_LENGTH, + &dwRead, + &dwTotal, + &dwResume); + if (Status != NERR_Success) + { + PrintErrorMessage(Status); + return 1; + } + + if (dwTotal == 0) + { + ConResPrintf(StdOut, IDS_NO_ENTRIES); + return 0; + } + + ConResPrintf(StdOut, IDS_JOBS_LIST); + PrintHorizontalLine(); + + hInstance = GetModuleHandle(NULL); + + for (i = 0; i < dwRead; i++) + { + if (pBuffer[i].DaysOfMonth != 0) + { + wcscpy(szDayBuffer, L"TODO: DaysOfMonth"); + } + else if (pBuffer[i].DaysOfWeek != 0) + { + wcscpy(szDayBuffer, L"TODO: DaysOfWeek"); + } + else + { + CurrentTime = GetTimeAsJobTime(); + if (CurrentTime > pBuffer[i].JobTime) + LoadStringW(hInstance, IDS_TOMORROW, szDayBuffer, ARRAYSIZE(szDayBuffer)); + else + LoadStringW(hInstance, IDS_TODAY, szDayBuffer, ARRAYSIZE(szDayBuffer)); + } + + JobTimeToTimeString(szTimeBuffer, + ARRAYSIZE(szTimeBuffer), + (WORD)(pBuffer[i].JobTime / 3600000), + (WORD)((pBuffer[i].JobTime % 3600000) / 60000)); + + ConPrintf(StdOut, + L" %7lu %-22s %-12s %s\n", + pBuffer[i].JobId, + szDayBuffer, + szTimeBuffer, + pBuffer[i].Command); + } + + NetApiBufferFree(pBuffer); + + return 0; +} + + +static +INT +AddJob( + PWSTR pszComputerName, + ULONG ulJobHour, + ULONG ulJobMinute, + BOOL bInteractiveJob, + PWSTR pszCommand) +{ + AT_INFO InfoBuffer; + ULONG ulJobId = 0; + NET_API_STATUS Status; + + InfoBuffer.JobTime = (DWORD_PTR)ulJobHour * 3600000 + + (DWORD_PTR)ulJobMinute * 60000; + InfoBuffer.DaysOfMonth = 0; + InfoBuffer.DaysOfWeek = 0; + InfoBuffer.Flags = bInteractiveJob ? 0 : JOB_NONINTERACTIVE; + InfoBuffer.Command = pszCommand; + + Status = NetScheduleJobAdd(pszComputerName, + (PBYTE)&InfoBuffer, + &ulJobId); + if (Status != NERR_Success) + { + PrintErrorMessage(Status); + return 1; + } + + ConResPrintf(StdOut, IDS_NEW_JOB, ulJobId); + + return 0; +} + + +static +INT +DeleteJob( + PWSTR pszComputerName, + ULONG ulJobId, + BOOL bForceDelete) +{ + NET_API_STATUS Status; + + if (ulJobId == (ULONG)-1 && bForceDelete == FALSE) + { + ConResPrintf(StdOut, IDS_CONFIRM_DELETE); + return 0; + } + + Status = NetScheduleJobDel(pszComputerName, + (ulJobId == (ULONG)-1) ? 0 : ulJobId, + (ulJobId == (ULONG)-1) ? -1 : ulJobId); + if (Status != NERR_Success) + { + PrintErrorMessage(Status); + return 1; + } + + return 0; +} + + +int wmain(int argc, WCHAR **argv) +{ + PWSTR pszComputerName = NULL; + PWSTR pszCommand = NULL; + ULONG ulJobId = (ULONG)-1; + ULONG ulJobHour = (ULONG)-1; + ULONG ulJobMinute = (ULONG)-1; + BOOL bDeleteJob = FALSE, bForceDelete = FALSE; + BOOL bInteractiveJob = FALSE; + BOOL bPrintUsage = FALSE; + INT nResult = 0; + INT i, minIdx; + + /* Initialize the Console Standard Streams */ + ConInitStdStreams(); + + /* Parse the computer name */ + i = 1; + minIdx = 1; + if (i < argc && + argv[i][0] == L'\\' && + argv[i][1] == L'\\') + { + pszComputerName = argv[i]; + i++; + minIdx++; + } + + /* Parse the time or job id */ + if (i < argc && argv[i][0] != L'/') + { + if (ParseTime(argv[i], &ulJobHour, &ulJobMinute)) + { + i++; + minIdx++; + } + else if (ParseId(argv[i], &ulJobId)) + { + i++; + minIdx++; + } + } + + /* Parse the options */ + for (; i < argc; i++) + { + if (argv[i][0] == L'/') + { + if (_wcsicmp(argv[i], L"/?") == 0) + { + bPrintUsage = TRUE; + goto done; + } + else if (_wcsicmp(argv[i], L"/delete") == 0) + { + bDeleteJob = TRUE; + } + else if (_wcsicmp(argv[i], L"/yes") == 0) + { + bForceDelete = TRUE; + } + else if (_wcsicmp(argv[i], L"/interactive") == 0) + { + bInteractiveJob = TRUE; + } +/* + else if (_wcsnicmp(argv[i], L"/every:", 7) == 0) + { + } + else if (_wcsnicmp(argv[i], L"/next:", 6) == 0) + { + } +*/ + else + { + bPrintUsage = TRUE; + nResult = 1; + goto done; + } + } + } + + /* Parse the command */ + if (argc > minIdx && argv[argc - 1][0] != L'/') + { + pszCommand = argv[argc - 1]; + } + + if (bDeleteJob == TRUE) + { + /* Check for invalid options or arguments */ + if (bInteractiveJob == TRUE || + ulJobHour != (ULONG)-1 || + ulJobMinute != (ULONG)-1 || + pszCommand != NULL) + { + bPrintUsage = TRUE; + nResult = 1; + goto done; + } + + nResult = DeleteJob(pszComputerName, ulJobId, bForceDelete); + } + else + { + if (ulJobHour != (ULONG)-1 && ulJobMinute != (ULONG)-1) + { + /* Check for invalid options or arguments */ + if (bForceDelete == TRUE || pszCommand == NULL) + { + bPrintUsage = TRUE; + nResult = 1; + goto done; + } + + nResult = AddJob(pszComputerName, + ulJobHour, + ulJobMinute, + bInteractiveJob, + pszCommand); + } + else + { + /* Check for invalid options or arguments */ + if (bForceDelete == TRUE || bInteractiveJob == TRUE) + { + bPrintUsage = TRUE; + nResult = 1; + goto done; + } + + if (ulJobId == (ULONG)-1) + { + nResult = PrintAllJobs(pszComputerName); + } + else + { + nResult = PrintJobDetails(pszComputerName, ulJobId); + } + } + } + +done: + if (bPrintUsage == TRUE) + ConResPuts(StdOut, IDS_USAGE); + + return nResult; +} + +/* EOF */ Propchange: trunk/reactos/base/applications/cmdutils/at/at.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/at/at.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/at.rc (added) +++ trunk/reactos/base/applications/cmdutils/at/at.rc [iso-8859-1] Sun Mar 19 00:11:31 2017 @@ -0,0 +1,17 @@ +#include <windef.h> + +#include "resource.h" + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS AT Command" +#define REACTOS_STR_INTERNAL_NAME "at" +#define REACTOS_STR_ORIGINAL_FILENAME "at.exe" +#include <reactos/version.rc> + +/* UTF-8 */ +#pragma code_page(65001) +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif Propchange: trunk/reactos/base/applications/cmdutils/at/at.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/applications/cmdutils/at/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Mar 19 00:11:31 2017 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/base/applications/cmdutils/at/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/base/applications/cmdutils/at/lang/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/base/applications/cmdutils/at/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/applications/cmdutils/at/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/lang/de-DE.rc (added) +++ trunk/reactos/base/applications/cmdutils/at/lang/de-DE.rc [iso-8859-1] Sun Mar 19 00:11:31 2017 @@ -0,0 +1,40 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "Mit dem AT Befeht kÃ¶nnen Befehle und Programme zu einem vorbestimmten\n\ +Termin gestartet werden. Der Zeitplandienst muss gestartet sein, um den\n\ +Befeht AT zu verwenden.\n\n\ +AT [\\\\Computername] [ [Kennung] [/DELETE] | /DELETE [/YES]]\n\ +AT [\\\\Computername] Zeit [/INTERACTIVE]\n\ + [ /EVERY:Datum[,...] | /NEXT:Datum[,...]] ""Befehl""\n\n\ +\\\\Computername ...\n\ +Kennung ...\n\ +/DELETE ...\n\ +/YES ...\n\ +Zeit Gibt die Zeit an, zu der ein Befehl ausgefÃ¼hrt werden soll.\n\ +/INTERACTIVE ...\n\ +/EVERY:Datum[,...] ...\n\ +/NEXT:Datum[,...] ...\n\ +""Befehl"" Ist der auszufÃ¼hrende Befehl oder das Stapelprogramm.\n" + + IDS_CONFIRM_DELETE "Dieser Vorgang wird alle geplanten AufrÃ¤ge lÃ¶schen.\nMÃ¶chten Sie diesen Vorgang fortsetzen? (J/N) [N]" + IDS_NEW_JOB "Neuer Auftrag hinzugefÃ¼gt. Kennung = %lu\n" + IDS_JOBS_LIST "Statuskenn. Tag Zeit Befehlszeile\n" + IDS_NO_ENTRIES "Es sind keine EintrÃ¤ge in der Liste.\n" + + IDS_TODAY "Heute" + IDS_TOMORROW "Morgen" + + IDS_YES "Ja" + IDS_NO "Nein" + IDS_ERROR "ERROR" + IDS_OK "OK" + + IDS_TASKID "Taskkennung: %lu\n" + IDS_STATUS "Status: %s\n" + IDS_SCHEDULE "Zeitplan: %s\n" + IDS_TIME "Zeit: %s\n" + IDS_INTERACTIVE "Interaktiv: %s\n" + IDS_COMMAND "Befehl: %s\n" +END Propchange: trunk/reactos/base/applications/cmdutils/at/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc (added) +++ trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc [iso-8859-1] Sun Mar 19 00:11:31 2017 @@ -0,0 +1,50 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_USAGE "The AT command schedules commands and programs to run on a computer at\n\ +a specified time and date. The Schedule service must be running to use\n\ +the AT command.\n\n\ +AT [\\\\computername] [ [id] [/DELETE] | /DELETE [/YES]]\n\ +AT [\\\\computername] time [/INTERACTIVE]\n\ + [ /EVERY:date[,...] | /NEXT:date[,...]] ""command""\n\n\ +\\\\computername Specifies a remote computer. Commands are scheduled on the \n\ + local computer if this parameter is omitted.\n\ +id Is an identification number assigned to a scheduled\n\ + command.\n\ +/DELETE Cancels a scheduled command. If id is omitted, all the\n\ + scheduled commands on the computer are canceled.\n\ +/YES Used with cancel all jobs command when no further\n\ + confirmation is desired.\n\ +Zeit Specifies the time when command is to run.\n\ +/INTERACTIVE Allows the ob to interact with the desktop of the user\n\ + who is logged on at the time the job runs.\n\ +/EVERY:date[,...] Runs the command on each specified day(s) of the week or\n\ + month. If date is omitted, the current day of the month\n\ + is assumed.\n\ +/NEXT:date[,...] Runs the specified command on the next occurrence of the\n\ + day (for example, next Thursday). If date is omitted, the \n\ + current day of the month is assumed.\n\ +""command"" Is the command or batch program to be run.\n" + + IDS_CONFIRM_DELETE "This operation will delete all seduled jobs.\nDo you want to continue this operation? (Y/N) [N]: " + IDS_NEW_JOB "Added a new job with job ID = %lu\n" + IDS_JOBS_LIST "Statuskenn. Tag Zeit Befehlszeile\n" + IDS_JOBS_LIST "Status ID Day Time Command Line\n" + IDS_NO_ENTRIES "There are no entries in the list.\n" + + IDS_TODAY "Today" + IDS_TOMORROW "Tomorrow" + + IDS_YES "Yes" + IDS_NO "No" + IDS_ERROR "ERROR" + IDS_OK "OK" + + IDS_TASKID "Task ID: %lu\n" + IDS_STATUS "Status: %s\n" + IDS_SCHEDULE "Schedule: %s\n" + IDS_TIME "Time of day: %s\n" + IDS_INTERACTIVE "Interactive: %s\n" + IDS_COMMAND "Command: %s\n" +END Propchange: trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/at/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/resource.h (added) +++ trunk/reactos/base/applications/cmdutils/at/resource.h [iso-8859-1] Sun Mar 19 00:11:31 2017 @@ -0,0 +1,24 @@ +#pragma once + +#define IDS_USAGE 100 + +#define IDS_CONFIRM_DELETE 105 +#define IDS_NEW_JOB 106 +#define IDS_JOBS_LIST 107 +#define IDS_NO_ENTRIES 108 + +#define IDS_TODAY 109 +#define IDS_TOMORROW 110 + + +#define IDS_YES 101 +#define IDS_NO 102 +#define IDS_ERROR 103 +#define IDS_OK 104 + +#define IDS_TASKID 122 +#define IDS_STATUS 123 +#define IDS_SCHEDULE 124 +#define IDS_TIME 125 +#define IDS_INTERACTIVE 126 +#define IDS_COMMAND 127 Propchange: trunk/reactos/base/applications/cmdutils/at/resource.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[pschweitzer] 74189: [MUP] Properly define magic values for CCB and DFS
by pschweitzer＠svn.reactos.org 18 Mar '17

18 Mar '17

Author: pschweitzer Date: Sat Mar 18 14:03:45 2017 New Revision: 74189 URL: http://svn.reactos.org/svn/reactos?rev=74189&view=rev Log: [MUP] Properly define magic values for CCB and DFS Modified: trunk/reactos/drivers/filesystems/mup/mup.c trunk/reactos/drivers/filesystems/mup/mup.h Modified: trunk/reactos/drivers/filesystems/mup/mup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/mu… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/mup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/mup.c [iso-8859-1] Sat Mar 18 14:03:45 2017 @@ -1804,7 +1804,7 @@ MasterQueryContext->LatestProvider = QueryContext->UncProvider; MasterQueryContext->LatestStatus = Status; - if (MasterQueryContext->FileObject->FsContext2 != DFS_MAGIC_CCB) + if (MasterQueryContext->FileObject->FsContext2 != (PVOID)DFS_DOWNLEVEL_OPEN_CONTEXT) { /* Allocate a buffer for the prefix */ AcceptedPrefix = ExAllocatePoolWithTag(PagedPool, QueryResponse->LengthAccepted, TAG_MUP); @@ -2045,7 +2045,7 @@ } /* Ok, at that point, that's a regular MUP opening (if no DFS) */ - if (!MupEnableDfs || FileObject->FsContext2 == DFS_MAGIC_CCB) + if (!MupEnableDfs || FileObject->FsContext2 == (PVOID)DFS_DOWNLEVEL_OPEN_CONTEXT) { /* We won't complete immediately */ IoMarkIrpPending(Irp); Modified: trunk/reactos/drivers/filesystems/mup/mup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/mu… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/mup.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/mup.h [iso-8859-1] Sat Mar 18 14:03:45 2017 @@ -17,8 +17,12 @@ #define TAG_MUP ' puM' -#define DFS_MAGIC_CCB (PVOID)0x11444653 #define FILE_SIMPLE_RIGHTS_MASK (FILE_ALL_ACCESS & ~STANDARD_RIGHTS_REQUIRED &~ SYNCHRONIZE) + +#define DFS_OPEN_CONTEXT 0xFF444653 +#define DFS_DOWNLEVEL_OPEN_CONTEXT 0x11444653 +#define DFS_CSCAGENT_NAME_CONTEXT 0xAAAAAAAA +#define DFS_USER_NAME_CONTEXT 0xBBBBBBBB #define NODE_TYPE_VCB 0x1 #define NODE_TYPE_UNC 0x2

1 0

[mjansen] 74188: [USETUP] Split font substitution settings for CJK languages. Patch by Katayama Hirofumi MZ. CORE-9615
by mjansen＠svn.reactos.org 18 Mar '17

18 Mar '17

Author: mjansen Date: Sat Mar 18 13:28:57 2017 New Revision: 74188 URL: http://svn.reactos.org/svn/reactos?rev=74188&view=rev Log: [USETUP] Split font substitution settings for CJK languages. Patch by Katayama Hirofumi MZ. CORE-9615 Modified: trunk/reactos/base/setup/usetup/muifonts.h trunk/reactos/base/setup/usetup/muilanguages.h Modified: trunk/reactos/base/setup/usetup/muifonts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muifonts… ============================================================================== --- trunk/reactos/base/setup/usetup/muifonts.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muifonts.h [iso-8859-1] Sat Mar 18 13:28:57 2017 @@ -2,8 +2,7 @@ MUI_SUBFONT LatinFonts[] = { - /*Font Substitute */ - + /*Font Substitute */ { L"Arial", L"Liberation Sans" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, @@ -82,7 +81,11 @@ { NULL, NULL } }; -MUI_SUBFONT CJKFonts[] = +WCHAR CSF_LocalName0[] = {0x5B8B, 0x4F53, 0}; +WCHAR CSF_LocalName1[] = {0x65B0, 0x5B8B, 0x4F53, 0}; +WCHAR CSF_LocalName2[] = {0x4E2D, 0x6613, 0x5B8B, 0x4F53, 0}; +WCHAR CSF_LocalName3[] = {'M', 'S', 0x5B8B, 0x4F53, 0}; +MUI_SUBFONT ChineseSimplifiedFonts[] = { { L"Arial", L"Liberation Sans" }, { L"Courier", L"FreeMono" }, @@ -101,6 +104,109 @@ { L"Terminal", L"DejaVu Sans Mono" }, { L"Times New Roman", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, + { L"SimSun", L"Droid Sans Fallback" }, + { L"NSimSun", L"Droid Sans Fallback" }, + { L"MS Song", L"Droid Sans Fallback" }, + /* localized names */ + { CSF_LocalName0, L"Droid Sans Fallback" }, + { CSF_LocalName1, L"Droid Sans Fallback" }, + { CSF_LocalName2, L"Droid Sans Fallback" }, + { CSF_LocalName3, L"Droid Sans Fallback" }, + { NULL, NULL } +}; + +WCHAR CTF_LocalName0[] = {0x7D30, 0x660E, 0x9AD4, 0}; +WCHAR CTF_LocalName1[] = {0x65B0, 0x7D30, 0x660E, 0x9AD4, 0}; +WCHAR CTF_LocalName2[] = {0x83EF, 0x5EB7, 0x4E2D, 0x660E, 0x9AD4, 0}; +WCHAR CTF_LocalName3[] = {0x83EF, 0x5EB7, 0x7C97, 0x660E, 0x9AD4, 0}; +MUI_SUBFONT ChineseTraditionalFonts[] = +{ + { L"Arial", L"Liberation Sans" }, + { L"Courier", L"FreeMono" }, + { L"Courier New", L"FreeMono" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { L"Helv", L"Droid Sans Fallback" }, + { L"Helvetica", L"Liberation Sans" }, + { L"Lucida Console", L"DejaVu Sans Mono" }, + { L"MS Sans Serif", L"Droid Sans Fallback" }, + { L"MS Shell Dlg", L"Droid Sans Fallback" }, + { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, + { L"MS UI Gothic", L"Droid Sans Fallback" }, + { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"Tahoma", L"Droid Sans Fallback" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, + { L"Ming Light", L"Droid Sans Fallback" }, + { L"PMingLiU", L"Droid Sans Fallback" }, + { L"DLCMingMedium", L"Droid Sans Fallback" }, + { L"DLCMingBold", L"Droid Sans Fallback" }, + /* localized names */ + { CTF_LocalName0, L"Droid Sans Fallback" }, + { CTF_LocalName1, L"Droid Sans Fallback" }, + { CTF_LocalName2, L"Droid Sans Fallback" }, + { CTF_LocalName3, L"Droid Sans Fallback" }, + { NULL, NULL } +}; + +WCHAR JF_LocalName0[] = {0xFF2D, 0xFF33, ' ', 0x660E, 0x671D, 0}; +WCHAR JF_LocalName1[] = {0xFF2D, 0xFF33, ' ', 0xFF30, 0x660E, 0x671D, 0}; +WCHAR JF_LocalName2[] = {0xFF2D, 0xFF33, ' ', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0}; +WCHAR JF_LocalName3[] = {0xFF2D, 0xFF33, ' ', 0xFF30, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0}; +MUI_SUBFONT JapaneseFonts[] = +{ + { L"Arial", L"Liberation Sans" }, + { L"Courier", L"FreeMono" }, + { L"Courier New", L"FreeMono" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { L"Helv", L"Droid Sans Fallback" }, + { L"Helvetica", L"Liberation Sans" }, + { L"Lucida Console", L"DejaVu Sans Mono" }, + { L"MS Sans Serif", L"Droid Sans Fallback" }, + { L"MS Shell Dlg", L"Droid Sans Fallback" }, + { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, + { L"MS UI Gothic", L"Droid Sans Fallback" }, + { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"Tahoma", L"Droid Sans Fallback" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, + /* localized names */ + { JF_LocalName0, L"Droid Sans Fallback" }, + { JF_LocalName1, L"Droid Sans Fallback" }, + { JF_LocalName2, L"Droid Sans Fallback" }, + { JF_LocalName3, L"Droid Sans Fallback" }, + { NULL, NULL } +}; + +WCHAR KF_LocalName0[] = {0xBC14, 0xD0D5, 0}; +WCHAR KF_LocalName1[] = {0xBC14, 0xD0D5, 0xCCB4, 0}; +WCHAR KF_LocalName2[] = {0xAD81, 0xC11C, 0}; +WCHAR KF_LocalName3[] = {0xAD81, 0xC11C, 0xCCB4, 0}; +MUI_SUBFONT KoreanFonts[] = +{ + { L"Arial", L"Liberation Sans" }, + { L"Courier", L"FreeMono" }, + { L"Courier New", L"FreeMono" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { L"Helv", L"Droid Sans Fallback" }, + { L"Helvetica", L"Liberation Sans" }, + { L"Lucida Console", L"DejaVu Sans Mono" }, + { L"MS Sans Serif", L"Droid Sans Fallback" }, + { L"MS Shell Dlg", L"Droid Sans Fallback" }, + { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, + { L"MS UI Gothic", L"Droid Sans Fallback" }, + { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"Tahoma", L"Droid Sans Fallback" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, + { L"Batang", L"Droid Sans Fallback" }, + { L"BatangChe", L"Droid Sans Fallback" }, + { L"Gungsuh", L"Droid Sans Fallback" }, + { L"GungsuhChe", L"Droid Sans Fallback" }, + /* localized names */ + { KF_LocalName0, L"Droid Sans Fallback" }, + { KF_LocalName1, L"Droid Sans Fallback" }, + { KF_LocalName2, L"Droid Sans Fallback" }, + { KF_LocalName3, L"Droid Sans Fallback" }, { NULL, NULL } }; Modified: trunk/reactos/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muilangu… ============================================================================== --- trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] Sat Mar 18 13:28:57 2017 @@ -499,19 +499,19 @@ {L"00000403", L"1252", L"850", L"10000", L"Catalan", L"217", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, caESLayouts }, #endif #ifdef LANGUAGE_ZH_TW - {L"00000404", L"950", L"950", L"10008", L"Chinese (Taiwan)", L"237", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhTWLayouts }, + {L"00000404", L"950", L"950", L"10008", L"Chinese (Taiwan)", L"237", enUSPages, enUSErrorEntries, enUSStrings, ChineseTraditionalFonts, zhTWLayouts }, #endif #ifdef LANGUAGE_ZH_CN - {L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", L"45", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhCNLayouts }, + {L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", L"45", enUSPages, enUSErrorEntries, enUSStrings, ChineseSimplifiedFonts, zhCNLayouts }, #endif #ifdef LANGUAGE_ZH_HK - {L"00000C04", L"950", L"950", L"10008", L"Chinese (Hong Kong S.A.R.)", L"104", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhHKLayouts }, + {L"00000C04", L"950", L"950", L"10008", L"Chinese (Hong Kong S.A.R.)", L"104", enUSPages, enUSErrorEntries, enUSStrings, ChineseTraditionalFonts, zhHKLayouts }, #endif #ifdef LANGUAGE_ZH_SG - {L"00001004", L"936", L"936", L"10008", L"Chinese (Singapore)", L"215", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhSGLayouts }, + {L"00001004", L"936", L"936", L"10008", L"Chinese (Singapore)", L"215", enUSPages, enUSErrorEntries, enUSStrings, ChineseSimplifiedFonts, zhSGLayouts }, #endif #ifdef LANGUAGE_ZH_MO - {L"00001404", L"950", L"950", L"10002", L"Chinese (Macau S.A.R.)", L"151", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhMOLayouts }, + {L"00001404", L"950", L"950", L"10002", L"Chinese (Macau S.A.R.)", L"151", enUSPages, enUSErrorEntries, enUSStrings, ChineseSimplifiedFonts, zhMOLayouts }, #endif #ifdef LANGUAGE_HR_HR {L"0000041A", L"1250", L"852", L"10029", L"Croatian", L"108", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, hrHRLayouts }, @@ -652,7 +652,7 @@ {L"00000810", L"1252", L"850", L"10000", L"Italian (Switzerland)", L"223", itITPages, itITErrorEntries, itITStrings, LatinFonts, itCHLayouts }, #endif #ifdef LANGUAGE_JA_JP - {L"00000411", L"932", L"932", L"10001", L"Japanese", L"122", jaJPPages, jaJPErrorEntries, jaJPStrings, CJKFonts, jaJPLayouts }, + {L"00000411", L"932", L"932", L"10001", L"Japanese", L"122", jaJPPages, jaJPErrorEntries, jaJPStrings, JapaneseFonts, jaJPLayouts }, #endif #ifdef LANGUAGE_KN_IN {L"0000044B", L"1252", L"437", L"10079", L"Kannada (India)", L"113", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, knINLayouts }, @@ -664,7 +664,7 @@ {L"00000457", L"0", L"437", L"2", L"Konkani", L"113", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, kokINLayouts}, #endif #ifdef LANGUAGE_KO_KR - {L"00000412", L"949", L"949", L"10003", L"Korean", L"134", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, koKRLayouts }, + {L"00000412", L"949", L"949", L"10003", L"Korean", L"134", enUSPages, enUSErrorEntries, enUSStrings, KoreanFonts, koKRLayouts }, #endif #ifdef LANGUAGE_KY_KG {L"00000440", L"1251", L"866", L"10007", L"Kyrgyz (Kyrgyzstan)", L"130", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, kyKGLayouts },

1 0

[mjansen] 74187: [APPLICATIONS/SYSUTILS] Add a font substitutes editor. Patch by Katayama Hirofumi MZ. CORE-12749 #resolve #comment Thanks!
by mjansen＠svn.reactos.org 18 Mar '17

18 Mar '17

Author: mjansen Date: Sat Mar 18 13:01:18 2017 New Revision: 74187 URL: http://svn.reactos.org/svn/reactos?rev=74187&view=rev Log: [APPLICATIONS/SYSUTILS] Add a font substitutes editor. Patch by Katayama Hirofumi MZ. CORE-12749 #resolve #comment Thanks! Added: trunk/rosapps/applications/sysutils/fontsub/ trunk/rosapps/applications/sysutils/fontsub/CMakeLists.txt (with props) trunk/rosapps/applications/sysutils/fontsub/License.txt (with props) trunk/rosapps/applications/sysutils/fontsub/down.bmp (with props) trunk/rosapps/applications/sysutils/fontsub/fontsub.cpp (with props) trunk/rosapps/applications/sysutils/fontsub/fontsub.ico (with props) trunk/rosapps/applications/sysutils/fontsub/fontsub.svg trunk/rosapps/applications/sysutils/fontsub/fontsub_res.rc (with props) trunk/rosapps/applications/sysutils/fontsub/lang/ trunk/rosapps/applications/sysutils/fontsub/lang/en-US.rc (with props) trunk/rosapps/applications/sysutils/fontsub/lang/ja-JP.rc (with props) trunk/rosapps/applications/sysutils/fontsub/nil.bmp (with props) trunk/rosapps/applications/sysutils/fontsub/resource.h (with props) trunk/rosapps/applications/sysutils/fontsub/up.bmp (with props) Modified: trunk/rosapps/applications/sysutils/CMakeLists.txt Modified: trunk/rosapps/applications/sysutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/CMak… ============================================================================== --- trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] Sat Mar 18 13:01:18 2017 @@ -1,5 +1,6 @@ add_subdirectory(chklib) add_subdirectory(ctm) +add_subdirectory(fontsub) add_subdirectory(gettype) add_subdirectory(kill) add_subdirectory(logevent) Added: trunk/rosapps/applications/sysutils/fontsub/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/font… ============================================================================== --- trunk/rosapps/applications/sysutils/fontsub/CMakeLists.txt (added) +++ trunk/rosapps/applications/sysutils/fontsub/CMakeLists.txt [iso-8859-1] Sat Mar 18 13:01:18 2017 @@ -0,0 +1,16 @@ +# FontSub by Katayama Hirofumi MZ +# +# To the extent possible under law, the person who associated CC0 with +# FontSub has waived all copyright and related or neighboring rights +# to FontSub. +# +# You should have received a copy of the CC0 legalcode along with this +# work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. + +set_cpp(WITH_RUNTIME WITH_STL WITH_EXCEPTIONS) + +add_executable(fontsubedit fontsub.cpp fontsub_res.rc) +set_module_type(fontsubedit win32gui UNICODE) +add_importlibs(fontsubedit advapi32 comctl32 comdlg32 shell32 gdi32 user32 msvcrt kernel32) +set_target_properties(fontsubedit PROPERTIES OUTPUT_NAME "fontsub") +add_cd_file(TARGET fontsubedit DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/sysutils/fontsub/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/sysutils/fontsub/License.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/font… ============================================================================== --- trunk/rosapps/applications/sysutils/fontsub/License.txt (added) +++ trunk/rosapps/applications/sysutils/fontsub/License.txt [iso-8859-1] Sat Mar 18 13:01:18 2017 @@ -0,0 +1,122 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. + Propchange: trunk/rosapps/applications/sysutils/fontsub/License.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/sysutils/fontsub/down.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/font… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/applications/sysutils/fontsub/down.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/applications/sysutils/fontsub/fontsub.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/font… ============================================================================== --- trunk/rosapps/applications/sysutils/fontsub/fontsub.cpp (added) +++ trunk/rosapps/applications/sysutils/fontsub/fontsub.cpp [iso-8859-1] Sat Mar 18 13:01:18 2017 @@ -0,0 +1,1603 @@ +// FontSub by Katayama Hirofumi MZ +// +// To the extent possible under law, the person who associated CC0 with +// FontSub has waived all copyright and related or neighboring rights +// to FontSub. +// +// You should have received a copy of the CC0 legalcode along with this +// work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. + + +#include <windows.h> +#include <windowsx.h> +#include <commctrl.h> +#include <tchar.h> +#include <vector> // for std::vector +#include <set> // for std::set +#include <string> // for std::basic_string +#include <algorithm> // for std::sort +#include <cstdio> +#include <cstring> +#include <cassert> +#include "resource.h" + + +#define NAME_COLUMN_WIDTH 250 +#define SUB_COLUMN_WIDTH 250 +#define MAX_STRING 120 + +#ifndef _countof + #define _countof(array) (sizeof(array) / sizeof(array[0])) +#endif + +typedef std::wstring STRING; + +struct ITEM +{ + STRING m_Name, m_Substitute; + BYTE m_CharSet1, m_CharSet2; + ITEM(const STRING& Name, const STRING& Substitute, + BYTE CharSet1, BYTE CharSet2) + : m_Name(Name), m_Substitute(Substitute), + m_CharSet1(CharSet1), m_CharSet2(CharSet2) { } +}; + +/* global variables */ +HINSTANCE g_hInstance = NULL; +HWND g_hMainWnd = NULL; +HICON g_hIcon = NULL; +HWND g_hListView = NULL; +BOOL g_bModified = FALSE; +BOOL g_bNeedsReboot = FALSE; +INT g_iItem = 0; + +LPCWSTR g_pszClassName = L"ReactOS Font Substitutes Editor"; +LPCWSTR g_pszFileHeader = L"Windows Registry Editor Version 5.00"; + +WCHAR g_szTitle[MAX_STRING]; +WCHAR g_szNameHead[MAX_STRING]; +WCHAR g_szSubstituteHead[MAX_STRING]; + +INT g_iSortColumn = 0; +BOOL g_bSortAscendant = TRUE; + +LPCWSTR g_pszKey = + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\FontSubstitutes"; + +typedef std::set<STRING> FONTNAMESET; +typedef std::vector<ITEM> ITEMVECTOR; + +FONTNAMESET g_Names; +ITEMVECTOR g_Items; +STRING g_strFontName; +STRING g_strSubstitute; +BYTE g_CharSet1 = DEFAULT_CHARSET; +BYTE g_CharSet2 = DEFAULT_CHARSET; + +typedef struct CHARSET_ENTRY +{ + BYTE CharSet; + LPCWSTR DisplayName; +} CHARSET_ENTRY; + +CHARSET_ENTRY g_CharSetList[] = +{ + { DEFAULT_CHARSET, L"DEFAULT_CHARSET (1)" }, + { ANSI_CHARSET, L"ANSI_CHARSET (0)" }, + { SYMBOL_CHARSET, L"SYMBOL_CHARSET (2)" }, + { SHIFTJIS_CHARSET, L"SHIFTJIS_CHARSET (128)" }, + { HANGUL_CHARSET, L"HANGUL_CHARSET (129)" }, + { GB2312_CHARSET, L"GB2312_CHARSET (134)" }, + { CHINESEBIG5_CHARSET, L"CHINESEBIG5_CHARSET (136)" }, + { OEM_CHARSET, L"OEM_CHARSET (255)" }, + { JOHAB_CHARSET, L"JOHAB_CHARSET (130)" }, + { HEBREW_CHARSET, L"HEBREW_CHARSET (177)" }, + { ARABIC_CHARSET, L"ARABIC_CHARSET (178)" }, + { GREEK_CHARSET, L"GREEK_CHARSET (161)" }, + { TURKISH_CHARSET, L"TURKISH_CHARSET (162)" }, + { VIETNAMESE_CHARSET, L"VIETNAMESE_CHARSET (163)" }, + { THAI_CHARSET, L"THAI_CHARSET (222)" }, + { EASTEUROPE_CHARSET, L"EASTEUROPE_CHARSET (238)" }, + { RUSSIAN_CHARSET, L"RUSSIAN_CHARSET (204)" }, + { MAC_CHARSET, L"MAC_CHARSET (77)" }, + { BALTIC_CHARSET, L"BALTIC_CHARSET (186)" } +}; +const WCHAR g_LongestName[] = L"CHINESEBIG5_CHARSET (136)"; + +static void trim(STRING& str) +{ + static const WCHAR Spaces[] = L" \t\r\n"; + size_t i = str.find_first_not_of(Spaces); + size_t j = str.find_last_not_of(Spaces); + if (i == STRING::npos || j == STRING::npos) + { + str.clear(); + } + else + { + str = str.substr(i, j - i + 1); + } +} + +static int CALLBACK +EnumFontFamExProc(const ENUMLOGFONTW *pelf, + const NEWTEXTMETRICW *pntm, + int FontType, + LPARAM lParam) +{ + switch (pelf->elfFullName[0]) + { + case UNICODE_NULL: case L'@': + break; + default: + g_Names.insert((const WCHAR *)pelf->elfFullName); + } + switch (pelf->elfLogFont.lfFaceName[0]) + { + case UNICODE_NULL: case L'@': + break; + default: + g_Names.insert(pelf->elfLogFont.lfFaceName); + } + return 1; +} + +BOOL DoLoadNames(void) +{ + g_Names.clear(); + + LOGFONTW lf; + ZeroMemory(&lf, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + + HDC hDC = CreateCompatibleDC(NULL); + EnumFontFamiliesExW(hDC, &lf, (FONTENUMPROCW)EnumFontFamExProc, 0, 0); + DeleteDC(hDC); + + return !g_Names.empty(); +} + +inline bool ItemCompareByNameAscend(const ITEM& Item1, const ITEM& Item2) +{ + return Item1.m_Name < Item2.m_Name; +} + +inline bool ItemCompareByNameDescend(const ITEM& Item1, const ITEM& Item2) +{ + return Item1.m_Name > Item2.m_Name; +} + +inline bool ItemCompareBySubAscend(const ITEM& Item1, const ITEM& Item2) +{ + return Item1.m_Substitute < Item2.m_Substitute; +} + +inline bool ItemCompareBySubDescend(const ITEM& Item1, const ITEM& Item2) +{ + return Item1.m_Substitute > Item2.m_Substitute; +} + +void DoSort(INT iColumn, BOOL bAscendant = TRUE) +{ + LV_COLUMN Column; + ZeroMemory(&Column, sizeof(Column)); + Column.mask = LVCF_IMAGE | LVCF_SUBITEM; + Column.iImage = 2; + Column.iSubItem = 0; + ListView_SetColumn(g_hListView, 0, &Column); + Column.iSubItem = 1; + ListView_SetColumn(g_hListView, 1, &Column); + + switch (iColumn) + { + case 0: + Column.iSubItem = 0; + if (bAscendant) + { + std::sort(g_Items.begin(), g_Items.end(), + ItemCompareByNameAscend); + Column.iImage = 0; + ListView_SetColumn(g_hListView, 0, &Column); + } + else + { + std::sort(g_Items.begin(), g_Items.end(), + ItemCompareByNameDescend); + Column.iImage = 1; + ListView_SetColumn(g_hListView, 0, &Column); + } + break; + case 1: + Column.iSubItem = 1; + if (bAscendant) + { + std::sort(g_Items.begin(), g_Items.end(), + ItemCompareBySubAscend); + Column.iImage = 0; + ListView_SetColumn(g_hListView, 1, &Column); + } + else + { + std::sort(g_Items.begin(), g_Items.end(), + ItemCompareBySubDescend); + Column.iImage = 1; + ListView_SetColumn(g_hListView, 1, &Column); + } + break; + } + g_iSortColumn = iColumn; + g_bSortAscendant = bAscendant; + InvalidateRect(g_hListView, NULL, TRUE); +} + +void LV_AddItems(HWND hwnd) +{ + ListView_DeleteAllItems(hwnd); + + LV_ITEM Item; + ZeroMemory(&Item, sizeof(Item)); + Item.mask = LVIF_PARAM; + + const INT Count = INT(g_Items.size()); + for (INT i = 0; i < Count; ++i) + { + Item.iItem = i; + Item.iSubItem = 0; + Item.lParam = i; + ListView_InsertItem(hwnd, &Item); + + Item.iItem = i; + Item.iSubItem = 1; + Item.lParam = i; + ListView_InsertItem(hwnd, &Item); + } +} + +BOOL DoLoadItems(void) +{ + ITEMVECTOR Items; + + HKEY hKey = NULL; + RegOpenKeyExW(HKEY_LOCAL_MACHINE, g_pszKey, 0, KEY_READ, &hKey); + if (hKey == NULL) + return FALSE; + + WCHAR szName[MAX_STRING], szValue[MAX_STRING]; + DWORD cbName, cbValue; + for (DWORD dwIndex = 0; ; ++dwIndex) + { + cbName = sizeof(szName); + cbValue = sizeof(szValue); + LONG Error = RegEnumValueW(hKey, dwIndex, szName, &cbName, + NULL, NULL, (LPBYTE)szValue, &cbValue); + if (Error != ERROR_SUCCESS) + break; + + BYTE CharSet1 = DEFAULT_CHARSET, CharSet2 = DEFAULT_CHARSET; + LPWSTR pch; + + pch = wcsrchr(szName, L','); + if (pch) + { + *pch = 0; + CharSet1 = (BYTE)_wtoi(pch + 1); + } + + pch = wcsrchr(szValue, L','); + if (pch) + { + *pch = 0; + CharSet2 = (BYTE)_wtoi(pch + 1); + } + + ITEM Item(szName, szValue, CharSet1, CharSet2); + trim(Item.m_Name); + trim(Item.m_Substitute); + Items.push_back(Item); + } + + RegCloseKey(hKey); + + g_Items = Items; + LV_AddItems(g_hListView); + DoSort(0, TRUE); + g_bModified = FALSE; + g_bNeedsReboot = FALSE; + + return !g_Items.empty(); +} + +BOOL DoLoad(void) +{ + return DoLoadNames() && DoLoadItems(); +} + +void LV_InvalidateRow(HWND hwnd, INT iRow = -1) +{ + if (iRow == -1) + iRow = ListView_GetNextItem(hwnd, -1, LVNI_SELECTED); + if (iRow == -1) + return; + + RECT Rect; + LPRECT GccIsWhining = &Rect; + ListView_GetItemRect(hwnd, iRow, GccIsWhining, LVIR_BOUNDS); + InvalidateRect(hwnd, &Rect, FALSE); +} + +BOOL LV_Init(HWND hwnd) +{ + ListView_SetExtendedListViewStyle(hwnd, + LVS_EX_FULLROWSELECT | LVS_EX_GRIDLINES); + + HIMAGELIST hImageList; + hImageList = ImageList_Create(12, 12, ILC_COLOR8 | ILC_MASK, 2, 2); + + HBITMAP hbm; + hbm = (HBITMAP)LoadImage(g_hInstance, MAKEINTRESOURCE(2), IMAGE_BITMAP, + 12, 12, LR_CREATEDIBSECTION | LR_LOADMAP3DCOLORS); + assert(hbm); + ImageList_AddMasked(hImageList, hbm, RGB(192, 192, 192)); + DeleteObject(hbm); + + hbm = (HBITMAP)LoadImage(g_hInstance, MAKEINTRESOURCE(3), IMAGE_BITMAP, + 12, 12, LR_CREATEDIBSECTION | LR_LOADMAP3DCOLORS); + assert(hbm); + ImageList_AddMasked(hImageList, hbm, RGB(192, 192, 192)); + DeleteObject(hbm); + + hbm = (HBITMAP)LoadImage(g_hInstance, MAKEINTRESOURCE(4), IMAGE_BITMAP, + 12, 12, LR_CREATEDIBSECTION | LR_LOADMAP3DCOLORS); + assert(hbm); + ImageList_AddMasked(hImageList, hbm, RGB(192, 192, 192)); + DeleteObject(hbm); + + ListView_SetImageList(hwnd, hImageList, LVSIL_SMALL); + + LV_COLUMNW Column; + ZeroMemory(&Column, sizeof(Column)); + Column.mask = LVCF_FMT | LVCF_TEXT | LVCF_SUBITEM | LVCF_WIDTH | LVCF_IMAGE; + Column.fmt = LVCFMT_LEFT; + + Column.cx = NAME_COLUMN_WIDTH; + Column.pszText = g_szNameHead; + Column.iSubItem = 0; + Column.iImage = 0; + ListView_InsertColumn(hwnd, 0, &Column); + + Column.cx = SUB_COLUMN_WIDTH; + Column.pszText = g_szSubstituteHead; + Column.iSubItem = 1; + Column.iImage = 2; + ListView_InsertColumn(hwnd, 1, &Column); + + UINT State = LVIS_SELECTED | LVIS_FOCUSED; + ListView_SetItemState(hwnd, 0, State, State); + + return TRUE; +} + +BOOL EditDlg_OnInitDialog(HWND hwnd, HWND hwndFocus, LPARAM lParam) +{ + COMBOBOXEXITEMW Item; + ZeroMemory(&Item, sizeof(Item)); + Item.mask = CBEIF_TEXT; + + FONTNAMESET::iterator it, end = g_Names.end(); + for (it = g_Names.begin(); it != end; ++it) + { + Item.pszText = const_cast<LPWSTR>(it->c_str()); + Item.iItem = ComboBox_GetCount(GetDlgItem(hwnd, cmb2)); + SendDlgItemMessageW(hwnd, cmb2, CBEM_INSERTITEM, 0, (LPARAM)&Item); + } + SetDlgItemTextW(hwnd, edt1, g_strFontName.c_str()); + SetDlgItemTextW(hwnd, cmb2, g_strSubstitute.c_str()); + + const INT Count = _countof(g_CharSetList); + for (INT i = 0; i < Count; ++i) + { + Item.pszText = const_cast<LPWSTR>(g_CharSetList[i].DisplayName); + Item.iItem = ComboBox_GetCount(GetDlgItem(hwnd, cmb3)); + SendDlgItemMessageW(hwnd, cmb3, CBEM_INSERTITEM, 0, (LPARAM)&Item); + Item.iItem = ComboBox_GetCount(GetDlgItem(hwnd, cmb4)); + SendDlgItemMessageW(hwnd, cmb4, CBEM_INSERTITEM, 0, (LPARAM)&Item); + } + + SendDlgItemMessageW(hwnd, cmb3, CB_SETCURSEL, 0, 0); + SendDlgItemMessageW(hwnd, cmb4, CB_SETCURSEL, 0, 0); + for (INT i = 0; i < Count; ++i) + { + if (g_CharSet1 == g_CharSetList[i].CharSet) + { + SendDlgItemMessageW(hwnd, cmb3, CB_SETCURSEL, i, 0); + } + if (g_CharSet2 == g_CharSetList[i].CharSet) + { + SendDlgItemMessageW(hwnd, cmb4, CB_SETCURSEL, i, 0); + } + } + + SIZE siz; + HDC hDC = CreateCompatibleDC(NULL); + SelectObject(hDC, GetStockObject(DEFAULT_GUI_FONT)); + GetTextExtentPoint32W(hDC, g_LongestName, lstrlenW(g_LongestName), &siz); + DeleteDC(hDC); + + SendDlgItemMessageW(hwnd, cmb3, CB_SETHORIZONTALEXTENT, siz.cx + 16, 0); + SendDlgItemMessageW(hwnd, cmb4, CB_SETHORIZONTALEXTENT, siz.cx + 16, 0); + + EnableWindow(GetDlgItem(hwnd, cmb3), FALSE); + + return TRUE; +} + +void LV_OnDelete(HWND hwnd, INT iRow = -1) +{ + if (iRow == -1) + iRow = ListView_GetNextItem(hwnd, -1, LVNI_SELECTED); + if (iRow == -1) + return; + + UINT State = LVIS_SELECTED | LVIS_FOCUSED; + ListView_SetItemState(g_hListView, iRow, State, State); + + WCHAR sz[MAX_STRING]; + LoadStringW(g_hInstance, IDS_QUERYDELETE, sz, _countof(sz)); + if (IDYES != MessageBoxW(g_hMainWnd, sz, g_szTitle, + MB_ICONINFORMATION | MB_YESNO)) + { + return; + } + + ListView_DeleteItem(hwnd, iRow); + g_Items.erase(g_Items.begin() + iRow); + g_bModified = TRUE; + + ListView_SetItemState(g_hListView, iRow, State, State); + + InvalidateRect(hwnd, NULL, TRUE); +} + +void EditDlg_OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify) +{ + WCHAR szValue[MAX_STRING]; + STRING str; + INT i; + + switch (id) + { + case IDOK: + GetDlgItemTextW(hwnd, cmb2, szValue, _countof(szValue)); + str = szValue; + trim(str); + if (str.empty()) + { + WCHAR sz[MAX_STRING]; + SendDlgItemMessageW(hwnd, cmb2, CB_SETEDITSEL, 0, MAKELPARAM(0, -1)); + SetFocus(GetDlgItem(hwnd, cmb2)); + LoadStringW(g_hInstance, IDS_ENTERNAME2, sz, _countof(sz)); + MessageBoxW(hwnd, sz, NULL, MB_ICONERROR); + return; + } + + g_Items[g_iItem].m_CharSet2 = DEFAULT_CHARSET; + i = SendDlgItemMessageW(hwnd, cmb4, CB_GETCURSEL, 0, 0); + if (i != CB_ERR) + { + g_Items[g_iItem].m_CharSet2 = g_CharSetList[i].CharSet; + } + g_Items[g_iItem].m_Substitute = str; + + g_bModified = TRUE; + EndDialog(hwnd, IDOK); + break; + case IDCANCEL: + EndDialog(hwnd, IDCANCEL); + break; + case psh1: + LV_OnDelete(g_hListView, g_iItem); + EndDialog(hwnd, psh1); + break; + } +} + +INT_PTR CALLBACK +EditDlg_DlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + HANDLE_MSG(hwnd, WM_INITDIALOG, EditDlg_OnInitDialog); + HANDLE_MSG(hwnd, WM_COMMAND, EditDlg_OnCommand); + } + return 0; +} + +void LV_OnDblClk(HWND hwnd) +{ + g_iItem = ListView_GetNextItem(hwnd, -1, LVNI_SELECTED); + if (g_iItem == -1) + return; + + g_strFontName = g_Items[g_iItem].m_Name; + g_strSubstitute = g_Items[g_iItem].m_Substitute; + g_CharSet1 = g_Items[g_iItem].m_CharSet1; + g_CharSet2 = g_Items[g_iItem].m_CharSet2; + + DialogBox(g_hInstance, MAKEINTRESOURCE(IDD_EDIT), g_hMainWnd, + EditDlg_DlgProc); + InvalidateRect(g_hListView, NULL, TRUE); +} + +BOOL MainWnd_OnCreate(HWND hwnd, LPCREATESTRUCT lpCreateStruct) +{ + DWORD dwStyle = WS_CHILD | WS_VISIBLE | WS_VSCROLL | + LVS_SINGLESEL | LVS_REPORT | LVS_OWNERDRAWFIXED; + DWORD dwExStyle = WS_EX_CLIENTEDGE; + g_hListView = CreateWindowEx(dwExStyle, WC_LISTVIEW, NULL, dwStyle, + 0, 0, 0, 0, + hwnd, (HMENU)1, g_hInstance, NULL); + if (g_hListView == NULL) + return FALSE; + + if (!LV_Init(g_hListView)) + return FALSE; + + if (!DoLoad()) + return FALSE; + + UINT State = LVIS_SELECTED | LVIS_FOCUSED; + ListView_SetItemState(g_hListView, 0, State, State); + SetFocus(g_hListView); + return TRUE; +} + +BOOL AddDlg_OnInitDialog(HWND hwnd, HWND hwndFocus, LPARAM lParam) +{ + COMBOBOXEXITEMW Item; + ZeroMemory(&Item, sizeof(Item)); + Item.iItem = -1; + Item.mask = CBEIF_TEXT; + + FONTNAMESET::iterator it, end = g_Names.end(); + for (it = g_Names.begin(); it != end; ++it) + { + Item.pszText = const_cast<LPWSTR>(it->c_str()); + Item.iItem = ComboBox_GetCount(GetDlgItem(hwnd, cmb1)); + SendDlgItemMessageW(hwnd, cmb1, CBEM_INSERTITEM, 0, (LPARAM)&Item); + Item.iItem = ComboBox_GetCount(GetDlgItem(hwnd, cmb2)); + SendDlgItemMessageW(hwnd, cmb2, CBEM_INSERTITEM, 0, (LPARAM)&Item); + } + WCHAR szEnterName[MAX_STRING]; + LoadStringW(g_hInstance, IDS_ENTERNAME, szEnterName, _countof(szEnterName)); + SetDlgItemTextW(hwnd, cmb1, szEnterName); + SendDlgItemMessageW(hwnd, cmb1, CB_SETEDITSEL, 0, MAKELPARAM(0, -1)); + + const INT Count = _countof(g_CharSetList); + for (INT i = 0; i < Count; ++i) + { + Item.pszText = const_cast<LPWSTR>(g_CharSetList[i].DisplayName); + Item.iItem = ComboBox_GetCount(GetDlgItem(hwnd, cmb3)); + SendDlgItemMessageW(hwnd, cmb3, CBEM_INSERTITEM, 0, (LPARAM)&Item); + Item.iItem = ComboBox_GetCount(GetDlgItem(hwnd, cmb4)); + SendDlgItemMessageW(hwnd, cmb4, CBEM_INSERTITEM, 0, (LPARAM)&Item); + } + + SendDlgItemMessageW(hwnd, cmb3, CB_SETCURSEL, 0, 0); + SendDlgItemMessageW(hwnd, cmb4, CB_SETCURSEL, 0, 0); + for (INT i = 0; i < Count; ++i) + { + if (g_CharSet1 == g_CharSetList[i].CharSet) + { + SendDlgItemMessageW(hwnd, cmb3, CB_SETCURSEL, i, 0); + } + if (g_CharSet2 == g_CharSetList[i].CharSet) + { + SendDlgItemMessageW(hwnd, cmb4, CB_SETCURSEL, i, 0); + } + } + + SIZE siz; + HDC hDC = CreateCompatibleDC(NULL); + SelectObject(hDC, GetStockObject(DEFAULT_GUI_FONT)); + GetTextExtentPoint32W(hDC, g_LongestName, lstrlenW(g_LongestName), &siz); + DeleteDC(hDC); + + SendDlgItemMessageW(hwnd, cmb3, CB_SETHORIZONTALEXTENT, siz.cx + 16, 0); + SendDlgItemMessageW(hwnd, cmb4, CB_SETHORIZONTALEXTENT, siz.cx + 16, 0); + + return TRUE; +} + +void AddDlg_OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify) +{ + WCHAR szKey[MAX_STRING], szValue[MAX_STRING], sz[MAX_STRING]; + INT i, iCharSet1, iCharSet2; + BYTE CharSet1, CharSet2; + STRING key, value; + switch (id) + { + case IDOK: + GetDlgItemTextW(hwnd, cmb1, szKey, _countof(szKey)); + key = szKey; + trim(key); + LoadStringW(g_hInstance, IDS_ENTERNAME, sz, _countof(sz)); + if (key.empty() || key == sz) + { + SendDlgItemMessageW(hwnd, cmb1, CB_SETEDITSEL, 0, MAKELPARAM(0, -1)); + SetFocus(GetDlgItem(hwnd, cmb1)); + LoadStringW(g_hInstance, IDS_ENTERNAME2, sz, _countof(sz)); + MessageBoxW(hwnd, sz, NULL, MB_ICONERROR); + return; + } + + GetDlgItemTextW(hwnd, cmb2, szValue, _countof(szValue)); + value = szValue; + trim(value); + if (value.empty()) + { + SendDlgItemMessageW(hwnd, cmb2, CB_SETEDITSEL, 0, MAKELPARAM(0, -1)); + SetFocus(GetDlgItem(hwnd, cmb2)); + LoadStringW(g_hInstance, IDS_ENTERNAME2, sz, _countof(sz)); + MessageBoxW(hwnd, sz, NULL, MB_ICONERROR); + return; + } + + iCharSet1 = SendDlgItemMessageW(hwnd, cmb3, CB_GETCURSEL, 0, 0); + if (iCharSet1 == CB_ERR) + iCharSet1 = 0; + iCharSet2 = SendDlgItemMessageW(hwnd, cmb4, CB_GETCURSEL, 0, 0); + if (iCharSet2 == CB_ERR) + iCharSet2 = 0; + + CharSet1 = g_CharSetList[iCharSet1].CharSet; + CharSet2 = g_CharSetList[iCharSet2].CharSet; + + for (i = 0; i < (INT)g_Items.size(); ++i) + { + if (g_Items[i].m_Name == key && + g_Items[i].m_CharSet1 == CharSet1) + { + WCHAR sz[MAX_STRING]; + SendDlgItemMessageW(hwnd, cmb1, CB_SETEDITSEL, 0, MAKELPARAM(0, -1)); + SetFocus(GetDlgItem(hwnd, cmb1)); + LoadStringW(g_hInstance, IDS_ALREADYEXISTS, sz, _countof(sz)); + MessageBoxW(hwnd, sz, NULL, MB_ICONERROR); + return; + } + } + { + ITEM Item(key, value, CharSet1, CharSet2); + g_Items.push_back(Item); + g_bModified = TRUE; + + i = (INT)g_Items.size(); + LV_ITEM LvItem; + ZeroMemory(&LvItem, sizeof(LvItem)); + LvItem.mask = LVIF_PARAM; + LvItem.iItem = i; + LvItem.lParam = i; + + LvItem.iSubItem = 0; + ListView_InsertItem(g_hListView, &LvItem); + + LvItem.iSubItem = 1; + ListView_InsertItem(g_hListView, &LvItem); + } + g_bModified = TRUE; + EndDialog(hwnd, IDOK); + break; + case IDCANCEL: + EndDialog(hwnd, IDCANCEL); + break; + } +} + +INT_PTR CALLBACK +AddDlg_DlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + HANDLE_MSG(hwnd, WM_INITDIALOG, AddDlg_OnInitDialog); + HANDLE_MSG(hwnd, WM_COMMAND, AddDlg_OnCommand); + } + return 0; +} + +void MainWnd_OnNew(HWND hwnd) +{ + g_iItem = ListView_GetNextItem(hwnd, -1, LVNI_SELECTED); + if (g_iItem == -1) + return; + + g_strFontName = g_Items[g_iItem].m_Name; + g_strSubstitute = g_Items[g_iItem].m_Substitute; + g_CharSet1 = g_Items[g_iItem].m_CharSet1; + g_CharSet2 = g_Items[g_iItem].m_CharSet2; + + if (IDOK == DialogBox(g_hInstance, MAKEINTRESOURCE(IDD_ADD), g_hMainWnd, + AddDlg_DlgProc)) + { + INT i = ListView_GetItemCount(g_hListView) - 1; + UINT State = LVIS_SELECTED | LVIS_FOCUSED; + ListView_SetItemState(g_hListView, i, State, State); + ListView_EnsureVisible(g_hListView, i, FALSE); + } +} + +BOOL MainWnd_OnUpdateRegistry(HWND hwnd) +{ + // open the key + HKEY hKey = NULL; + RegOpenKeyExW(HKEY_LOCAL_MACHINE, g_pszKey, 0, KEY_ALL_ACCESS, &hKey); + if (hKey == NULL) + return FALSE; + + // clear all values + WCHAR szName[MAX_STRING], szValue[MAX_STRING]; + DWORD cbName, cbValue; + for (;;) + { + cbName = sizeof(szName); + cbValue = sizeof(szValue); + LONG Error = RegEnumValueW(hKey, 0, szName, &cbName, + NULL, NULL, (LPBYTE)szValue, &cbValue); + if (Error != ERROR_SUCCESS) + break; + + RegDeleteValueW(hKey, szName); + } + + // set values + size_t Count = g_Items.size(); + for (size_t i = 0; i < Count; ++i) + { + DWORD cbData = (g_Items[i].m_Substitute.size() + 1) * sizeof(WCHAR); + RegSetValueExW(hKey, g_Items[i].m_Name.c_str(), 0, + REG_SZ, (LPBYTE)g_Items[i].m_Substitute.c_str(), cbData); + } + + // close now + RegCloseKey(hKey); + + g_bModified = FALSE; + g_bNeedsReboot = TRUE; + return TRUE; +} + +LPWSTR SkipSpace(LPCWSTR pch) +{ + while (*pch && wcschr(L" \t\r\n", *pch) != NULL) + { + ++pch; + } + return const_cast<LPWSTR>(pch); +} + +LPWSTR SkipQuoted(LPWSTR pch) +{ + ++pch; // L'"' + while (*pch) + { + if (*pch == L'"') + { + ++pch; + break; + } + if (*pch == L'\\') + { + ++pch; + } + ++pch; + } + return pch; +} + +void UnescapeHex(const STRING& str, size_t& i, STRING& Ret, BOOL Unicode) +{ + STRING Num; + + // hexadecimal + if (iswxdigit(str[i])) + { + Num += str[i]; + ++i; + if (iswxdigit(str[i])) + { + Num += str[i]; + ++i; + if (Unicode) + { + if (iswxdigit(str[i])) + { + Num += str[i]; + ++i; + if (iswxdigit(str[i])) + { + Num += str[i]; + ++i; + } + } + } + } + } + if (!Num.empty()) + { + Ret += (WCHAR)wcstoul(&Num[0], NULL, 16); + } +} + +void UnescapeOther(const STRING& str, size_t& i, STRING& Ret) +{ + STRING Num; + + // check octal + if (L'0' <= str[i] && str[i] < L'8') + { + Num += str[i]; + ++i; + if (L'0' <= str[i] && str[i] < L'8') + { + Num += str[i]; + ++i; + if (L'0' <= str[i] && str[i] < L'8') + { + Num += str[i]; + ++i; + } + } + } + if (Num.empty()) + { + Ret += str[i]; + ++i; + } + else + { + // octal + Ret += (WCHAR)wcstoul(&Num[0], NULL, 8); + } +} + +// process escape sequence +void UnescapeChar(const STRING& str, size_t& i, STRING& Ret) +{ + if (str[i] != L'\\') + { + Ret += str[i]; + ++i; + return; + } + + ++i; + switch (str[i]) + { + case L'a': Ret += L'\a'; ++i; break; + case L'b': Ret += L'\b'; ++i; break; + case L'f': Ret += L'\f'; ++i; break; + case L'n': Ret += L'\n'; ++i; break; + case L'r': Ret += L'\r'; ++i; break; + case L't': Ret += L'\t'; ++i; break; + case L'v': Ret += L'\v'; ++i; break; + case L'x': + // hexidemical + ++i; + UnescapeHex(str, i, Ret, FALSE); + break; + case L'u': + // Unicode hexidemical + ++i; + UnescapeHex(str, i, Ret, TRUE); + break; + default: + // other case + UnescapeOther(str, i, Ret); + break; + } +} + +STRING Unquote(const STRING& str) +{ + if (str[0] != L'"') + return str; + + STRING Ret; + size_t i = 1; + while (i < str.size()) + { + if (str[i] == L'"' || str[i] == UNICODE_NULL) + break; + + UnescapeChar(str, i, Ret); + } + return Ret; +} + +BOOL DoParseFile(LPVOID pvContents, DWORD dwSize) +{ + ITEMVECTOR Items; + + LPWSTR pch, pchSep, pchStart = (LPWSTR)pvContents; + + pchStart[dwSize / sizeof(WCHAR)] = UNICODE_NULL; + + // check header + const DWORD cbHeader = lstrlenW(g_pszFileHeader) * sizeof(WCHAR); + if (memcmp(pchStart, g_pszFileHeader, cbHeader) != 0) + return FALSE; + + pchStart += cbHeader / sizeof(WCHAR); + + // find the key + WCHAR szKey[MAX_STRING]; + wsprintfW(szKey, L"[HKEY_LOCAL_MACHINE\\%s]", g_pszKey); + pch = wcsstr(pchStart, szKey); + if (pch == NULL) + return FALSE; + + pchStart = pch + lstrlenW(szKey); + + for (;;) + { + pchStart = SkipSpace(pchStart); + if (*pchStart == UNICODE_NULL || *pchStart == L'[') + break; + + pch = wcschr(pchStart, L'\n'); + if (pch) + *pch = UNICODE_NULL; + + pchSep = SkipQuoted(pchStart); + if (*pchSep == L'=') + { + *pchSep = UNICODE_NULL; + + STRING key = pchStart; + trim(key); + key = Unquote(key); + + STRING value = pchSep + 1; + trim(value); + value = Unquote(value); + + BYTE CharSet1 = DEFAULT_CHARSET, CharSet2 = DEFAULT_CHARSET; + + size_t pos; + pos = key.find(L','); + if (pos != STRING::npos) + { + CharSet1 = (BYTE)_wtoi(&key[pos + 1]); + key.resize(pos); + trim(key); + } + pos = value.find(L','); + if (pos != STRING::npos) + { + CharSet2 = (BYTE)_wtoi(&value[pos + 1]); + value.resize(pos); + trim(value); + } + + ITEM Item(key, value, CharSet1, CharSet2); + Items.push_back(Item); + } + + if (pch == NULL) + break; + + pchStart = pch + 1; + } + + g_Items = Items; + g_bModified = TRUE; + + LV_AddItems(g_hListView); + return TRUE; +} + +BOOL DoImport(HWND hwnd, LPCWSTR pszFile) +{ + HANDLE hFile = CreateFileW(pszFile, GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, + OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL); + if (hFile == INVALID_HANDLE_VALUE) + return FALSE; + + BOOL bSuccess = FALSE; + DWORD dwSize = GetFileSize(hFile, NULL); + if (dwSize != 0xFFFFFFFF) + { + std::vector<BYTE> Contents(dwSize + 2); + DWORD cbRead; + if (ReadFile(hFile, &Contents[0], dwSize, &cbRead, NULL) && + cbRead == dwSize) + { + /* check BOM */ + if (memcmp(&Contents[0], "\xFF\xFE", 2) == 0) + { + bSuccess = DoParseFile(&Contents[2], dwSize - 2); + } + else + { + bSuccess = DoParseFile(&Contents[0], dwSize); + } + } + } + CloseHandle(hFile); + + return bSuccess; +} + +STRING Escape(const STRING& str) +{ + STRING Ret; + for (size_t i = 0; i < str.size(); ++i) + { + switch (str[i]) + { + case L'"': case L'\\': + Ret += L'\\'; + Ret += str[i]; + break; + default: + Ret += str[i]; + } + } + return Ret; +} + +BOOL DoExport(HWND hwnd, LPCWSTR pszFile) +{ + HANDLE hFile = CreateFileW(pszFile, GENERIC_WRITE, FILE_SHARE_READ, + NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_WRITE_THROUGH, NULL); + if (hFile == INVALID_HANDLE_VALUE) + return FALSE; + + BOOL bSuccess; + DWORD dwSize, cbWritten; + WCHAR szCharSet1[MAX_STRING], szCharSet2[MAX_STRING]; + WCHAR szLine[MAX_STRING * 2 + 4]; + + /* write header */ + dwSize = lstrlenW(g_pszFileHeader) * sizeof(WCHAR); + bSuccess = + WriteFile(hFile, "\xFF\xFE", 2, &cbWritten, NULL) && + WriteFile(hFile, g_pszFileHeader, dwSize, &cbWritten, NULL); + if (bSuccess) + { + wsprintfW(szLine, L"\r\n\r\n[HKEY_LOCAL_MACHINE\\%s]\r\n", g_pszKey); + dwSize = lstrlenW(szLine) * sizeof(WCHAR); + bSuccess = WriteFile(hFile, szLine, dwSize, &cbWritten, NULL); + } + if (bSuccess) + { + size_t i, Count = g_Items.size(); + for (i = 0; i < Count; ++i) + { + if (g_Items[i].m_CharSet1 != DEFAULT_CHARSET) + wsprintfW(szCharSet1, L",%u", g_Items[i].m_CharSet1); + else + szCharSet1[0] = UNICODE_NULL; + + if (g_Items[i].m_CharSet2 != DEFAULT_CHARSET) + wsprintfW(szCharSet2, L",%u", g_Items[i].m_CharSet2); + else + szCharSet2[0] = UNICODE_NULL; + + STRING Name = Escape(g_Items[i].m_Name); + STRING Substitute = Escape(g_Items[i].m_Substitute); + wsprintfW(szLine, L"\"%s%s\"=\"%s%s\"\r\n", + Name.c_str(), szCharSet1, + Substitute.c_str(), szCharSet2); + + dwSize = lstrlenW(szLine) * sizeof(WCHAR); + if (!WriteFile(hFile, szLine, dwSize, &cbWritten, NULL)) + { + bSuccess = FALSE; + break; + } + } + WriteFile(hFile, L"\r\n", 2 * sizeof(WCHAR), &cbWritten, NULL); + } + CloseHandle(hFile); + + if (!bSuccess) + { + DeleteFileW(pszFile); + } + + return bSuccess; +} + +void MakeFilter(LPWSTR pszFilter) +{ + while (*pszFilter) + { + if (*pszFilter == L'|') + *pszFilter = 0; + + ++pszFilter; + } +} + +void MainWnd_OnImport(HWND hwnd) +{ + OPENFILENAMEW ofn = {0}; + WCHAR szFile[MAX_PATH] = L""; + WCHAR szImportTitle[MAX_STRING]; + WCHAR szCannotImport[MAX_STRING]; + WCHAR szImportFilter[MAX_STRING]; + LoadStringW(g_hInstance, IDS_IMPORT, szImportTitle, _countof(szImportTitle)); + LoadStringW(g_hInstance, IDS_CANTIMPORT, szCannotImport, _countof(szCannotImport)); + LoadStringW(g_hInstance, IDS_INPFILTER, szImportFilter, _countof(szImportFilter)); + MakeFilter(szImportFilter); + + ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400; + ofn.hwndOwner = hwnd; + ofn.lpstrFilter = szImportFilter; + ofn.lpstrFile = szFile; + ofn.nMaxFile = _countof(szFile); + ofn.lpstrTitle = szImportTitle; + ofn.Flags = OFN_DONTADDTORECENT | OFN_ENABLESIZING | + OFN_EXPLORER | OFN_FILEMUSTEXIST | + OFN_HIDEREADONLY | OFN_LONGNAMES | + OFN_PATHMUSTEXIST; + ofn.lpstrDefExt = L"reg"; + if (GetOpenFileNameW(&ofn)) + { + if (!DoImport(hwnd, szFile)) + { + MessageBoxW(hwnd, szCannotImport, g_szTitle, MB_ICONERROR); + } + } +} + +void MainWnd_OnExport(HWND hwnd) +{ + OPENFILENAMEW ofn = {0}; + WCHAR szFile[MAX_PATH] = L""; + WCHAR szExportTitle[MAX_STRING]; + WCHAR szCannotExport[MAX_STRING]; + WCHAR szExportFilter[MAX_STRING]; + LoadStringW(g_hInstance, IDS_EXPORT, szExportTitle, _countof(szExportTitle)); + LoadStringW(g_hInstance, IDS_CANTEXPORT, szCannotExport, _countof(szCannotExport)); + LoadStringW(g_hInstance, IDS_OUTFILTER, szExportFilter, _countof(szExportFilter)); + MakeFilter(szExportFilter); + + ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400; + ofn.hwndOwner = hwnd; + ofn.lpstrFilter = szExportFilter; + ofn.lpstrFile = szFile; + ofn.nMaxFile = _countof(szFile); + ofn.lpstrTitle = szExportTitle; + ofn.Flags = OFN_DONTADDTORECENT | OFN_ENABLESIZING | + OFN_EXPLORER | OFN_HIDEREADONLY | OFN_LONGNAMES | + OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT; + ofn.lpstrDefExt = L"reg"; + if (GetSaveFileNameW(&ofn)) + { + if (!DoExport(hwnd, szFile)) + { + MessageBoxW(hwnd, szCannotExport, g_szTitle, MB_ICONERROR); + } + } +} + +void MainWnd_OnReload(HWND hwnd) +{ + DoLoad(); +} + +void MainWnd_OnEdit(HWND hwnd) +{ + LV_OnDblClk(g_hListView); +} + +void MainWnd_OnDelete(HWND hwnd) +{ + LV_OnDelete(g_hListView); +} + +void MainWnd_OnOpenRegKey(HWND hwnd) +{ + static const WCHAR s_szRegeditKey[] = + L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Applets\\Regedit"; + WCHAR sz[MAX_STRING]; + + // open regedit key + HKEY hKey = NULL; + LSTATUS Result = RegCreateKeyExW(HKEY_CURRENT_USER, s_szRegeditKey, 0, + NULL, 0, KEY_WRITE, NULL, &hKey, NULL); + if (Result != ERROR_SUCCESS) + { + LoadStringW(g_hInstance, IDS_CANTOPENKEY, sz, _countof(sz)); + MessageBoxW(hwnd, sz, NULL, MB_ICONERROR); + return; + } + + // set LastKey value + wsprintfW(sz, L"HKEY_LOCAL_MACHINE\\%s", g_pszKey); + DWORD dwSize = sizeof(sz); + Result = RegSetValueExW(hKey, L"LastKey", 0, REG_SZ, + (LPBYTE)sz, dwSize); + + // close now + RegCloseKey(hKey); + + if (Result != ERROR_SUCCESS) + { + LoadStringW(g_hInstance, IDS_CANTOPENKEY, sz, _countof(sz)); + MessageBoxW(hwnd, sz, NULL, MB_ICONERROR); + return; + } + + // open by regedit + ShellExecuteW(hwnd, NULL, L"regedit.exe", NULL, NULL, SW_SHOWNORMAL); +} + +void MainWnd_OnAbout(HWND hwnd) +{ + WCHAR szAbout[MAX_PATH]; + LoadStringW(g_hInstance, IDS_ABOUT, szAbout, _countof(szAbout)); + + MSGBOXPARAMS Params; + ZeroMemory(&Params, sizeof(Params)); + Params.cbSize = sizeof(Params); + Params.hwndOwner = hwnd; + Params.hInstance = g_hInstance; + Params.lpszText = szAbout; + Params.lpszCaption = g_szTitle; + Params.dwStyle = MB_OK | MB_USERICON; + Params.lpszIcon = MAKEINTRESOURCEW(1); + Params.dwLanguageId = LANG_USER_DEFAULT; + MessageBoxIndirectW(&Params); +} + +void MainWnd_OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify) +{ + switch (id) + { + case ID_NEW: + MainWnd_OnNew(hwnd); + break; + case ID_EDIT: + MainWnd_OnEdit(hwnd); + break; + case ID_EXIT: + PostMessage(hwnd, WM_CLOSE, 0, 0); + break; + case ID_RELOAD: + MainWnd_OnReload(hwnd); + break; + case ID_UPDATE_REGISTRY: + MainWnd_OnUpdateRegistry(hwnd); + break; + case ID_DELETE: + MainWnd_OnDelete(hwnd); + break; + case ID_IMPORT: + MainWnd_OnImport(hwnd); + break; + case ID_EXPORT: + MainWnd_OnExport(hwnd); + break; + case ID_OPEN_REGKEY: + MainWnd_OnOpenRegKey(hwnd); + break; + case ID_ABOUT: + MainWnd_OnAbout(hwnd); + break; + } +} + +void MainWnd_OnDestroy(HWND hwnd) +{ + PostQuitMessage(0); +} + +void MainWnd_OnSize(HWND hwnd, UINT state, int cx, int cy) +{ + MoveWindow(g_hListView, 0, 0, cx, cy, TRUE); +} + +void MainWnd_OnDrawItem(HWND hwnd, const DRAWITEMSTRUCT *lpDrawItem) +{ + if (lpDrawItem->CtlType != ODT_LISTVIEW) + return; + + HDC hDC = lpDrawItem->hDC; + SetBkMode(hDC, TRANSPARENT); + + INT iColumn = 0, x, cx; + RECT rcItem, rcSubItem, rcText; + STRING Str; + + x = -GetScrollPos(g_hListView, SB_HORZ); + + rcItem = lpDrawItem->rcItem; + if (lpDrawItem->itemState & ODS_SELECTED) + { + FillRect(hDC, &rcItem, (HBRUSH)(COLOR_HIGHLIGHT + 1)); + SetTextColor(hDC, GetSysColor(COLOR_HIGHLIGHTTEXT)); + } + else + { + FillRect(hDC, &rcItem, (HBRUSH)(COLOR_WINDOW + 1)); + SetTextColor(hDC, GetSysColor(COLOR_WINDOWTEXT)); + } + + cx = ListView_GetColumnWidth(g_hListView, iColumn); + rcSubItem = rcItem; + rcSubItem.left = x; + rcSubItem.right = x + cx; + + WCHAR sz[MAX_STRING]; + + rcText = rcSubItem; + InflateRect(&rcText, -1, -1); + Str = g_Items[lpDrawItem->itemID].m_Name; + BYTE CharSet1 = g_Items[lpDrawItem->itemID].m_CharSet1; + if (CharSet1 != DEFAULT_CHARSET) + wsprintfW(sz, L"%s,%u", Str.c_str(), CharSet1); + else + wsprintfW(sz, L"%s", Str.c_str()); + + DrawTextW(hDC, sz, lstrlenW(sz), &rcText, + DT_SINGLELINE | DT_LEFT | DT_VCENTER | DT_END_ELLIPSIS | + DT_NOPREFIX); + + x += cx; + ++iColumn; + + cx = ListView_GetColumnWidth(g_hListView, iColumn); + rcSubItem = rcItem; + rcSubItem.left = x; + rcSubItem.right = x + cx; + + rcText = rcSubItem; + InflateRect(&rcText, -1, -1); + Str = g_Items[lpDrawItem->itemID].m_Substitute; + BYTE CharSet2 = g_Items[lpDrawItem->itemID].m_CharSet2; + if (CharSet2 != DEFAULT_CHARSET) + wsprintfW(sz, L"%s,%u", Str.c_str(), CharSet2); + else + wsprintfW(sz, L"%s", Str.c_str()); + + DrawTextW(hDC, sz, lstrlenW(sz), &rcText, + DT_SINGLELINE | DT_LEFT | DT_VCENTER | DT_END_ELLIPSIS | + DT_NOPREFIX); +} + +void MainWnd_OnMeasureItem(HWND hwnd, MEASUREITEMSTRUCT *lpMeasureItem) +{ + if (lpMeasureItem->CtlType != ODT_LISTVIEW) + return; + + TEXTMETRIC tm; + HDC hDC = GetDC(hwnd); + GetTextMetrics(hDC, &tm); + ReleaseDC(hwnd, hDC); + + lpMeasureItem->itemHeight = tm.tmHeight * 4 / 3; +} + +LRESULT MainWnd_OnNotify(HWND hwnd, int idFrom, NMHDR *pnmhdr) +{ + NM_LISTVIEW *pNMLV = (NM_LISTVIEW *)pnmhdr; + LV_KEYDOWN *pLVKD = (LV_KEYDOWN *)pnmhdr; + + switch (pnmhdr->code) + { + case LVN_COLUMNCLICK: + if (pNMLV->iSubItem == g_iSortColumn) + DoSort(pNMLV->iSubItem, !g_bSortAscendant); + else + DoSort(pNMLV->iSubItem, TRUE); + break; + case NM_DBLCLK: + LV_OnDblClk(g_hListView); + break; + case LVN_KEYDOWN: + if (pLVKD->wVKey == VK_RETURN) // [Enter] key + { + LV_OnDblClk(g_hListView); + } + if (pLVKD->wVKey == VK_DELETE) // [Del] key + { + LV_OnDelete(g_hListView); + } + break; + } + return 0; +} + +LRESULT MainWnd_OnContextMenu(HWND hwnd, HWND hwndContext, UINT xPos, UINT yPos) +{ + POINT pt = {(INT)xPos, (INT)yPos}; + ScreenToClient(g_hListView, &pt); + SendMessageW(g_hListView, WM_LBUTTONDOWN, 0, MAKELPARAM(pt.x, pt.y)); + + HMENU hMenu = LoadMenu(g_hInstance, MAKEINTRESOURCE(2)); + if (hMenu == NULL) + return 0; + + HMENU hSubMenu = GetSubMenu(hMenu, 0); + if (hSubMenu == NULL) + return 0; + + SetForegroundWindow(hwnd); + TrackPopupMenu(hSubMenu, TPM_LEFTALIGN | TPM_RIGHTBUTTON, + xPos, yPos, 0, g_hMainWnd, NULL); + PostMessage(g_hMainWnd, WM_NULL, 0, 0); + return 0; +} + +void MainWnd_OnActivate(HWND hwnd, UINT state, HWND hwndActDeact, BOOL fMinimized) +{ + if (state != WA_INACTIVE) + { + SetFocus(g_hListView); + } +} + +BOOL EnableProcessPrivileges(LPCWSTR lpPrivilegeName, BOOL bEnable = TRUE) +{ + HANDLE hToken; + LUID luid; + TOKEN_PRIVILEGES tokenPrivileges; + BOOL Ret; + + Ret = ::OpenProcessToken(::GetCurrentProcess(), + TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, + &hToken); + if (!Ret) + return Ret; // failure + + Ret = ::LookupPrivilegeValueW(NULL, lpPrivilegeName, &luid); + if (Ret) + { + tokenPrivileges.PrivilegeCount = 1; + tokenPrivileges.Privileges[0].Luid = luid; + tokenPrivileges.Privileges[0].Attributes = bEnable ? SE_PRIVILEGE_ENABLED : 0; + + Ret = ::AdjustTokenPrivileges(hToken, FALSE, &tokenPrivileges, 0, 0, 0); + } + + ::CloseHandle(hToken); + return Ret; +} + +void MainWnd_OnClose(HWND hwnd) +{ + if (!g_bNeedsReboot && !g_bModified) + { + DestroyWindow(hwnd); + return; + } + + if (g_bModified) + { + WCHAR szUpdateNow[MAX_STRING]; + LoadStringW(g_hInstance, IDS_QUERYUPDATE, szUpdateNow, _countof(szUpdateNow)); + INT id = MessageBoxW(hwnd, szUpdateNow, g_szTitle, + MB_ICONINFORMATION | MB_YESNOCANCEL); + switch (id) + { + case IDYES: + MainWnd_OnUpdateRegistry(hwnd); + break; + case IDNO: + break; + case IDCANCEL: + return; + } + } + + if (g_bNeedsReboot) + { + WCHAR szRebootNow[MAX_STRING]; + LoadStringW(g_hInstance, IDS_REBOOTNOW, szRebootNow, _countof(szRebootNow)); + INT id = MessageBoxW(hwnd, szRebootNow, g_szTitle, + MB_ICONINFORMATION | MB_YESNOCANCEL); + switch (id) + { + case IDYES: + EnableProcessPrivileges(SE_SHUTDOWN_NAME, TRUE); + ::ExitWindowsEx(EWX_REBOOT | EWX_FORCE, 0); + break; + case IDNO: + break; + case IDCANCEL: + return; + } + } + + ::DestroyWindow(hwnd); +} + +LRESULT CALLBACK +WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + HANDLE_MSG(hwnd, WM_CREATE, MainWnd_OnCreate); + HANDLE_MSG(hwnd, WM_COMMAND, MainWnd_OnCommand); + HANDLE_MSG(hwnd, WM_DESTROY, MainWnd_OnDestroy); + HANDLE_MSG(hwnd, WM_SIZE, MainWnd_OnSize); + HANDLE_MSG(hwnd, WM_DRAWITEM, MainWnd_OnDrawItem); + HANDLE_MSG(hwnd, WM_MEASUREITEM, MainWnd_OnMeasureItem); + HANDLE_MSG(hwnd, WM_NOTIFY, MainWnd_OnNotify); + HANDLE_MSG(hwnd, WM_CONTEXTMENU, MainWnd_OnContextMenu); + HANDLE_MSG(hwnd, WM_ACTIVATE, MainWnd_OnActivate); + HANDLE_MSG(hwnd, WM_CLOSE, MainWnd_OnClose); + default: + return DefWindowProc(hwnd, uMsg, wParam, lParam); + } +} + +INT WINAPI wWinMain( + HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPWSTR lpCmdLine, + INT nCmdShow) +{ + g_hInstance = hInstance; + InitCommonControls(); + + HACCEL hAccel = LoadAcceleratorsW(hInstance, MAKEINTRESOURCEW(1)); + + LoadStringW(hInstance, IDS_TITLE, g_szTitle, _countof(g_szTitle)); + LoadStringW(hInstance, IDS_FONTNAME, g_szNameHead, _countof(g_szNameHead)); + LoadStringW(hInstance, IDS_SUBSTITUTE, g_szSubstituteHead, _countof(g_szSubstituteHead)); + + WNDCLASSW wc = {0}; + wc.style = 0; + wc.lpfnWndProc = WindowProc; + wc.hInstance = hInstance; + g_hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(1)); + wc.hIcon = g_hIcon; + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1); + wc.lpszMenuName = MAKEINTRESOURCEW(1); + wc.lpszClassName = g_pszClassName; + if (!RegisterClassW(&wc)) + { + MessageBoxA(NULL, "ERROR: RegisterClass failed.", NULL, MB_ICONERROR); + return 1; + } + + const DWORD dwStyle = WS_OVERLAPPEDWINDOW; + INT Width = NAME_COLUMN_WIDTH + SUB_COLUMN_WIDTH + + GetSystemMetrics(SM_CXVSCROLL) + + GetSystemMetrics(SM_CXSIZEFRAME); + INT Height = 320; + + RECT Rect = { 0, 0, Width, Height }; + AdjustWindowRect(&Rect, dwStyle, TRUE); + Width = Rect.right - Rect.left; + Height = Rect.bottom - Rect.top; + + g_hMainWnd = CreateWindowW(g_pszClassName, g_szTitle, dwStyle, + CW_USEDEFAULT, CW_USEDEFAULT, Width, Height, + NULL, NULL, hInstance, NULL); + if (g_hMainWnd == NULL) + { + MessageBoxA(NULL, "ERROR: CreateWindow failed.", NULL, MB_ICONERROR); + return 2; + } + + ShowWindow(g_hMainWnd, nCmdShow); + UpdateWindow(g_hMainWnd); + + MSG msg; + while (GetMessage(&msg, NULL, 0, 0)) + { + if (TranslateAccelerator(g_hMainWnd, hAccel, &msg)) + continue; + + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + return (INT)msg.wParam; +} Propchange: trunk/rosapps/applications/sysutils/fontsub/fontsub.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/sysutils/fontsub/fontsub.ico URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/font… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/applications/sysutils/fontsub/fontsub.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/applications/sysutils/fontsub/fontsub.svg URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/font… ============================================================================== --- trunk/rosapps/applications/sysutils/fontsub/fontsub.svg (added) +++ trunk/rosapps/applications/sysutils/fontsub/fontsub.svg [iso-8859-1] Sat Mar 18 13:01:18 2017 @@ -0,0 +1,368 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="256" + height="256" + viewBox="0 0 256 256" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="fontsub.svg" + inkscape:export-filename="C:\Users\katahiromz\Desktop\fontsub2\fontsub.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="0.35" + inkscape:cx="-96.950454" + inkscape:cy="-3.229257" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:snap-bbox="true" + inkscape:bbox-paths="true" + inkscape:bbox-nodes="true" + inkscape:snap-bbox-edge-midpoints="true" + inkscape:snap-bbox-midpoints="true" + inkscape:snap-intersection-paths="true" + inkscape:object-paths="true" + inkscape:object-nodes="true" + inkscape:snap-smooth-nodes="true" + inkscape:snap-midpoints="true" + inkscape:snap-object-midpoints="true" + inkscape:snap-center="true" + inkscape:snap-text-baseline="true" + inkscape:snap-page="true" + inkscape:snap-global="true" + inkscape:window-width="1366" + inkscape:window-height="705" + inkscape:window-x="-8" + inkscape:window-y="-8" + inkscape:window-maximized="1" + units="px" /> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="ã¬ã¤ã¤ã¼ 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-796.36219)"> + <g + id="g4467" + transform="matrix(0.2822222,0,0,0.2822222,0,755.36218)"> + <rect + y="362.76154" + x="2.6432549e-006" + height="689.60077" + width="907.08661" + id="rect4240-2" + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" /> + <rect + y="145.27559" + x="7.7024585e-015" + height="254.62881" + width="907.08661" + id="rect4240" + style="opacity:1;fill:#b1b1b1;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" /> + <rect + y="145.27559" + x="2.6432549e-006" + height="37.142868" + width="907.08661" + id="rect3336" + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" /> + <rect + y="1015.2194" + x="2.6432549e-006" + height="37.142868" + width="907.08661" + id="rect3336-9" + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" /> + <rect + transform="matrix(0,-1,1,0,0,0)" + y="0" + x="-1052.3622" + height="37.142868" + width="907.08661" + id="rect3336-9-4" + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" /> + <rect + transform="matrix(0,-1,1,0,0,0)" + y="869.94373" + x="-1052.3623" + height="37.142868" + width="907.08661" + id="rect3336-9-4-9" + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" /> + <rect + transform="matrix(0,-1,1,0,0,0)" + y="434.97186" + x="-1052.3623" + height="37.142868" + width="907.08661" + id="rect3336-9-4-8" + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" /> + <rect + y="580.2475" + x="2.6432549e-006" + height="37.142868" + width="907.08661" + id="rect3336-9-4-8-9" + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" /> + <rect + y="362.76154" + x="2.6432549e-006" + height="37.142868" + width="907.08661" + id="rect3336-9-4-8-9-9" + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" /> + <rect + y="797.73346" + x="2.6432549e-006" + height="37.142868" + width="907.08661" + id="rect3336-9-4-8-9-9-0" + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" /> + <g + id="g4346"> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" + id="rect3336-9-4-98" + width="147.08661" + height="37.142868" + x="-564.2475" + y="87.599564" + transform="matrix(0,-1,1,0,0,0)" /> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" + id="rect3336-9-4-98-1" + width="118.51518" + height="37.142868" + x="-206.11475" + y="-454.30377" + transform="scale(-1,-1)" /> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" + id="rect3336-9-4-98-1-8" + width="94.285751" + height="37.142868" + x="-181.88531" + y="-516.64795" + transform="scale(-1,-1)" /> + </g> + <g + transform="translate(0,-2)" + id="g4351"> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" + id="rect3336-9-4-98-4" + width="85.427803" + height="37.142868" + x="-502.58875" + y="506.45667" + transform="matrix(0,-1,1,0,0,0)" /> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" + id="rect3336-9-4-98-1-6" + width="118.51518" + height="37.142868" + x="-624.97186" + y="-454.3038" + transform="scale(-1,-1)" /> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" + id="rect3336-9-4-98-1-8-7" + width="117.19617" + height="37.142868" + x="-623.65283" + y="-510.8382" + transform="scale(-1,-1)" /> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" + id="rect3336-9-4-98-4-1" + width="72.800896" + height="37.142868" + x="-552.87671" + y="586.50995" + transform="matrix(0,-1,1,0,0,0)" /> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" + id="rect3336-9-4-98-1-6-6" + width="118.51518" + height="37.142868" + x="-623.65283" + y="-567.37256" + transform="scale(-1,-1)" /> + </g> + <g + id="g4346-9" + transform="translate(0,217.11474)"> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" + id="rect3336-9-4-98-6" + width="147.08661" + height="37.142868" + x="-564.2475" + y="87.599564" + transform="matrix(0,-1,1,0,0,0)" /> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" + id="rect3336-9-4-98-1-5" + width="118.51518" + height="37.142868" + x="-206.11475" + y="-454.30377" + transform="scale(-1,-1)" /> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" + id="rect3336-9-4-98-1-8-8" + width="94.285751" + height="37.142868" + x="-181.88531" + y="-516.64795" + transform="scale(-1,-1)" /> + </g> + <g + id="g4346-9-6" + transform="translate(0,434.22944)"> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" + id="rect3336-9-4-98-6-9" + width="147.08661" + height="37.142868" + x="-564.2475" + y="87.599564" + transform="matrix(0,-1,1,0,0,0)" /> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" + id="rect3336-9-4-98-1-5-2" + width="118.51518" + height="37.142868" + x="-206.11475" + y="-454.30377" + transform="scale(-1,-1)" /> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" + id="rect3336-9-4-98-1-8-8-5" + width="94.285751" + height="37.142868" + x="-181.88531" + y="-516.64795" + transform="scale(-1,-1)" /> + </g> + <g + transform="translate(0,215.61916)" + id="g4351-9"> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" + id="rect3336-9-4-98-4-8" + width="85.427803" + height="37.142868" + x="-502.58875" + y="506.45667" + transform="matrix(0,-1,1,0,0,0)" /> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" + id="rect3336-9-4-98-1-6-7" + width="118.51518" + height="37.142868" + x="-624.97186" + y="-454.3038" + transform="scale(-1,-1)" /> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" + id="rect3336-9-4-98-1-8-7-3" + width="117.19617" + height="37.142868" + x="-623.65283" + y="-510.8382" + transform="scale(-1,-1)" /> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" + id="rect3336-9-4-98-4-1-2" + width="72.800896" + height="37.142868" + x="-552.87671" + y="586.50995" + transform="matrix(0,-1,1,0,0,0)" /> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" + id="rect3336-9-4-98-1-6-6-4" + width="118.51518" + height="37.142868" + x="-623.65283" + y="-567.37256" + transform="scale(-1,-1)" /> + </g> + <g + transform="translate(0,433.23832)" + id="g4351-1"> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" + id="rect3336-9-4-98-4-15" + width="85.427803" + height="37.142868" + x="-502.58875" + y="506.45667" + transform="matrix(0,-1,1,0,0,0)" /> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" + id="rect3336-9-4-98-1-6-64" + width="118.51518" + height="37.142868" + x="-624.97186" + y="-454.3038" + transform="scale(-1,-1)" /> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" + id="rect3336-9-4-98-1-8-7-9" + width="117.19617" + height="37.142868" + x="-623.65283" + y="-510.8382" + transform="scale(-1,-1)" /> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" + id="rect3336-9-4-98-4-1-5" + width="72.800896" + height="37.142868" + x="-552.87671" + y="586.50995" + transform="matrix(0,-1,1,0,0,0)" /> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.90200043;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50243901" + id="rect3336-9-4-98-1-6-6-6" + width="118.51518" + height="37.142868" + x="-623.65283" + y="-567.37256" + transform="scale(-1,-1)" /> + </g> + </g> + </g> +</svg> Added: trunk/rosapps/applications/sysutils/fontsub/fontsub_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/font… ============================================================================== --- trunk/rosapps/applications/sysutils/fontsub/fontsub_res.rc (added) +++ trunk/rosapps/applications/sysutils/fontsub/fontsub_res.rc [iso-8859-1] Sat Mar 18 13:01:18 2017 @@ -0,0 +1,46 @@ +/* FontSub by Katayama Hirofumi MZ + * + * To the extent possible under law, the person who associated CC0 with + * FontSub has waived all copyright and related or neighboring rights + * to FontSub. + * + * You should have received a copy of the CC0 legalcode along with this + * work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. + */ +#include <windef.h> +#include <winuser.h> +#include <dlgs.h> + +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Font Substitute Editor" +#define REACTOS_STR_INTERNAL_NAME "fontsub" +#define REACTOS_STR_ORIGINAL_FILENAME "fontsub.exe" +#include <reactos/version.rc> + +/* UTF-8 */ +#pragma code_page(65001) + +1 ICON "fontsub.ico" + +2 BITMAP "up.bmp" +3 BITMAP "down.bmp" +4 BITMAP "nil.bmp" + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif + +1 ACCELERATORS +BEGIN + "O", ID_IMPORT, CONTROL, VIRTKEY + "S", ID_EXPORT, CONTROL, VIRTKEY + "N", ID_NEW, CONTROL, VIRTKEY + "L", ID_RELOAD, CONTROL, VIRTKEY + "U", ID_UPDATE_REGISTRY, CONTROL, VIRTKEY +END Propchange: trunk/rosapps/applications/sysutils/fontsub/fontsub_res.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/sysutils/fontsub/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/font… ============================================================================== --- trunk/rosapps/applications/sysutils/fontsub/lang/en-US.rc (added) +++ trunk/rosapps/applications/sysutils/fontsub/lang/en-US.rc [iso-8859-1] Sat Mar 18 13:01:18 2017 @@ -0,0 +1,106 @@ +/* FontSub by Katayama Hirofumi MZ + * + * To the extent possible under law, the person who associated CC0 with + * FontSub has waived all copyright and related or neighboring rights + * to FontSub. + * + * You should have received a copy of the CC0 legalcode along with this + * work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +1 MENU +BEGIN + POPUP "&File" + BEGIN + MENUITEM "&Import From...\tCtrl+O", ID_IMPORT + MENUITEM "&Export To...\tCtrl+S", ID_EXPORT + MENUITEM SEPARATOR + MENUITEM "Re&load from Registry\tCtrl+L", ID_RELOAD + MENUITEM "Update &Registry\tCtrl+U", ID_UPDATE_REGISTRY + MENUITEM SEPARATOR + MENUITEM "Open in Reg&edit", ID_OPEN_REGKEY + MENUITEM SEPARATOR + MENUITEM "E&xit\tAlt+F4", ID_EXIT + END + POPUP "&Edit" + BEGIN + MENUITEM "&New Item\tCtrl+N", ID_NEW + MENUITEM SEPARATOR + MENUITEM "&Edit Item\tEnter", ID_EDIT + MENUITEM SEPARATOR + MENUITEM "&Delete Item\tDel", ID_DELETE + END + POPUP "&Help" + BEGIN + MENUITEM "&About...", ID_ABOUT + END +END + +2 MENU +BEGIN + POPUP "Popup" + BEGIN + MENUITEM "&New Item\tCtrl+N", ID_NEW + MENUITEM SEPARATOR + MENUITEM "&Edit Item\tEnter", ID_EDIT + MENUITEM SEPARATOR + MENUITEM "&Delete Item\tDel", ID_DELETE + END +END + +STRINGTABLE +BEGIN + IDS_TITLE, "Font Substitutes Editor" + IDS_FONTNAME, "Font Name" + IDS_SUBSTITUTE, "Substitute" + IDS_ENTERNAME, "(Please enter a font name...)" + IDS_IMPORT, "Import" + IDS_EXPORT, "Export" + IDS_CANTIMPORT, "Could not import." + IDS_CANTEXPORT, "Could not export." + IDS_INPFILTER, "Registry Files (*.reg)|*.reg|All Files (*.*)|*.*|" + IDS_OUTFILTER, "Registry Files (*.reg)|*.reg|" + IDS_QUERYUPDATE, "Substitutes info has been modified. Update registry now?" + IDS_ALREADYEXISTS, "The same name already exists." + IDS_ENTERNAME2, "Enter the font name." + IDS_QUERYDELETE, "Do you really want to delete this item?" + IDS_CANTOPENKEY, "Could not open the registry key." + IDS_REBOOTNOW, "Registry was updated. Reboot Windows now?" + IDS_ABOUT, "FontSub (Font Substitute Editor) Version 0.5\r\nby Katayama Hirofumi MZ and The ReactOS Team\r\n\r\nThis software was released under CC0 1.0 license." +END + +IDD_ADD DIALOG 0, 0, 315, 65 +STYLE DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU +CAPTION "Add Substitute Item" +FONT 10, "MS Shell Dlg" +BEGIN + CONTROL "Font &Name:", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 5, 55, 15 + CONTROL "", cmb1, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 70, 6, 120, 120 + CONTROL "", cmb3, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 6, 115, 120 + CONTROL "&Substitute:", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 25, 55, 15 + CONTROL "", cmb2, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 70, 26, 120, 120 + CONTROL "", cmb4, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 26, 115, 120 + CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 175, 45, 60, 14 + CONTROL "Cancel", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 45, 60, 14 +END + +IDD_EDIT DIALOG 0, 0, 315, 65 +STYLE DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU +CAPTION "Edit Substitute Item" +FONT 10, "MS Shell Dlg" +BEGIN + CONTROL "Font &Name:", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 5, 55, 15 + CONTROL "", edt1, "EDIT", ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_BORDER | WS_TABSTOP, 70, 6, 120, 14 + CONTROL "", cmb3, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 6, 115, 120 + CONTROL "&Substitute:", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 25, 55, 15 + CONTROL "", cmb2, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 70, 26, 120, 120 + CONTROL "", cmb4, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 26, 115, 120 + CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 175, 45, 60, 14 + CONTROL "Cancel", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 45, 60, 14 + CONTROL "&Delete", psh1, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 5, 45, 60, 14 +END Propchange: trunk/rosapps/applications/sysutils/fontsub/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/sysutils/fontsub/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/font… ============================================================================== --- trunk/rosapps/applications/sysutils/fontsub/lang/ja-JP.rc (added) +++ trunk/rosapps/applications/sysutils/fontsub/lang/ja-JP.rc [iso-8859-1] Sat Mar 18 13:01:18 2017 @@ -0,0 +1,106 @@ +/* FontSub by Katayama Hirofumi MZ + * + * To the extent possible under law, the person who associated CC0 with + * FontSub has waived all copyright and related or neighboring rights + * to FontSub. + * + * You should have received a copy of the CC0 legalcode along with this + * work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +1 MENU +BEGIN + POPUP "ãã¡ã¤ã«(&F)" + BEGIN + MENUITEM "ã¤ã³ãã¼ã(&I)...\tCtrl+O", ID_IMPORT + MENUITEM "ã¨ã¯ã¹ãã¼ã(&E)...\tCtrl+S", ID_EXPORT + MENUITEM SEPARATOR + MENUITEM "ã¬ã¸ã¹ããªããåèªã¿è¾¼ã¿(&L)\tCtrl+L", ID_RELOAD + MENUITEM "ã¬ã¸ã¹ããªã®æ´æ°(&R)\tCtrl+U", ID_UPDATE_REGISTRY + MENUITEM SEPARATOR + MENUITEM "Regeditã§éã(&E)", ID_OPEN_REGKEY + MENUITEM SEPARATOR + MENUITEM "çµäº(&X)\tAlt+F4", ID_EXIT + END + POPUP "ç·¨é(&E)" + BEGIN + MENUITEM "æ°ããé ç®(&N)\tCtrl+N", ID_NEW + MENUITEM SEPARATOR + MENUITEM "é ç®ã®ç·¨é(&E)\tEnter", ID_EDIT + MENUITEM SEPARATOR + MENUITEM "é ç®ã®åé¤(&D)\tDel", ID_DELETE + END + POPUP "ãã«ã(&H)" + BEGIN + MENUITEM "ãã¼ã¸ã§ã³æå ±(&A)...", ID_ABOUT + END +END + +2 MENU +BEGIN + POPUP "ãããã¢ãã" + BEGIN + MENUITEM "æ°ããé ç®(&N)\tCtrl+N", ID_NEW + MENUITEM SEPARATOR + MENUITEM "é ç®ã®ç·¨é(&E)\tEnter", ID_EDIT + MENUITEM SEPARATOR + MENUITEM "é ç®ã®åé¤(&D)\tDel", ID_DELETE + END +END + +STRINGTABLE +BEGIN + IDS_TITLE, "ãã©ã³ãä»£æ¿ã¨ãã£ã¿" + IDS_FONTNAME, "ãã©ã³ãå" + IDS_SUBSTITUTE, "ä»£æ¿å" + IDS_ENTERNAME, "(ãã©ã³ãåãå¥åãã¦ä¸ãã...)" + IDS_IMPORT, "ã¤ã³ãã¼ã" + IDS_EXPORT, "ã¨ã¯ã¹ãã¼ã" + IDS_CANTIMPORT, "ã¤ã³ãã¼ãã§ãã¾ããã" + IDS_CANTEXPORT, "ã¨ã¯ã¹ãã¼ãã§ãã¾ããã" + IDS_INPFILTER, "ã¬ã¸ã¹ããª ãã¡ã¤ã« (*.reg)|*.reg|ãã¹ã¦ã®ãã¡ã¤ã« (*.*)|*.*|" + IDS_OUTFILTER, "ã¬ã¸ã¹ããª ãã¡ã¤ã« (*.reg)|*.reg|" + IDS_QUERYUPDATE, "ä»£æ¿æå ±ã¯å¤æ´ããã¦ãã¾ããã¬ã¸ã¹ããªãæ´æ°ãã¾ããï¼" + IDS_ALREADYEXISTS, "ãã§ã«åãååãåå¨ãã¾ãã" + IDS_ENTERNAME2, "ãã©ã³ãåãå¥åãã¦ä¸ããã" + IDS_QUERYDELETE, "æ¬å½ã«ãã®é ç®ãåé¤ãããã§ããï¼" + IDS_CANTOPENKEY, "ã¬ã¸ã¹ããªãã¼ãéãã¾ããã§ããã" + IDS_REBOOTNOW, "ã¬ã¸ã¹ããªãæ´æ°ããã¾ãããWindowsãåèµ·åãã¾ããï¼" + IDS_ABOUT, "FontSub (Font Substitute Editor) Version 0.5\r\nby Katayama Hirofumi MZ and The ReactOS Team\r\n\r\nThis software was released under CC0 1.0 license." +END + +IDD_ADD DIALOG 0, 0, 315, 65 +STYLE DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU +CAPTION "ä»£æ¿é ç®ãè¿½å ãã" +FONT 10, "MS UI Gothic" +BEGIN + CONTROL "ãã©ã³ãå(&N):", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 5, 55, 15 + CONTROL "", cmb1, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 70, 6, 120, 120 + CONTROL "", cmb3, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 6, 115, 120 + CONTROL "ä»£æ¿å(&S):", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 25, 55, 15 + CONTROL "", cmb2, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 70, 26, 120, 120 + CONTROL "", cmb4, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 26, 115, 120 + CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 175, 45, 60, 14 + CONTROL "ãã£ã³ã»ã«", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 45, 60, 14 +END + +IDD_EDIT DIALOG 0, 0, 315, 65 +STYLE DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU +CAPTION "ä»£æ¿é ç®ãç·¨éãã" +FONT 10, "MS UI Gothic" +BEGIN + CONTROL "ãã©ã³ãå(&N):", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 5, 55, 15 + CONTROL "", edt1, "EDIT", ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_BORDER | WS_TABSTOP, 70, 6, 120, 14 + CONTROL "", cmb3, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 6, 115, 120 + CONTROL "ä»£æ¿å(&S):", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 25, 55, 15 + CONTROL "", cmb2, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 70, 26, 120, 120 + CONTROL "", cmb4, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 26, 115, 120 + CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 175, 45, 60, 14 + CONTROL "ãã£ã³ã»ã«", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 45, 60, 14 + CONTROL "åé¤(&D)", psh1, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 5, 45, 60, 14 +END Propchange: trunk/rosapps/applications/sysutils/fontsub/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/sysutils/fontsub/nil.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/font… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/applications/sysutils/fontsub/nil.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/applications/sysutils/fontsub/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/font… ============================================================================== --- trunk/rosapps/applications/sysutils/fontsub/resource.h (added) +++ trunk/rosapps/applications/sysutils/fontsub/resource.h [iso-8859-1] Sat Mar 18 13:01:18 2017 @@ -0,0 +1,40 @@ +/* FontSub by Katayama Hirofumi MZ + * + * To the extent possible under law, the person who associated CC0 with + * FontSub has waived all copyright and related or neighboring rights + * to FontSub. + * + * You should have received a copy of the CC0 legalcode along with this + * work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. + */ +#define ID_NEW 100 +#define ID_EDIT 101 +#define ID_EXIT 102 +#define ID_UPDATE_REGISTRY 103 +#define ID_DELETE 104 +#define ID_IMPORT 105 +#define ID_EXPORT 106 +#define ID_RELOAD 107 +#define ID_ABOUT 108 +#define ID_OPEN_REGKEY 109 + +#define IDD_ADD 1 +#define IDD_EDIT 2 + +#define IDS_TITLE 1 +#define IDS_FONTNAME 2 +#define IDS_SUBSTITUTE 3 +#define IDS_ENTERNAME 4 +#define IDS_IMPORT 5 +#define IDS_EXPORT 6 +#define IDS_CANTIMPORT 7 +#define IDS_CANTEXPORT 8 +#define IDS_INPFILTER 9 +#define IDS_OUTFILTER 10 +#define IDS_QUERYUPDATE 11 +#define IDS_ALREADYEXISTS 12 +#define IDS_ENTERNAME2 13 +#define IDS_QUERYDELETE 14 +#define IDS_CANTOPENKEY 15 +#define IDS_REBOOTNOW 16 +#define IDS_ABOUT 17 Propchange: trunk/rosapps/applications/sysutils/fontsub/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/sysutils/fontsub/up.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/font… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/applications/sysutils/fontsub/up.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[mjansen] 74186: [REGEDIT] Fix regedit not showing it's main window when loading view settings fail. CORE-12749
by mjansen＠svn.reactos.org 18 Mar '17

18 Mar '17

Author: mjansen Date: Sat Mar 18 12:54:43 2017 New Revision: 74186 URL: http://svn.reactos.org/svn/reactos?rev=74186&view=rev Log: [REGEDIT] Fix regedit not showing it's main window when loading view settings fail. CORE-12749 Modified: trunk/reactos/base/applications/regedit/settings.c Modified: trunk/reactos/base/applications/regedit/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/settings.c [iso-8859-1] Sat Mar 18 12:54:43 2017 @@ -67,6 +67,7 @@ { RegistryBinaryConfig tConfig; DWORD iBufferSize = sizeof(tConfig); + BOOL bVisible = FALSE; if (RegQueryValueExW(hKey, L"View", NULL, NULL, (LPBYTE)&tConfig, &iBufferSize) == ERROR_SUCCESS) { @@ -90,11 +91,13 @@ /* Apply program window settings */ tConfig.tPlacement.length = sizeof(WINDOWPLACEMENT); - if (SetWindowPlacement(hFrameWnd, &tConfig.tPlacement) == FALSE) - /* In case we fail, show normal */ - ShowWindow(hFrameWnd, SW_SHOWNORMAL); + bVisible = SetWindowPlacement(hFrameWnd, &tConfig.tPlacement); } } + + /* In case we fail to restore the window, or open the key, show normal */ + if (!bVisible) + ShowWindow(hFrameWnd, SW_SHOWNORMAL); /* Restore key position */ if (QueryStringValue(HKEY_CURRENT_USER, g_szGeneralRegKey, L"LastKey", szBuffer, COUNT_OF(szBuffer)) == ERROR_SUCCESS) @@ -102,7 +105,7 @@ SelectNode(g_pChildWnd->hTreeWnd, szBuffer); } - RegCloseKey(hKey); + RegCloseKey(hKey); } else {

1 0

[mjansen] 74185: [SDK] Add WM_CONTEXTMENU handler to WindowsX.h CORE-12749
by mjansen＠svn.reactos.org 18 Mar '17

18 Mar '17

Author: mjansen Date: Sat Mar 18 12:24:16 2017 New Revision: 74185 URL: http://svn.reactos.org/svn/reactos?rev=74185&view=rev Log: [SDK] Add WM_CONTEXTMENU handler to WindowsX.h CORE-12749 Modified: trunk/reactos/sdk/include/psdk/windowsx.h Modified: trunk/reactos/sdk/include/psdk/windowsx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/windowsx.… ============================================================================== --- trunk/reactos/sdk/include/psdk/windowsx.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/windowsx.h [iso-8859-1] Sat Mar 18 12:24:16 2017 @@ -309,6 +309,7 @@ #define HANDLE_WM_COMMNOTIFY(hwnd,wParam,lParam,fn) ((fn)((hwnd),(int)(wParam),(UINT)LOWORD(lParam)),0) #define HANDLE_WM_COMPACTING(hwnd,wParam,lParam,fn) ((fn)((hwnd),(UINT)(wParam)),0) #define HANDLE_WM_COMPAREITEM(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(int)(fn)((hwnd),(const COMPAREITEMSTRUCT*)(lParam)) +#define HANDLE_WM_CONTEXTMENU(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam),(UINT)GET_X_LPARAM(lParam),(UINT)GET_Y_LPARAM(lParam))) #define HANDLE_WM_COPY(hwnd,wParam,lParam,fn) ((fn)(hwnd),0) #define HANDLE_WM_CREATE(hwnd,wParam,lParam,fn) ((fn)((hwnd),(LPCREATESTRUCT)(lParam)) ? 0 : (LRESULT)-1L) #define HANDLE_WM_CTLCOLORBTN(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_BTN)

1 0

[tfaber] 74184: [BOOTLIB] - Avoid an uninitialized variable in BlpDisplayReinitialize. Patch by Victor Martinez Calvo. CID 1363648. CORE-11692 #resolve
by tfaber＠svn.reactos.org 17 Mar '17

17 Mar '17

Author: tfaber Date: Fri Mar 17 14:11:03 2017 New Revision: 74184 URL: http://svn.reactos.org/svn/reactos?rev=74184&view=rev Log: [BOOTLIB] - Avoid an uninitialized variable in BlpDisplayReinitialize. Patch by Victor Martinez Calvo. CID 1363648. CORE-11692 #resolve Modified: trunk/reactos/boot/environ/lib/io/display/display.c Modified: trunk/reactos/boot/environ/lib/io/display/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/displa… ============================================================================== --- trunk/reactos/boot/environ/lib/io/display/display.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/display/display.c [iso-8859-1] Fri Mar 17 14:11:03 2017 @@ -547,7 +547,7 @@ VOID ) { - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; PBL_TEXT_CONSOLE TextConsole; PBL_INPUT_CONSOLE InputConsole;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs