wine-commits December 2020

wine-commits@winehq.org

1 participants
414 discussions

Martin Storsjo : include: Check whether the ms_abi attribute is supported on aarch64.
by Alexandre Julliard 21 Dec '20

21 Dec '20

Module: wine Branch: master Commit: dac1e16dd4edc8404c59dc63ae708cd8bb50a38a URL: https://source.winehq.org/git/wine.git/?a=commit;h=dac1e16dd4edc8404c59dc63… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Dec 21 00:38:46 2020 +0200 include: Check whether the ms_abi attribute is supported on aarch64. While wine's configure checks and requires that the ms_abi attribute is supported on aarch64 (without it, variadic functions don't have the correct ABI), these headers are also included when building widl as a generic cross compilation tool as part of mingw-w64-tools. In the case of widl, the functions that use these attributes (and in particular, their ABI) doesn't matter as they aren't used/called, they're just included as a side effect of including the headers that widl actually needs. This fixes building the widl tool for aarch64 linux with GCC, even if wine itself can't be built in that configuration. Only windef.h is used/needed by widl, but update msvcrt/corecrt.h as well to keep these definitions in sync. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt.h | 4 ++-- include/windef.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index 4d11f68be0d..a66f43877ac 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -81,7 +81,7 @@ # endif # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __stdcall __attribute__((pcs("aapcs-vfp"))) -# elif defined(__aarch64__) && defined (__GNUC__) +# elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi) # define __stdcall __attribute__((ms_abi)) # else /* __i386__ */ # define __stdcall @@ -102,7 +102,7 @@ #endif #ifndef __ms_va_list -# if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__) +# if (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) && defined (__GNUC__) # define __ms_va_list __builtin_ms_va_list # define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg) # define __ms_va_end(list) __builtin_ms_va_end(list) diff --git a/include/windef.h b/include/windef.h index b8e5ed692b1..5351afe66db 100644 --- a/include/windef.h +++ b/include/windef.h @@ -74,7 +74,7 @@ extern "C" { # endif # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __stdcall __attribute__((pcs("aapcs-vfp"))) -# elif defined(__aarch64__) && defined (__GNUC__) +# elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi) # define __stdcall __attribute__((ms_abi)) # else /* __i386__ */ # define __stdcall @@ -103,7 +103,7 @@ extern "C" { #endif #ifndef __ms_va_list -# if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__) +# if (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) && defined (__GNUC__) # define __ms_va_list __builtin_ms_va_list # define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg) # define __ms_va_end(list) __builtin_ms_va_end(list)

1 0

Dmitry Timoshkov : fonts: Correct default glyph index for MS Sans Serif font to match Windows.
by Alexandre Julliard 21 Dec '20

21 Dec '20

