wine-commits October 2020

wine-commits@winehq.org

1 participants
796 discussions

Alexandre Julliard : gdi32: Store face data as a single binary value in the registry cache.
by Alexandre Julliard 06 Oct '20

06 Oct '20

Module: wine Branch: master Commit: b6c099cda6c7d7694956758ec121562e781c97fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6c099cda6c7d7694956758e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 19:58:11 2020 +0200 gdi32: Store face data as a single binary value in the registry cache. This is faster than a bunch of separate string values. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 260 ++++++++++++++++++++------------------------------ 1 file changed, 102 insertions(+), 158 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b6c099cda6c7d7694956…

1 0

Alexandre Julliard : gdi32: Compare DOS filenames instead of Unix stat information for font files.
by Alexandre Julliard 06 Oct '20

06 Oct '20

Module: wine Branch: master Commit: 14395c85354ca90f2f37b1ed3ac6d2077e3d1f0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=14395c85354ca90f2f37b1ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 15:40:25 2020 +0200 gdi32: Compare DOS filenames instead of Unix stat information for font files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 64 ++++++++++++++++++++------------------------------- 1 file changed, 25 insertions(+), 39 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index cb23173915..23edd1b0c3 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -272,8 +272,6 @@ typedef struct tagFace { WCHAR *style_name; WCHAR *full_name; WCHAR *file; - dev_t dev; - ino_t ino; void *font_data_ptr; DWORD font_data_size; FT_Long face_index; @@ -1573,7 +1571,7 @@ static BOOL insert_face_in_family_list( Face *face, Family *family ) debugstr_w(face->full_name), debugstr_w(family->family_name), cursor->font_version, face->font_version ); - if (face->file && face->dev == cursor->dev && face->ino == cursor->ino) + if (face->file && !strcmpiW( face->file, cursor->file )) { cursor->refcount++; TRACE("Font %s already in list, refcount now %d\n", @@ -2100,10 +2098,9 @@ static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) } } -static Face *create_face( FT_Face ft_face, FT_Long face_index, const WCHAR *dos_name, const char *unix_name, +static Face *create_face( FT_Face ft_face, FT_Long face_index, const WCHAR *filename, void *font_data_ptr, DWORD font_data_size, DWORD flags ) { - struct stat st; Face *face = HeapAlloc( GetProcessHeap(), 0, sizeof(*face) ); face->refcount = 1; @@ -2111,18 +2108,11 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const WCHAR *dos_ face->full_name = ft_face_get_full_name( ft_face, GetSystemDefaultLangID() ); if (flags & ADDFONT_VERTICAL_FONT) face->full_name = get_vertical_name( face->full_name ); - face->dev = 0; - face->ino = 0; - if (unix_name) + if (filename) { - face->file = dos_name ? strdupW( dos_name ) : wine_get_dos_file_name( unix_name ); + face->file = strdupW( filename ); face->font_data_ptr = NULL; face->font_data_size = 0; - if (!stat( unix_name, &st )) - { - face->dev = st.st_dev; - face->ino = st.st_ino; - } } else { @@ -2160,13 +2150,13 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const WCHAR *dos_ return face; } -static void AddFaceToList(FT_Face ft_face, const WCHAR *dos_name, const char *unix_name, - void *font_data_ptr, DWORD font_data_size, FT_Long face_index, DWORD flags ) +static void AddFaceToList(FT_Face ft_face, const WCHAR *file, void *font_data_ptr, DWORD font_data_size, + FT_Long face_index, DWORD flags ) { Face *face; Family *family; - face = create_face( ft_face, face_index, dos_name, unix_name, font_data_ptr, font_data_size, flags ); + face = create_face( ft_face, face_index, file, font_data_ptr, font_data_size, flags ); family = get_family( ft_face, flags & ADDFONT_VERTICAL_FONT ); if (insert_face_in_family_list( face, family )) @@ -2261,6 +2251,7 @@ static INT AddFontToList(const WCHAR *dos_name, const char *unix_name, void *fon FT_Face ft_face; FT_Long face_index = 0, num_faces; INT ret = 0; + WCHAR *filename = NULL; /* we always load external fonts from files - otherwise we would get a crash in update_reg_entries */ assert(unix_name || !(flags & ADDFONT_EXTERNAL_FONT)); @@ -2286,26 +2277,28 @@ static INT AddFontToList(const WCHAR *dos_name, const char *unix_name, void *fon } #endif /* HAVE_CARBON_CARBON_H */ + if (!dos_name && unix_name) dos_name = filename = wine_get_dos_file_name( unix_name ); + do { FONTSIGNATURE fs; ft_face = new_ft_face( unix_name, font_data_ptr, font_data_size, face_index, flags & ADDFONT_ALLOW_BITMAP ); - if (!ft_face) return 0; + if (!ft_face) break; if(ft_face->family_name[0] == '.') /* Ignore fonts with names beginning with a dot */ { TRACE("Ignoring %s since its family name begins with a dot\n", debugstr_a(unix_name)); pFT_Done_Face(ft_face); - return 0; + break; } - AddFaceToList(ft_face, dos_name, unix_name, font_data_ptr, font_data_size, face_index, flags); + AddFaceToList(ft_face, dos_name, font_data_ptr, font_data_size, face_index, flags); ++ret; get_fontsig(ft_face, &fs); if (fs.fsCsb[0] & FS_DBCS_MASK) { - AddFaceToList(ft_face, dos_name, unix_name, font_data_ptr, font_data_size, face_index, + AddFaceToList(ft_face, dos_name, font_data_ptr, font_data_size, face_index, flags | ADDFONT_VERTICAL_FONT); ++ret; } @@ -2313,6 +2306,7 @@ static INT AddFontToList(const WCHAR *dos_name, const char *unix_name, void *fon num_faces = ft_face->num_faces; pFT_Done_Face(ft_face); } while(num_faces > ++face_index); + HeapFree( GetProcessHeap(), 0, filename ); return ret; } @@ -2333,12 +2327,8 @@ static int remove_font_resource( const WCHAR *file, DWORD flags ) { Family *family, *family_next; Face *face, *face_next; - struct stat st; int count = 0; - char *unixname; - if (!(unixname = wine_get_unix_file_name( file ))) return 0; - if (stat( unixname, &st ) == -1) goto done; LIST_FOR_EACH_ENTRY_SAFE( family, family_next, &font_list, Family, entry ) { family->refcount++; @@ -2346,7 +2336,7 @@ static int remove_font_resource( const WCHAR *file, DWORD flags ) { if (!face->file) continue; if (LOWORD(face->flags) != LOWORD(flags)) continue; - if (st.st_dev == face->dev && st.st_ino == face->ino) + if (!strcmpiW( face->file, file )) { TRACE( "removing matching face %s refcount %d\n", debugstr_w(face->file), face->refcount ); release_face( face ); @@ -2355,8 +2345,6 @@ static int remove_font_resource( const WCHAR *file, DWORD flags ) } release_family( family ); } -done: - HeapFree( GetProcessHeap(), 0, unixname ); return count; } @@ -3500,19 +3488,17 @@ static BOOL get_fontdir( const WCHAR *dos_name, struct fontdir *fd ) if (!(unix_name = wine_get_unix_file_name( dos_name ))) return FALSE; ft_face = new_ft_face( unix_name, NULL, 0, 0, FALSE ); - if (ft_face) + HeapFree( GetProcessHeap(), 0, unix_name ); + if (!ft_face) return FALSE; + face = create_face( ft_face, 0, dos_name, NULL, 0, 0 ); + if (face) { - face = create_face( ft_face, 0, dos_name, unix_name, NULL, 0, 0 ); - if (face) - { - family_name = ft_face_get_family_name( ft_face, GetSystemDefaultLCID() ); - GetEnumStructs( face, family_name, &elf, &ntm, &type ); - release_face( face ); - HeapFree( GetProcessHeap(), 0, family_name ); - } - pFT_Done_Face( ft_face ); + family_name = ft_face_get_family_name( ft_face, GetSystemDefaultLCID() ); + GetEnumStructs( face, family_name, &elf, &ntm, &type ); + release_face( face ); + HeapFree( GetProcessHeap(), 0, family_name ); } - HeapFree( GetProcessHeap(), 0, unix_name ); + pFT_Done_Face( ft_face ); if (!face) return FALSE; if ((type & TRUETYPE_FONTTYPE) == 0) return FALSE;

1 0

Alexandre Julliard : gdi32: Store the face filename as a DOS path.
by Alexandre Julliard 06 Oct '20

06 Oct '20

Module: wine Branch: master Commit: f51fe9ead3f8322a6bba7984b4c0583d78d01c0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f51fe9ead3f8322a6bba7984… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 15:12:09 2020 +0200 gdi32: Store the face filename as a DOS path. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 138 ++++++++++++++++++++++---------------------------- 1 file changed, 61 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f51fe9ead3f8322a6bba…

1 0

Martin Storsjo : ntdll: Fix nested exceptions on arm64.
by Alexandre Julliard 06 Oct '20

06 Oct '20

Module: wine Branch: master Commit: 0a6e46e4367e10caa0b13156d89807c45a5bc3ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a6e46e4367e10caa0b13156… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Oct 6 11:49:43 2020 +0300 ntdll: Fix nested exceptions on arm64. This mirrors ae07938ba661dc0515673835878710a25c99eec8 (from x86_64) to arm64. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index cc620eb1b4..c31eb51038 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -315,10 +315,10 @@ static DWORD call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT static DWORD __cdecl nested_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { - if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) return ExceptionContinueSearch; + if (!(rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))) + rec->ExceptionFlags |= EH_NESTED_CALL; - /* FIXME */ - return ExceptionNestedException; + return ExceptionContinueSearch; }

1 0

Martin Storsjo : ntdll: Clear ExceptionFlags on arm64 after running an exception handler.
by Alexandre Julliard 06 Oct '20

06 Oct '20

Module: wine Branch: master Commit: b09acd526d0093962131ff900445cc2dae1f33c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b09acd526d0093962131ff90… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Oct 6 11:49:42 2020 +0300 ntdll: Clear ExceptionFlags on arm64 after running an exception handler. This applies the beahviour from a69762541a18107fbd8e9fb8362c3af8ddf1d90b (on x86_64) to arm64 as well. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index c9f44e92d3..cc620eb1b4 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -341,6 +341,7 @@ static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_C res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, context, dispatch ); TRACE( "handler at %p returned %u\n", dispatch->LanguageHandler, res ); + rec->ExceptionFlags &= EH_NONCONTINUABLE; __wine_pop_frame( &frame ); return res; }

