wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

Drew Ronneberg : winmm: Remove obsolete -D_WINMM_ from Makefile.in.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: f20771e76cb0720b677a1428d5b92a88e3684542 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f20771e76cb0720b677a1428… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Sun May 1 05:59:11 2022 -0400 winmm: Remove obsolete -D_WINMM_ from Makefile.in. Signed-off-by: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in index c515a3aba2e..81519a58853 100644 --- a/dlls/winmm/Makefile.in +++ b/dlls/winmm/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -D_WINMM_ MODULE = winmm.dll IMPORTLIB = winmm IMPORTS = uuid user32 advapi32 ole32 msacm32

1 0

Drew Ronneberg : urlmon: Remove obsolete -D_URLMON_ from Makefile.in.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: 4d9b7b6cbc317bb77b200cefa6fe52ec4b183020 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d9b7b6cbc317bb77b200cef… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Sun May 1 05:59:10 2022 -0400 urlmon: Remove obsolete -D_URLMON_ from Makefile.in. Signed-off-by: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in index f95e7972829..a29c831e455 100644 --- a/dlls/urlmon/Makefile.in +++ b/dlls/urlmon/Makefile.in @@ -1,7 +1,6 @@ MODULE = urlmon.dll IMPORTLIB = urlmon IMPORTS = uuid ole32 oleaut32 shell32 rpcrt4 shlwapi wininet user32 advapi32 -EXTRADEFS = -D_URLMON_ DELAYIMPORTS = advpack C_SRCS = \

1 0

Drew Ronneberg : oleaut32: Remove obsolete -D_OLEAUT32_ from Makefile.in.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: 75f6f22d5b1f7e9c40595c2fa35131c8f3e636c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75f6f22d5b1f7e9c40595c2f… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Sun May 1 05:59:08 2022 -0400 oleaut32: Remove obsolete -D_OLEAUT32_ from Makefile.in. Signed-off-by: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index a7dea7a37c7..3e760b8d835 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -2,7 +2,6 @@ MODULE = oleaut32.dll IMPORTLIB = oleaut32 IMPORTS = uuid ole32 rpcrt4 user32 gdi32 advapi32 DELAYIMPORTS = comctl32 urlmon windowscodecs -EXTRADEFS = -D_OLEAUT32_ C_SRCS = \ connpt.c \

1 0

Drew Ronneberg : user32: Remove obsolete -D_WINABLE_ from Makefile.in.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: 52a4126bc92a0d7ddf979d2c4a4e6d4bba18d251 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52a4126bc92a0d7ddf979d2c… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Sun May 1 05:59:12 2022 -0400 user32: Remove obsolete -D_WINABLE_ from Makefile.in. Signed-off-by: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index 92d5c1ec1d9..4a413746de7 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_USER32_ -D_WINABLE_ +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_USER32_ MODULE = user32.dll IMPORTLIB = user32 IMPORTS = $(PNG_PE_LIBS) gdi32 version sechost advapi32 kernelbase win32u

1 0

Drew Ronneberg : rpcrt4: Remove obsolete -D_RPCRT4_ from Makefile.in.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: a1f8a75aa434d1bedc2024174161c174977086b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1f8a75aa434d1bedc202417… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Sun May 1 05:59:09 2022 -0400 rpcrt4: Remove obsolete -D_RPCRT4_ from Makefile.in. Signed-off-by: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in index 2aa2a5376aa..822e6ded35d 100644 --- a/dlls/rpcrt4/Makefile.in +++ b/dlls/rpcrt4/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_RPCRT4_ -DMSWMSG +EXTRADEFS = -DMSWMSG MODULE = rpcrt4.dll IMPORTLIB = rpcrt4 IMPORTS = uuid advapi32

1 0

Drew Ronneberg : netapi32: Remove obsolete -D_SVRAPI_ from Makefile.in.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: cacf4d1a55ad657eb05dd55661da048e789fb3cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=cacf4d1a55ad657eb05dd556… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Sun May 1 05:59:07 2022 -0400 netapi32: Remove obsolete -D_SVRAPI_ from Makefile.in. Signed-off-by: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/netapi32/Makefile.in b/dlls/netapi32/Makefile.in index 1f97d9797b9..cb0ea5168b5 100644 --- a/dlls/netapi32/Makefile.in +++ b/dlls/netapi32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -D_SVRAPI_ MODULE = netapi32.dll UNIXLIB = netapi32.so IMPORTLIB = netapi32

1 0