Module: wine Branch: master Commit: ada03e761492c89814e91402a682b25c09fe9f9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ada03e761492c89814e91402… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 15 15:04:58 2020 +0300 fonts: Correct default glyph index for MS Sans Serif font to match Windows. This one doesn't depend on previous patches in the sequence. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- fonts/ms_sans_serif.sfd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fonts/ms_sans_serif.sfd b/fonts/ms_sans_serif.sfd index 751b35d0649..e8c720b528c 100644 --- a/fonts/ms_sans_serif.sfd +++ b/fonts/ms_sans_serif.sfd @@ -4,7 +4,7 @@ FullName: MS Sans Serif FamilyName: MS Sans Serif Weight: Medium Copyright: Copyright (C) 2004 Huw D M Davies, Dmitry Timoshkov -UComments: "#pragma makedep font ssee1255.fon -d 129 13,1255,5 16,1255,7 20,1255,8+AAoA#pragma makedep font ssee1256.fon -d 129 13,1256,5 16,1256,7 20,1256,8+AAoA#pragma makedep font ssee1257.fon -d 129 13,1257,5 16,1257,7 20,1257,8+AAoA#pragma makedep font ssee874.fon -d 129 13,874,5 16,874,7 20,874,8+AAoA#pragma makedep font ssef1255.fon -d 129 -r 120 16,1255,7 20,1255,8+AAoA#pragma makedep font ssef1256.fon -d 129 -r 120 16,1256,7 20,1256,8+AAoA#pragma makedep font ssef1257.fon -d 129 -r 120 16,1257,7 20,1257,8+AAoA#pragma makedep font ssef874.fon -d 129 -r 120 16,874,7 20,874,8+AAoA#pragma makedep font sserife.fon -d 129 13,1252,5 16,1252,7 20,1252,8+AAoA#pragma makedep font sserifee.fon -d 129 13,1250,5 16,1250,7+AAoA#pragma makedep font sserifeg.fon -d 129 13,1253,5 16,1253,7 20,1253,8 +AAoA#pragma makedep font sserifer.fon -d 129 13,1251,5 16,1251,7 20,1251,8+AAoA#pragma makedep font sserifet.fon -d 129 13,1254,5 16,1254,7 20,1254,8+AAoA#pragma makedep font sseriff.fon -d 129 -r 120 16,1252,7 20,1252,8+AAoA#pragma makedep font sseriffe.fon -d 129 -r 120 16,1250,7+AAoA#pragma makedep font sseriffg.fon -d 129 -r 120 16,1253,7 20,1253,8 +AAoA#pragma makedep font sseriffr.fon -d 129 -r 120 16,1251,7 20,1251,8+AAoA#pragma makedep font sserifft.fon -d 129 -r 120 16,1254,7 20,1254,8" +UComments: "#pragma makedep font ssee1255.fon -d 129 13,1255,5 16,1255,7 20,1255,8+AAoA#pragma makedep font ssee1256.fon -d 129 13,1256,5 16,1256,7 20,1256,8+AAoA#pragma makedep font ssee1257.fon -d 128 13,1257,5 16,1257,7 20,1257,8+AAoA#pragma makedep font ssee874.fon -d 129 13,874,5 16,874,7 20,874,8+AAoA#pragma makedep font ssef1255.fon -d 129 -r 120 16,1255,7 20,1255,8+AAoA#pragma makedep font ssef1256.fon -d 129 -r 120 16,1256,7 20,1256,8+AAoA#pragma makedep font ssef1257.fon -d 128 -r 120 16,1257,7 20,1257,8+AAoA#pragma makedep font ssef874.fon -d 129 -r 120 16,874,7 20,874,8+AAoA#pragma makedep font sserife.fon -d 129 13,1252,5 16,1252,7 20,1252,8+AAoA#pragma makedep font sserifee.fon -d 128 13,1250,5 16,1250,7+AAoA#pragma makedep font sserifeg.fon -d 129 13,1253,5 16,1253,7 20,1253,8 +AAoA#pragma makedep font sserifer.fon -d 127 13,1251,5 16,1251,7 20,1251,8+AAoA#pragma makedep font sserifet.fon -d 129 13,1254,5 16,1254,7 20,1254,8+AAoA#pragma makedep font sseriff.fon -d 129 -r 120 16,1252,7 20,1252,8+AAoA#pragma makedep font sseriffe.fon -d 128 -r 120 16,1250,7+AAoA#pragma makedep font sseriffg.fon -d 129 -r 120 16,1253,7 20,1253,8 +AAoA#pragma makedep font sseriffr.fon -d 127 -r 120 16,1251,7 20,1251,8+AAoA#pragma makedep font sserifft.fon -d 129 -r 120 16,1254,7 20,1254,8" Version: 001.000 ItalicAngle: 0 UnderlinePosition: -15753.8

1 0

Dmitry Timoshkov : gdi32/tests: Add some tests to show that GetGlyphIndices() should avoid best fit chars.
by Alexandre Julliard 21 Dec '20

21 Dec '20

