June 2018 - Wine-devel - list.winehq.org

[PATCH 2/2] msvcp120: Add test for Concurrent_vector_grow_to_at_least_with_result.
by Hua Meng 26 Jun '18

26 Jun '18

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp120/tests/msvcp120.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index b5e470cba3..2974482ec1 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -420,6 +420,8 @@ static void* (__thiscall *p_vector_base_v4__Internal_compact)( void (__cdecl*)(void*, const void*, size_t)); static size_t (__thiscall *p_vector_base_v4__Internal_grow_by)( vector_base_v4*, size_t, size_t, void (__cdecl*)(void*, const void*, size_t), const void *); +static size_t (__thiscall *p_vector_base_v4__Internal_grow_to_at_least_with_result)( + vector_base_v4*, size_t, size_t, void (__cdecl*)(void*, const void*, size_t), const void *); static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -572,6 +574,8 @@ static BOOL init(void) "?_Internal_compact(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAPEAX_KPEAXP6AX10(a)ZP6AX1PEBX0@Z(a)Z"); SET(p_vector_base_v4__Internal_grow_by, "?_Internal_grow_by(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAA_K_K0P6AXPEAXPEBX0(a)Z2@Z"); + SET(p_vector_base_v4__Internal_grow_to_at_least_with_result, + "?_Internal_grow_to_at_least_with_result(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAA_K_K0P6AXPEAXPEBX0(a)Z2@Z"); } else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); @@ -693,6 +697,8 @@ static BOOL init(void) "?_Internal_compact(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEPAXIPAXP6AX0I(a)ZP6AX0PBXI@Z(a)Z"); SET(p_vector_base_v4__Internal_grow_by, "?_Internal_grow_by(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEIIIP6AXPAXPBXI(a)Z1@Z"); + SET(p_vector_base_v4__Internal_grow_to_at_least_with_result, + "?_Internal_grow_to_at_least_with_result(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEIIIP6AXPAXPBXI(a)Z1@Z"); #else SET(p__Thrd_current, "_Thrd_current"); @@ -742,6 +748,8 @@ static BOOL init(void) "?_Internal_compact(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAPAXIPAXP6AX0I(a)ZP6AX0PBXI@Z(a)Z"); SET(p_vector_base_v4__Internal_grow_by, "?_Internal_grow_by(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAIIIP6AXPAXPBXI(a)Z1@Z"); + SET(p_vector_base_v4__Internal_grow_to_at_least_with_result, + "?_Internal_grow_to_at_least_with_result(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAIIIP6AXPAXPBXI(a)Z1@Z"); #endif } SET(p__Thrd_equal, @@ -3036,6 +3044,44 @@ static void test_vector_base_v4(void) CHECK_CALLED(concurrent_vector_int_destroy); concurrent_vector_int_dtor(&v2); + /* test for Internal_grow_to_at_least_with_result */ + concurrent_vector_int_ctor(&v2); + SET_EXPECT(concurrent_vector_int_alloc); + data = call_func3(p_vector_base_v4__Internal_push_back, &v2, sizeof(int), &idx); + CHECK_CALLED(concurrent_vector_int_alloc); + ok(data != NULL, "_Internal_push_back returned NULL\n"); + data = call_func3(p_vector_base_v4__Internal_push_back, &v2, sizeof(int), &idx); + ok(data != NULL, "_Internal_push_back returned NULL\n"); + vector_elem_count += 2; + ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", (long)v2.first_block); + ok(v2.early_size == 2, "v2.early_size got %ld expected 2\n", (long)v2.early_size); + i = 0; + SET_EXPECT(concurrent_vector_int_alloc); + SET_EXPECT(concurrent_vector_int_copy); + idx = (size_t)call_func5(p_vector_base_v4__Internal_grow_to_at_least_with_result, + &v2, 3, sizeof(int), concurrent_vector_int_copy, &i); + CHECK_CALLED(concurrent_vector_int_alloc); + CHECK_CALLED(concurrent_vector_int_copy); + ok(idx == 2, "_Internal_grow_to_at_least_with_result returned %ld expected 2\n", (long)idx); + ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", (long)v2.first_block); + ok(v2.early_size == 3, "v2.early_size got %ld expected 3\n", (long)v2.early_size); + i = 0; + SET_EXPECT(concurrent_vector_int_alloc); + SET_EXPECT(concurrent_vector_int_copy); + idx = (size_t)call_func5(p_vector_base_v4__Internal_grow_to_at_least_with_result, + &v2, 5, sizeof(int), concurrent_vector_int_copy, &i); + CHECK_CALLED(concurrent_vector_int_alloc); + CHECK_CALLED(concurrent_vector_int_copy); + ok(idx == 3, "_Internal_grow_to_at_least_with_result returned %ld expected 3\n", (long)idx); + ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", (long)v2.first_block); + ok(v2.early_size == 5, "v2.early_size got %ld expected 5\n", (long)v2.early_size); + SET_EXPECT(concurrent_vector_int_destroy); + size = (size_t)call_func2(p_vector_base_v4__Internal_clear, + &v2, concurrent_vector_int_destroy); + ok(size == 3, "_Internal_clear returned %ld expected 3\n", (long)size); + CHECK_CALLED(concurrent_vector_int_destroy); + concurrent_vector_int_dtor(&v2); + SET_EXPECT(concurrent_vector_int_destroy); size = (size_t)call_func2(p_vector_base_v4__Internal_clear, &vector, concurrent_vector_int_destroy); -- 2.11.0

1 0

[PATCH 1/2] msvcp120: Add test for Concurrent_vector_grow_by.
by Hua Meng 26 Jun '18

