wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Alexandre Julliard : wrc: Only add translations for specific fields in version blocks.
by Alexandre Julliard 07 Apr '17

07 Apr '17

Module: wine Branch: master Commit: 8f08aee04d101834336120f1fd480f2400d21f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f08aee04d101834336120f1f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 7 11:19:08 2017 +0200 wrc: Only add translations for specific fields in version blocks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/wine_common_ver.rc | 12 ++++++------ tools/wrc/po.c | 18 +++++++++++++++++- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index b1b054d..39a17d6 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -125,14 +125,14 @@ FILESUBTYPE WINE_FILESUBTYPE /* LANG_ENGLISH/SUBLANG_DEFAULT, WINE_CODEPAGE */ BLOCK "0409" WINE_CODEPAGE_STR { - VALUE "CompanyName", "#msgctxt#do not translate#Microsoft Corporation" /* GameGuard depends on this */ + VALUE "CompanyName", "Microsoft Corporation" /* GameGuard depends on this */ VALUE "FileDescription", WINE_FILEDESCRIPTION_STR - VALUE "FileVersion", "#msgctxt#do not translate#" WINE_FILEVERSION_STR - VALUE "InternalName", "#msgctxt#do not translate#" WINE_FILENAME - VALUE "LegalCopyright", "#msgctxt#do not translate#" WINE_LEGALCOPYRIGHT - VALUE "OriginalFilename", "#msgctxt#do not translate#" WINE_FILENAME_STR + VALUE "FileVersion", WINE_FILEVERSION_STR + VALUE "InternalName", WINE_FILENAME + VALUE "LegalCopyright", WINE_LEGALCOPYRIGHT + VALUE "OriginalFilename", WINE_FILENAME_STR VALUE "ProductName", WINE_PRODUCTNAME_STR - VALUE "ProductVersion", "#msgctxt#do not translate#" WINE_PRODUCTVERSION_STR + VALUE "ProductVersion", WINE_PRODUCTVERSION_STR WINE_EXTRAVALUES } } diff --git a/tools/wrc/po.c b/tools/wrc/po.c index c28c7d8..7b09f10 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -917,6 +917,21 @@ static ver_block_t *get_version_langcharset_block( ver_block_t *block ) return NULL; } +static int version_value_needs_translation( const ver_value_t *val ) +{ + int ret; + char *key; + + if (val->type != val_str) return 0; + if (!(key = convert_msgid_ascii( val->key, 0 ))) return 0; + + /* most values contain version numbers or file names, only translate a few specific ones */ + ret = (!strcasecmp( key, "FileDescription" ) || !strcasecmp( key, "ProductName" )); + + free( key ); + return ret; +} + static void add_pot_versioninfo( po_file_t po, const resource_t *res ) { ver_value_t *val; @@ -924,7 +939,8 @@ static void add_pot_versioninfo( po_file_t po, const resource_t *res ) if (!langcharset) return; for (val = langcharset->values; val; val = val->next) - add_po_string( po, val->value.str, NULL, NULL ); + if (version_value_needs_translation( val )) + add_po_string( po, val->value.str, NULL, NULL ); } static void add_po_versioninfo( const resource_t *english, const resource_t *res )

1 0

Henri Verbeet : usp10: Avoid special handling if the substitution count is 0 in GSUB_apply_ChainContextSubst ().
by Alexandre Julliard 06 Apr '17

06 Apr '17