Module: wine Branch: master Commit: 22d776fc1b5a8f6e6a260465c717dc1292f8e7b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22d776fc1b5a8f6e6a260465… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 21 12:32:45 2020 +0000 gdi32/tests: Add some tests to show that GetGlyphIndices() should avoid best fit chars. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ad7408f5620..da5fdf2238e 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1632,6 +1632,7 @@ static void test_GetGlyphIndices(void) LOGFONTA lf; DWORD flags = 0; WCHAR testtext[] = L"Test\xffff"; + WCHAR c[] = { 0x25bc /* Black Down-Pointing Triangle */, 0x212a /* Kelvin Sign */ }; WORD glyphs[(sizeof(testtext)/2)-1]; TEXTMETRICA textm; HFONT hOldFont; @@ -1653,8 +1654,9 @@ static void test_GetGlyphIndices(void) lf.lfCharSet = ANSI_CHARSET; hfont = CreateFontIndirectA(&lf); - ok(hfont != 0, "CreateFontIndirectEx failed\n"); - ok(GetTextMetricsA(hdc, &textm), "GetTextMetric failed\n"); + ok(hfont != 0, "CreateFontIndirect failed\n"); + hOldFont = SelectObject(hdc, hfont); + ok(GetTextMetricsA(hdc, &textm), "GetTextMetrics failed\n"); if (textm.tmCharSet == ANSI_CHARSET) { flags |= GGI_MARK_NONEXISTING_GLYPHS; @@ -1664,16 +1666,44 @@ static void test_GetGlyphIndices(void) flags = 0; charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); - ok(glyphs[4] == textm.tmDefaultChar, "GetGlyphIndicesW should have returned a %04x not %04x\n", - textm.tmDefaultChar, glyphs[4]); + ok(glyphs[4] == textm.tmDefaultChar || glyphs[4] == 0x20 /* CJK Windows */, + "GetGlyphIndicesW should have returned a %04x not %04x\n", textm.tmDefaultChar, glyphs[4]); } else /* FIXME: Write tests for non-ANSI charsets. */ skip("GetGlyphIndices System font tests only for ANSI_CHARSET\n"); + DeleteObject(SelectObject(hdc, hOldFont)); + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "MS Sans Serif"); + lf.lfHeight = -13; + lf.lfCharSet = DEFAULT_CHARSET; + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirect failed\n"); + hOldFont = SelectObject(hdc, hfont); + ok(GetTextMetricsA(hdc, &textm), "GetTextMetrics failed\n"); + + glyphs[0] = glyphs[1] = 0; + charcount = GetGlyphIndicesW(hdc, c, ARRAY_SIZE(c), glyphs, GGI_MARK_NONEXISTING_GLYPHS); + ok(charcount == ARRAY_SIZE(c), "got %u\n", charcount); + ok(glyphs[0] == 0x001f || glyphs[0] == 0xffff /* Vista */, "got %#x\n", glyphs[0]); +todo_wine + ok(glyphs[1] == 0x001f || glyphs[1] == 0xffff /* Vista */, "got %#x\n", glyphs[1]); + + glyphs[0] = glyphs[1] = 0; + charcount = GetGlyphIndicesW(hdc, c, ARRAY_SIZE(c), glyphs, 0); + ok(charcount == ARRAY_SIZE(c), "got %u\n", charcount); + ok(glyphs[0] == textm.tmDefaultChar || glyphs[0] == 0x20 /* CJK Windows */, "got %#x\n", glyphs[0]); +todo_wine + ok(glyphs[1] == textm.tmDefaultChar || glyphs[1] == 0x20 /* CJK Windows */, "got %#x\n", glyphs[1]); + + DeleteObject(SelectObject(hdc, hOldFont)); + if(!is_font_installed("Tahoma")) { skip("Tahoma is not installed so skipping this test\n"); + ReleaseDC(0, hdc); return; } memset(&lf, 0, sizeof(lf)); @@ -1718,12 +1748,13 @@ static void test_GetGlyphIndices(void) ok(glyphs[4] == 0, "GetGlyphIndicesW should have returned 0 not %04x\n", glyphs[4]); DeleteObject(SelectObject(hdc, hOldFont)); + ReleaseDC(0, hdc); + ret = pRemoveFontMemResourceEx(rsrc); ok(ret, "RemoveFontMemResourceEx error %d\n", GetLastError()); free_font(font); ret = DeleteFileA(ttf_name); ok(ret, "Failed to delete font file, %d.\n", GetLastError()); - } static void test_GetKerningPairs(void)

1 0

Zhiyi Zhang : gdi32/tests: Fix test failures on Win10 1909+.
by Alexandre Julliard 21 Dec '20

21 Dec '20