26 Jun '18

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp120/tests/msvcp120.c | 46 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 0ec9fbd3b1..b5e470cba3 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -418,6 +418,8 @@ static void (__thiscall *p_vector_base_v4__Internal_swap)( static void* (__thiscall *p_vector_base_v4__Internal_compact)( vector_base_v4*, size_t, void*, void (__cdecl*)(void*, size_t), void (__cdecl*)(void*, const void*, size_t)); +static size_t (__thiscall *p_vector_base_v4__Internal_grow_by)( + vector_base_v4*, size_t, size_t, void (__cdecl*)(void*, const void*, size_t), const void *); static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -568,6 +570,8 @@ static BOOL init(void) "?_Internal_swap(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAXAEAV123@@Z"); SET(p_vector_base_v4__Internal_compact, "?_Internal_compact(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAPEAX_KPEAXP6AX10(a)ZP6AX1PEBX0@Z(a)Z"); + SET(p_vector_base_v4__Internal_grow_by, + "?_Internal_grow_by(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAA_K_K0P6AXPEAXPEBX0(a)Z2@Z"); } else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); @@ -687,6 +691,8 @@ static BOOL init(void) "?_Internal_swap(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXAAV123@@Z"); SET(p_vector_base_v4__Internal_compact, "?_Internal_compact(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEPAXIPAXP6AX0I(a)ZP6AX0PBXI@Z(a)Z"); + SET(p_vector_base_v4__Internal_grow_by, + "?_Internal_grow_by(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEIIIP6AXPAXPBXI(a)Z1@Z"); #else SET(p__Thrd_current, "_Thrd_current"); @@ -734,7 +740,8 @@ static BOOL init(void) "?_Internal_swap(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAXAAV123@@Z"); SET(p_vector_base_v4__Internal_compact, "?_Internal_compact(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAPAXIPAXP6AX0I(a)ZP6AX0PBXI@Z(a)Z"); - + SET(p_vector_base_v4__Internal_grow_by, + "?_Internal_grow_by(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAIIIP6AXPAXPBXI(a)Z1@Z"); #endif } SET(p__Thrd_equal, @@ -2992,6 +2999,43 @@ static void test_vector_base_v4(void) CHECK_CALLED(concurrent_vector_int_destroy); concurrent_vector_int_dtor(&v2); + /* test for Internal_grow_by */ + concurrent_vector_int_ctor(&v2); + SET_EXPECT(concurrent_vector_int_alloc); + data = call_func3(p_vector_base_v4__Internal_push_back, &v2, sizeof(int), &idx); + CHECK_CALLED(concurrent_vector_int_alloc); + ok(data != NULL, "_Internal_push_back returned NULL\n"); + data = call_func3(p_vector_base_v4__Internal_push_back, &v2, sizeof(int), &idx); + ok(data != NULL, "_Internal_push_back returned NULL\n"); + vector_elem_count += 2; + ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", (long)v2.first_block); + ok(v2.early_size == 2, "v2.early_size got %ld expected 2\n", (long)v2.early_size); + i = 0; + SET_EXPECT(concurrent_vector_int_alloc); + SET_EXPECT(concurrent_vector_int_copy); + idx = (size_t)call_func5(p_vector_base_v4__Internal_grow_by, + &v2, 1, sizeof(int), concurrent_vector_int_copy, &i); + CHECK_CALLED(concurrent_vector_int_alloc); + CHECK_CALLED(concurrent_vector_int_copy); + ok(idx == 2, "_Internal_grow_by returned %ld expected 2\n", (long)idx); + ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", (long)v2.first_block); + ok(v2.early_size == 3, "v2.early_size got %ld expected 3\n", (long)v2.early_size); + SET_EXPECT(concurrent_vector_int_alloc); + SET_EXPECT(concurrent_vector_int_copy); + idx = (size_t)call_func5(p_vector_base_v4__Internal_grow_by, + &v2, 2, sizeof(int), concurrent_vector_int_copy, &i); + CHECK_CALLED(concurrent_vector_int_alloc); + CHECK_CALLED(concurrent_vector_int_copy); + ok(idx == 3, "_Internal_grow_by returned %ld expected 3\n", (long)idx); + ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", (long)v2.first_block); + ok(v2.early_size == 5, "v2.early_size got %ld expected 5\n", (long)v2.early_size); + SET_EXPECT(concurrent_vector_int_destroy); + size = (size_t)call_func2(p_vector_base_v4__Internal_clear, + &v2, concurrent_vector_int_destroy); + ok(size == 3, "_Internal_clear returned %ld expected 3\n", (long)size); + CHECK_CALLED(concurrent_vector_int_destroy); + concurrent_vector_int_dtor(&v2); + SET_EXPECT(concurrent_vector_int_destroy); size = (size_t)call_func2(p_vector_base_v4__Internal_clear, &vector, concurrent_vector_int_destroy); -- 2.11.0

1 0

[PATCH] gdi32/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 26 Jun '18