Module: wine Branch: master Commit: 9694aeb06d9417089c10b8b09ddffd0ba47eff02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9694aeb06d9417089c10b8b09… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 6 12:03:45 2017 +0200 usp10: Avoid special handling if the substitution count is 0 in GSUB_apply_ChainContextSubst(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 62 +++++++++++++++++++++------------------------------ 1 file changed, 26 insertions(+), 36 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 81a5180..a3346ef 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1237,7 +1237,6 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo } else if (GET_BE_WORD(ccsf1->SubstFormat) == 2) { - int newIndex = glyph_index; WORD offset, count; const void *backtrack_class_table; const void *input_class_table; @@ -1281,12 +1280,13 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo for (i = 0; i < count; i++) { - WORD backtrack_count, input_count, lookahead_count; + WORD backtrack_count, input_count, lookahead_count, substitute_count; int k; const GSUB_ChainSubClassRule_1 *backtrack; const GSUB_ChainSubClassRule_2 *input; const GSUB_ChainSubClassRule_3 *lookahead; const GSUB_ChainSubClassRule_4 *substitute; + int new_index = GSUB_E_NOGLYPH; offset = GET_BE_WORD(csc->ChainSubClassRule[i]); backtrack = (const GSUB_ChainSubClassRule_1 *)((BYTE *)csc + offset); @@ -1343,35 +1343,30 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo continue; TRACE("Matched LookAhead\n"); - if (GET_BE_WORD(substitute->SubstCount)) + substitute_count = GET_BE_WORD(substitute->SubstCount); + for (k = 0; k < substitute_count; ++k) { - for (k = 0; k < GET_BE_WORD(substitute->SubstCount); ++k) - { - int lookupIndex = GET_BE_WORD(substitute->SubstLookupRecord[k].LookupListIndex); - int SequenceIndex = GET_BE_WORD(substitute->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; + WORD lookup_index = GET_BE_WORD(substitute->SubstLookupRecord[k].LookupListIndex); + WORD sequence_index = GET_BE_WORD(substitute->SubstLookupRecord[k].SequenceIndex) * write_dir; + + TRACE("SUBST: %u -> %u %u.\n", k, sequence_index, lookup_index); + new_index = GSUB_apply_lookup(lookup, lookup_index, glyphs, + glyph_index + sequence_index, write_dir, glyph_count); + if (new_index == GSUB_E_NOGLYPH) + ERR("Chain failed to generate a glyph.\n"); } - else return GSUB_E_NOGLYPH; + return new_index; } } else if (GET_BE_WORD(ccsf1->SubstFormat) == 3) { - WORD backtrack_count, input_count, lookahead_count; + WORD backtrack_count, input_count, lookahead_count, substitution_count; int k; const GSUB_ChainContextSubstFormat3_1 *backtrack; const GSUB_ChainContextSubstFormat3_2 *input; const GSUB_ChainContextSubstFormat3_3 *lookahead; const GSUB_ChainContextSubstFormat3_4 *substitute; - int newIndex = glyph_index; + int new_index = GSUB_E_NOGLYPH; TRACE(" subtype 3 (Coverage-based Chaining Context Glyph Substitution)\n"); @@ -1428,24 +1423,19 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo continue; TRACE("Matched LookAhead\n"); - if (GET_BE_WORD(substitute->SubstCount)) + substitution_count = GET_BE_WORD(substitute->SubstCount); + for (k = 0; k < substitution_count; ++k) { - for (k = 0; k < GET_BE_WORD(substitute->SubstCount); ++k) - { - int lookupIndex = GET_BE_WORD(substitute->SubstLookupRecord[k].LookupListIndex); - int SequenceIndex = GET_BE_WORD(substitute->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; + WORD lookup_index = GET_BE_WORD(substitute->SubstLookupRecord[k].LookupListIndex); + WORD sequence_index = GET_BE_WORD(substitute->SubstLookupRecord[k].SequenceIndex) * write_dir; + + TRACE("SUBST: %u -> %u %u.\n", k, sequence_index, lookup_index); + new_index = GSUB_apply_lookup(lookup, lookup_index, glyphs, + glyph_index + sequence_index, write_dir, glyph_count); + if (new_index == GSUB_E_NOGLYPH) + ERR("Chain failed to generate a glyph.\n"); } - else return GSUB_E_NOGLYPH; + return new_index; } } return GSUB_E_NOGLYPH;

1 0

Henri Verbeet : usp10: Range check glyph counts in GSUB_apply_ChainContextSubst().
by Alexandre Julliard 06 Apr '17

06 Apr '17

Module: wine Branch: master Commit: f7b943edbc1e3227db13b3384f9513e98580b8ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7b943edbc1e3227db13b3384… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 6 12:03:44 2017 +0200 usp10: Range check glyph counts in GSUB_apply_ChainContextSubst(). Like in GPOS_apply_ChainContextPos(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 76a559c..81a5180 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1291,10 +1291,22 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo offset = GET_BE_WORD(csc->ChainSubClassRule[i]); backtrack = (const GSUB_ChainSubClassRule_1 *)((BYTE *)csc + offset); backtrack_count = GET_BE_WORD(backtrack->BacktrackGlyphCount); + k = glyph_index + dirBacktrack * backtrack_count; + if (k < 0 || k >= *glyph_count) + continue; + input = (const GSUB_ChainSubClassRule_2 *)&backtrack->Backtrack[backtrack_count]; input_count = GET_BE_WORD(input->InputGlyphCount) - 1; + k = glyph_index + write_dir * input_count; + if (k < 0 || k >= *glyph_count) + continue; + lookahead = (const GSUB_ChainSubClassRule_3 *)&input->Input[input_count]; lookahead_count = GET_BE_WORD(lookahead->LookaheadGlyphCount); + k = glyph_index + dirLookahead * (input_count + lookahead_count); + if (k < 0 || k >= *glyph_count) + continue; + substitute = (const GSUB_ChainSubClassRule_4 *)&lookahead->LookAhead[lookahead_count]; for (k = 0; k < backtrack_count; ++k) @@ -1365,10 +1377,22 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo backtrack = (const GSUB_ChainContextSubstFormat3_1 *)ccsf1; backtrack_count = GET_BE_WORD(backtrack->BacktrackGlyphCount); + k = glyph_index + dirBacktrack * backtrack_count; + if (k < 0 || k >= *glyph_count) + continue; + input = (const GSUB_ChainContextSubstFormat3_2 *)&backtrack->Coverage[backtrack_count]; input_count = GET_BE_WORD(input->InputGlyphCount); + k = glyph_index + write_dir * (input_count - 1); + if (k < 0 || k >= *glyph_count) + continue; + lookahead = (const GSUB_ChainContextSubstFormat3_3 *)&input->Coverage[input_count]; lookahead_count = GET_BE_WORD(lookahead->LookaheadGlyphCount); + k = glyph_index + dirLookahead * (input_count + lookahead_count - 1); + if (k < 0 || k >= *glyph_count) + continue; + substitute = (const GSUB_ChainContextSubstFormat3_4 *)&lookahead->Coverage[lookahead_count]; for (k = 0; k < backtrack_count; ++k)

1 0

Henri Verbeet : usp10: Simplify the chaining context table assignments in GSUB_apply_ChainContextSubst ().
by Alexandre Julliard 06 Apr '17

06 Apr '17

Module: wine Branch: master Commit: 24943fe5e294c2095775c5856530739e732a6fcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=24943fe5e294c2095775c5856… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 6 12:03:43 2017 +0200 usp10: Simplify the chaining context table assignments in GSUB_apply_ChainContextSubst(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 71 +++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 39 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 7a4e866..76a559c 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1281,8 +1281,8 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo for (i = 0; i < count; i++) { + WORD backtrack_count, input_count, lookahead_count; int k; - int indexGlyphs; const GSUB_ChainSubClassRule_1 *backtrack; const GSUB_ChainSubClassRule_2 *input; const GSUB_ChainSubClassRule_3 *lookahead; @@ -1290,50 +1290,47 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo offset = GET_BE_WORD(csc->ChainSubClassRule[i]); backtrack = (const GSUB_ChainSubClassRule_1 *)((BYTE *)csc + offset); - - for (k = 0; k < GET_BE_WORD(backtrack->BacktrackGlyphCount); ++k) + backtrack_count = GET_BE_WORD(backtrack->BacktrackGlyphCount); + input = (const GSUB_ChainSubClassRule_2 *)&backtrack->Backtrack[backtrack_count]; + input_count = GET_BE_WORD(input->InputGlyphCount) - 1; + lookahead = (const GSUB_ChainSubClassRule_3 *)&input->Input[input_count]; + lookahead_count = GET_BE_WORD(lookahead->LookaheadGlyphCount); + substitute = (const GSUB_ChainSubClassRule_4 *)&lookahead->LookAhead[lookahead_count]; + + for (k = 0; k < backtrack_count; ++k) { WORD target_class = GET_BE_WORD(backtrack->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(backtrack->BacktrackGlyphCount)) + if (k != backtrack_count) continue; TRACE("Matched Backtrack\n"); - input = (const GSUB_ChainSubClassRule_2 *)((BYTE *)backtrack + - FIELD_OFFSET(GSUB_ChainSubClassRule_1, Backtrack[GET_BE_WORD(backtrack->BacktrackGlyphCount)])); - - indexGlyphs = GET_BE_WORD(input->InputGlyphCount); - for (k = 0; k < indexGlyphs - 1; k++) + for (k = 0; k < input_count; ++k) { WORD target_class = GET_BE_WORD(input->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) + if (k != input_count) continue; TRACE("Matched IndexGlyphs\n"); - lookahead = (const GSUB_ChainSubClassRule_3 *)((BYTE *)input + - FIELD_OFFSET(GSUB_ChainSubClassRule_2, Input[GET_BE_WORD(input->InputGlyphCount) - 1])); - - for (k = 0; k < GET_BE_WORD(lookahead->LookaheadGlyphCount); ++k) + for (k = 0; k < lookahead_count; ++k) { WORD target_class = GET_BE_WORD(lookahead->LookAhead[k]); - WORD glyph_class = OT_get_glyph_class(lookahead_class_table, glyphs[glyph_index + (dirLookahead * (indexGlyphs+k))]); + WORD glyph_class = OT_get_glyph_class(lookahead_class_table, + glyphs[glyph_index + (dirLookahead * (input_count + k + 1))]); if (target_class != glyph_class) break; } - if (k != GET_BE_WORD(lookahead->LookaheadGlyphCount)) + if (k != lookahead_count) continue; TRACE("Matched LookAhead\n"); - substitute = (const GSUB_ChainSubClassRule_4 *)((BYTE *)lookahead + - FIELD_OFFSET(GSUB_ChainSubClassRule_3, LookAhead[GET_BE_WORD(lookahead->LookaheadGlyphCount)])); - if (GET_BE_WORD(substitute->SubstCount)) { for (k = 0; k < GET_BE_WORD(substitute->SubstCount); ++k) @@ -1356,61 +1353,57 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo } else if (GET_BE_WORD(ccsf1->SubstFormat) == 3) { + WORD backtrack_count, input_count, lookahead_count; int k; - int indexGlyphs; const GSUB_ChainContextSubstFormat3_1 *backtrack; const GSUB_ChainContextSubstFormat3_2 *input; const GSUB_ChainContextSubstFormat3_3 *lookahead; const GSUB_ChainContextSubstFormat3_4 *substitute; int newIndex = glyph_index; - backtrack = (const GSUB_ChainContextSubstFormat3_1 *)ccsf1; - TRACE(" subtype 3 (Coverage-based Chaining Context Glyph Substitution)\n"); - for (k = 0; k < GET_BE_WORD(backtrack->BacktrackGlyphCount); ++k) + backtrack = (const GSUB_ChainContextSubstFormat3_1 *)ccsf1; + backtrack_count = GET_BE_WORD(backtrack->BacktrackGlyphCount); + input = (const GSUB_ChainContextSubstFormat3_2 *)&backtrack->Coverage[backtrack_count]; + input_count = GET_BE_WORD(input->InputGlyphCount); + lookahead = (const GSUB_ChainContextSubstFormat3_3 *)&input->Coverage[input_count]; + lookahead_count = GET_BE_WORD(lookahead->LookaheadGlyphCount); + substitute = (const GSUB_ChainContextSubstFormat3_4 *)&lookahead->Coverage[lookahead_count]; + + for (k = 0; k < backtrack_count; ++k) { offset = GET_BE_WORD(backtrack->Coverage[k]); if (GSUB_is_glyph_covered((const BYTE *)ccsf1 + offset, glyphs[glyph_index + (dirBacktrack * (k + 1))]) == -1) break; } - if (k != GET_BE_WORD(backtrack->BacktrackGlyphCount)) + if (k != backtrack_count) continue; TRACE("Matched Backtrack\n"); - input = (const GSUB_ChainContextSubstFormat3_2 *)((BYTE *)ccsf1 + - FIELD_OFFSET(GSUB_ChainContextSubstFormat3_1, Coverage[GET_BE_WORD(backtrack->BacktrackGlyphCount)])); - - indexGlyphs = GET_BE_WORD(input->InputGlyphCount); - for (k = 0; k < indexGlyphs; k++) + for (k = 0; k < input_count; ++k) { offset = GET_BE_WORD(input->Coverage[k]); if (GSUB_is_glyph_covered((const BYTE *)ccsf1 + offset, glyphs[glyph_index + (write_dir * k)]) == -1) break; } - if (k != indexGlyphs) + if (k != input_count) continue; TRACE("Matched IndexGlyphs\n"); - lookahead = (const GSUB_ChainContextSubstFormat3_3 *)((BYTE *)input + - FIELD_OFFSET(GSUB_ChainContextSubstFormat3_2, Coverage[GET_BE_WORD(input->InputGlyphCount)])); - - for (k = 0; k < GET_BE_WORD(lookahead->LookaheadGlyphCount); ++k) + for (k = 0; k < lookahead_count; ++k) { offset = GET_BE_WORD(lookahead->Coverage[k]); if (GSUB_is_glyph_covered((const BYTE *)ccsf1 + offset, - glyphs[glyph_index + (dirLookahead * (indexGlyphs + k))]) == -1) + glyphs[glyph_index + (dirLookahead * (input_count + k))]) == -1) break; } - if (k != GET_BE_WORD(lookahead->LookaheadGlyphCount)) + if (k != lookahead_count) continue; TRACE("Matched LookAhead\n"); - substitute = (const GSUB_ChainContextSubstFormat3_4 *)((BYTE *)lookahead + - FIELD_OFFSET(GSUB_ChainContextSubstFormat3_3, Coverage[GET_BE_WORD(lookahead->LookaheadGlyphCount)])); - if (GET_BE_WORD(substitute->SubstCount)) { for (k = 0; k < GET_BE_WORD(substitute->SubstCount); ++k)

1 0

Henri Verbeet : usp10: Rename the chaining context tables in GSUB_apply_ChainContextSubst() to something more descriptive.
by Alexandre Julliard 06 Apr '17

06 Apr '17

Module: wine Branch: master Commit: 02316e66131665e129ab1df70a6134b590f71f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=02316e66131665e129ab1df70… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 6 12:03:42 2017 +0200 usp10: Rename the chaining context tables in GSUB_apply_ChainContextSubst() to something more descriptive. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 101 ++++++++++++++++++++++++++------------------------ 1 file changed, 52 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02316e66131665e129ab1…

1 0

Henri Verbeet : wined3d: Get rid of surface_get_rect().
by Alexandre Julliard 06 Apr '17

06 Apr '17

Module: wine Branch: master Commit: ecf1bbd5255ac68dd90efcef6a22f9de92d3f922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecf1bbd5255ac68dd90efcef6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 6 12:03:41 2017 +0200 wined3d: Get rid of surface_get_rect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8a1ad4e..889a8d1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -175,19 +175,6 @@ static void surface_get_blt_info(GLenum target, const RECT *rect, GLsizei w, GLs } } -static void surface_get_rect(const struct wined3d_surface *surface, const RECT *rect_in, RECT *rect_out) -{ - if (rect_in) - *rect_out = *rect_in; - else - { - const struct wined3d_texture *texture = surface->container; - - SetRect(rect_out, 0, 0, wined3d_texture_get_level_width(texture, surface->texture_level), - wined3d_texture_get_level_height(texture, surface->texture_level)); - } -} - /* Context activation is done by the caller. */ void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3d_context *context, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) @@ -2204,7 +2191,8 @@ static BOOL surface_load_drawable(struct wined3d_surface *surface, else restore_rt = NULL; - surface_get_rect(surface, NULL, &r); + SetRect(&r, 0, 0, wined3d_texture_get_level_width(texture, surface->texture_level), + wined3d_texture_get_level_height(texture, surface->texture_level)); wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); device->blitter->ops->blitter_blit(device->blitter, WINED3D_BLIT_OP_COLOR_BLIT, context, surface, WINED3D_LOCATION_TEXTURE_RGB, &r,

1 0

Nikolay Sivov : gdi32: Trace charmap encoding as 4 bytes tag.
by Alexandre Julliard 06 Apr '17

06 Apr '17

Module: wine Branch: master Commit: 215e8b10a8c883ee03801a06f19f960b629c4c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=215e8b10a8c883ee03801a06f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 6 14:07:05 2017 +0300 gdi32: Trace charmap encoding as 4 bytes tag. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 49e8c2f..d627e7e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -8389,7 +8389,10 @@ static DWORD get_font_unicode_ranges(FT_Face face, GLYPHSET *gs) } } else - FIXME("encoding %u not supported\n", face->charmap->encoding); + { + DWORD encoding = RtlUlongByteSwap(face->charmap->encoding); + FIXME("encoding %s not supported\n", debugstr_an((char *)&encoding, 4)); + } return num_ranges; } @@ -8701,9 +8704,10 @@ static DWORD freetype_GetKerningPairs( PHYSDEV dev, DWORD cPairs, KERNINGPAIR *k } else { + DWORD encoding = RtlUlongByteSwap(font->ft_face->charmap->encoding); ULONG n; - FIXME("encoding %u not supported\n", font->ft_face->charmap->encoding); + FIXME("encoding %s not supported\n", debugstr_an((char *)&encoding, 4)); for (n = 0; n <= 65535; n++) glyph_to_char[n] = (USHORT)n; }

1 0

Alistair Leslie-Hughes : odbccp32: Implement SQLRemoveTranslator/W.
by Alexandre Julliard 06 Apr '17

06 Apr '17

Module: wine Branch: master Commit: e7afcb98508eb2b087a23ad0cdf94cc1b3e3a1a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7afcb98508eb2b087a23ad0c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 6 10:03:52 2017 +0000 odbccp32: Implement SQLRemoveTranslator/W. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 78 +++++++++++++++++++++++++++++++++++++++++----- dlls/odbccp32/tests/misc.c | 17 +++++++--- 2 files changed, 84 insertions(+), 11 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 7b2f020..773c5d2 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -1229,20 +1229,84 @@ BOOL WINAPI SQLRemoveDSNFromIni(LPCSTR lpszDSN) return FALSE; } -BOOL WINAPI SQLRemoveTranslatorW(LPCWSTR lpszTranslator, LPDWORD lpdwUsageCount) +BOOL WINAPI SQLRemoveTranslatorW(const WCHAR *translator, DWORD *usage_count) { + HKEY hkey; + DWORD usagecount = 1; + BOOL ret = TRUE; + clear_errors(); - FIXME("%s %p\n", debugstr_w(lpszTranslator), lpdwUsageCount); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE("%s %p\n", debugstr_w(translator), usage_count); + + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, odbcini, &hkey) == ERROR_SUCCESS) + { + HKEY hkeydriver; + + if (RegOpenKeyW(hkey, translator, &hkeydriver) == ERROR_SUCCESS) + { + DWORD size, type; + DWORD count; + + size = sizeof(usagecount); + RegGetValueA(hkeydriver, NULL, "UsageCount", RRF_RT_DWORD, &type, &usagecount, &size); + TRACE("Usage count %d\n", usagecount); + count = usagecount - 1; + if (count) + { + if (RegSetValueExA(hkeydriver, "UsageCount", 0, REG_DWORD, (BYTE*)&count, sizeof(count)) != ERROR_SUCCESS) + ERR("Failed to write registry UsageCount key\n"); + } + + RegCloseKey(hkeydriver); + } + + if (usagecount) + usagecount--; + + if (!usagecount) + { + if(RegDeleteKeyW(hkey, translator) != ERROR_SUCCESS) + { + push_error(ODBC_ERROR_COMPONENT_NOT_FOUND, odbc_error_component_not_found); + WARN("Failed to delete registry key: %s\n", debugstr_w(translator)); + ret = FALSE; + } + + if (ret && RegOpenKeyW(hkey, odbctranslators, &hkeydriver) == ERROR_SUCCESS) + { + if(RegDeleteValueW(hkeydriver, translator) != ERROR_SUCCESS) + { + push_error(ODBC_ERROR_COMPONENT_NOT_FOUND, odbc_error_component_not_found); + WARN("Failed to delete registry key: %s\n", debugstr_w(translator)); + ret = FALSE; + } + + RegCloseKey(hkeydriver); + } + } + + RegCloseKey(hkey); + } + + if (ret && usage_count) + *usage_count = usagecount; + + return ret; } BOOL WINAPI SQLRemoveTranslator(LPCSTR lpszTranslator, LPDWORD lpdwUsageCount) { + WCHAR *translator; + BOOL ret; + clear_errors(); - FIXME("%s %p\n", debugstr_a(lpszTranslator), lpdwUsageCount); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE("%s %p\n", debugstr_a(lpszTranslator), lpdwUsageCount); + + translator = SQLInstall_strdup(lpszTranslator); + ret = SQLRemoveTranslatorW(translator, lpdwUsageCount); + + HeapFree(GetProcessHeap(), 0, translator); + return ret; } BOOL WINAPI SQLSetConfigMode(UWORD wConfigMode) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index 7a6e8db..ed8e6f1 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -530,13 +530,22 @@ void test_SQLInstallTranslatorEx(void) cnt = 100; ret = SQLRemoveTranslator("WINE ODBC Translator", &cnt); - todo_wine ok(ret, "SQLRemoveTranslator failed\n"); - todo_wine ok(cnt == 0, "SQLRemoveTranslator failed %d\n", cnt); + ok(ret, "SQLRemoveTranslator failed\n"); + ok(cnt == 0, "SQLRemoveTranslator failed %d\n", cnt); cnt = 100; ret = SQLRemoveTranslator("WINE ODBC Translator Path", &cnt); - todo_wine ok(ret, "SQLRemoveTranslator failed\n"); - todo_wine ok(cnt == 0, "SQLRemoveTranslator failed %d\n", cnt); + ok(ret, "SQLRemoveTranslator failed\n"); + ok(cnt == 0, "SQLRemoveTranslator failed %d\n", cnt); + + cnt = 100; + ret = SQLRemoveTranslator("WINE ODBC Translator NonExist", &cnt); + ok(!ret, "SQLRemoveTranslator succeeded\n"); + ok(cnt == 100, "SQLRemoveTranslator succeeded %d\n", cnt); + sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); + ok(sql_ret && error_code == ODBC_ERROR_COMPONENT_NOT_FOUND, + "SQLInstallTranslatorEx failed %d, %u\n", sql_ret, error_code); + } START_TEST(misc)