Module: wine Branch: master Commit: aa3e02e19399f175110ba002ad65f685229a7084 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa3e02e19399f175110ba002… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Dec 14 15:12:21 2020 +0800 gdi32/tests: Fix test failures on Win10 1909+. Memory DC, metafile DC and enhanced metafile DC support gamma ramp on Win10 1909+. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/dc.c | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 2cb8c65dd64..04703288302 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -346,11 +346,6 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale "wrong caps on %s for %u: %u\n", descr, caps[i], GetDeviceCaps( hdc, caps[i] ) ); - SetLastError( 0xdeadbeef ); - ret = GetDeviceGammaRamp( hdc, &ramp ); - ok( !ret, "GetDeviceGammaRamp succeeded on %s\n", descr ); - ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ - "wrong error %u on %s\n", GetLastError(), descr ); type = GetClipBox( hdc, &rect ); ok( type == ERROR, "GetClipBox returned %d on %s\n", type, descr ); @@ -393,17 +388,6 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale hdc_caps, GetDeviceCaps( ref_dc, caps[i] ), scale ); } - SetLastError( 0xdeadbeef ); - ret = GetDeviceGammaRamp( hdc, &ramp ); - if (GetObjectType( hdc ) != OBJ_DC || GetDeviceCaps( hdc, TECHNOLOGY ) == DT_RASPRINTER) - { - ok( !ret, "GetDeviceGammaRamp succeeded on %s (type %d)\n", descr, GetObjectType( hdc ) ); - ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ - "wrong error %u on %s\n", GetLastError(), descr ); - } - else - ok( ret || broken(!ret) /* NT4 */, "GetDeviceGammaRamp failed on %s (type %d), error %u\n", descr, GetObjectType( hdc ), GetLastError() ); - type = GetBoundsRect( hdc, &rect, 0 ); ok( type == DCB_RESET || broken(type == DCB_SET) /* XP */, "GetBoundsRect returned type %x for %s\n", type, descr ); @@ -494,12 +478,6 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale "mismatched caps on %s and DIB for %u: %u/%u\n", descr, caps[i], GetDeviceCaps( hdc, caps[i] ), GetDeviceCaps( ref_dc, caps[i] ) ); - SetLastError( 0xdeadbeef ); - ret = GetDeviceGammaRamp( hdc, &ramp ); - ok( !ret, "GetDeviceGammaRamp succeeded on %s\n", descr ); - ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ - "wrong error %u on %s\n", GetLastError(), descr ); - type = GetClipBox( hdc, &rect ); ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); ok( rect.left == 0 && rect.top == 0 && rect.right == 16 && rect.bottom == 16, @@ -517,6 +495,29 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale DeleteObject( dib ); } + /* Memory DC, metafile DC and enhanced metafile DC support gamma ramp on Win10 1909+. Exclude + * these types from tests as they return different results depending on Windows versions */ + if (GetObjectType( hdc ) != OBJ_MEMDC + && GetObjectType( hdc ) != OBJ_METADC + && GetObjectType( hdc ) != OBJ_ENHMETADC) + { + SetLastError( 0xdeadbeef ); + ret = GetDeviceGammaRamp( hdc, &ramp ); + if (GetObjectType( hdc ) != OBJ_DC || GetDeviceCaps( hdc, TECHNOLOGY ) == DT_RASPRINTER) + { + ok( !ret, "GetDeviceGammaRamp succeeded on %s (type %d)\n", descr, GetObjectType( hdc ) ); + ok( GetLastError() == ERROR_INVALID_PARAMETER + || broken(GetLastError() == 0xdeadbeef) /* nt4 */ + || broken(GetLastError() == NO_ERROR), /* Printer DC on Win10 1909+ */ + "wrong error %u on %s\n", GetLastError(), descr ); + } + else + { + ok( ret || broken(!ret) /* NT4 */, "GetDeviceGammaRamp failed on %s (type %d), error %u\n", + descr, GetObjectType( hdc ), GetLastError() ); + } + } + /* restore hdc state */ SetBoundsRect( hdc, NULL, DCB_RESET | DCB_DISABLE ); SetBoundsRect( ref_dc, NULL, DCB_RESET | DCB_DISABLE );

1 0

Zhiyi Zhang : gdi32/tests: Fix possible test failures in test_clip_box().
by Alexandre Julliard 21 Dec '20

21 Dec '20