1 0

Nikolay Sivov : comctl32/tests: Remove skips from DPA tests.
by Alexandre Julliard 06 Oct '20

06 Oct '20

Module: wine Branch: master Commit: 81727e1953f2ae32573e8e36504413419c4924b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81727e1953f2ae32573e8e36… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 6 10:41:18 2020 +0300 comctl32/tests: Remove skips from DPA tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/dpa.c | 42 ++---------------------------------------- 1 file changed, 2 insertions(+), 40 deletions(-) diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index 2a5eb503d9..cbe3ab7fb2 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -356,12 +356,6 @@ static void test_DPA_Merge(void) DWORD dw; BOOL rc; - if(!pDPA_Merge) - { - win_skip("DPA_Merge() not available\n"); - return; - } - dpa = pDPA_Create(0); dpa2 = pDPA_Create(0); dpa3 = pDPA_Create(0); @@ -485,12 +479,6 @@ static void test_DPA_EnumCallback(void) DWORD dw; INT i, ret; - if(!pDPA_EnumCallback) - { - win_skip("DPA_EnumCallback() not available\n"); - return; - } - dpa = pDPA_Create(0); for (i = 0; i < 6; i++) @@ -517,12 +505,6 @@ static void test_DPA_DestroyCallback(void) HDPA dpa; INT i, ret; - if(!pDPA_DestroyCallback) - { - win_skip("DPA_DestroyCallback() not available\n"); - return; - } - dpa = pDPA_Create(0); for (i = 0; i < 3; i++) @@ -548,18 +530,8 @@ static void test_DPA_LoadStream(void) ULONG written, ret; HDPA dpa; - if(!pDPA_LoadStream) - { - win_skip("DPA_LoadStream() not available. Skipping stream tests.\n"); - return; - } - hRes = CoInitialize(NULL); - if (hRes != S_OK) - { - ok(0, "hResult: %d\n", hRes); - return; - } + ok(hRes == S_OK, "Failed to initialize COM, hr %#x.\n", hRes); dwMode = STGM_DIRECT|STGM_CREATE|STGM_READWRITE|STGM_SHARE_EXCLUSIVE; hRes = StgCreateDocfile(NULL, dwMode|STGM_DELETEONRELEASE, 0, &pStg); @@ -666,18 +638,8 @@ static void test_DPA_SaveStream(void) BOOL rc; LARGE_INTEGER liZero; - if(!pDPA_SaveStream) - { - win_skip("DPA_SaveStream() not available. Skipping stream tests.\n"); - return; - } - hRes = CoInitialize(NULL); - if (hRes != S_OK) - { - ok(0, "hResult: %d\n", hRes); - return; - } + ok(hRes == S_OK, "Failed to initialize COM, hr %#x.\n", hRes); dwMode = STGM_DIRECT|STGM_CREATE|STGM_READWRITE|STGM_SHARE_EXCLUSIVE; hRes = StgCreateDocfile(NULL, dwMode|STGM_DELETEONRELEASE, 0, &pStg);