26 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/tests/bitmap.c | 10 ++++----- dlls/gdi32/tests/brush.c | 2 +- dlls/gdi32/tests/dc.c | 6 +++--- dlls/gdi32/tests/dib.c | 38 ++++++++++++++++----------------- dlls/gdi32/tests/font.c | 52 ++++++++++++++++++++++----------------------- dlls/gdi32/tests/gdiobj.c | 2 +- dlls/gdi32/tests/icm.c | 2 +- dlls/gdi32/tests/metafile.c | 7 +++--- dlls/gdi32/tests/path.c | 14 ++++++------ dlls/gdi32/tests/pen.c | 2 +- 10 files changed, 67 insertions(+), 68 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index a4002c83b5..4748691791 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -84,7 +84,7 @@ static void test_bitmap_info(HBITMAP hbm, INT expected_depth, const BITMAPINFOHE SetLastError(0xdeadbeef); test_size[0] = bm.bmWidthBytes * bm.bmHeight; /* NULL output buffer with different count values */ - for (i = 0; i < sizeof(test_size) / sizeof(test_size[0]); i++) + for (i = 0; i < ARRAY_SIZE(test_size); i++) { ret = GetBitmapBits(hbm, test_size[i], NULL); ok(ret == bm.bmWidthBytes * bm.bmHeight, "%d != %d\n", ret, bm.bmWidthBytes * bm.bmHeight); @@ -94,7 +94,7 @@ static void test_bitmap_info(HBITMAP hbm, INT expected_depth, const BITMAPINFOHE memset(buf_cmp, 0, bm.bmWidthBytes * bm.bmHeight); /* Correct output buffer with different count values */ - for (i = 0; i < sizeof(test_size) / sizeof(test_size[0]); i++) + for (i = 0; i < ARRAY_SIZE(test_size); i++) { int expect = i == 1 ? 0 : bm.bmWidthBytes * bm.bmHeight; memset(buf, 0xAA, sizeof(buf)); @@ -1745,7 +1745,7 @@ static void test_mono_bitmap(void) SelectObject( hdc, hbmp ); - for (col = 0; col < sizeof(colors) / sizeof(colors[0]); col++) + for (col = 0; col < ARRAY_SIZE(colors); col++) { SetTextColor( hdc, colors[col][0] ); SetBkColor( hdc, colors[col][1] ); @@ -2690,7 +2690,7 @@ static void test_select_object(void) DeleteObject(hbm); - for(i = 0; i < sizeof(depths)/sizeof(depths[0]); i++) { + for(i = 0; i < ARRAY_SIZE(depths); i++) { /* test a color bitmap to dc bpp matching */ planes = GetDeviceCaps(hdc, PLANES); bpp = GetDeviceCaps(hdc, BITSPIXEL); @@ -5710,7 +5710,7 @@ static void test_D3DKMTCreateDCFromMemory( void ) status = pD3DKMTCreateDCFromMemory( NULL ); ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status); - for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i) + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { memset( data, 0xaa, sizeof(data) ); diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index 1a10429c05..a3ebb91e1e 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -48,7 +48,7 @@ static void test_solidbrush(void) size_t i; INT ret; - for(i=0; i<sizeof(stock)/sizeof(stock[0]); i++) { + for(i = 0; i < ARRAY_SIZE(stock); i++) { solidBrush = CreateSolidBrush(stock[i].color); if(stock[i].stockobj != -1) { diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 3c1fa603a6..5ad3b31483 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -361,7 +361,7 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale if (GetObjectType( hdc ) == OBJ_METADC) { - for (i = 0; i < sizeof(caps)/sizeof(caps[0]); i++) + for (i = 0; i < ARRAY_SIZE(caps); i++) ok( GetDeviceCaps( hdc, caps[i] ) == (caps[i] == TECHNOLOGY ? DT_METAFILE : 0), "wrong caps on %s for %u: %u\n", descr, caps[i], GetDeviceCaps( hdc, caps[i] ) ); @@ -384,7 +384,7 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale } else { - for (i = 0; i < sizeof(caps)/sizeof(caps[0]); i++) + for (i = 0; i < ARRAY_SIZE(caps); i++) { INT precision = 0; INT hdc_caps = GetDeviceCaps( hdc, caps[i] ); @@ -506,7 +506,7 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale dib = CreateDIBSection( ref_dc, info, DIB_RGB_COLORS, NULL, NULL, 0 ); old = SelectObject( hdc, dib ); - for (i = 0; i < sizeof(caps)/sizeof(caps[0]); i++) + for (i = 0; i < ARRAY_SIZE(caps); i++) ok( GetDeviceCaps( hdc, caps[i] ) == GetDeviceCaps( ref_dc, caps[i] ), "mismatched caps on %s and DIB for %u: %u/%u\n", descr, caps[i], GetDeviceCaps( hdc, caps[i] ), GetDeviceCaps( ref_dc, caps[i] ) ); diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index e3f188749d..d16cb0df5c 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -1559,7 +1559,7 @@ static const POINT polypoly_lines[] = static const DWORD polypoly_counts[] = { - sizeof(polypoly_lines)/sizeof(polypoly_lines[0]) + ARRAY_SIZE(polypoly_lines) }; static const RECT patblt_clips[] = @@ -1816,7 +1816,7 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) } compare_hash(hdc, bmi, bits, "diagonal solid lines"); - for(i = 0; i < sizeof(bias_check) / sizeof(bias_check[0]); i++) + for(i = 0; i < ARRAY_SIZE(bias_check); i++) { MoveToEx(hdc, bias_check[i].left, bias_check[i].top, NULL); LineTo(hdc, bias_check[i].right, bias_check[i].bottom); @@ -1851,21 +1851,21 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) ExtSelectClipRgn(hdc, hrgn, RGN_COPY); DeleteObject(hrgn2); - for(i = 0; i < sizeof(hline_clips)/sizeof(hline_clips[0]); i++) + for(i = 0; i < ARRAY_SIZE(hline_clips); i++) { MoveToEx(hdc, hline_clips[i].left, hline_clips[i].top, NULL); LineTo(hdc, hline_clips[i].right, hline_clips[i].bottom); } compare_hash(hdc, bmi, bits, "clipped solid hlines"); - for(i = 0; i < sizeof(vline_clips)/sizeof(vline_clips[0]); i++) + for(i = 0; i < ARRAY_SIZE(vline_clips); i++) { MoveToEx(hdc, vline_clips[i].left, vline_clips[i].top, NULL); LineTo(hdc, vline_clips[i].right, vline_clips[i].bottom); } compare_hash(hdc, bmi, bits, "clipped solid vlines"); - for(i = 0; i < sizeof(line_clips)/sizeof(line_clips[0]); i++) + for(i = 0; i < ARRAY_SIZE(line_clips); i++) { MoveToEx(hdc, line_clips[i].left, line_clips[i].top, NULL); LineTo(hdc, line_clips[i].right, line_clips[i].bottom); @@ -1873,7 +1873,7 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) compare_hash(hdc, bmi, bits, "clipped solid diagonal lines"); /* clipped PatBlt */ - for(i = 0; i < sizeof(patblt_clips) / sizeof(patblt_clips[0]); i++) + for(i = 0; i < ARRAY_SIZE(patblt_clips); i++) { PatBlt(hdc, patblt_clips[i].left, patblt_clips[i].top, patblt_clips[i].right - patblt_clips[i].left, @@ -1887,35 +1887,35 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) SetBkMode(hdc, TRANSPARENT); SetBkColor(hdc, RGB(0, 0xff, 0)); - for(i = 0; i < sizeof(hline_clips)/sizeof(hline_clips[0]); i++) + for(i = 0; i < ARRAY_SIZE(hline_clips); i++) { MoveToEx(hdc, hline_clips[i].left, hline_clips[i].top, NULL); LineTo(hdc, hline_clips[i].right, hline_clips[i].bottom); } compare_hash(hdc, bmi, bits, "clipped dashed hlines"); - for(i = 0; i < sizeof(hline_clips)/sizeof(hline_clips[0]); i++) + for(i = 0; i < ARRAY_SIZE(hline_clips); i++) { MoveToEx(hdc, hline_clips[i].right - 1, hline_clips[i].bottom, NULL); LineTo(hdc, hline_clips[i].left - 1, hline_clips[i].top); } compare_hash(hdc, bmi, bits, "clipped dashed hlines r -> l"); - for(i = 0; i < sizeof(vline_clips)/sizeof(vline_clips[0]); i++) + for(i = 0; i < ARRAY_SIZE(vline_clips); i++) { MoveToEx(hdc, vline_clips[i].left, vline_clips[i].top, NULL); LineTo(hdc, vline_clips[i].right, vline_clips[i].bottom); } compare_hash(hdc, bmi, bits, "clipped dashed vlines"); - for(i = 0; i < sizeof(vline_clips)/sizeof(vline_clips[0]); i++) + for(i = 0; i < ARRAY_SIZE(vline_clips); i++) { MoveToEx(hdc, vline_clips[i].right, vline_clips[i].bottom - 1, NULL); LineTo(hdc, vline_clips[i].left, vline_clips[i].top - 1); } compare_hash(hdc, bmi, bits, "clipped dashed vlines b -> t"); - for(i = 0; i < sizeof(line_clips)/sizeof(line_clips[0]); i++) + for(i = 0; i < ARRAY_SIZE(line_clips); i++) { MoveToEx(hdc, line_clips[i].left, line_clips[i].top, NULL); LineTo(hdc, line_clips[i].right, line_clips[i].bottom); @@ -1924,7 +1924,7 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) SetBkMode(hdc, OPAQUE); - for(i = 0; i < sizeof(line_clips)/sizeof(line_clips[0]); i++) + for(i = 0; i < ARRAY_SIZE(line_clips); i++) { MoveToEx(hdc, line_clips[i].left, line_clips[i].top, NULL); LineTo(hdc, line_clips[i].right, line_clips[i].bottom); @@ -2163,13 +2163,13 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) SelectObject(hdc, solid_pen); SelectObject(hdc, solid_brush); - for(i = 0; i < sizeof(rectangles)/sizeof(rectangles[0]); i++) + for(i = 0; i < ARRAY_SIZE(rectangles); i++) { Rectangle(hdc, rectangles[i].left, rectangles[i].top, rectangles[i].right, rectangles[i].bottom); } SelectObject(hdc, dashed_pen); - for(i = 0; i < sizeof(rectangles)/sizeof(rectangles[0]); i++) + for(i = 0; i < ARRAY_SIZE(rectangles); i++) { Rectangle(hdc, rectangles[i].left, rectangles[i].top + 150, rectangles[i].right, rectangles[i].bottom + 150); } @@ -2775,7 +2775,7 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) wide_pen = CreatePen( PS_SOLID, 7, RGB( 0xff, 0, 0 ) ); SelectObject( hdc, wide_pen ); - for (i = 0; i < sizeof( wide_lines ) / sizeof( wide_lines[0] ); i++) + for (i = 0; i < ARRAY_SIZE(wide_lines); i++) { MoveToEx( hdc, wide_lines[i].left, wide_lines[i].top, NULL ); LineTo( hdc, wide_lines[i].right, wide_lines[i].bottom ); @@ -2794,7 +2794,7 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) 9, &log_brush, 0, NULL ); SelectObject( hdc, wide_pen ); SetBrushOrgEx( hdc, 3, 3, NULL ); - Polyline( hdc, poly_lines, sizeof(poly_lines) / sizeof(poly_lines[0]) ); + Polyline( hdc, poly_lines, ARRAY_SIZE( poly_lines )); compare_hash_broken_todo( hdc, bmi, bits, "wide pen - flat caps, mitred", is_ddb, is_ddb ); SetBrushOrgEx( hdc, 0, 0, NULL ); @@ -2805,7 +2805,7 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) 16, &log_brush, 0, NULL ); SelectObject( hdc, wide_pen ); - Polyline( hdc, poly_lines, sizeof(poly_lines) / sizeof(poly_lines[0]) ); + Polyline( hdc, poly_lines, ARRAY_SIZE( poly_lines )); compare_hash_broken_todo( hdc, bmi, bits, "wide pen - square caps, bevelled", is_ddb, is_ddb ); SelectObject( hdc, orig_pen ); @@ -2815,7 +2815,7 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) 9, &log_brush, 0, NULL ); SelectObject( hdc, wide_pen ); - PolyPolyline( hdc, polypoly_lines, polypoly_counts, sizeof(polypoly_counts)/sizeof(polypoly_counts[0]) ); + PolyPolyline( hdc, polypoly_lines, polypoly_counts, ARRAY_SIZE( polypoly_counts )); compare_hash_broken_todo( hdc, bmi, bits, "wide pen - empty segments", is_ddb, is_ddb ); SelectObject( hdc, orig_pen ); @@ -2833,7 +2833,7 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) 12, &log_brush, 0, NULL ); ok( wide_pen != 0, "failed to create pen\n" ); SelectObject( hdc, wide_pen ); - Polyline( hdc, poly_lines, sizeof(poly_lines) / sizeof(poly_lines[0]) ); + Polyline( hdc, poly_lines, ARRAY_SIZE( poly_lines )); for (i = 1; i < 20; i++) { diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 6243a6d339..8f5454b918 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -937,7 +937,7 @@ static void test_bitmap_font_metrics(void) screen_log_pixels = GetDeviceCaps(hdc, LOGPIXELSY); diff = 32768; font_res = 0; - for (i = 0; i < sizeof(font_log_pixels)/sizeof(font_log_pixels[0]); i++) + for (i = 0; i < ARRAY_SIZE(font_log_pixels); i++) { int new_diff = abs(font_log_pixels[i] - screen_log_pixels); if (new_diff < diff) @@ -948,7 +948,7 @@ static void test_bitmap_font_metrics(void) } trace("best font resolution is %d\n", font_res); - for (i = 0; i < sizeof(fd)/sizeof(fd[0]); i++) + for (i = 0; i < ARRAY_SIZE(fd); i++) { int bit, height; @@ -1190,7 +1190,7 @@ static void test_GetCharABCWidths(void) UINT cs; UINT a; UINT w; - BOOL r[sizeof range / sizeof range[0]]; + BOOL r[ARRAY_SIZE(range)]; } c[] = { {ANSI_CHARSET, 0x30, 0x30, @@ -1253,7 +1253,7 @@ static void test_GetCharABCWidths(void) hfont = SelectObject(hdc, hfont); DeleteObject(hfont); - for (i = 0; i < sizeof c / sizeof c[0]; ++i) + for (i = 0; i < ARRAY_SIZE(c); ++i) { ABC a[2], w[2]; ABC full[256]; @@ -1285,7 +1285,7 @@ static void test_GetCharABCWidths(void) ok(memcmp(&a[0], &full[code], sizeof(ABC)) == 0, "GetCharABCWidthsA info should match. codepage = %u\n", c[i].cs); - for (j = 0; j < sizeof range / sizeof range[0]; ++j) + for (j = 0; j < ARRAY_SIZE(range); ++j) { memset(full, 0xdd, sizeof full); ret = pGetCharABCWidthsA(hdc, range[j].first, range[j].last, full); @@ -1774,7 +1774,7 @@ static void test_GetKerningPairs(void) return; } - for (i = 0; i < sizeof(kd)/sizeof(kd[0]); i++) + for (i = 0; i < ARRAY_SIZE(kd); i++) { OUTLINETEXTMETRICW otm; UINT uiRet; @@ -2095,7 +2095,7 @@ static void test_height_selection_vdmx( HDC hdc ) return; } - for (i = 0; i < sizeof(data) / sizeof(data[0]); i++) + for (i = 0; i < ARRAY_SIZE(data); i++) { res = get_res_data( "wine_vdmx.ttf", &size ); @@ -2356,7 +2356,7 @@ static void testJustification(HDC hdc, PCSTR str, RECT *clientArea) { SetTextJustification(hdc, areaWidth - size.cx, breakCount); GetTextExtentPoint32A(hdc, pFirstChar, pLastChar - pFirstChar, &size); - if (size.cx != areaWidth && nErrors < sizeof(error)/sizeof(error[0]) - 1) + if (size.cx != areaWidth && nErrors < ARRAY_SIZE(error) - 1) { error[nErrors].start = pFirstChar; error[nErrors].len = pLastChar - pFirstChar; @@ -2613,7 +2613,7 @@ static void test_font_charset(void) return; } - for (i = 0; i < sizeof(cd)/sizeof(cd[0]); i++) + for (i = 0; i < ARRAY_SIZE(cd); i++) { if (cd[i].charset == SYMBOL_CHARSET) { @@ -2687,7 +2687,7 @@ static void test_GdiGetCodePage(void) acp = GetACP(); - for (i = 0; i < sizeof(matching_data) / sizeof(struct _matching_data); i++) + for (i = 0; i < ARRAY_SIZE(matching_data); i++) { /* only test data matched current locale codepage */ if (matching_data[i].current_codepage != acp) @@ -3700,7 +3700,7 @@ static int match_name_table_language( const sfnt_name *name, LANGID lang ) break; case TT_PLATFORM_MACINTOSH: if (!IsValidCodePage( get_mac_code_page( name ))) return 0; - if (GET_BE_WORD(name->language_id) >= sizeof(mac_langid_table)/sizeof(mac_langid_table[0])) return 0; + if (GET_BE_WORD(name->language_id) >= ARRAY_SIZE(mac_langid_table)) return 0; name_lang = mac_langid_table[GET_BE_WORD(name->language_id)]; break; case TT_PLATFORM_APPLE_UNICODE: @@ -3710,7 +3710,7 @@ static int match_name_table_language( const sfnt_name *name, LANGID lang ) case TT_APPLE_ID_DEFAULT: case TT_APPLE_ID_ISO_10646: case TT_APPLE_ID_UNICODE_2_0: - if (GET_BE_WORD(name->language_id) >= sizeof(mac_langid_table)/sizeof(mac_langid_table[0])) return 0; + if (GET_BE_WORD(name->language_id) >= ARRAY_SIZE(mac_langid_table)) return 0; name_lang = mac_langid_table[GET_BE_WORD(name->language_id)]; break; default: @@ -4105,7 +4105,7 @@ static void test_nonexistent_font(void) hdc = CreateCompatibleDC(0); - for (i = 0; i < sizeof(shell_subst)/sizeof(shell_subst[0]); i++) + for (i = 0; i < ARRAY_SIZE(shell_subst); i++) { ret = is_font_installed(shell_subst[i].name); ok(ret || broken(!ret) /* win2000 */, "%s should be enumerated\n", shell_subst[i].name); @@ -4201,7 +4201,7 @@ todo_wine /* Wine uses Arial for all substitutions */ ok(cs == ANSI_CHARSET, "expected ANSI_CHARSET, got %d\n", cs); DeleteObject(SelectObject(hdc, hfont)); - for (i = 0; i < sizeof(font_subst)/sizeof(font_subst[0]); i++) + for (i = 0; i < ARRAY_SIZE(font_subst); i++) { ret = is_font_installed(font_subst[i].name); todo_wine @@ -4487,8 +4487,8 @@ static void test_GetTextFace(void) dc = GetDC(NULL); g = SelectObject(dc, f); - n = GetTextFaceW(dc, sizeof bufW / sizeof bufW[0], bufW); - ok(n == sizeof faceW / sizeof faceW[0], "GetTextFaceW returned %d\n", n); + n = GetTextFaceW(dc, ARRAY_SIZE(bufW), bufW); + ok(n == ARRAY_SIZE(faceW), "GetTextFaceW returned %d\n", n); ok(lstrcmpW(faceW, bufW) == 0, "GetTextFaceW\n"); /* Play with the count arg. */ @@ -4508,7 +4508,7 @@ static void test_GetTextFace(void) ok(bufW[0] == faceW[0] && bufW[1] == '\0', "GetTextFaceW didn't copy\n"); n = GetTextFaceW(dc, 0, NULL); - ok(n == sizeof faceW / sizeof faceW[0], "GetTextFaceW returned %d\n", n); + ok(n == ARRAY_SIZE(faceW), "GetTextFaceW returned %d\n", n); DeleteObject(SelectObject(dc, g)); ReleaseDC(NULL, dc); @@ -4719,7 +4719,7 @@ static void test_GetGlyphOutline(void) if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) ok(ret == GDI_ERROR, "GetGlyphOutlineW should return an error when the buffer size is too small.\n"); - for (i = 0; i < sizeof(fmt) / sizeof(fmt[0]); ++i) + for (i = 0; i < ARRAY_SIZE(fmt); ++i) { DWORD dummy; @@ -4785,7 +4785,7 @@ static void test_GetGlyphOutline(void) SelectObject(hdc, old_hfont); DeleteObject(hfont); - for (i = 0; i < sizeof c / sizeof c[0]; ++i) + for (i = 0; i < ARRAY_SIZE(c); ++i) { static const MAT2 rotate_mat = {{0, 0}, {0, -1}, {0, 1}, {0, 0}}; TEXTMETRICA tm; @@ -4955,7 +4955,7 @@ static void test_CreateFontIndirect(void) lf.lfItalic = FALSE; lf.lfWeight = FW_DONTCARE; - for (i = 0; i < sizeof(TestName)/sizeof(TestName[0]); i++) + for (i = 0; i < ARRAY_SIZE(TestName); i++) { lstrcpyA(lf.lfFaceName, TestName[i]); hfont = CreateFontIndirectA(&lf); @@ -5409,7 +5409,7 @@ static void test_fullname(void) lf.lfItalic = FALSE; lf.lfWeight = FW_DONTCARE; - for (i = 0; i < sizeof(TestName) / sizeof(TestName[0]); i++) + for (i = 0; i < ARRAY_SIZE(TestName); i++) { if (!is_font_installed_fullname("Lucida Sans", TestName[i])) { @@ -6058,7 +6058,7 @@ static void test_vertical_font(void) ok(hgi != vgi, "same glyph h:%u v:%u\n", hgi, vgi); - for (i = 0; i < sizeof(face_list)/sizeof(face_list[0]); i++) { + for (i = 0; i < ARRAY_SIZE(face_list); i++) { const char* face = face_list[i]; if (!is_truetype_font_installed(face)) { skip("%s is not installed\n", face); @@ -6092,7 +6092,7 @@ static void test_east_asian_font_selection(void) hdc = GetDC(NULL); - for (i = 0; i < sizeof(charset)/sizeof(charset[0]); i++) + for (i = 0; i < ARRAY_SIZE(charset); i++) { LOGFONTA lf; HFONT hfont; @@ -6214,7 +6214,7 @@ static void test_stock_fonts(void) }; int i, j; - for (i = 0; i < sizeof(font)/sizeof(font[0]); i++) + for (i = 0; i < ARRAY_SIZE(font); i++) { HFONT hfont; LOGFONTA lf; @@ -6314,7 +6314,7 @@ static void test_max_height(void) DeleteObject(SelectObject(hdc, hfont_old)); /* test an invalid value */ - for (i = 0; i < sizeof(invalid_height)/sizeof(invalid_height[0]); i++) { + for (i = 0; i < ARRAY_SIZE(invalid_height); i++) { lf.lfHeight = invalid_height[i]; hfont = CreateFontIndirectA(&lf); hfont_old = SelectObject(hdc, hfont); @@ -6638,7 +6638,7 @@ static void test_bitmap_font_glyph_index(void) bmi.bmiHeader.biHeight = 32; bmi.bmiHeader.biCompression = BI_RGB; - for (i = 0; i < sizeof(bitmap_font_list)/sizeof(bitmap_font_list[0]); i++) { + for (i = 0; i < ARRAY_SIZE(bitmap_font_list); i++) { memset(&lf, 0, sizeof(lf)); lf.lfCharSet = bitmap_font_list[i].charset; strcpy(lf.lfFaceName, bitmap_font_list[i].face); diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c index 65374ea85d..8f3d01c27d 100644 --- a/dlls/gdi32/tests/gdiobj.c +++ b/dlls/gdi32/tests/gdiobj.c @@ -345,7 +345,7 @@ static void test_handles_on_win64(void) if (sizeof(void*) != 8) return; - for (i = 0; i < sizeof(cases)/sizeof(cases[0]); i++) + for (i = 0; i < ARRAY_SIZE(cases); i++) { hrgn = CreateRectRgn(10, 10, 20, 20); hrgn_test = (HRGN)(ULONG_PTR)((ULONG_PTR)hrgn | ((ULONGLONG)cases[i].high << 32) | cases[i].low); diff --git a/dlls/gdi32/tests/icm.c b/dlls/gdi32/tests/icm.c index 620809018a..340ebeef55 100644 --- a/dlls/gdi32/tests/icm.c +++ b/dlls/gdi32/tests/icm.c @@ -278,7 +278,7 @@ static void test_SetICMProfileW( HDC dc ) return; } - len = sizeof(profile)/sizeof(profile[0]); + len = ARRAY_SIZE(profile); ret = GetICMProfileW( dc, &len, profile ); ok(ret, "GetICMProfileW failed %u\n", GetLastError()); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 780b65f1b6..230d1e6d84 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -183,7 +183,7 @@ static void test_ExtTextOut(void) static const RECT rc = { 0, 0, 100, 100 }; BOOL ret; - assert(sizeof(dx)/sizeof(dx[0]) >= lstrlenA(text)); + assert(ARRAY_SIZE(dx) >= lstrlenA(text)); /* Win9x doesn't play EMFs on invisible windows */ hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP | WS_VISIBLE, @@ -3895,8 +3895,7 @@ static void test_emf_GradientFill(void) * written to the EMF, but is not considered in the bounds * calculation. */ - ret = GdiGradientFill( mf, v, sizeof(v) / sizeof(v[0]), tri, sizeof(tri) / sizeof(tri[0]), - GRADIENT_FILL_TRIANGLE ); + ret = GdiGradientFill( mf, v, ARRAY_SIZE(v), tri, ARRAY_SIZE(tri), GRADIENT_FILL_TRIANGLE ); ok( ret, "GradientFill\n" ); hemf = CloseEnhMetaFile( mf ); @@ -4117,7 +4116,7 @@ static void test_emf_WorldTransform(void) { "manual modify", TRUE, FALSE } }; - for(i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i) + for(i = 0; i < ARRAY_SIZE(test_data); ++i) { hdcMetafile = CreateEnhMetaFileA(GetDC(0), NULL, NULL, NULL); ok(hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError()); diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 48ef4f016a..80145fc6b2 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -495,7 +495,7 @@ static void test_arcto(void) CloseFigure(hdc); EndPath(hdc); - ok_path(hdc, "arcto_path", arcto_path, sizeof(arcto_path)/sizeof(path_test_t)); + ok_path(hdc, "arcto_path", arcto_path, ARRAY_SIZE(arcto_path)); done: ReleaseDC(0, hdc); } @@ -540,7 +540,7 @@ static void test_anglearc(void) CloseFigure(hdc); EndPath(hdc); - ok_path(hdc, "anglearc_path", anglearc_path, sizeof(anglearc_path)/sizeof(path_test_t)); + ok_path(hdc, "anglearc_path", anglearc_path, ARRAY_SIZE(anglearc_path)); done: ReleaseDC(0, hdc); } @@ -681,7 +681,7 @@ static void test_polydraw(void) ok( pos.x == 80 && pos.y == 80, "wrong pos %d,%d\n", pos.x, pos.y ); EndPath(hdc); - ok_path(hdc, "polydraw_path", polydraw_path, sizeof(polydraw_path)/sizeof(path_test_t)); + ok_path(hdc, "polydraw_path", polydraw_path, ARRAY_SIZE(polydraw_path)); GetCurrentPositionEx( hdc, &pos ); ok( pos.x == 80 && pos.y == 80, "wrong pos %d,%d\n", pos.x, pos.y ); done: @@ -966,7 +966,7 @@ static void test_rectangle(void) SetArcDirection( hdc, AD_COUNTERCLOCKWISE ); EndPath( hdc ); SetMapMode( hdc, MM_TEXT ); - ok_path( hdc, "rectangle_path", rectangle_path, sizeof(rectangle_path)/sizeof(path_test_t) ); + ok_path( hdc, "rectangle_path", rectangle_path, ARRAY_SIZE(rectangle_path) ); ReleaseDC( 0, hdc ); } @@ -1327,7 +1327,7 @@ static void test_roundrect(void) SetArcDirection( hdc, AD_COUNTERCLOCKWISE ); EndPath( hdc ); SetMapMode( hdc, MM_TEXT ); - ok_path( hdc, "roundrect_path", roundrect_path, sizeof(roundrect_path)/sizeof(path_test_t) ); + ok_path( hdc, "roundrect_path", roundrect_path, ARRAY_SIZE(roundrect_path) ); ReleaseDC( 0, hdc ); } @@ -1707,7 +1707,7 @@ static void test_ellipse(void) SetArcDirection( hdc, AD_COUNTERCLOCKWISE ); EndPath( hdc ); SetMapMode( hdc, MM_TEXT ); - ok_path( hdc, "ellipse_path", ellipse_path, sizeof(ellipse_path)/sizeof(path_test_t) ); + ok_path( hdc, "ellipse_path", ellipse_path, ARRAY_SIZE(ellipse_path) ); } static const path_test_t all_funcs_path[] = @@ -1890,7 +1890,7 @@ static void test_all_functions(void) LineTo( hdc, 150, 150 ); /* FIXME: ExtTextOut */ EndPath( hdc ); - ok_path( hdc, "all_funcs_path", all_funcs_path, sizeof(all_funcs_path)/sizeof(path_test_t) ); + ok_path( hdc, "all_funcs_path", all_funcs_path, ARRAY_SIZE(all_funcs_path) ); ReleaseDC( 0, hdc ); } diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index 43f00d8f50..badc585f57 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -72,7 +72,7 @@ static void test_logpen(void) EXTLOGPEN *ext_pen = (EXTLOGPEN *)elp_buffer; DWORD *ext_style = ext_pen->elpStyleEntry; - for (i = 0; i < sizeof(pen)/sizeof(pen[0]); i++) + for (i = 0; i < ARRAY_SIZE(pen); i++) { trace("%d: testing style %u\n", i, pen[i].style); -- 2.14.4

2 1

[PATCH 1/2] testbot/Janitor: Add DeletePath() to simplify deleting file/directories.
by Francois Gouget 26 Jun '18

26 Jun '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 9fb38efde..9252efa65 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -116,6 +116,17 @@ if (defined $Usage) # Main # +sub DeletePath($) +{ + my ($Path) = @_; + + Trace "Deleting '$Path'\n"; + if (!$DryRun and !rmtree($Path)) + { + Error "Could not delete '$Path': $!\n"; + } +} + # Delete obsolete Jobs if ($JobPurgeDays != 0) { @@ -268,11 +279,7 @@ if (opendir(my $dh, "$DataDir/staging")) { if ($Age >= $JobPurgeDays + 7) { - Trace "Deleting '$FileName'\n"; - if (!$DryRun and !rmtree($FileName)) - { - Error "Could not delete '$FileName': $!\n"; - } + DeletePath($FileName); } elsif ($Age > $JobPurgeDays) { @@ -282,12 +289,8 @@ if (opendir(my $dh, "$DataDir/staging")) } elsif ($Age >= 1) { - Trace "Deleting '$FileName'\n"; - if (!$DryRun and !unlink $FileName) - { - # The user abandoned the submit procedure half-way through - Error "Could not delete '$FileName': $!\n"; - } + # The user abandoned the submit procedure half-way through + DeletePath($FileName); } } } -- 2.18.0

1 1

[PATCH 1/2] crypt32: Implement verification of ECDSA signatures.
by Nikolay Sivov 26 Jun '18

26 Jun '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Modifications from original patch: - few renames to make it closer to existing code; - removed unrelated formatting changes in existing code; - new BCrypt path is rearranged to match existing order : import -> hash -> verify. dlls/crypt32/Makefile.in | 2 +- dlls/crypt32/cert.c | 260 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 250 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/Makefile.in b/dlls/crypt32/Makefile.in index d3a409fcae..0934222119 100644 --- a/dlls/crypt32/Makefile.in +++ b/dlls/crypt32/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRYPT32_ MODULE = crypt32.dll IMPORTLIB = crypt32 -IMPORTS = user32 advapi32 +IMPORTS = user32 advapi32 bcrypt DELAYIMPORTS = cryptnet EXTRALIBS = $(SECURITY_LIBS) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 83aac5d8f4..1667b42b0b 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -21,9 +21,14 @@ #include <stdarg.h> #define NONAMELESSUNION +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winternl.h" +#define CRYPT_OID_INFO_HAS_EXTRA_FIELDS #include "wincrypt.h" +#include "bcrypt.h" #include "winnls.h" #include "rpc.h" #include "wine/debug.h" @@ -2408,22 +2413,13 @@ BOOL WINAPI CryptVerifyCertificateSignature(HCRYPTPROV_LEGACY hCryptProv, CRYPT_VERIFY_CERT_SIGN_ISSUER_PUBKEY, pPublicKey, 0, NULL); } -static BOOL CRYPT_VerifyCertSignatureFromPublicKeyInfo(HCRYPTPROV_LEGACY hCryptProv, - DWORD dwCertEncodingType, PCERT_PUBLIC_KEY_INFO pubKeyInfo, - const CERT_SIGNED_CONTENT_INFO *signedCert) +static BOOL CRYPT_VerifySignature(HCRYPTPROV_LEGACY hCryptProv, DWORD dwCertEncodingType, + CERT_PUBLIC_KEY_INFO *pubKeyInfo, const CERT_SIGNED_CONTENT_INFO *signedCert, const CRYPT_OID_INFO *info) { BOOL ret; HCRYPTKEY key; - PCCRYPT_OID_INFO info; ALG_ID pubKeyID, hashID; - info = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, - signedCert->SignatureAlgorithm.pszObjId, 0); - if (!info || info->dwGroupId != CRYPT_SIGN_ALG_OID_GROUP_ID) - { - SetLastError(NTE_BAD_ALGID); - return FALSE; - } hashID = info->u.Algid; if (info->ExtraInfo.cbData >= sizeof(ALG_ID)) pubKeyID = *(ALG_ID *)info->ExtraInfo.pbData; @@ -2453,6 +2449,248 @@ static BOOL CRYPT_VerifyCertSignatureFromPublicKeyInfo(HCRYPTPROV_LEGACY hCryptP return ret; } +static BOOL CNG_CalcHash(const WCHAR *algorithm, const CERT_SIGNED_CONTENT_INFO *signedCert, + BYTE **hash_value, DWORD *hash_len) +{ + BCRYPT_HASH_HANDLE hash = NULL; + BCRYPT_ALG_HANDLE alg = NULL; + NTSTATUS status; + DWORD size; + + if ((status = BCryptOpenAlgorithmProvider(&alg, algorithm, NULL, 0))) + goto done; + + if ((status = BCryptCreateHash(alg, &hash, NULL, 0, NULL, 0, 0))) + goto done; + + if ((status = BCryptHashData(hash, signedCert->ToBeSigned.pbData, signedCert->ToBeSigned.cbData, 0))) + goto done; + + if ((status = BCryptGetProperty(hash, BCRYPT_HASH_LENGTH, (BYTE *)hash_len, sizeof(*hash_len), &size, 0))) + goto done; + + if (!(*hash_value = CryptMemAlloc(*hash_len))) + { + status = STATUS_NO_MEMORY; + goto done; + } + + if ((status = BCryptFinishHash(hash, *hash_value, *hash_len, 0))) + { + CryptMemFree(*hash_value); + goto done; + } + +done: + if (hash) BCryptDestroyHash(hash); + if (alg) BCryptCloseAlgorithmProvider(alg, 0); + if (status) SetLastError(RtlNtStatusToDosError(status)); + return status == 0; +} + +static BOOL CNG_ImportECCPubKey(CERT_PUBLIC_KEY_INFO *pubKeyInfo, BCRYPT_KEY_HANDLE *key) +{ + DWORD blob_magic, ecckey_len, size; + BCRYPT_ALG_HANDLE alg = NULL; + BCRYPT_ECCKEY_BLOB *ecckey; + const WCHAR *sign_algo; + char **ecc_curve; + NTSTATUS status; + + if (!pubKeyInfo->PublicKey.cbData) + { + SetLastError(NTE_BAD_ALGID); + return FALSE; + } + + if (pubKeyInfo->PublicKey.pbData[0] != 0x4) + { + FIXME("Compressed ECC curves (%02x) not yet supported\n", pubKeyInfo->PublicKey.pbData[0]); + SetLastError(NTE_BAD_ALGID); + return FALSE; + } + + if (!CryptDecodeObjectEx(X509_ASN_ENCODING, X509_OBJECT_IDENTIFIER, pubKeyInfo->Algorithm.Parameters.pbData, + pubKeyInfo->Algorithm.Parameters.cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &ecc_curve, &size)) + return FALSE; + + if (!strcmp(*ecc_curve, szOID_ECC_CURVE_P256)) + { + sign_algo = BCRYPT_ECDSA_P256_ALGORITHM; + blob_magic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; + } + else if (!strcmp(*ecc_curve, szOID_ECC_CURVE_P384)) + { + sign_algo = BCRYPT_ECDSA_P384_ALGORITHM; + blob_magic = BCRYPT_ECDSA_PUBLIC_P384_MAGIC; + } + else + { + FIXME("Unsupported ecc curve type: %s\n", *ecc_curve); + sign_algo = NULL; + blob_magic = 0; + } + LocalFree(ecc_curve); + + if (!sign_algo) + { + SetLastError(NTE_BAD_ALGID); + return FALSE; + } + + if ((status = BCryptOpenAlgorithmProvider(&alg, sign_algo, NULL, 0))) + goto done; + + ecckey_len = sizeof(BCRYPT_ECCKEY_BLOB) + pubKeyInfo->PublicKey.cbData - 1; + if (!(ecckey = CryptMemAlloc(ecckey_len))) + { + status = STATUS_NO_MEMORY; + goto done; + } + + ecckey->dwMagic = blob_magic; + ecckey->cbKey = (pubKeyInfo->PublicKey.cbData - 1) / 2; + memcpy(ecckey + 1, pubKeyInfo->PublicKey.pbData + 1, pubKeyInfo->PublicKey.cbData - 1); + + status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, key, (BYTE*)ecckey, ecckey_len, 0); + +done: + if (alg) BCryptCloseAlgorithmProvider(alg, 0); + if (status) SetLastError(RtlNtStatusToDosError(status)); + return !status; +} + +static BOOL CNG_ImportPubKey(CERT_PUBLIC_KEY_INFO *pubKeyInfo, BCRYPT_KEY_HANDLE *key) +{ + if (!strcmp(pubKeyInfo->Algorithm.pszObjId, szOID_ECC_PUBLIC_KEY)) + return CNG_ImportECCPubKey(pubKeyInfo, key); + + FIXME("Unsupported public key type: %s\n", debugstr_a(pubKeyInfo->Algorithm.pszObjId)); + SetLastError(NTE_BAD_ALGID); + return FALSE; +} + +static BOOL CNG_PrepareSignatureECC(BYTE *encoded_sig, DWORD encoded_size, BYTE **sig_value, DWORD *sig_len) +{ + CERT_ECC_SIGNATURE *ecc_sig; + DWORD size; + int i; + + if (!CryptDecodeObjectEx(X509_ASN_ENCODING, X509_ECC_SIGNATURE, encoded_sig, encoded_size, + CRYPT_DECODE_ALLOC_FLAG, NULL, &ecc_sig, &size)) + return FALSE; + + if (!ecc_sig->r.cbData || !ecc_sig->s.cbData) + { + LocalFree(ecc_sig); + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } + + *sig_len = ecc_sig->r.cbData + ecc_sig->s.cbData; + if (!(*sig_value = CryptMemAlloc(*sig_len))) + { + LocalFree(ecc_sig); + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + + for (i = 0; i < ecc_sig->r.cbData; i++) + (*sig_value)[i] = ecc_sig->r.pbData[ecc_sig->r.cbData - i - 1]; + for (i = 0; i < ecc_sig->s.cbData; i++) + (*sig_value)[ecc_sig->r.cbData + i] = ecc_sig->s.pbData[ecc_sig->s.cbData - i - 1]; + + LocalFree(ecc_sig); + return TRUE; +} + +static BOOL CNG_PrepareSignature(CERT_PUBLIC_KEY_INFO *pubKeyInfo, const CERT_SIGNED_CONTENT_INFO *signedCert, + BYTE **sig_value, DWORD *sig_len) +{ + BYTE *encoded_sig; + BOOL ret = FALSE; + int i; + + if (!signedCert->Signature.cbData) + { + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } + + if (!(encoded_sig = CryptMemAlloc(signedCert->Signature.cbData))) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + + for (i = 0; i < signedCert->Signature.cbData; i++) + encoded_sig[i] = signedCert->Signature.pbData[signedCert->Signature.cbData - i - 1]; + + if (!strcmp(pubKeyInfo->Algorithm.pszObjId, szOID_ECC_PUBLIC_KEY)) + ret = CNG_PrepareSignatureECC(encoded_sig, signedCert->Signature.cbData, sig_value, sig_len); + else + { + FIXME("Unsupported public key type: %s\n", debugstr_a(pubKeyInfo->Algorithm.pszObjId)); + SetLastError(NTE_BAD_ALGID); + } + + CryptMemFree(encoded_sig); + return ret; +} + +static BOOL CNG_VerifySignature(HCRYPTPROV_LEGACY hCryptProv, DWORD dwCertEncodingType, + CERT_PUBLIC_KEY_INFO *pubKeyInfo, const CERT_SIGNED_CONTENT_INFO *signedCert, const CRYPT_OID_INFO *info) +{ + BCRYPT_KEY_HANDLE key = NULL; + BYTE *hash_value = NULL, *sig_value; + DWORD hash_len, sig_len; + NTSTATUS status; + BOOL ret; + + ret = CNG_ImportPubKey(pubKeyInfo, &key); + if (ret) + { + ret = CNG_CalcHash(info->pwszCNGAlgid, signedCert, &hash_value, &hash_len); + if (ret) + { + ret = CNG_PrepareSignature(pubKeyInfo, signedCert, &sig_value, &sig_len); + if (ret) + { + status = BCryptVerifySignature(key, NULL, hash_value, hash_len, sig_value, sig_len, 0); + if (status) + { + FIXME("Failed to verify signature: %08x\n", status); + SetLastError(RtlNtStatusToDosError(status)); + ret = FALSE; + } + CryptMemFree(sig_value); + } + CryptMemFree(hash_value); + } + BCryptDestroyKey(key); + } + + return ret; +} + +static BOOL CRYPT_VerifyCertSignatureFromPublicKeyInfo(HCRYPTPROV_LEGACY hCryptProv, DWORD dwCertEncodingType, + CERT_PUBLIC_KEY_INFO *pubKeyInfo, const CERT_SIGNED_CONTENT_INFO *signedCert) +{ + CCRYPT_OID_INFO *info; + + info = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, signedCert->SignatureAlgorithm.pszObjId, 0); + if (!info || info->dwGroupId != CRYPT_SIGN_ALG_OID_GROUP_ID) + { + SetLastError(NTE_BAD_ALGID); + return FALSE; + } + + if (info->u.Algid == CALG_OID_INFO_CNG_ONLY) + return CNG_VerifySignature(hCryptProv, dwCertEncodingType, pubKeyInfo, signedCert, info); + else + return CRYPT_VerifySignature(hCryptProv, dwCertEncodingType, pubKeyInfo, signedCert, info); +} + BOOL WINAPI CryptVerifyCertificateSignatureEx(HCRYPTPROV_LEGACY hCryptProv, DWORD dwCertEncodingType, DWORD dwSubjectType, void *pvSubject, DWORD dwIssuerType, void *pvIssuer, DWORD dwFlags, void *pvReserved) -- 2.18.0

1 1

[PATCH] msi: Remove checks for negative value.
by Hans Leidekker 26 Jun '18

26 Jun '18

From: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/format.c | 2 +- dlls/msi/string.c | 5 ++--- dlls/msi/table.c | 4 +--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 9356c9e30d..d32afb2a60 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -242,7 +242,7 @@ static WCHAR *deformat_file( FORMAT *format, FORMSTR *str, BOOL shortname, int * if ((ret = strdupW( file->TargetPath ))) len = strlenW( ret ); goto done; } - if ((len = GetShortPathNameW(file->TargetPath, NULL, 0)) <= 0) + if (!(len = GetShortPathNameW(file->TargetPath, NULL, 0))) { if ((ret = strdupW( file->TargetPath ))) len = strlenW( ret ); goto done; diff --git a/dlls/msi/string.c b/dlls/msi/string.c index f094a53c9e..7383fddbed 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -233,7 +233,7 @@ static void set_st_entry( string_table *st, UINT n, WCHAR *str, int len, USHORT static UINT string2id( const string_table *st, const char *buffer, UINT *id ) { - DWORD sz; + int sz; UINT r = ERROR_INVALID_PARAMETER; LPWSTR str; @@ -245,8 +245,7 @@ static UINT string2id( const string_table *st, const char *buffer, UINT *id ) return ERROR_SUCCESS; } - sz = MultiByteToWideChar( st->codepage, 0, buffer, -1, NULL, 0 ); - if( sz <= 0 ) + if (!(sz = MultiByteToWideChar( st->codepage, 0, buffer, -1, NULL, 0 ))) return r; str = msi_alloc( sz*sizeof(WCHAR) ); if( !str ) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 45a181445a..e046c5c9e2 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1279,9 +1279,7 @@ static UINT get_table_value_from_record( MSITABLEVIEW *tv, MSIRECORD *rec, UINT UINT r; int ival; - if ( (iField <= 0) || - (iField > tv->num_cols) || - MSI_RecordIsNull( rec, iField ) ) + if (!iField || iField > tv->num_cols || MSI_RecordIsNull( rec, iField )) return ERROR_FUNCTION_FAILED; columninfo = tv->columns[ iField - 1 ]; -- 2.11.0

1 0

[PATCH] shell32: use characters as arguments to GetTempPathW and GetLongPathNameW
by Marcus Meissner 26 Jun '18

26 Jun '18

Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> --- dlls/shell32/tests/shlfolder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 6460fd9381..bb303f66e4 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -244,8 +244,8 @@ todo_wine_if(parse_tests[i].todo) CoTaskMemFree(pidl); /* Relative paths are interpreted relative to the desktop. */ - GetTempPathW(sizeof(buffer), buffer); - GetLongPathNameW(buffer, buffer, sizeof(buffer)); + GetTempPathW(ARRAY_SIZE(buffer), buffer); + GetLongPathNameW(buffer, buffer, ARRAY_SIZE(buffer)); SetCurrentDirectoryW(buffer); CreateDirectoryW(testdirW, NULL); -- 2.17.1

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 26 Jun '18

26 Jun '18

1 0

[PATCH 3/3] wsdapi: Send Probe Matches message via UDP unicast.
by Owen Rudge 25 Jun '18

25 Jun '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/network.c | 32 ++++++++++++++++++++++++++++++++ dlls/wsdapi/soap.c | 4 ++-- dlls/wsdapi/tests/discovery.c | 22 +++++++++++----------- dlls/wsdapi/wsdapi_internal.h | 1 + 4 files changed, 46 insertions(+), 13 deletions(-)

1 0

[PATCH 1/3] wsdapi: Implement matching of names in MatchProbeEx.
by Owen Rudge 25 Jun '18

25 Jun '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/discovery.c | 58 ++++++++++++++++++++++++++++++++++++++++--- dlls/wsdapi/soap.c | 9 +++++++ dlls/wsdapi/wsdapi_internal.h | 6 +++++ 3 files changed, 69 insertions(+), 4 deletions(-)

1 0