Module: wine Branch: master Commit: d93412ca67f6cadc0e593b27439ead8138093ec0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d93412ca67f6cadc0e593b27… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Dec 14 15:11:43 2020 +0800 gdi32/tests: Fix possible test failures in test_clip_box(). When there are multiple monitors and their monitor region union can still be represented by a simple rectangle, the clip box region type for the screen DC is still SIMPLEREGION. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/dc.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index b4a89b213d2..2cb8c65dd64 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -1539,6 +1539,40 @@ static void test_pscript_printer_dc(void) DeleteDC(hdc); } +struct screen_region_info +{ + HRGN region; + INT type; +}; + +static BOOL CALLBACK enum_monitor_proc(HMONITOR monitor, HDC hdc, RECT *rect, LPARAM lparam) +{ + struct screen_region_info *info = (struct screen_region_info *)lparam; + HRGN region; + + if (!info->region) + { + info->region = CreateRectRgnIndirect(rect); + info->type = SIMPLEREGION; + } + else + { + region = CreateRectRgnIndirect(rect); + info->type = CombineRgn(info->region, info->region, region, RGN_OR); + DeleteObject(region); + } + return TRUE; +} + +static INT get_screen_region_type(void) +{ + struct screen_region_info info = {NULL, NULLREGION}; + + EnumDisplayMonitors(NULL, NULL, enum_monitor_proc, (LPARAM)&info); + DeleteObject(info.region); + return info.type; +} + static void test_clip_box(void) { DEVMODEA scale_mode = {.dmSize = sizeof(DEVMODEA)}; @@ -1554,7 +1588,7 @@ static void test_clip_box(void) SetRect(&screen_rect, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), GetSystemMetrics(SM_XVIRTUALSCREEN) + GetSystemMetrics(SM_CXVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN) + GetSystemMetrics(SM_CYVIRTUALSCREEN)); - screen_type = GetSystemMetrics(SM_CMONITORS) > 1 ? COMPLEXREGION : SIMPLEREGION; + screen_type = get_screen_region_type(); dc = CreateDCA("DISPLAY", NULL, NULL, NULL); type = GetClipBox(dc, &rect);

1 0

Alistair Leslie-Hughes : include: Add ExecuteOptionEnum typedef.
by Alexandre Julliard 21 Dec '20

21 Dec '20