1 0

Nikolay Sivov : msxml3/tests: Use wide string literals in tests.
by Alexandre Julliard 06 Oct '20

06 Oct '20

Module: wine Branch: master Commit: e5c87396b1c6fe32bbcb6d3129b21adb22621b55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5c87396b1c6fe32bbcb6d31… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 6 10:25:18 2020 +0300 msxml3/tests: Use wide string literals in tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 263 ++++++++++++++++----------------------------- 1 file changed, 90 insertions(+), 173 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e5c87396b1c6fe32bbcb…

1 0

Nikolay Sivov : oleaut32: Do not forward IErrorInfo functions.
by Alexandre Julliard 06 Oct '20

06 Oct '20

Module: wine Branch: master Commit: 4dff46520720bc6c7e45a838cf6a2bea32b02584 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4dff46520720bc6c7e45a838… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 6 10:23:38 2020 +0300 oleaut32: Do not forward IErrorInfo functions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49946 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut32.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec index cc18a04bef..21b52f1f06 100644 --- a/dlls/oleaut32/oleaut32.spec +++ b/dlls/oleaut32/oleaut32.spec @@ -194,9 +194,9 @@ 197 stdcall VarDecFromStr(wstr long long ptr) 198 stdcall VarDecFromDisp(ptr long ptr) 199 stdcall VarDecFromBool(long ptr) -200 stdcall GetErrorInfo(long ptr) ole32.GetErrorInfo -201 stdcall SetErrorInfo(long ptr) ole32.SetErrorInfo -202 stdcall CreateErrorInfo(ptr) ole32.CreateErrorInfo +200 stdcall -import GetErrorInfo(long ptr) +201 stdcall -import SetErrorInfo(long ptr) +202 stdcall -import CreateErrorInfo(ptr) 203 stdcall VarDecRound(ptr long ptr) 204 stdcall VarDecCmp(ptr ptr) 205 stdcall VarI2FromI1(long ptr)

1 0

Zebediah Figura : ws2_32/tests: Avoid ok(0, ...) where the condition can be checked directly.
by Alexandre Julliard 06 Oct '20

06 Oct '20

Module: wine Branch: master Commit: ecc790ad479958d0c9a5af105463cfc3da3c3126 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecc790ad479958d0c9a5af10… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 5 22:22:36 2020 -0500 ws2_32/tests: Avoid ok(0, ...) where the condition can be checked directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 383 ++++++++++++----------------------------------- 1 file changed, 95 insertions(+), 288 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ecc790ad479958d0c9a5…

1 0

Zebediah Figura : ws2_32/tests: Link directly to more functions.
by Alexandre Julliard 06 Oct '20

06 Oct '20

Module: wine Branch: master Commit: 94ea4252cf3fd3613c8fe78b9af3f36609a3d8c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94ea4252cf3fd3613c8fe78b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 5 22:22:35 2020 -0500 ws2_32/tests: Link directly to more functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/Makefile.in | 2 +- dlls/ws2_32/tests/sock.c | 325 +++++++++++++++++------------------------- 2 files changed, 129 insertions(+), 198 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=94ea4252cf3fd3613c8f…

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
80
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 October 2020