wine-commits June 2020

wine-commits@winehq.org

1 participants
947 discussions

Jacek Caban : mshtml: Use DISPID_UNKNOWN for compat dispids not supported in compat mode.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: b5d0c98857eb4becb7ceafb54bb74c51cad97bad URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5d0c98857eb4becb7ceafb5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 9 16:15:34 2020 +0200 mshtml: Use DISPID_UNKNOWN for compat dispids not supported in compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 845eeb1da1..af6a0ce458 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -342,7 +342,8 @@ typedef struct { static const style_tbl_entry_t style_tbl[] = { { L"animation-name", - DISPID_IHTMLCSSSTYLEDECLARATION2_ANIMATIONNAME + DISPID_IHTMLCSSSTYLEDECLARATION2_ANIMATIONNAME, + DISPID_UNKNOWN }, { backgroundW, @@ -799,11 +800,13 @@ static const style_tbl_entry_t style_tbl[] = { }, { L"transform", - DISPID_IHTMLCSSSTYLEDECLARATION2_TRANSFORM + DISPID_IHTMLCSSSTYLEDECLARATION2_TRANSFORM, + DISPID_UNKNOWN }, { L"transition", - DISPID_IHTMLCSSSTYLEDECLARATION2_TRANSITION + DISPID_IHTMLCSSSTYLEDECLARATION2_TRANSITION, + DISPID_UNKNOWN }, { vertical_alignW,

1 0

Nikolay Sivov : dwrite: Get rid of cmap cache.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: a767467d2e246057242de199e223121d20f881e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a767467d2e246057242de199… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 9 12:14:37 2020 +0300 dwrite: Get rid of cmap cache. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 8 ++---- dlls/dwrite/font.c | 37 +++++++++++++-------------- dlls/dwrite/freetype.c | 60 -------------------------------------------- dlls/dwrite/opentype.c | 4 ++- 4 files changed, 22 insertions(+), 87 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a767467d2e246057242d…

1 0

Nikolay Sivov : dwrite: Remove unused field from fontface data structure.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: 1cfa1c6930867bb32e2b78a16b95daac07327958 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cfa1c6930867bb32e2b78a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 9 12:14:36 2020 +0300 dwrite: Remove unused field from fontface data structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 - dlls/dwrite/font.c | 3 --- 2 files changed, 4 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 2d736fdec3..5e6946717b 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -262,7 +262,6 @@ struct dwrite_fontface INT charmap; UINT32 flags; - struct dwrite_fonttable cmap; struct dwrite_fonttable vdmx; struct dwrite_fonttable gasp; struct dwrite_fonttable cpal; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index dbb44327f2..f180ba765b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -585,8 +585,6 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace5 *iface) heap_free(fontface->cached); } release_scriptshaping_cache(fontface->shaping_cache); - if (fontface->cmap.context) - IDWriteFontFace5_ReleaseFontTable(iface, fontface->cmap.context); if (fontface->vdmx.context) IDWriteFontFace5_ReleaseFontTable(iface, fontface->vdmx.context); if (fontface->gasp.context) @@ -4906,7 +4904,6 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li fontface->refcount = 1; fontface->type = desc->face_type; fontface->file_count = desc->files_number; - fontface->cmap.exists = TRUE; fontface->vdmx.exists = TRUE; fontface->gasp.exists = TRUE; fontface->cpal.exists = TRUE;

1 0

Nikolay Sivov : dwrite: Do not require fontface object for HasCharacter().
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: 745452ee948380261ce992ad681fc1dc6c16df2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=745452ee948380261ce992ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 9 12:14:35 2020 +0300 dwrite: Do not require fontface object for HasCharacter(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 41 +++++++ dlls/dwrite/font.c | 41 +++---- dlls/dwrite/opentype.c | 257 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 313 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=745452ee948380261ce9…

1 0

Nikolay Sivov : dwrite: Disallow recursing to reverse chaining substitution.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: fb5eec2c1eb8cffaa5ee1902469735baa7b404c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb5eec2c1eb8cffaa5ee1902… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 9 12:14:34 2020 +0300 dwrite: Disallow recursing to reverse chaining substitution. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 22ae106924..e502be1e12 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -5482,6 +5482,9 @@ static BOOL opentype_layout_apply_gsub_reverse_chain_context_substitution(struct unsigned int offset = subtable_offset; UINT16 glyph, format; + if (context->nesting_level_left != SHAPE_MAX_NESTING_LEVEL) + return FALSE; + glyph = context->u.subst.glyphs[context->cur]; format = table_read_be_word(table, offset);

1 0

Nikolay Sivov : dwrite: Limit recursion level for context lookups.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: 3c415128f1f63eb5b1d768b6b1d060c7ff319cb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c415128f1f63eb5b1d768b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 9 12:14:33 2020 +0300 dwrite: Limit recursion level for context lookups. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 ++ dlls/dwrite/opentype.c | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 3d7884cb57..0bb5455a67 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -543,6 +543,8 @@ struct scriptshaping_context unsigned int cur; unsigned int glyph_count; + unsigned int nesting_level_left; + float emsize; DWRITE_MEASURING_MODE measuring_mode; float *advances; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 8853f3a424..22ae106924 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -67,6 +67,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define GET_BE_DWORD(x) RtlUlongByteSwap(x) #endif +#define GLYPH_CONTEXT_MAX_LENGTH 64 +#define SHAPE_MAX_NESTING_LEVEL 6 + typedef struct { CHAR TTCTag[4]; DWORD Version; @@ -4616,6 +4619,7 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, unsigned int i; BOOL ret; + context->nesting_level_left = SHAPE_MAX_NESTING_LEVEL; context->u.buffer.apply_context_lookup = opentype_layout_apply_gpos_context_lookup; opentype_layout_collect_lookups(context, script_index, language_index, features, &context->cache->gpos, &lookups); @@ -4993,8 +4997,6 @@ static BOOL opentype_layout_apply_gsub_lig_substitution(struct scriptshaping_con return FALSE; } -#define GLYPH_CONTEXT_MAX_LENGTH 64 - static BOOL opentype_layout_context_match_input(const struct match_context *mc, unsigned int count, const UINT16 *input, unsigned int *end_offset, unsigned int *match_positions) { @@ -5081,6 +5083,9 @@ static BOOL opentype_layout_context_apply_lookup(struct scriptshaping_context *c unsigned int i, j; int end, delta; + if (!context->nesting_level_left) + return TRUE; + end = context->cur + match_length; for (i = 0; i < lookup_count; ++i) @@ -5097,7 +5102,9 @@ static BOOL opentype_layout_context_apply_lookup(struct scriptshaping_context *c lookup_index = GET_BE_WORD(lookup_records[i+1]); + --context->nesting_level_left; context->u.buffer.apply_context_lookup(context, lookup_index); + ++context->nesting_level_left; delta = context->glyph_count - orig_len; if (!delta) @@ -5692,6 +5699,7 @@ void opentype_layout_apply_gsub_features(struct scriptshaping_context *context, unsigned int i; BOOL ret; + context->nesting_level_left = SHAPE_MAX_NESTING_LEVEL; context->u.buffer.apply_context_lookup = opentype_layout_apply_gsub_context_lookup; opentype_layout_collect_lookups(context, script_index, language_index, features, context->table, &lookups);

1 0

Gabriel Ivăncescu : gdi32: Skip scan conversion on overflow.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: 7bb5b074b5b6a13e13a21accc35947fc927ca33e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bb5b074b5b6a13e13a21acc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jun 9 10:54:49 2020 +0100 gdi32: Skip scan conversion on overflow. Fixes a regression introduced by 9bc6f004ceccf3963584a4f7f4681b5c0578c214, which broke when REGION_CreateEdgeTable overflowed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/region.c | 2 +- dlls/gdi32/tests/clipping.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 893b6d6f4d..878b73f8c9 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2742,7 +2742,7 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo nb_points = REGION_CreateEdgeTable( Count, nbpolygons, Pts, &ET, pETEs, &SLLBlock, clip_rect ); if ((obj = alloc_region( nb_points / 2 ))) { - scan_convert( obj, &ET, mode, clip_rect ); + if (nb_points) scan_convert( obj, &ET, mode, clip_rect ); if (!(hrgn = alloc_gdi_handle( obj, OBJ_REGION, &region_funcs ))) free_region( obj ); diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index 015157522d..484430b0cb 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -513,8 +513,10 @@ static void test_CreatePolyPolygonRgn(void) POINT points_mixed[] = { {0, 0}, {0, 0}, {0, 0}, {6, 6}, {6, 6}, {6, 6} }; POINT points_six[] = { {6, 6}, {6, 6}, {6, 6} }; POINT points_line[] = { {1, 0}, {11, 0}, {21, 0}}; + POINT points_overflow[] = { {0, 0}, {1, 0}, {0, 0x80000000} }; INT counts_single_poly[] = { 3 }; INT counts_two_poly[] = { 3, 3 }; + INT counts_overflow[] = { ARRAY_SIZE(points_overflow) }; int ret; RECT rect; @@ -543,6 +545,13 @@ static void test_CreatePolyPolygonRgn(void) ret = GetRgnBox(region, &rect); ok (ret == NULLREGION, "Expected NULLREGION, got %d\n", ret); DeleteObject(region); + + /* Test with points that overflow the edge table */ + region = CreatePolyPolygonRgn(points_overflow, counts_overflow, ARRAY_SIZE(counts_overflow), ALTERNATE); + ok (region != NULL, "region must not be NULL\n"); + ret = GetRgnBox(region, &rect); + ok (ret == NULLREGION, "Expected NULLREGION, got %d\n", ret); + DeleteObject(region); } START_TEST(clipping)

1 0

Huw Davies : gdi32: Move the scan conversion to a helper function.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: 31605eb4178094e4637ebc0017b5f037b82a9684 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31605eb4178094e4637ebc00… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 9 10:54:48 2020 +0100 gdi32: Move the scan conversion to a helper function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/region.c | 154 +++++++++++++++++++++++++--------------------------- 1 file changed, 73 insertions(+), 81 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 93238b5a84..893b6d6f4d 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2583,67 +2583,25 @@ static void REGION_FreeStorage(ScanLineListBlock *pSLLBlock) } } -/*********************************************************************** - * create_polypolygon_region - * - * Helper for CreatePolyPolygonRgn. - */ -HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygons, INT mode, - const RECT *clip_rect ) +static void scan_convert( WINEREGION *obj, EdgeTable *ET, INT mode, const RECT *clip_rect ) { - HRGN hrgn = 0; - WINEREGION *obj = NULL; - INT y; /* current scanline */ - struct list WETE, *pWETE; /* Winding Edge Table */ - ScanLineList *pSLL; /* current scanLineList */ - EdgeTable ET; /* header node for ET */ - struct list AET; /* header for AET */ - EdgeTableEntry *pETEs; /* EdgeTableEntries pool */ - ScanLineListBlock SLLBlock; /* header for scanlinelist */ + struct list AET; + ScanLineList *pSLL; struct edge_table_entry *active; - unsigned int nb_points; - int cur_band = 0, prev_band = 0; - INT i, poly, total, first = 1; + INT i, y, first = 1, cur_band = 0, prev_band = 0; - TRACE("%p, count %d, polygons %d, mode %d\n", Pts, *Count, nbpolygons, mode); - - /* special case a rectangle */ + if (clip_rect) ET->ymax = min( ET->ymax, clip_rect->bottom ); - if (((nbpolygons == 1) && ((*Count == 4) || - ((*Count == 5) && (Pts[4].x == Pts[0].x) && (Pts[4].y == Pts[0].y)))) && - (((Pts[0].y == Pts[1].y) && - (Pts[1].x == Pts[2].x) && - (Pts[2].y == Pts[3].y) && - (Pts[3].x == Pts[0].x)) || - ((Pts[0].x == Pts[1].x) && - (Pts[1].y == Pts[2].y) && - (Pts[2].x == Pts[3].x) && - (Pts[3].y == Pts[0].y)))) - return CreateRectRgn( min(Pts[0].x, Pts[2].x), min(Pts[0].y, Pts[2].y), - max(Pts[0].x, Pts[2].x), max(Pts[0].y, Pts[2].y) ); - - for(poly = total = 0; poly < nbpolygons; poly++) - total += Count[poly]; - if (! (pETEs = HeapAlloc( GetProcessHeap(), 0, sizeof(EdgeTableEntry) * total ))) - return 0; - - nb_points = REGION_CreateEdgeTable( Count, nbpolygons, Pts, &ET, pETEs, &SLLBlock, clip_rect ); - if (!(obj = alloc_region( nb_points / 2 ))) - goto done; - - if (clip_rect) ET.ymax = min( ET.ymax, clip_rect->bottom ); list_init( &AET ); - pSLL = ET.scanlines.next; - if (mode != WINDING) { - /* - * for each scanline - */ - for (y = ET.ymin; y < ET.ymax; y++) { - /* - * Add a new edge to the active edge table when we - * get to the next edge. - */ - if (pSLL != NULL && y == pSLL->scanline) { + pSLL = ET->scanlines.next; + + if (mode != WINDING) + { + for (y = ET->ymin; y < ET->ymax; y++) + { + /* Add a new edge to the active edge table when we get to the next edge. */ + if (pSLL != NULL && y == pSLL->scanline) + { REGION_loadAET(&AET, &pSLL->edgelist); pSLL = pSLL->next; } @@ -2676,33 +2634,26 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo } } } - else { - /* - * for each scanline - */ - for (y = ET.ymin; y < ET.ymax; y++) { - /* - * Add a new edge to the active edge table when we - * get to the next edge. - */ - if (pSLL != NULL && y == pSLL->scanline) { + else /* mode == WINDING */ + { + struct list WETE, *pWETE; + + for (y = ET->ymin; y < ET->ymax; y++) + { + /* Add a new edge to the active edge table when we get to the next edge. */ + if (pSLL != NULL && y == pSLL->scanline) + { REGION_loadAET(&AET, &pSLL->edgelist); REGION_computeWAET( &AET, &WETE ); pSLL = pSLL->next; } pWETE = list_head( &WETE ); - /* - * for each active edge - */ if (!clip_rect || y >= clip_rect->top) { LIST_FOR_EACH_ENTRY( active, &AET, struct edge_table_entry, entry ) { - /* - * add to the buffer only those edges that - * are in the Winding active edge table. - */ + /* Add to the buffer only those edges that are in the Winding active edge table. */ if (pWETE == &active->winding_entry) { if (first) @@ -2722,10 +2673,7 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo } } - /* - * recompute the winding active edge table if - * we just resorted or have exited an edge. - */ + /* Recompute the winding active edge table if we just resorted or have exited an edge. */ if (next_scanline( &AET, y )) REGION_computeWAET( &AET, &WETE ); if (obj->numRects) @@ -2736,7 +2684,7 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo } } - assert( obj->numRects <= nb_points / 2 ); + assert( obj->numRects <= obj->size ); if (obj->numRects) { @@ -2751,11 +2699,55 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo } } REGION_compact( obj ); +} - if (!(hrgn = alloc_gdi_handle( obj, OBJ_REGION, &region_funcs ))) - free_region( obj ); +/*********************************************************************** + * create_polypolygon_region + * + * Helper for CreatePolyPolygonRgn. + */ +HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygons, INT mode, + const RECT *clip_rect ) +{ + HRGN hrgn = 0; + WINEREGION *obj = NULL; + EdgeTable ET; /* header node for ET */ + EdgeTableEntry *pETEs; /* EdgeTableEntries pool */ + ScanLineListBlock SLLBlock; /* header for scanlinelist */ + unsigned int nb_points; + INT poly, total; + + TRACE("%p, count %d, polygons %d, mode %d\n", Pts, *Count, nbpolygons, mode); + + /* special case a rectangle */ + + if (((nbpolygons == 1) && ((*Count == 4) || + ((*Count == 5) && (Pts[4].x == Pts[0].x) && (Pts[4].y == Pts[0].y)))) && + (((Pts[0].y == Pts[1].y) && + (Pts[1].x == Pts[2].x) && + (Pts[2].y == Pts[3].y) && + (Pts[3].x == Pts[0].x)) || + ((Pts[0].x == Pts[1].x) && + (Pts[1].y == Pts[2].y) && + (Pts[2].x == Pts[3].x) && + (Pts[3].y == Pts[0].y)))) + return CreateRectRgn( min(Pts[0].x, Pts[2].x), min(Pts[0].y, Pts[2].y), + max(Pts[0].x, Pts[2].x), max(Pts[0].y, Pts[2].y) ); + + for(poly = total = 0; poly < nbpolygons; poly++) + total += Count[poly]; + if (! (pETEs = HeapAlloc( GetProcessHeap(), 0, sizeof(EdgeTableEntry) * total ))) + return 0; + + nb_points = REGION_CreateEdgeTable( Count, nbpolygons, Pts, &ET, pETEs, &SLLBlock, clip_rect ); + if ((obj = alloc_region( nb_points / 2 ))) + { + scan_convert( obj, &ET, mode, clip_rect ); + + if (!(hrgn = alloc_gdi_handle( obj, OBJ_REGION, &region_funcs ))) + free_region( obj ); + } -done: REGION_FreeStorage(SLLBlock.next); HeapFree( GetProcessHeap(), 0, pETEs ); return hrgn;

1 0

Zhiyi Zhang : winex11.drv: Set DM_POSITION and DM_DISPLAYORIENTATION when reporting registry display settings.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: 1b33e0f72e87e3c3af905df27c339887f4cb5a18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b33e0f72e87e3c3af905df2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 3 22:28:32 2020 +0800 winex11.drv: Set DM_POSITION and DM_DISPLAYORIENTATION when reporting registry display settings. Set DM_POSITION and DM_DISPLAYORIENTATION when calling EnumDisplaySettings(ENUM_REGISTRY_SETTINGS). DM_DISPLAYFIXEDOUTPUT is not set because it is not necessarily reported according to tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 3 ++- dlls/winex11.drv/settings.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index b37af4d420..6750325a29 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3319,7 +3319,8 @@ static void test_EnumDisplaySettings(void) } else { - todo_wine ok((dm.dmFields & mode_fields) == mode_fields, "Expect dmFields to contain %#x, got %#x\n", + todo_wine_if(mode != ENUM_REGISTRY_SETTINGS) + ok((dm.dmFields & mode_fields) == mode_fields, "Expect dmFields to contain %#x, got %#x\n", mode_fields, dm.dmFields); } diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 70ce35361b..bc9f7aa1dc 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -210,7 +210,9 @@ static BOOL read_registry_settings(DEVMODEW *dm) dm->dmFields |= DM_DISPLAYFLAGS; query_value("DefaultSettings.XPanning", &dm->u1.s2.dmPosition.x); query_value("DefaultSettings.YPanning", &dm->u1.s2.dmPosition.y); + dm->dmFields |= DM_POSITION; query_value("DefaultSettings.Orientation", &dm->u1.s2.dmDisplayOrientation); + dm->dmFields |= DM_DISPLAYORIENTATION; query_value("DefaultSettings.FixedOutput", &dm->u1.s2.dmDisplayFixedOutput); #undef query_value

1 0

Derek Lesho : server: Partially implement JobObjectBasicAccountingInformation.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: d8d6a6b2e639d2e29e166a3faf988b81388ae191 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8d6a6b2e639d2e29e166a3f… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon May 18 08:20:37 2020 -0500 server: Partially implement JobObjectBasicAccountingInformation. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 9 +++++++++ dlls/ntdll/sync.c | 20 +++++++++++++++++--- include/wine/server_protocol.h | 19 ++++++++++++++++++- server/process.c | 15 +++++++++++++++ server/protocol.def | 9 +++++++++ server/request.h | 7 +++++++ server/trace.c | 14 ++++++++++++++ 7 files changed, 89 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d8d6a6b2e639d2e29e16…

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
95
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 June 2020