1 0

Alexandre Julliard : glu32: Make gluGetString return the same data as on Windows.
by Alexandre Julliard 06 Apr '17

06 Apr '17

Module: wine Branch: master Commit: 0128e1a18f25848e6f47146580a8f0db69687dd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0128e1a18f25848e6f4714658… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 6 15:35:59 2017 +0200 glu32: Make gluGetString return the same data as on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/glu.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/glu32/glu.c b/dlls/glu32/glu.c index de634ba..87a9952 100644 --- a/dlls/glu32/glu.c +++ b/dlls/glu32/glu.c @@ -74,6 +74,9 @@ typedef struct { #define GLU_TESS_EDGE_FLAG_DATA 100110 #define GLU_TESS_COMBINE_DATA 100111 +#define GLU_VERSION 100800 +#define GLU_EXTENSIONS 100801 + #define GLU_INVALID_ENUM 100900 #define GLU_INVALID_VALUE 100901 #define GLU_OUT_OF_MEMORY 100902 @@ -97,7 +100,6 @@ static void (*p_gluEndSurface)( GLUnurbs* nurb ); static void (*p_gluEndTrim)( GLUnurbs* nurb ); static const GLubyte * (*p_gluErrorString)( GLenum error ); static void (*p_gluGetNurbsProperty)( GLUnurbs* nurb, GLenum property, GLfloat* data ); -static const GLubyte * (*p_gluGetString)( GLenum name ); static void (*p_gluGetTessProperty)( GLUtesselator* tess, GLenum which, GLdouble* data ); static void (*p_gluLoadSamplingMatrices)( GLUnurbs* nurb, const GLfloat *model, const GLfloat *perspective, const GLint *view ); static void (*p_gluLookAt)( GLdouble eyeX, GLdouble eyeY, GLdouble eyeZ, GLdouble centerX, GLdouble centerY, GLdouble centerZ, GLdouble upX, GLdouble upY, GLdouble upZ ); @@ -510,8 +512,12 @@ void WINAPI wine_gluNurbsCallback( GLUnurbs *nobj, GLenum which, void (CALLBACK */ const GLubyte * WINAPI wine_gluGetString( GLenum name ) { - if (!LOAD_FUNCPTR( gluGetString )) return NULL; - return p_gluGetString( name ); + switch (name) + { + case GLU_VERSION: return (const GLubyte *)"1.2.2.0 Microsoft Corporation"; /* sic */ + case GLU_EXTENSIONS: return (const GLubyte *)""; + } + return NULL; } /***********************************************************************

1 0

Alexandre Julliard : glu32: Load libGLU only when functions are actually called.
by Alexandre Julliard 06 Apr '17

06 Apr '17

Module: wine Branch: master Commit: ade10ebc9ed25363cd0bf4aa5d3b50d224e31ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ade10ebc9ed25363cd0bf4aa5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 6 14:40:46 2017 +0200 glu32: Load libGLU only when functions are actually called. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 - configure.ac | 2 - dlls/glu32/glu.c | 156 +++++++++++++++++++++++++++++-------------------------- 3 files changed, 81 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ade10ebc9ed25363cd0bf…

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2017