Drew Ronneberg : winspool.drv: Remove obsolete -D_SPOOL32_ from Makefile.in.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: 68bdfcda76d9760c3a6def67487387934221d1da URL: https://source.winehq.org/git/wine.git/?a=commit;h=68bdfcda76d9760c3a6def67… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Sun May 1 05:59:13 2022 -0400 winspool.drv: Remove obsolete -D_SPOOL32_ from Makefile.in. Signed-off-by: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in index 019b0e8ab9d..cd70d13b6f9 100644 --- a/dlls/winspool.drv/Makefile.in +++ b/dlls/winspool.drv/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_SPOOL32_ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winspool.drv UNIXLIB = winspool.so IMPORTLIB = winspool

1 0

Drew Ronneberg : shdocvw: Remove obsolete -D_SHDOCVW_ from Makefile.in.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: 842b0eb511be7ae9826c25b890460dc7db6da659 URL: https://source.winehq.org/git/wine.git/?a=commit;h=842b0eb511be7ae9826c25b8… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Fri Apr 29 06:14:31 2022 -0400 shdocvw: Remove obsolete -D_SHDOCVW_ from Makefile.in. Signed-off-by: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shdocvw/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 30b0a1a299c..9523f299ce1 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -D_SHDOCVW_ MODULE = shdocvw.dll IMPORTLIB = shdocvw IMPORTS = uuid shlwapi advapi32

1 0

Nikolay Sivov : dwrite/opentype: Do not include base advance to the mark advance offset.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: 979868aed5084a8cb96f015dba46b217ead58965 URL: https://source.winehq.org/git/wine.git/?a=commit;h=979868aed5084a8cb96f015d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 2 09:22:18 2022 +0300 dwrite/opentype: Do not include base advance to the mark advance offset. This is handled later using attachment chains, after all positional features are applied. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index f07b010baae..50e83769715 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4320,7 +4320,7 @@ static BOOL opentype_layout_apply_mark_array(struct scriptshaping_context *conte if (context->is_rtl) context->offsets[context->cur].advanceOffset = mark_x - base_x; else - context->offsets[context->cur].advanceOffset = -context->advances[glyph_pos] + base_x - mark_x; + context->offsets[context->cur].advanceOffset = base_x - mark_x; context->offsets[context->cur].ascenderOffset = base_y - mark_y; opentype_set_glyph_attach_type(context, context->cur, GLYPH_ATTACH_MARK); context->glyph_infos[context->cur].attach_chain = (int)glyph_pos - (int)context->cur;

1 0

Nikolay Sivov : dwrite/opentype: Fix incorrect MarkGlyphSets table handling.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: d2d91fba5553c3c0d44c9e3ebf665961199def69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2d91fba5553c3c0d44c9e3e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 2 09:22:17 2022 +0300 dwrite/opentype: Fix incorrect MarkGlyphSets table handling. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 7df153e681d..f07b010baae 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -475,6 +475,13 @@ struct ot_gdef_classdef_format2 struct ot_gdef_class_range ranges[1]; }; +struct ot_gdef_markglyphsets +{ + uint16_t format; + uint16_t count; + uint32_t offsets[1]; +}; + struct gpos_gsub_header { uint16_t major_version; @@ -3762,7 +3769,7 @@ static BOOL opentype_match_coverage_func(UINT16 glyph, UINT16 glyph_data, const static BOOL opentype_layout_mark_set_covers(const struct scriptshaping_cache *cache, unsigned int set_index, UINT16 glyph) { - unsigned int format, offset = cache->gdef.markglyphsetdef, coverage_offset, set_count; + unsigned int format, offset = cache->gdef.markglyphsetdef, coverage_offset, count; if (!offset) return FALSE; @@ -3771,11 +3778,12 @@ static BOOL opentype_layout_mark_set_covers(const struct scriptshaping_cache *ca if (format == 1) { - set_count = table_read_be_word(&cache->gdef.table, offset + 2); - if (!set_count || set_index >= set_count) + count = table_read_be_word(&cache->gdef.table, offset + FIELD_OFFSET(struct ot_gdef_markglyphsets, count)); + if (!count || set_index >= count) return FALSE; - coverage_offset = table_read_be_dword(&cache->gdef.table, offset + 2 + set_index * sizeof(coverage_offset)); + coverage_offset = table_read_be_dword(&cache->gdef.table, offset + + FIELD_OFFSET(struct ot_gdef_markglyphsets, offsets[set_index])); return opentype_layout_is_glyph_covered(&cache->gdef.table, offset + coverage_offset, glyph) != GLYPH_NOT_COVERED; } else

1 0

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 May 2022