Module: wine Branch: master Commit: a4456ff9f9c34c1ec481e15a61d96786d1336a80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4456ff9f9c34c1ec481e15a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Dec 21 20:54:34 2020 +1100 include: Add ExecuteOptionEnum typedef. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msado15_backcompat.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index e5d0f5ecfe9..fedaf557066 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -513,6 +513,17 @@ typedef [uuid(00000531-0000-0010-8000-00aa006d2ea4)] enum EventReasonEnum adRsnMoveLast = 15 } EventReasonEnum; +typedef [uuid(0000051e-0000-0010-8000-00aa006d2ea4)] enum ExecuteOptionEnum +{ + adOptionUnspecified = -1, + adAsyncExecute = 16, + adAsyncFetch = 32, + adAsyncFetchNonBlocking = 64, + adExecuteNoRecords = 128, + adExecuteStream = 1024, + [hidden] adExecuteRecord = 2048 +} ExecuteOptionEnum; + typedef [uuid(00000541-0000-0010-8000-00aa006d2ea4)] enum ConnectOptionEnum { adConnectUnspecified = -1,

1 0

Alistair Leslie-Hughes : include: Add DB_LRESERVE type.
by Alexandre Julliard 21 Dec '20

21 Dec '20

Module: wine Branch: master Commit: fd416ebc7859cb92f3e7d97cf0f865c9ac90db58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd416ebc7859cb92f3e7d97c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Dec 21 20:54:33 2020 +1100 include: Add DB_LRESERVE type. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/oledb.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/oledb.idl b/include/oledb.idl index 5609e219320..4e333353a5e 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -40,6 +40,7 @@ typedef ULONG_PTR DBREFCOUNT; typedef ULONG_PTR DB_UPARAMS; typedef LONG_PTR DB_LPARAMS; typedef DWORD_PTR DBHASHVALUE; +typedef LONG_PTR DB_LRESERVE; #include "dbs.idl"

1 0

André Hentschel : kernel32/tests: Don't test functions directly when reporting GetLastError().
by Alexandre Julliard 21 Dec '20

21 Dec '20

Module: wine Branch: master Commit: 63f205df8925602aea902fc90936846dd70c1fea URL: https://source.winehq.org/git/wine.git/?a=commit;h=63f205df8925602aea902fc9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 19 16:00:00 2020 +0100 kernel32/tests: Don't test functions directly when reporting GetLastError(). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 0a43fe91e64..962b308b6dc 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1332,8 +1332,8 @@ static void test_debugger(const char *argv0) status = NtSuspendThread(thread, NULL); ok(!status, "NtSuspendThread failed, last error:%u\n", GetLastError()); - ok(ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER), - "ContinueDebugEvent failed, last error:%u\n", GetLastError()); + ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER); + ok(ret, "ContinueDebugEvent failed, last error:%u\n", GetLastError()); ok(!WaitForDebugEvent(&ctx.ev, POLL_EVENT_TIMEOUT), "WaitForDebugEvent succeeded.\n"); status = NtResumeThread(thread, NULL); @@ -1350,8 +1350,8 @@ static void test_debugger(const char *argv0) ok(ctx.ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); de = ctx.ev; - ok(ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER), - "ContinueDebugEvent failed, last error:%u\n", GetLastError()); + ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER); + ok(ret, "ContinueDebugEvent failed, last error:%u\n", GetLastError()); ctx.ev.dwDebugEventCode = -1; next_event(&ctx, WAIT_EVENT_TIMEOUT); @@ -1462,8 +1462,8 @@ static void test_debugger(const char *argv0) status = NtSuspendThread(thread_b, NULL); ok(!status, "NtSuspendThread failed, last error:%u\n", GetLastError()); - ok(ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER), - "ContinueDebugEvent failed, last error:%u\n", GetLastError()); + ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER); + ok(ret, "ContinueDebugEvent failed, last error:%u\n", GetLastError()); ctx.ev.dwDebugEventCode = -1; next_event(&ctx, WAIT_EVENT_TIMEOUT); @@ -1485,8 +1485,8 @@ static void test_debugger(const char *argv0) { status = pNtSuspendProcess(pi.hProcess); ok(!status, "NtSuspendProcess failed, last error:%u\n", GetLastError()); - ok(ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER), - "ContinueDebugEvent failed, last error:%u\n", GetLastError()); + ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER); + ok(ret, "ContinueDebugEvent failed, last error:%u\n", GetLastError()); ok(!WaitForDebugEvent(&ctx.ev, POLL_EVENT_TIMEOUT), "WaitForDebugEvent succeeded.\n"); status = NtResumeThread(thread_b, NULL);

1 0

André Hentschel : opengl32/tests: Don't test function directly when reporting GetLastError().
by Alexandre Julliard 21 Dec '20

21 Dec '20

Module: wine Branch: master Commit: 77047c76dd6a1f7f2b1391844f1509fcb6127c55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77047c76dd6a1f7f2b139184… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 19 16:00:39 2020 +0100 opengl32/tests: Don't test function directly when reporting GetLastError(). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/tests/opengl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index db5ad0ad765..90f06492e81 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -235,9 +235,10 @@ static int test_pfd(const PIXELFORMATDESCRIPTOR *pfd, PIXELFORMATDESCRIPTOR *fmt pf = ChoosePixelFormat( hdc, pfd ); if (pf && fmt) { + INT ret; memset(fmt, 0, sizeof(*fmt)); - ok(DescribePixelFormat( hdc, pf, sizeof(*fmt), fmt ), - "DescribePixelFormat failed with error: %u\n", GetLastError()); + ret = DescribePixelFormat( hdc, pf, sizeof(*fmt), fmt ); + ok(ret, "DescribePixelFormat failed with error: %u\n", GetLastError()); } ReleaseDC( hwnd, hdc ); DestroyWindow( hwnd );

1 0

Michael Stefaniuc : winspool/tests: Use wide-char string literals.
by Alexandre Julliard 21 Dec '20

21 Dec '20

Module: wine Branch: master Commit: 301d7204f90bcd1896dd82e3d943256710add5a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=301d7204f90bcd1896dd82e3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Dec 19 21:17:01 2020 +0100 winspool/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/tests/info.c | 46 +++++++++++++++++------------------------- 1 file changed, 19 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=301d7204f90bcd1896dd…

1 0

← Newer
1
2
3
4
5
6
7
8
...
42
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 December 2020