February 2021 - Wine-commits

Haoyang Chen : gdiplus/tests: Test image brush transformation.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: cda039943dca510b412743c8a376fc36815bbfef URL: https://source.winehq.org/git/wine.git/?a=commit;h=cda039943dca510b412743c8… Author: Haoyang Chen <chenhaoyang(a)uniontech.com> Date: Tue Feb 2 10:56:56 2021 +0800 gdiplus/tests: Test image brush transformation. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/brush.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 78939e68991..0287078bc80 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include <math.h> #include "objbase.h" @@ -274,6 +275,37 @@ static void test_transform(void) GpPointF start, end; GpRectF rectf; REAL elements[6]; + UINT buf[15]; + HBITMAP hbmp,old; + HDC dcmem; + BITMAP bm; + GpImage *image; + IStream *stream; + HGLOBAL hglob; + VOID *data; + HRESULT hr; + LONG size; + + /* 3*5 bmp 32bit*/ + static const unsigned char bmpimage[] = { + 0x42,0x4d,0x74,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x36,0x00, + 0x00,0x00,0x28,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00, + 0x00,0x00,0x01,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x3e,0x00, + 0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00, + 0xff,0x11,0xff,0x00,0xff,0x11,0xff,0x00,0xff,0x11,0xff,0x00, + 0xff,0x33,0xff,0x00,0xff,0x33,0xff,0x00,0xff,0x33,0xff,0x00, + 0xff,0x55,0xff,0x00,0xff,0x55,0xff,0x00,0xff,0x55,0xff,0x00, + 0xff,0xaa,0xff,0x00,0xff,0xaa,0xff,0x00,0xff,0xaa,0xff,0x00, + 0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00, + 0x00,0x00,0x00,0x00}; + + static const UINT buf_rotate_180[15] = { + 0xffffffff, 0xffffffff, 0xffffffff, + 0xffff11ff, 0xffff11ff, 0xffff11ff, + 0xffff33ff, 0xffff33ff, 0xffff33ff, + 0xffff55ff, 0xffff55ff, 0xffff55ff, + 0xffffaaff, 0xffffaaff, 0xffffaaff}; /* GpTexture */ status = GdipCreateMatrix2(2.0, 0.0, 0.0, 0.0, 0.0, 0.0, &m); @@ -556,6 +588,38 @@ static void test_transform(void) expect(Ok, status); status = GdipDeleteBrush((GpBrush*)line); expect(Ok,status); + GdipDeleteGraphics(graphics); + + dcmem = CreateCompatibleDC(hdc); + hbmp = CreateBitmap(3, 5, 1, 32, NULL); + old = SelectObject(dcmem, hbmp); + status = GdipCreateFromHDC(dcmem, &graphics); + expect(Ok, status); + hglob = GlobalAlloc(0, sizeof(bmpimage)); + data = GlobalLock (hglob); + memcpy(data, bmpimage, sizeof(bmpimage)); + GlobalUnlock(hglob); + hr = CreateStreamOnHGlobal(hglob, TRUE, &stream); + expect(S_OK, hr); + status = GdipLoadImageFromStream(stream, &image); + expect(Ok, status); + status = GdipCreateTexture(image, WrapModeTile, &texture); + expect(Ok, status); + status = GdipRotateTextureTransform(texture, 180.0f, MatrixOrderPrepend); + expect(Ok, status); + status = GdipFillRectangle(graphics, (GpBrush*)texture, .0f, .0f, (REAL)3, (REAL)5); + expect(Ok, status); + GdipDeleteBrush((GpBrush*)texture); + GdipDisposeImage(image); + GdipDeleteGraphics(graphics); + IStream_Release(stream); + hbmp = SelectObject(dcmem, old); + GetObjectW(hbmp, sizeof(bm), &bm); + size = GetBitmapBits(hbmp, sizeof(buf), buf); + expect(sizeof(buf), size); + DeleteObject(hbmp); + DeleteDC(dcmem); + ok(!memcmp(buf, buf_rotate_180, sizeof(buf)), "Failed to rotate image.\n"); if(0){ /* enable to visually compare with Windows */

1 0

Rémi Bernon : mscoree: Improve non-neutral assembly lookup logic.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 500478cae926259faf1df16d881878711252d08c URL: https://source.winehq.org/git/wine.git/?a=commit;h=500478cae926259faf1df16d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 2 09:25:18 2021 +0100 mscoree: Improve non-neutral assembly lookup logic. And neutral logic too, and the combinations with custom privatePath config. This fixes a crash with Mafia III launcher, when it tries to load its localized strings from culture-specific assemblies to display its warning popup message. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 75 ++++++++--- dlls/mscoree/tests/loadpaths.dll.cs | 33 +++++ dlls/mscoree/tests/loadpaths.exe.config | 8 ++ dlls/mscoree/tests/loadpaths.exe.cs | 28 ++++ dlls/mscoree/tests/mscoree.c | 226 ++++++++++++++++++++++++++++++++ dlls/mscoree/tests/resource.rc | 9 ++ 6 files changed, 360 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=500478cae926259faf1d…

1 0

Alexandre Julliard : include: Add a couple of access right flags.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 7b78896a8a3924d992ce9d74a74c9dfe4b968d92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b78896a8a3924d992ce9d74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 20:43:08 2021 +0100 include: Add a couple of access right flags. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index bb045fa2745..8feb2e53a4c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4323,17 +4323,16 @@ typedef enum _TOKEN_INFORMATION_CLASS { #define LUA_TOKEN 0x4 #define WRITE_RESTRICTED 0x8 -#define TOKEN_TOKEN_ADJUST_DEFAULT 0x0080 -#define TOKEN_ADJUST_GROUPS 0x0040 -#define TOKEN_ADJUST_PRIVILEGES 0x0020 -#define TOKEN_ADJUST_SESSIONID 0x0100 #define TOKEN_ASSIGN_PRIMARY 0x0001 #define TOKEN_DUPLICATE 0x0002 -#define TOKEN_EXECUTE STANDARD_RIGHTS_EXECUTE #define TOKEN_IMPERSONATE 0x0004 #define TOKEN_QUERY 0x0008 #define TOKEN_QUERY_SOURCE 0x0010 +#define TOKEN_ADJUST_PRIVILEGES 0x0020 +#define TOKEN_ADJUST_GROUPS 0x0040 #define TOKEN_ADJUST_DEFAULT 0x0080 +#define TOKEN_ADJUST_SESSIONID 0x0100 +#define TOKEN_EXECUTE STANDARD_RIGHTS_EXECUTE #define TOKEN_READ (STANDARD_RIGHTS_READ|TOKEN_QUERY) #define TOKEN_WRITE (STANDARD_RIGHTS_WRITE | \ TOKEN_ADJUST_PRIVILEGES | \ @@ -5416,7 +5415,8 @@ typedef enum tagSID_NAME_USE { #define JOB_OBJECT_QUERY 0x0004 #define JOB_OBJECT_TERMINATE 0x0008 #define JOB_OBJECT_SET_SECURITY_ATTRIBUTES 0x0010 -#define JOB_OBJECT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x1f) +#define JOB_OBJECT_IMPERSONATE 0x0020 +#define JOB_OBJECT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3f) #define TIMER_QUERY_STATE 0x0001 #define TIMER_MODIFY_STATE 0x0002

1 0

Alexandre Julliard : gdi32/tests: Regenerate ttf files with the official fontforge version.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 8d373a67e179ecfb4dfa86be17bc7236ac1c690d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d373a67e179ecfb4dfa86be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 20:43:55 2021 +0100 gdi32/tests: Regenerate ttf files with the official fontforge version. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/vertical.ttf | Bin 3560 -> 3560 bytes dlls/gdi32/tests/wine_langnames.sfd | 2 +- dlls/gdi32/tests/wine_langnames.ttf | Bin 2792 -> 2760 bytes dlls/gdi32/tests/wine_langnames2.sfd | 2 +- dlls/gdi32/tests/wine_langnames2.ttf | Bin 2016 -> 1984 bytes dlls/gdi32/tests/wine_langnames3.sfd | 2 +- dlls/gdi32/tests/wine_langnames3.ttf | Bin 2076 -> 2044 bytes dlls/gdi32/tests/wine_nul.sfd | 2 +- dlls/gdi32/tests/wine_nul.ttf | Bin 1600 -> 1604 bytes dlls/gdi32/tests/wine_ttfnames.sfd | 2 +- dlls/gdi32/tests/wine_ttfnames.ttf | Bin 2232 -> 2200 bytes dlls/gdi32/tests/wine_ttfnames_bold.sfd | 2 +- dlls/gdi32/tests/wine_ttfnames_bold.ttf | Bin 2272 -> 2240 bytes 13 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/vertical.ttf b/dlls/gdi32/tests/vertical.ttf index 0fc07796047..d82cbb106cb 100644 Binary files a/dlls/gdi32/tests/vertical.ttf and b/dlls/gdi32/tests/vertical.ttf differ diff --git a/dlls/gdi32/tests/wine_langnames.sfd b/dlls/gdi32/tests/wine_langnames.sfd index 4ce1e70baca..14b422f48da 100644 --- a/dlls/gdi32/tests/wine_langnames.sfd +++ b/dlls/gdi32/tests/wine_langnames.sfd @@ -1,4 +1,4 @@ -SplineFontDB: 3.2 +SplineFontDB: 3.0 FontName: WineLangNamesRegular FullName: Wine_Lang_Names_Regular FamilyName: Wine_Lang_Names diff --git a/dlls/gdi32/tests/wine_langnames.ttf b/dlls/gdi32/tests/wine_langnames.ttf index 674fd1bc7e4..ff3fb6b7a10 100644 Binary files a/dlls/gdi32/tests/wine_langnames.ttf and b/dlls/gdi32/tests/wine_langnames.ttf differ diff --git a/dlls/gdi32/tests/wine_langnames2.sfd b/dlls/gdi32/tests/wine_langnames2.sfd index 50199af9adf..8ed0a302ce9 100644 --- a/dlls/gdi32/tests/wine_langnames2.sfd +++ b/dlls/gdi32/tests/wine_langnames2.sfd @@ -1,4 +1,4 @@ -SplineFontDB: 3.2 +SplineFontDB: 3.0 FontName: WineLangNamesRegular FullName: Wine_Lang_Names_Regular FamilyName: Wine_Lang_Names diff --git a/dlls/gdi32/tests/wine_langnames2.ttf b/dlls/gdi32/tests/wine_langnames2.ttf index 47082dbd67e..8a61f0d5dd5 100644 Binary files a/dlls/gdi32/tests/wine_langnames2.ttf and b/dlls/gdi32/tests/wine_langnames2.ttf differ diff --git a/dlls/gdi32/tests/wine_langnames3.sfd b/dlls/gdi32/tests/wine_langnames3.sfd index 55536fa58c1..914105d50b6 100644 --- a/dlls/gdi32/tests/wine_langnames3.sfd +++ b/dlls/gdi32/tests/wine_langnames3.sfd @@ -1,4 +1,4 @@ -SplineFontDB: 3.2 +SplineFontDB: 3.0 FontName: WineLangNamesRegular FullName: Wine_Lang_Names_Regular FamilyName: Wine_Lang_Names diff --git a/dlls/gdi32/tests/wine_langnames3.ttf b/dlls/gdi32/tests/wine_langnames3.ttf index 408d127fb1e..64317e81dc4 100644 Binary files a/dlls/gdi32/tests/wine_langnames3.ttf and b/dlls/gdi32/tests/wine_langnames3.ttf differ diff --git a/dlls/gdi32/tests/wine_nul.sfd b/dlls/gdi32/tests/wine_nul.sfd index c82180f1007..f28616bcb02 100644 --- a/dlls/gdi32/tests/wine_nul.sfd +++ b/dlls/gdi32/tests/wine_nul.sfd @@ -1,4 +1,4 @@ -SplineFontDB: 3.2 +SplineFontDB: 3.0 FontName: wine_nul FullName: wine_nul FamilyName: wine_nul diff --git a/dlls/gdi32/tests/wine_nul.ttf b/dlls/gdi32/tests/wine_nul.ttf index 89e5648fd92..17a68419377 100644 Binary files a/dlls/gdi32/tests/wine_nul.ttf and b/dlls/gdi32/tests/wine_nul.ttf differ diff --git a/dlls/gdi32/tests/wine_ttfnames.sfd b/dlls/gdi32/tests/wine_ttfnames.sfd index 566749d19a7..bef10463d6c 100644 --- a/dlls/gdi32/tests/wine_ttfnames.sfd +++ b/dlls/gdi32/tests/wine_ttfnames.sfd @@ -1,4 +1,4 @@ -SplineFontDB: 3.2 +SplineFontDB: 3.0 FontName: Wine_TTF_Names_Long_Family1_Cond_Regular FamilyName: Wine_TTF_Names_Long_Family1_Cond Weight: Regular diff --git a/dlls/gdi32/tests/wine_ttfnames.ttf b/dlls/gdi32/tests/wine_ttfnames.ttf index 2eb2ad1f95e..6e5ce78fb7a 100644 Binary files a/dlls/gdi32/tests/wine_ttfnames.ttf and b/dlls/gdi32/tests/wine_ttfnames.ttf differ diff --git a/dlls/gdi32/tests/wine_ttfnames_bold.sfd b/dlls/gdi32/tests/wine_ttfnames_bold.sfd index b3bf4ddfe90..40c94e7e7c1 100644 --- a/dlls/gdi32/tests/wine_ttfnames_bold.sfd +++ b/dlls/gdi32/tests/wine_ttfnames_bold.sfd @@ -1,4 +1,4 @@ -SplineFontDB: 3.2 +SplineFontDB: 3.0 FontName: Wine_TTF_Names_Long_Family1_Cond_Regular FamilyName: Wine_TTF_Names_Long_Family1_Cond Weight: Regular diff --git a/dlls/gdi32/tests/wine_ttfnames_bold.ttf b/dlls/gdi32/tests/wine_ttfnames_bold.ttf index 919a5ea1310..a9293d7d7ca 100644 Binary files a/dlls/gdi32/tests/wine_ttfnames_bold.ttf and b/dlls/gdi32/tests/wine_ttfnames_bold.ttf differ

1 0

Alexandre Julliard : gdiplus/tests: Regenerate ttf files with the official fontforge version.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 0ec38429f35ba3fdc3510f46550ea384b423fdef URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ec38429f35ba3fdc3510f46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 20:44:03 2021 +0100 gdiplus/tests: Regenerate ttf files with the official fontforge version. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/wine_testfont0.sfd | 2 +- dlls/gdiplus/tests/wine_testfont0.ttf | Bin 1688 -> 1656 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/tests/wine_testfont0.sfd b/dlls/gdiplus/tests/wine_testfont0.sfd index ba99b9f99b4..c71f717c4a6 100644 --- a/dlls/gdiplus/tests/wine_testfont0.sfd +++ b/dlls/gdiplus/tests/wine_testfont0.sfd @@ -1,4 +1,4 @@ -SplineFontDB: 3.2 +SplineFontDB: 3.0 FontName: winegdiptestfont0 FullName: Wine GDI+ Test Font 0 FamilyName: winegdiptestfont diff --git a/dlls/gdiplus/tests/wine_testfont0.ttf b/dlls/gdiplus/tests/wine_testfont0.ttf index 227c2251432..fb899cb342f 100644 Binary files a/dlls/gdiplus/tests/wine_testfont0.ttf and b/dlls/gdiplus/tests/wine_testfont0.ttf differ

1 0

Alexandre Julliard : gdi32: Cache the codepage tables also for OpenType names mapping.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 9581b2df8c9c9ce1688b0d111d0206564b9fcd8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9581b2df8c9c9ce1688b0d11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 20:55:06 2021 +0100 gdi32: Cache the codepage tables also for OpenType names mapping. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b3fc565afe8..fae4aa94a78 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -714,21 +714,27 @@ static const LANGID mac_langid_table[] = MAKELANGID(LANG_AZERI,SUBLANG_AZERI_LATIN), /* TT_MAC_LANGID_AZERBAIJANI_ROMAN_SCRIPT */ }; -static CPTABLEINFO *get_mac_code_page( const FT_SfntName *name ) +static CPTABLEINFO *get_cptable( WORD cp ) { static CPTABLEINFO tables[100]; - int id = name->encoding_id; + unsigned int i; USHORT *ptr; SIZE_T size; + for (i = 0; i < ARRAY_SIZE(tables) && tables[i].CodePage; i++) + if (tables[i].CodePage == cp) return &tables[i]; + if (NtGetNlsSectionPtr( 11, cp, NULL, (void **)&ptr, &size )) return NULL; + if (i == ARRAY_SIZE(tables)) ERR( "too many code pages\n" ); + RtlInitCodePageTable( ptr, &tables[i] ); + return &tables[i]; +} + +static CPTABLEINFO *get_mac_code_page( const FT_SfntName *name ) +{ + int id = name->encoding_id; + if (name->encoding_id == TT_MAC_ID_SIMPLIFIED_CHINESE) id = 8; /* special case */ - if (id >= ARRAY_SIZE(tables)) return NULL; - if (!tables[id].CodePage) - { - if (NtGetNlsSectionPtr( 11, 10000 + id, NULL, (void **)&ptr, &size )) return NULL; - RtlInitCodePageTable( ptr, &tables[id] ); - } - return &tables[id]; + return get_cptable( 10000 + id ); } static int match_name_table_language( const FT_SfntName *name, LANGID lang ) @@ -1144,9 +1150,6 @@ static BOOL search_face_name_callback( LANGID langid, struct opentype_name *name static WCHAR *decode_opentype_name( struct opentype_name *name ) { - CPTABLEINFO codepage_info; - USHORT *codepage_ptr; - SIZE_T codepage_size; WCHAR buffer[512]; DWORD len; @@ -1158,11 +1161,10 @@ static WCHAR *decode_opentype_name( struct opentype_name *name ) } else { - NtGetNlsSectionPtr( 11, name->codepage, NULL, (void **)&codepage_ptr, &codepage_size ); - RtlInitCodePageTable( codepage_ptr, &codepage_info ); - RtlCustomCPToUnicodeN( &codepage_info, buffer, sizeof(buffer), &len, name->bytes, name->length ); + CPTABLEINFO *cptable = get_cptable( name->codepage ); + if (!cptable) return NULL; + RtlCustomCPToUnicodeN( cptable, buffer, sizeof(buffer), &len, name->bytes, name->length ); len /= sizeof(WCHAR); - NtUnmapViewOfSection( GetCurrentProcess(), codepage_ptr ); } buffer[ARRAY_SIZE(buffer) - 1] = 0;

1 0

Dmitry Timoshkov : ntdll: Exclude large integer APIs from relay tracing.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 8d7ec7968df1750c9c525817f1366b57fa72d839 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d7ec7968df1750c9c525817… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 3 13:00:06 2021 +0300 ntdll: Exclude large integer APIs from relay tracing. These builtin functions use stdcall calling convention, but compilers reference them without stdcall declarations. Otherwise ucrtbase initialization code crashes with +relay enabled when compiled with clang as a PE build. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0a2c2493334..185dd6767eb 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1450,17 +1450,17 @@ @ cdecl __iscsym(long) @ cdecl __iscsymf(long) @ cdecl __toascii(long) -@ cdecl -arch=i386 -ret64 _alldiv(int64 int64) +@ cdecl -norelay -arch=i386 -ret64 _alldiv(int64 int64) @ cdecl -arch=i386 -norelay _alldvrm(int64 int64) -@ cdecl -arch=i386 -ret64 _allmul(int64 int64) +@ cdecl -norelay -arch=i386 -ret64 _allmul(int64 int64) @ cdecl -arch=i386 -norelay _alloca_probe() -@ cdecl -arch=i386 -ret64 _allrem(int64 int64) +@ cdecl -norelay -arch=i386 -ret64 _allrem(int64 int64) @ stdcall -arch=i386 -ret64 _allshl(int64 long) @ stdcall -arch=i386 -ret64 _allshr(int64 long) @ cdecl -ret64 _atoi64(str) -@ cdecl -arch=i386 -ret64 _aulldiv(int64 int64) +@ cdecl -norelay -arch=i386 -ret64 _aulldiv(int64 int64) @ cdecl -arch=i386 -norelay _aulldvrm(int64 int64) -@ cdecl -arch=i386 -ret64 _aullrem(int64 int64) +@ cdecl -norelay -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -arch=i386 -ret64 _aullshr(int64 long) @ cdecl -arch=i386 -norelay _chkstk() @ stub _fltused

1 0

Hans Leidekker : wbemprox: Fix Windows 8/8.1 caption.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: bdba6037d01acce3cd1ea299a8859f3b99d4f520 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdba6037d01acce3cd1ea299… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 3 10:32:32 2021 +0100 wbemprox: Fix Windows 8/8.1 caption. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50610 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index f1cf75ab380..b86326327fb 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3436,8 +3436,8 @@ static WCHAR *get_oscaption( OSVERSIONINFOEXW *ver ) if (!(ret = heap_alloc( len * sizeof(WCHAR) + sizeof(win2003W) ))) return NULL; memcpy( ret, windowsW, sizeof(windowsW) ); if (ver->dwMajorVersion == 10 && ver->dwMinorVersion == 0) memcpy( ret + len, win10W, sizeof(win10W) ); - else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 3) memcpy( ret + len, win8W, sizeof(win8W) ); - else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 2) memcpy( ret + len, win81W, sizeof(win81W) ); + else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 3) memcpy( ret + len, win81W, sizeof(win81W) ); + else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 2) memcpy( ret + len, win8W, sizeof(win8W) ); else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 1) { if (ver->wProductType == VER_NT_WORKSTATION) memcpy( ret + len, win7W, sizeof(win7W) );

1 0

Francois Gouget : testbot/WinRun*: Simplify LogTaskError().
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: tools Branch: master Commit: 11b596f4425ff2c70da2f312529adabfe43a025d URL: https://source.winehq.org/git/tools.git/?a=commit;h=11b596f4425ff2c70da2f31… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 3 03:32:20 2021 +0100 testbot/WinRun*: Simplify LogTaskError(). The TestBot engine redirects stderr to testbot.log so there is no need to manually open and append to that file. This also makes the Debug() call in LogTaskError() redundant. Add the "tool:error:" prefix. This clarifies which errors come from the script, and which come from the TestBot Engine. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48658 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 14 +------------- testbot/bin/WineRunReconfig.pl | 14 +------------- testbot/bin/WineRunTask.pl | 14 +------------- testbot/bin/WineRunWineTest.pl | 12 +----------- 4 files changed, 4 insertions(+), 50 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 2764ffc..ff13052 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -178,19 +178,7 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; sub LogTaskError($) { my ($ErrMessage) = @_; - Debug("$Name0:error: ", $ErrMessage); - - my $OldUMask = umask(002); - if (open(my $ErrFile, ">>", "$TaskDir/testbot.log")) - { - print $ErrFile $ErrMessage; - close($ErrFile); - } - else - { - Error "Unable to open 'testbot.log' for writing: $!\n"; - } - umask($OldUMask); + print STDERR "$Name0:error: ", $ErrMessage; } sub WrapUpAndExit($;$$$) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 2d45ed5..49e7305 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -179,19 +179,7 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; sub LogTaskError($) { my ($ErrMessage) = @_; - Debug("$Name0:error: ", $ErrMessage); - - my $OldUMask = umask(002); - if (open(my $ErrFile, ">>", "$TaskDir/testbot.log")) - { - print $ErrFile $ErrMessage; - close($ErrFile); - } - else - { - Error "Unable to open 'testbot.log' for writing: $!\n"; - } - umask($OldUMask); + print STDERR "$Name0:error: ", $ErrMessage; } sub WrapUpAndExit($;$$$) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 3036488..6056806 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -207,19 +207,7 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; sub LogTaskError($) { my ($ErrMessage) = @_; - Debug("$Name0:error: ", $ErrMessage); - - my $OldUMask = umask(002); - if (open(my $ErrFile, ">>", "$TaskDir/testbot.log")) - { - print $ErrFile $ErrMessage; - close($ErrFile); - } - else - { - Error "Unable to open 'testbot.log' for writing: $!\n"; - } - umask($OldUMask); + print STDERR "$Name0:error: ", $ErrMessage; } my $ReportNames; diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index bcf89bf..7892bca 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -204,17 +204,7 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; sub LogTaskError($) { my ($ErrMessage) = @_; - Debug("$Name0:error: ", $ErrMessage); - - if (open(my $ErrFile, ">>", "$TaskDir/testbot.log")) - { - print $ErrFile $ErrMessage; - close($ErrFile); - } - else - { - Error "Unable to open 'testbot.log' for writing: $!\n"; - } + print STDERR "$Name0:error: ", $ErrMessage; } my $ReportNames;

1 0

Francois Gouget : testbot/TestWTBS: Convert the job ranges into patch ranges.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: tools Branch: master Commit: feabc381b3f4b23cc60b134b2566b9696a1f06d9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=feabc381b3f4b23cc60b134… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 3 04:33:16 2021 +0100 testbot/TestWTBS: Convert the job ranges into patch ranges. Check all patches that have a job that falls in the job ranges, or are in the set of no-job patches surrounding those. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 75 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 53 insertions(+), 22 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index f6ca54e..87b53fe 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -131,7 +131,7 @@ while (@ARGV) } } -my @JobRanges; +my $JobRanges = []; if (!defined $Usage) { if (defined $OptJobs) @@ -140,11 +140,11 @@ if (!defined $Usage) { if ($Range =~ /^([0-9]+)$/) { - push @JobRanges, [$1, $1]; + push @$JobRanges, [$1, $1]; } elsif ($Range =~ /^([0-9]*)\.\.([0-9]*)/) { - push @JobRanges, [$1 || 0, $2 || 0]; + push @$JobRanges, [$1 || 0, $2 || 0]; } else { @@ -983,15 +983,16 @@ sub CheckJob($$) } } -sub IsJobInRange($) +sub IsInRange($$) { - my ($Job) = @_; + my ($Ranges, $Id) = @_; - return 1 if (!@JobRanges); - foreach my $Range (@JobRanges) + return 0 if (!$Id); + return 1 if (!$Ranges or !@$Ranges); + foreach my $Range (@$Ranges) { - return 1 if (($Range->[0] == 0 or $Range->[0] <= $Job->Id) and - ($Range->[1] == 0 or $Job->Id <= $Range->[1])); + return 1 if (($Range->[0] == 0 or $Range->[0] <= $Id) and + ($Range->[1] == 0 or $Id <= $Range->[1])); } return 0; } @@ -1040,7 +1041,7 @@ but not parts 3 and 4. sub CheckJobTree($;$) { my ($Job, $TestInfo) = @_; - return if (!IsJobInRange($Job)); + return if (!IsInRange($JobRanges, $Job->Id)); my $JobId = $Job->Id; # Simplify use in strings return if ($CheckedJobs{$JobId}); @@ -1267,28 +1268,20 @@ sub CheckPatch($$$) { $Job = $Jobs->GetItem($1); } - # The job range restriction extends to their associated patches... - return if ($Job and !IsJobInRange($Job)); - # ..and to patches with no job - return if (!$Job and @JobRanges); my $PatchInfo = $TestInfo->{patch}; if (CheckValue($PatchInfo->{Disposition})) { is($Patch->Disposition, $PatchInfo->{Disposition}, "Check Disposition for patch ". $Patch->Id .": ". $Patch->Subject); } - elsif ($Patch->Disposition =~ /^Submitted job (.*)$/) + elsif ($Job) { - isnt($Job, undef, "Check job $1 for patch ". $Patch->Id .": ". $Patch->Subject); - if (!$Job or $Job->Status eq "canceled") - { - ; # Nothing to check - } - elsif ($Job->Status =~ /^(?:queued|running)$/) + isnt($Job, undef, "Check job ". $Job->Id ." for patch ". $Patch->Id .": ". $Patch->Subject); + if ($Job->Status =~ /^(?:queued|running)$/) { print "...skipping job ". $Job->Id ." because it is not complete yet (". $Job->Status .")\n"; } - else + elsif ($Job->Status ne "canceled") { # Provide defaults for the job checks my $Remarks = $Patch->Subject; @@ -1310,8 +1303,46 @@ sub CheckPatches() { my $Jobs = CreateJobs(); my $Patches = CreatePatches(); + + my $PatchRanges = []; + if (@$JobRanges) + { + # Convert the job ranges into a list of patch ranges so that these patches: + # 1. either have a job in the allowed job ranges, + # 2. or have no job but are contiguous to a patch satisfying 1 or 2. + my ($First, $Last, $AddRange); + foreach my $Patch (sort { $a->Id <=> $b->Id } @{$Patches->GetItems()}) + { + if ($Patch->Disposition =~ /^Submitted job (\d+)$/) + { + my $Job = $Jobs->GetItem($1); + if ($Job and IsInRange($JobRanges, $Job->Id)) + { + $AddRange = 1; + } + elsif ($AddRange) + { + push @$PatchRanges, [$First, $Last]; + $First = $Last = $AddRange = undef; + next; + } + else + { + $First = $Last = $AddRange = undef; + next; + } + } + + $First = $Patch->Id if (!$First); + $Last = $Patch->Id; + } + push @$PatchRanges, [$First, $Last] if ($AddRange); + } + foreach my $Patch (sort { $b->Id <=> $a->Id } @{$Patches->GetItems()}) { + next if (!IsInRange($PatchRanges, $Patch->Id)); + my $PatchFileName = "$DataDir/patches/". $Patch->Id; if (-f $PatchFileName) {

1 0