- Wine-Devel - list.winehq.org

[PATCH 1/2] cmd: Fix handling of nested if-for expressions on a single line.
by Roman Pišl Feb. 8, 2021

Feb. 8, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50641 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- programs/cmd/builtins.c | 10 ++++++++-- programs/cmd/tests/test_builtins.cmd | 4 ++++ programs/cmd/tests/test_builtins.cmd.exp | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index e99dd24ac72..0fb40d94e49 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1599,8 +1599,14 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, the same bracket depth as the IF, then the IF statement is over. This is required to handle nested ifs properly */ } else if (isIF && (*cmdList)->bracketDepth == myDepth) { - WINE_TRACE("Found end of this nested IF statement, ending this if\n"); - break; + static const WCHAR doW[] = {'d','o'}; + if (WCMD_keyword_ws_found(doW, ARRAY_SIZE(doW), (*cmdList)->command)) { + WINE_TRACE("Still inside FOR-loop, not an end of IF statement\n"); + *cmdList = (*cmdList)->nextcommand; + } else { + WINE_TRACE("Found end of this nested IF statement, ending this if\n"); + break; + } } else if (!processThese) { if (curPosition == *cmdList) *cmdList = (*cmdList)->nextcommand; WINE_TRACE("Skipping this command, as in not process mode (next = %p)\n", *cmdList); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index c7418b759e4..4019c51ba73 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1242,6 +1242,10 @@ goto :eof set WINE_STR_PARMS= set WINE_INT_PARMS= +echo ------------ Testing if/for ------------ +if ""=="" for %%i in (A) DO (echo %%i) +if not ""=="" for %%i in (B) DO (echo %%i) + echo ------------ Testing for ------------ echo --- plain FOR for %%i in (A B C) do echo %%i diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index f75839fdbe8..129e5313d90 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -914,6 +914,8 @@ x(a)space@ --- x(a)space@ --- +------------ Testing if/for ------------ +A ------------ Testing for ------------ --- plain FOR A -- 2.20.1

1 1

[PATCH 3/4] d3d10core/tests: Add input layout alignment tests.
by Henri Verbeet Feb. 8, 2021

Feb. 8, 2021

From: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v3: Minor formatting changes. dlls/d3d10core/tests/d3d10core.c | 93 ++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 4332ce2dcf22..9e116729e829 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -12270,6 +12270,98 @@ static void test_create_input_layout(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_input_layout_alignment(void) +{ + ID3D10InputLayout *layout; + ID3D10Device *device; + unsigned int i; + ULONG refcount; + HRESULT hr; + + static const DWORD vs_code[] = + { +#if 0 + float4 main(float4 position : POSITION) : SV_POSITION + { + return position; + } +#endif + 0x43425844, 0xa7a2f22d, 0x83ff2560, 0xe61638bd, 0x87e3ce90, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + }; + + static const struct + { + D3D10_INPUT_ELEMENT_DESC elements[2]; + HRESULT hr; + } + test_data[] = + { + {{ + {"POSITION", 0, DXGI_FORMAT_R8_UINT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"COLOR", 0, DXGI_FORMAT_R16_UINT, 0, 2, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }, S_OK}, + {{ + {"POSITION", 0, DXGI_FORMAT_R8_UINT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"COLOR", 0, DXGI_FORMAT_R16_UINT, 0, 1, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }, E_INVALIDARG}, + {{ + {"POSITION", 0, DXGI_FORMAT_R8_UINT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"COLOR", 0, DXGI_FORMAT_R8_UINT, 0, 1, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }, S_OK}, + {{ + {"POSITION", 0, DXGI_FORMAT_R16_UINT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"COLOR", 0, DXGI_FORMAT_R32_UINT, 0, 2, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }, E_INVALIDARG}, + {{ + {"POSITION", 0, DXGI_FORMAT_R16_UINT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"COLOR", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 2, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }, E_INVALIDARG}, + {{ + {"POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"COLOR", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 16, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }, S_OK}, + {{ + {"POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"COLOR", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 17, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }, E_INVALIDARG}, + {{ + {"POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"COLOR", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 18, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }, E_INVALIDARG}, + {{ + {"POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"COLOR", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 19, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }, E_INVALIDARG}, + {{ + {"POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"COLOR", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 20, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }, S_OK}, + }; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + for (i = 0; i < ARRAY_SIZE(test_data); ++i) + { + hr = ID3D10Device_CreateInputLayout(device, test_data[i].elements, 2, vs_code, sizeof(vs_code), &layout); + ok(hr == test_data[i].hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", i, hr, test_data[i].hr); + if (SUCCEEDED(hr)) + ID3D10InputLayout_Release(layout); + } + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_input_assembler(void) { enum layout_id @@ -18511,6 +18603,7 @@ START_TEST(d3d10core) queue_test(test_sm4_continuec_instruction); queue_test(test_sm4_discard_instruction); queue_test(test_create_input_layout); + queue_test(test_input_layout_alignment); queue_test(test_input_assembler); queue_test(test_null_sampler); queue_test(test_immediate_constant_buffer); -- 2.20.1

1 0

[PATCH 2/4] wined3d: Return E_INVALIDARG from vertexdeclaration_init() on validation failure.
by Henri Verbeet Feb. 8, 2021

Feb. 8, 2021

From: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v3: Minor formatting changes. dlls/d3d8/vertexdeclaration.c | 4 ++++ dlls/d3d9/vertexdeclaration.c | 2 ++ dlls/wined3d/vertexdeclaration.c | 6 +++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index 525666d680e9..d0e733b9e376 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -358,6 +358,8 @@ HRESULT d3d8_vertex_declaration_init(struct d3d8_vertex_declaration *declaration { WARN("Failed to create wined3d vertex declaration, hr %#x.\n", hr); heap_free(declaration->elements); + if (hr == E_INVALIDARG) + hr = E_FAIL; return hr; } @@ -379,6 +381,8 @@ HRESULT d3d8_vertex_declaration_init_fvf(struct d3d8_vertex_declaration *declara if (FAILED(hr)) { WARN("Failed to create wined3d vertex declaration, hr %#x.\n", hr); + if (hr == E_INVALIDARG) + hr = E_FAIL; return hr; } diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index c30a84313fbf..60701a9a9105 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -406,6 +406,8 @@ static HRESULT vertexdeclaration_init(struct d3d9_vertex_declaration *declaratio { heap_free(declaration->elements); WARN("Failed to create wined3d vertex declaration, hr %#x.\n", hr); + if (hr == E_INVALIDARG) + hr = E_FAIL; return hr; } diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index e96216db380d..b17059f5e644 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -226,10 +226,10 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara if (!(e->format->flags[WINED3D_GL_RES_TYPE_BUFFER] & WINED3DFMT_FLAG_VERTEX_ATTRIBUTE)) { - FIXME("The application tries to use an unsupported format (%s), returning E_FAIL.\n", + FIXME("The application tries to use an unsupported format (%s).\n", debug_d3dformat(elements[i].format)); heap_free(declaration->elements); - return E_FAIL; + return E_INVALIDARG; } if (e->offset == WINED3D_APPEND_ALIGNED_ELEMENT) @@ -254,7 +254,7 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara WARN("Declaration element %u with format %s and offset %u is not %u byte aligned.\n", i, debug_d3dformat(elements[i].format), e->offset, alignment); heap_free(declaration->elements); - return E_FAIL; + return E_INVALIDARG; } } -- 2.20.1

1 0

[PATCH 1/4] wined3d: Align vertex attribute offsets to their size, if smaller than 4.
by Henri Verbeet Feb. 8, 2021

Feb. 8, 2021

From: Jan Sikorski <jsikorski(a)codeweavers.com> This should not change behaviour for d3d9 and earlier, where all formats have sizes that are multiples of 4. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43422 Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v3: Minor formatting changes. dlls/wined3d/vertexdeclaration.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index c5df45541e4d..e96216db380d 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -200,6 +200,7 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara for (i = 0; i < element_count; ++i) { struct wined3d_vertex_declaration_element *e = &declaration->elements[i]; + unsigned int alignment; e->format = wined3d_get_format(adapter, elements[i].format, 0); e->ffp_valid = declaration_element_valid_ffp(&elements[i]); @@ -212,6 +213,9 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara e->usage = elements[i].usage; e->usage_idx = elements[i].usage_idx; + if ((alignment = e->format->byte_count) > 4) + alignment = 4; + if (e->usage == WINED3D_DECL_USAGE_POSITIONT) declaration->position_transformed = TRUE; @@ -239,15 +243,16 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara prev = &declaration->elements[i - j]; if (prev->input_slot == e->input_slot) { - e->offset = (prev->offset + prev->format->byte_count + 3) & ~3; + e->offset = (prev->offset + prev->format->byte_count + alignment - 1) & ~(alignment - 1); break; } } } - if (e->offset & 0x3) + if (e->offset & (alignment - 1)) { - WARN("Declaration element %u is not 4 byte aligned(%u), returning E_FAIL.\n", i, e->offset); + WARN("Declaration element %u with format %s and offset %u is not %u byte aligned.\n", + i, debug_d3dformat(elements[i].format), e->offset, alignment); heap_free(declaration->elements); return E_FAIL; } -- 2.20.1

1 0

[PATCH] user32: Fix a typo in a comment.
by Francois Gouget Feb. 8, 2021

Feb. 8, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/user32/winproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 0be51779f69..f83d8b61a63 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -172,7 +172,7 @@ static inline WINDOWPROC *alloc_winproc( WNDPROC func, BOOL unicode ) } #ifdef __i386__ -/* Some window procedures modify register they shouldn't, or are not +/* Some window procedures modify registers they shouldn't, or are not * properly declared stdcall; so we need a small assembly wrapper to * call them. */ extern LRESULT WINPROC_wrapper( WNDPROC proc, HWND hwnd, UINT msg, -- 2.20.1

1 0

[PATCH] windowscodecs/tests: Fix a typo in a variable name.
by Francois Gouget Feb. 8, 2021

Feb. 8, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/windowscodecs/tests/metadata.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index e6e46c389f9..b597e5490c6 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -3056,7 +3056,7 @@ static void test_metadata_writer(void) REFCLSID rclsid; BOOL wine_supports_encoder; BOOL metadata_supported; - BOOL succeeds_unitialized; + BOOL succeeds_uninitialized; } tests[] = { @@ -3106,7 +3106,7 @@ static void test_metadata_writer(void) ok(hr == (tests[i].metadata_supported ? S_OK : E_INVALIDARG), "Got unexpected hr %#x, i %u.\n", hr, i); hr = IWICBitmapFrameEncode_GetMetadataQueryWriter(frameencode, &querywriter2); - ok(hr == (tests[i].succeeds_unitialized ? S_OK : WINCODEC_ERR_NOTINITIALIZED), + ok(hr == (tests[i].succeeds_uninitialized ? S_OK : WINCODEC_ERR_NOTINITIALIZED), "Got unexpected hr %#x, i %u.\n", hr, i); if (hr == S_OK) IWICMetadataQueryWriter_Release(querywriter2); -- 2.20.1

1 0

[PATCH 1/2] gdi32/tests: Move out common functions into a separate file named misc.c|h
by Ralf Habacker Feb. 8, 2021

Feb. 8, 2021

This is used to avoid code duplication for adding an 'advanced' gdi32 test. Signed-off-by: Ralf Habacker <ralf.habacker(a)freenet.de> --- dlls/gdi32/tests/Makefile.in | 1 + dlls/gdi32/tests/dib.c | 338 +--------------------------- dlls/gdi32/tests/misc.c | 425 +++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/misc.h | 31 +++ 4 files changed, 460 insertions(+), 335 deletions(-) create mode 100644 dlls/gdi32/tests/misc.c create mode 100644 dlls/gdi32/tests/misc.h diff --git a/dlls/gdi32/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in index 876f6a376a2..ad8f0ce8bad 100644 --- a/dlls/gdi32/tests/Makefile.in +++ b/dlls/gdi32/tests/Makefile.in @@ -14,6 +14,7 @@ C_SRCS = \ icm.c \ mapping.c \ metafile.c \ + misc.c \ palette.c \ path.c \ pen.c diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index bdc3d9ed55b..96ac0b69271 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -31,7 +31,9 @@ #include "wine/test.h" -static HCRYPTPROV crypt_prov; +#include "misc.h" + +static const char *dst_format; static const DWORD rop3[256] = { @@ -1263,217 +1265,6 @@ static const char *sha1_graphics_1_ddb_inverted[] = NULL }; -static const RECT graphics_bounds[] = -{ - { 0, 0, 0, 0 }, - { 10, 3, 219, 101 }, - { 100, 100, 301, 301 }, - { 0, 0, 201, 201 }, - { 10, 10, 110, 320 }, - { 10, 99, 300, 200 }, - { 99, 12, 201, 200 }, - { 90, 110, 300, 200 }, - { 90, 90, 210, 200 }, - { 10, 99, 300, 200 }, - { 10, 99, 300, 200 }, - { 99, 12, 201, 200 }, - { 99, 11, 201, 200 }, - { 90, 110, 300, 200 }, - { 90, 110, 300, 200 }, - { 10, 10, 365, 405 }, - { 10, 10, 365, 405 }, - { 10, 10, 365, 405 }, - { 10, 10, 365, 405 }, - { 10, 10, 365, 405 }, - { 10, 10, 365, 405 }, - { 10, 10, 365, 405 }, - { 10, 10, 365, 405 }, - { 10, 10, 350, 251 }, - { 10, 10, 300, 200 }, - { 300, 10, 9, 260 }, - { 10, 10, 435, 405 }, - { 10, 10, 120, 120 }, - { 10, 10, 110, 110 }, - { 10, 10, 120, 110 }, - { 10, 10, 110, 120 }, - { 10, 10, 120, 120 }, - { 10, 10, 110, 110 }, - { 10, 10, 120, 110 }, - { 10, 10, 110, 120 }, - { 0, 4, 356, 356 }, - { 100, 100, 356, 356 }, - { 50, 50, 306, 306 }, - { 100, 100, 356, 356 }, - { 100, 100, 356, 356 }, - { 100, 100, 356, 356 }, - { 100, 100, 356, 356 }, - { 100, 100, 356, 356 }, - { 100, 100, 356, 356 }, - { 100, 100, 356, 356 }, - { 100, 100, 356, 356 }, - { 100, 100, 356, 356 }, - { 10, 10, 356, 356 }, - { 100, 100, 356, 356 }, - { 0, 0, 260, 39 }, - { 0, 0, 16, 16 }, - { 10, 10, 416, 26 }, - { 10, 8, 60, 104 }, - { 0, 0, 512, 512 }, - { 0, 10, 511, 306 }, - { 0, 0, 512, 336 }, - { 1, 1, 300, 512 }, - { 0, 0, 500, 512 }, - { 5, 5, 206, 206 }, - { 45, 45, 256, 256 }, - { 86, 86, 215, 215 }, - { 45, 45, 256, 256 }, - { 8, 0, 392, 231 }, - { 8, 0, 392, 231 }, - { 0, 0, 60, 20 }, - { 0, 0, 512, 512 }, - { -1, -1, -1, -1 } /* the end */ -}; - -static const char **current_sha1; -static const RECT *current_bounds; -static const char *dst_format; - -static inline DWORD get_stride(const BITMAPINFO *bmi) -{ - return ((bmi->bmiHeader.biBitCount * bmi->bmiHeader.biWidth + 31) >> 3) & ~3; -} - -static inline DWORD get_dib_size(const BITMAPINFO *bmi) -{ - return get_stride(bmi) * abs(bmi->bmiHeader.biHeight); -} - -static void reset_bits( HDC hdc, const BITMAPINFO *bmi, BYTE *bits ) -{ - DWORD size = get_dib_size( bmi ); - if (bits) memset( bits, 0xcc, size ); - else - { - void *ddb_bits = HeapAlloc( GetProcessHeap(), 0, size ); - memset( ddb_bits, 0xcc, size ); - SetBitmapBits( GetCurrentObject(hdc, OBJ_BITMAP), size, ddb_bits ); - HeapFree( GetProcessHeap(), 0, ddb_bits ); - } -} - -static char *hash_dib(HDC hdc, const BITMAPINFO *bmi, const void *bits) -{ - DWORD dib_size = get_dib_size(bmi); - HCRYPTHASH hash; - char *buf; - BYTE hash_buf[20]; - DWORD hash_size = sizeof(hash_buf); - int i; - static const char *hex = "0123456789abcdef"; - - if(!crypt_prov) return NULL; - - if(!CryptCreateHash(crypt_prov, CALG_SHA1, 0, 0, &hash)) return NULL; - - if (!bits) - { - void *ddb_bits = HeapAlloc( GetProcessHeap(), 0, dib_size ); - GetBitmapBits( GetCurrentObject(hdc, OBJ_BITMAP), dib_size, ddb_bits ); - CryptHashData(hash, ddb_bits, dib_size, 0); - HeapFree( GetProcessHeap(), 0, ddb_bits ); - } - else CryptHashData(hash, bits, dib_size, 0); - - CryptGetHashParam(hash, HP_HASHVAL, NULL, &hash_size, 0); - if(hash_size != sizeof(hash_buf)) return NULL; - - CryptGetHashParam(hash, HP_HASHVAL, hash_buf, &hash_size, 0); - CryptDestroyHash(hash); - - buf = HeapAlloc(GetProcessHeap(), 0, hash_size * 2 + 1); - - for(i = 0; i < hash_size; i++) - { - buf[i * 2] = hex[hash_buf[i] >> 4]; - buf[i * 2 + 1] = hex[hash_buf[i] & 0xf]; - } - buf[i * 2] = '\0'; - - return buf; -} - -static void reset_bounds( HDC hdc ) -{ - current_bounds = graphics_bounds; - SetBoundsRect( hdc, NULL, DCB_RESET | DCB_ENABLE ); -} - -static void compare_bounds( HDC hdc, const char *info ) -{ - RECT rect; - - GetBoundsRect( hdc, &rect, DCB_RESET ); - - if (current_bounds->left == -1 && - current_bounds->top == -1 && - current_bounds->right == -1 && - current_bounds->bottom == -1) - { - ok( 0, "missing bounds, got %s,\n", wine_dbgstr_rect( &rect )); - return; - } - - ok( EqualRect( current_bounds, &rect ), "%s: %s: expected bounds %s got %s\n", dst_format, info, - wine_dbgstr_rect( current_bounds ), wine_dbgstr_rect( &rect )); - current_bounds++; -} - -static void compare_hash_broken_todo(HDC hdc, const BITMAPINFO *bmi, BYTE *bits, const char *info, int num_broken, BOOL todo) -{ - char *hash = hash_dib(hdc, bmi, bits); - BOOL ok_cond; - int i; - - /* reset the bits for the next test */ - reset_bits( hdc, bmi, bits ); - - if(!hash) - { - skip("SHA1 hashing unavailable on this platform\n"); - return; - } - - for(i = 0; i <= num_broken; i++) - { - if(current_sha1[i] == NULL) - { - ok(current_sha1[i] != NULL, "missing hash, got \"%s\",\n", hash); - HeapFree(GetProcessHeap(), 0, hash); - return; - } - } - - ok_cond = !strcmp(hash, *current_sha1); - - for(i = 1; i <= num_broken; i++) - ok_cond = ok_cond || broken( !strcmp(hash, current_sha1[i]) ); - - todo_wine_if(todo) - ok( ok_cond, "%s: %s: expected hash %s got %s\n", - dst_format, info, *current_sha1, hash ); - - current_sha1 += num_broken + 1; - - HeapFree(GetProcessHeap(), 0, hash); - - compare_bounds( hdc, info ); -} - -static void compare_hash(HDC hdc, const BITMAPINFO *bmi, BYTE *bits, const char *info) -{ - compare_hash_broken_todo(hdc, bmi, bits, info, 0, FALSE); -} - static const RECT bias_check[] = { {100, 100, 200, 150}, @@ -1621,129 +1412,6 @@ static const DWORD four_by_four_data[16] = { 0x000000, 0xff0000, 0x00ff00, 0x000 static const DWORD ddb_brush_bits[8] = { 0x11112222, 0x33334444, 0x55556666, 0x77778888, 0xaaaaaaaa, 0x00000000, 0x98765432, 0xabcdef00 }; -static const RGBQUAD default_palette_1[2] = -{ - { 0x00, 0x00, 0x00 }, { 0xff, 0xff, 0xff } -}; - -static const RGBQUAD default_palette_4[16] = -{ - { 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x80 }, { 0x00, 0x80, 0x00 }, { 0x00, 0x80, 0x80 }, - { 0x80, 0x00, 0x00 }, { 0x80, 0x00, 0x80 }, { 0x80, 0x80, 0x00 }, { 0x80, 0x80, 0x80 }, - { 0xc0, 0xc0, 0xc0 }, { 0x00, 0x00, 0xff }, { 0x00, 0xff, 0x00 }, { 0x00, 0xff, 0xff }, - { 0xff, 0x00, 0x00 }, { 0xff, 0x00, 0xff }, { 0xff, 0xff, 0x00 }, { 0xff, 0xff, 0xff }, -}; - -static const RGBQUAD default_palette_8[256] = -{ - { 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x80 }, { 0x00, 0x80, 0x00 }, { 0x00, 0x80, 0x80 }, - { 0x80, 0x00, 0x00 }, { 0x80, 0x00, 0x80 }, { 0x80, 0x80, 0x00 }, { 0xc0, 0xc0, 0xc0 }, - { 0xc0, 0xdc, 0xc0 }, { 0xf0, 0xca, 0xa6 }, { 0x00, 0x20, 0x40 }, { 0x00, 0x20, 0x60 }, - { 0x00, 0x20, 0x80 }, { 0x00, 0x20, 0xa0 }, { 0x00, 0x20, 0xc0 }, { 0x00, 0x20, 0xe0 }, - { 0x00, 0x40, 0x00 }, { 0x00, 0x40, 0x20 }, { 0x00, 0x40, 0x40 }, { 0x00, 0x40, 0x60 }, - { 0x00, 0x40, 0x80 }, { 0x00, 0x40, 0xa0 }, { 0x00, 0x40, 0xc0 }, { 0x00, 0x40, 0xe0 }, - { 0x00, 0x60, 0x00 }, { 0x00, 0x60, 0x20 }, { 0x00, 0x60, 0x40 }, { 0x00, 0x60, 0x60 }, - { 0x00, 0x60, 0x80 }, { 0x00, 0x60, 0xa0 }, { 0x00, 0x60, 0xc0 }, { 0x00, 0x60, 0xe0 }, - { 0x00, 0x80, 0x00 }, { 0x00, 0x80, 0x20 }, { 0x00, 0x80, 0x40 }, { 0x00, 0x80, 0x60 }, - { 0x00, 0x80, 0x80 }, { 0x00, 0x80, 0xa0 }, { 0x00, 0x80, 0xc0 }, { 0x00, 0x80, 0xe0 }, - { 0x00, 0xa0, 0x00 }, { 0x00, 0xa0, 0x20 }, { 0x00, 0xa0, 0x40 }, { 0x00, 0xa0, 0x60 }, - { 0x00, 0xa0, 0x80 }, { 0x00, 0xa0, 0xa0 }, { 0x00, 0xa0, 0xc0 }, { 0x00, 0xa0, 0xe0 }, - { 0x00, 0xc0, 0x00 }, { 0x00, 0xc0, 0x20 }, { 0x00, 0xc0, 0x40 }, { 0x00, 0xc0, 0x60 }, - { 0x00, 0xc0, 0x80 }, { 0x00, 0xc0, 0xa0 }, { 0x00, 0xc0, 0xc0 }, { 0x00, 0xc0, 0xe0 }, - { 0x00, 0xe0, 0x00 }, { 0x00, 0xe0, 0x20 }, { 0x00, 0xe0, 0x40 }, { 0x00, 0xe0, 0x60 }, - { 0x00, 0xe0, 0x80 }, { 0x00, 0xe0, 0xa0 }, { 0x00, 0xe0, 0xc0 }, { 0x00, 0xe0, 0xe0 }, - { 0x40, 0x00, 0x00 }, { 0x40, 0x00, 0x20 }, { 0x40, 0x00, 0x40 }, { 0x40, 0x00, 0x60 }, - { 0x40, 0x00, 0x80 }, { 0x40, 0x00, 0xa0 }, { 0x40, 0x00, 0xc0 }, { 0x40, 0x00, 0xe0 }, - { 0x40, 0x20, 0x00 }, { 0x40, 0x20, 0x20 }, { 0x40, 0x20, 0x40 }, { 0x40, 0x20, 0x60 }, - { 0x40, 0x20, 0x80 }, { 0x40, 0x20, 0xa0 }, { 0x40, 0x20, 0xc0 }, { 0x40, 0x20, 0xe0 }, - { 0x40, 0x40, 0x00 }, { 0x40, 0x40, 0x20 }, { 0x40, 0x40, 0x40 }, { 0x40, 0x40, 0x60 }, - { 0x40, 0x40, 0x80 }, { 0x40, 0x40, 0xa0 }, { 0x40, 0x40, 0xc0 }, { 0x40, 0x40, 0xe0 }, - { 0x40, 0x60, 0x00 }, { 0x40, 0x60, 0x20 }, { 0x40, 0x60, 0x40 }, { 0x40, 0x60, 0x60 }, - { 0x40, 0x60, 0x80 }, { 0x40, 0x60, 0xa0 }, { 0x40, 0x60, 0xc0 }, { 0x40, 0x60, 0xe0 }, - { 0x40, 0x80, 0x00 }, { 0x40, 0x80, 0x20 }, { 0x40, 0x80, 0x40 }, { 0x40, 0x80, 0x60 }, - { 0x40, 0x80, 0x80 }, { 0x40, 0x80, 0xa0 }, { 0x40, 0x80, 0xc0 }, { 0x40, 0x80, 0xe0 }, - { 0x40, 0xa0, 0x00 }, { 0x40, 0xa0, 0x20 }, { 0x40, 0xa0, 0x40 }, { 0x40, 0xa0, 0x60 }, - { 0x40, 0xa0, 0x80 }, { 0x40, 0xa0, 0xa0 }, { 0x40, 0xa0, 0xc0 }, { 0x40, 0xa0, 0xe0 }, - { 0x40, 0xc0, 0x00 }, { 0x40, 0xc0, 0x20 }, { 0x40, 0xc0, 0x40 }, { 0x40, 0xc0, 0x60 }, - { 0x40, 0xc0, 0x80 }, { 0x40, 0xc0, 0xa0 }, { 0x40, 0xc0, 0xc0 }, { 0x40, 0xc0, 0xe0 }, - { 0x40, 0xe0, 0x00 }, { 0x40, 0xe0, 0x20 }, { 0x40, 0xe0, 0x40 }, { 0x40, 0xe0, 0x60 }, - { 0x40, 0xe0, 0x80 }, { 0x40, 0xe0, 0xa0 }, { 0x40, 0xe0, 0xc0 }, { 0x40, 0xe0, 0xe0 }, - { 0x80, 0x00, 0x00 }, { 0x80, 0x00, 0x20 }, { 0x80, 0x00, 0x40 }, { 0x80, 0x00, 0x60 }, - { 0x80, 0x00, 0x80 }, { 0x80, 0x00, 0xa0 }, { 0x80, 0x00, 0xc0 }, { 0x80, 0x00, 0xe0 }, - { 0x80, 0x20, 0x00 }, { 0x80, 0x20, 0x20 }, { 0x80, 0x20, 0x40 }, { 0x80, 0x20, 0x60 }, - { 0x80, 0x20, 0x80 }, { 0x80, 0x20, 0xa0 }, { 0x80, 0x20, 0xc0 }, { 0x80, 0x20, 0xe0 }, - { 0x80, 0x40, 0x00 }, { 0x80, 0x40, 0x20 }, { 0x80, 0x40, 0x40 }, { 0x80, 0x40, 0x60 }, - { 0x80, 0x40, 0x80 }, { 0x80, 0x40, 0xa0 }, { 0x80, 0x40, 0xc0 }, { 0x80, 0x40, 0xe0 }, - { 0x80, 0x60, 0x00 }, { 0x80, 0x60, 0x20 }, { 0x80, 0x60, 0x40 }, { 0x80, 0x60, 0x60 }, - { 0x80, 0x60, 0x80 }, { 0x80, 0x60, 0xa0 }, { 0x80, 0x60, 0xc0 }, { 0x80, 0x60, 0xe0 }, - { 0x80, 0x80, 0x00 }, { 0x80, 0x80, 0x20 }, { 0x80, 0x80, 0x40 }, { 0x80, 0x80, 0x60 }, - { 0x80, 0x80, 0x80 }, { 0x80, 0x80, 0xa0 }, { 0x80, 0x80, 0xc0 }, { 0x80, 0x80, 0xe0 }, - { 0x80, 0xa0, 0x00 }, { 0x80, 0xa0, 0x20 }, { 0x80, 0xa0, 0x40 }, { 0x80, 0xa0, 0x60 }, - { 0x80, 0xa0, 0x80 }, { 0x80, 0xa0, 0xa0 }, { 0x80, 0xa0, 0xc0 }, { 0x80, 0xa0, 0xe0 }, - { 0x80, 0xc0, 0x00 }, { 0x80, 0xc0, 0x20 }, { 0x80, 0xc0, 0x40 }, { 0x80, 0xc0, 0x60 }, - { 0x80, 0xc0, 0x80 }, { 0x80, 0xc0, 0xa0 }, { 0x80, 0xc0, 0xc0 }, { 0x80, 0xc0, 0xe0 }, - { 0x80, 0xe0, 0x00 }, { 0x80, 0xe0, 0x20 }, { 0x80, 0xe0, 0x40 }, { 0x80, 0xe0, 0x60 }, - { 0x80, 0xe0, 0x80 }, { 0x80, 0xe0, 0xa0 }, { 0x80, 0xe0, 0xc0 }, { 0x80, 0xe0, 0xe0 }, - { 0xc0, 0x00, 0x00 }, { 0xc0, 0x00, 0x20 }, { 0xc0, 0x00, 0x40 }, { 0xc0, 0x00, 0x60 }, - { 0xc0, 0x00, 0x80 }, { 0xc0, 0x00, 0xa0 }, { 0xc0, 0x00, 0xc0 }, { 0xc0, 0x00, 0xe0 }, - { 0xc0, 0x20, 0x00 }, { 0xc0, 0x20, 0x20 }, { 0xc0, 0x20, 0x40 }, { 0xc0, 0x20, 0x60 }, - { 0xc0, 0x20, 0x80 }, { 0xc0, 0x20, 0xa0 }, { 0xc0, 0x20, 0xc0 }, { 0xc0, 0x20, 0xe0 }, - { 0xc0, 0x40, 0x00 }, { 0xc0, 0x40, 0x20 }, { 0xc0, 0x40, 0x40 }, { 0xc0, 0x40, 0x60 }, - { 0xc0, 0x40, 0x80 }, { 0xc0, 0x40, 0xa0 }, { 0xc0, 0x40, 0xc0 }, { 0xc0, 0x40, 0xe0 }, - { 0xc0, 0x60, 0x00 }, { 0xc0, 0x60, 0x20 }, { 0xc0, 0x60, 0x40 }, { 0xc0, 0x60, 0x60 }, - { 0xc0, 0x60, 0x80 }, { 0xc0, 0x60, 0xa0 }, { 0xc0, 0x60, 0xc0 }, { 0xc0, 0x60, 0xe0 }, - { 0xc0, 0x80, 0x00 }, { 0xc0, 0x80, 0x20 }, { 0xc0, 0x80, 0x40 }, { 0xc0, 0x80, 0x60 }, - { 0xc0, 0x80, 0x80 }, { 0xc0, 0x80, 0xa0 }, { 0xc0, 0x80, 0xc0 }, { 0xc0, 0x80, 0xe0 }, - { 0xc0, 0xa0, 0x00 }, { 0xc0, 0xa0, 0x20 }, { 0xc0, 0xa0, 0x40 }, { 0xc0, 0xa0, 0x60 }, - { 0xc0, 0xa0, 0x80 }, { 0xc0, 0xa0, 0xa0 }, { 0xc0, 0xa0, 0xc0 }, { 0xc0, 0xa0, 0xe0 }, - { 0xc0, 0xc0, 0x00 }, { 0xc0, 0xc0, 0x20 }, { 0xc0, 0xc0, 0x40 }, { 0xc0, 0xc0, 0x60 }, - { 0xc0, 0xc0, 0x80 }, { 0xc0, 0xc0, 0xa0 }, { 0xf0, 0xfb, 0xff }, { 0xa4, 0xa0, 0xa0 }, - { 0x80, 0x80, 0x80 }, { 0x00, 0x00, 0xff }, { 0x00, 0xff, 0x00 }, { 0x00, 0xff, 0xff }, - { 0xff, 0x00, 0x00 }, { 0xff, 0x00, 0xff }, { 0xff, 0xff, 0x00 }, { 0xff, 0xff, 0xff } -}; - -static HPALETTE create_default_palette( int bpp ) -{ - char pal_buffer[sizeof(LOGPALETTE) + 255 * sizeof(PALETTEENTRY)]; - LOGPALETTE *pal = (LOGPALETTE *)pal_buffer; - PALETTEENTRY *entries = pal->palPalEntry; - int i; - - pal->palVersion = 0x300; - pal->palNumEntries = 1 << bpp; - switch (bpp) - { - case 1: - for (i = 0; i < 2; i++) - { - entries[i].peRed = default_palette_1[i].rgbRed; - entries[i].peGreen = default_palette_1[i].rgbGreen; - entries[i].peBlue = default_palette_1[i].rgbBlue; - entries[i].peFlags = 0; - } - break; - case 4: - for (i = 0; i < 16; i++) - { - entries[i].peRed = default_palette_4[i].rgbRed; - entries[i].peGreen = default_palette_4[i].rgbGreen; - entries[i].peBlue = default_palette_4[i].rgbBlue; - entries[i].peFlags = 0; - } - break; - case 8: - for (i = 0; i < 256; i++) - { - entries[i].peRed = default_palette_8[i].rgbRed; - entries[i].peGreen = default_palette_8[i].rgbGreen; - entries[i].peBlue = default_palette_8[i].rgbBlue; - entries[i].peFlags = 0; - } - break; - } - return CreatePalette( pal ); -} - static inline void solid_patblt( HDC hdc, int x, int y, int width, int height, COLORREF color ) { HBRUSH brush = CreateSolidBrush( color ); diff --git a/dlls/gdi32/tests/misc.c b/dlls/gdi32/tests/misc.c new file mode 100644 index 00000000000..828be2745a0 --- /dev/null +++ b/dlls/gdi32/tests/misc.c @@ -0,0 +1,425 @@ + + +#include <stdarg.h> +#include <stdio.h> +#include <math.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "wincrypt.h" +#include "mmsystem.h" /* DIBINDEX */ + +#include "wine/test.h" +#include "misc.h" + +const char **current_sha1; +const RECT *current_bounds; +const char *dst_format; +HCRYPTPROV crypt_prov; + +static const RECT graphics_bounds[] = +{ + { 0, 0, 0, 0 }, + { 10, 3, 219, 101 }, + { 100, 100, 301, 301 }, + { 0, 0, 201, 201 }, + { 10, 10, 110, 320 }, + { 10, 99, 300, 200 }, + { 99, 12, 201, 200 }, + { 90, 110, 300, 200 }, + { 90, 90, 210, 200 }, + { 10, 99, 300, 200 }, + { 10, 99, 300, 200 }, + { 99, 12, 201, 200 }, + { 99, 11, 201, 200 }, + { 90, 110, 300, 200 }, + { 90, 110, 300, 200 }, + { 10, 10, 365, 405 }, + { 10, 10, 365, 405 }, + { 10, 10, 365, 405 }, + { 10, 10, 365, 405 }, + { 10, 10, 365, 405 }, + { 10, 10, 365, 405 }, + { 10, 10, 365, 405 }, + { 10, 10, 365, 405 }, + { 10, 10, 350, 251 }, + { 10, 10, 300, 200 }, + { 300, 10, 9, 260 }, + { 10, 10, 435, 405 }, + { 10, 10, 120, 120 }, + { 10, 10, 110, 110 }, + { 10, 10, 120, 110 }, + { 10, 10, 110, 120 }, + { 10, 10, 120, 120 }, + { 10, 10, 110, 110 }, + { 10, 10, 120, 110 }, + { 10, 10, 110, 120 }, + { 0, 4, 356, 356 }, + { 100, 100, 356, 356 }, + { 50, 50, 306, 306 }, + { 100, 100, 356, 356 }, + { 100, 100, 356, 356 }, + { 100, 100, 356, 356 }, + { 100, 100, 356, 356 }, + { 100, 100, 356, 356 }, + { 100, 100, 356, 356 }, + { 100, 100, 356, 356 }, + { 100, 100, 356, 356 }, + { 100, 100, 356, 356 }, + { 10, 10, 356, 356 }, + { 100, 100, 356, 356 }, + { 0, 0, 260, 39 }, + { 0, 0, 16, 16 }, + { 10, 10, 416, 26 }, + { 10, 8, 60, 104 }, + { 0, 0, 512, 512 }, + { 0, 10, 511, 306 }, + { 0, 0, 512, 336 }, + { 1, 1, 300, 512 }, + { 0, 0, 500, 512 }, + { 5, 5, 206, 206 }, + { 45, 45, 256, 256 }, + { 86, 86, 215, 215 }, + { 45, 45, 256, 256 }, + { 8, 0, 392, 231 }, + { 8, 0, 392, 231 }, + { 0, 0, 60, 20 }, + { 0, 0, 512, 512 }, + { -1, -1, -1, -1 } /* the end */ +}; + +static const RGBQUAD default_palette_1[2] = +{ + { 0x00, 0x00, 0x00 }, { 0xff, 0xff, 0xff } +}; + +static const RGBQUAD default_palette_4[16] = +{ + { 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x80 }, { 0x00, 0x80, 0x00 }, { 0x00, 0x80, 0x80 }, + { 0x80, 0x00, 0x00 }, { 0x80, 0x00, 0x80 }, { 0x80, 0x80, 0x00 }, { 0x80, 0x80, 0x80 }, + { 0xc0, 0xc0, 0xc0 }, { 0x00, 0x00, 0xff }, { 0x00, 0xff, 0x00 }, { 0x00, 0xff, 0xff }, + { 0xff, 0x00, 0x00 }, { 0xff, 0x00, 0xff }, { 0xff, 0xff, 0x00 }, { 0xff, 0xff, 0xff }, +}; + +static const RGBQUAD default_palette_8[256] = +{ + { 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x80 }, { 0x00, 0x80, 0x00 }, { 0x00, 0x80, 0x80 }, + { 0x80, 0x00, 0x00 }, { 0x80, 0x00, 0x80 }, { 0x80, 0x80, 0x00 }, { 0xc0, 0xc0, 0xc0 }, + { 0xc0, 0xdc, 0xc0 }, { 0xf0, 0xca, 0xa6 }, { 0x00, 0x20, 0x40 }, { 0x00, 0x20, 0x60 }, + { 0x00, 0x20, 0x80 }, { 0x00, 0x20, 0xa0 }, { 0x00, 0x20, 0xc0 }, { 0x00, 0x20, 0xe0 }, + { 0x00, 0x40, 0x00 }, { 0x00, 0x40, 0x20 }, { 0x00, 0x40, 0x40 }, { 0x00, 0x40, 0x60 }, + { 0x00, 0x40, 0x80 }, { 0x00, 0x40, 0xa0 }, { 0x00, 0x40, 0xc0 }, { 0x00, 0x40, 0xe0 }, + { 0x00, 0x60, 0x00 }, { 0x00, 0x60, 0x20 }, { 0x00, 0x60, 0x40 }, { 0x00, 0x60, 0x60 }, + { 0x00, 0x60, 0x80 }, { 0x00, 0x60, 0xa0 }, { 0x00, 0x60, 0xc0 }, { 0x00, 0x60, 0xe0 }, + { 0x00, 0x80, 0x00 }, { 0x00, 0x80, 0x20 }, { 0x00, 0x80, 0x40 }, { 0x00, 0x80, 0x60 }, + { 0x00, 0x80, 0x80 }, { 0x00, 0x80, 0xa0 }, { 0x00, 0x80, 0xc0 }, { 0x00, 0x80, 0xe0 }, + { 0x00, 0xa0, 0x00 }, { 0x00, 0xa0, 0x20 }, { 0x00, 0xa0, 0x40 }, { 0x00, 0xa0, 0x60 }, + { 0x00, 0xa0, 0x80 }, { 0x00, 0xa0, 0xa0 }, { 0x00, 0xa0, 0xc0 }, { 0x00, 0xa0, 0xe0 }, + { 0x00, 0xc0, 0x00 }, { 0x00, 0xc0, 0x20 }, { 0x00, 0xc0, 0x40 }, { 0x00, 0xc0, 0x60 }, + { 0x00, 0xc0, 0x80 }, { 0x00, 0xc0, 0xa0 }, { 0x00, 0xc0, 0xc0 }, { 0x00, 0xc0, 0xe0 }, + { 0x00, 0xe0, 0x00 }, { 0x00, 0xe0, 0x20 }, { 0x00, 0xe0, 0x40 }, { 0x00, 0xe0, 0x60 }, + { 0x00, 0xe0, 0x80 }, { 0x00, 0xe0, 0xa0 }, { 0x00, 0xe0, 0xc0 }, { 0x00, 0xe0, 0xe0 }, + { 0x40, 0x00, 0x00 }, { 0x40, 0x00, 0x20 }, { 0x40, 0x00, 0x40 }, { 0x40, 0x00, 0x60 }, + { 0x40, 0x00, 0x80 }, { 0x40, 0x00, 0xa0 }, { 0x40, 0x00, 0xc0 }, { 0x40, 0x00, 0xe0 }, + { 0x40, 0x20, 0x00 }, { 0x40, 0x20, 0x20 }, { 0x40, 0x20, 0x40 }, { 0x40, 0x20, 0x60 }, + { 0x40, 0x20, 0x80 }, { 0x40, 0x20, 0xa0 }, { 0x40, 0x20, 0xc0 }, { 0x40, 0x20, 0xe0 }, + { 0x40, 0x40, 0x00 }, { 0x40, 0x40, 0x20 }, { 0x40, 0x40, 0x40 }, { 0x40, 0x40, 0x60 }, + { 0x40, 0x40, 0x80 }, { 0x40, 0x40, 0xa0 }, { 0x40, 0x40, 0xc0 }, { 0x40, 0x40, 0xe0 }, + { 0x40, 0x60, 0x00 }, { 0x40, 0x60, 0x20 }, { 0x40, 0x60, 0x40 }, { 0x40, 0x60, 0x60 }, + { 0x40, 0x60, 0x80 }, { 0x40, 0x60, 0xa0 }, { 0x40, 0x60, 0xc0 }, { 0x40, 0x60, 0xe0 }, + { 0x40, 0x80, 0x00 }, { 0x40, 0x80, 0x20 }, { 0x40, 0x80, 0x40 }, { 0x40, 0x80, 0x60 }, + { 0x40, 0x80, 0x80 }, { 0x40, 0x80, 0xa0 }, { 0x40, 0x80, 0xc0 }, { 0x40, 0x80, 0xe0 }, + { 0x40, 0xa0, 0x00 }, { 0x40, 0xa0, 0x20 }, { 0x40, 0xa0, 0x40 }, { 0x40, 0xa0, 0x60 }, + { 0x40, 0xa0, 0x80 }, { 0x40, 0xa0, 0xa0 }, { 0x40, 0xa0, 0xc0 }, { 0x40, 0xa0, 0xe0 }, + { 0x40, 0xc0, 0x00 }, { 0x40, 0xc0, 0x20 }, { 0x40, 0xc0, 0x40 }, { 0x40, 0xc0, 0x60 }, + { 0x40, 0xc0, 0x80 }, { 0x40, 0xc0, 0xa0 }, { 0x40, 0xc0, 0xc0 }, { 0x40, 0xc0, 0xe0 }, + { 0x40, 0xe0, 0x00 }, { 0x40, 0xe0, 0x20 }, { 0x40, 0xe0, 0x40 }, { 0x40, 0xe0, 0x60 }, + { 0x40, 0xe0, 0x80 }, { 0x40, 0xe0, 0xa0 }, { 0x40, 0xe0, 0xc0 }, { 0x40, 0xe0, 0xe0 }, + { 0x80, 0x00, 0x00 }, { 0x80, 0x00, 0x20 }, { 0x80, 0x00, 0x40 }, { 0x80, 0x00, 0x60 }, + { 0x80, 0x00, 0x80 }, { 0x80, 0x00, 0xa0 }, { 0x80, 0x00, 0xc0 }, { 0x80, 0x00, 0xe0 }, + { 0x80, 0x20, 0x00 }, { 0x80, 0x20, 0x20 }, { 0x80, 0x20, 0x40 }, { 0x80, 0x20, 0x60 }, + { 0x80, 0x20, 0x80 }, { 0x80, 0x20, 0xa0 }, { 0x80, 0x20, 0xc0 }, { 0x80, 0x20, 0xe0 }, + { 0x80, 0x40, 0x00 }, { 0x80, 0x40, 0x20 }, { 0x80, 0x40, 0x40 }, { 0x80, 0x40, 0x60 }, + { 0x80, 0x40, 0x80 }, { 0x80, 0x40, 0xa0 }, { 0x80, 0x40, 0xc0 }, { 0x80, 0x40, 0xe0 }, + { 0x80, 0x60, 0x00 }, { 0x80, 0x60, 0x20 }, { 0x80, 0x60, 0x40 }, { 0x80, 0x60, 0x60 }, + { 0x80, 0x60, 0x80 }, { 0x80, 0x60, 0xa0 }, { 0x80, 0x60, 0xc0 }, { 0x80, 0x60, 0xe0 }, + { 0x80, 0x80, 0x00 }, { 0x80, 0x80, 0x20 }, { 0x80, 0x80, 0x40 }, { 0x80, 0x80, 0x60 }, + { 0x80, 0x80, 0x80 }, { 0x80, 0x80, 0xa0 }, { 0x80, 0x80, 0xc0 }, { 0x80, 0x80, 0xe0 }, + { 0x80, 0xa0, 0x00 }, { 0x80, 0xa0, 0x20 }, { 0x80, 0xa0, 0x40 }, { 0x80, 0xa0, 0x60 }, + { 0x80, 0xa0, 0x80 }, { 0x80, 0xa0, 0xa0 }, { 0x80, 0xa0, 0xc0 }, { 0x80, 0xa0, 0xe0 }, + { 0x80, 0xc0, 0x00 }, { 0x80, 0xc0, 0x20 }, { 0x80, 0xc0, 0x40 }, { 0x80, 0xc0, 0x60 }, + { 0x80, 0xc0, 0x80 }, { 0x80, 0xc0, 0xa0 }, { 0x80, 0xc0, 0xc0 }, { 0x80, 0xc0, 0xe0 }, + { 0x80, 0xe0, 0x00 }, { 0x80, 0xe0, 0x20 }, { 0x80, 0xe0, 0x40 }, { 0x80, 0xe0, 0x60 }, + { 0x80, 0xe0, 0x80 }, { 0x80, 0xe0, 0xa0 }, { 0x80, 0xe0, 0xc0 }, { 0x80, 0xe0, 0xe0 }, + { 0xc0, 0x00, 0x00 }, { 0xc0, 0x00, 0x20 }, { 0xc0, 0x00, 0x40 }, { 0xc0, 0x00, 0x60 }, + { 0xc0, 0x00, 0x80 }, { 0xc0, 0x00, 0xa0 }, { 0xc0, 0x00, 0xc0 }, { 0xc0, 0x00, 0xe0 }, + { 0xc0, 0x20, 0x00 }, { 0xc0, 0x20, 0x20 }, { 0xc0, 0x20, 0x40 }, { 0xc0, 0x20, 0x60 }, + { 0xc0, 0x20, 0x80 }, { 0xc0, 0x20, 0xa0 }, { 0xc0, 0x20, 0xc0 }, { 0xc0, 0x20, 0xe0 }, + { 0xc0, 0x40, 0x00 }, { 0xc0, 0x40, 0x20 }, { 0xc0, 0x40, 0x40 }, { 0xc0, 0x40, 0x60 }, + { 0xc0, 0x40, 0x80 }, { 0xc0, 0x40, 0xa0 }, { 0xc0, 0x40, 0xc0 }, { 0xc0, 0x40, 0xe0 }, + { 0xc0, 0x60, 0x00 }, { 0xc0, 0x60, 0x20 }, { 0xc0, 0x60, 0x40 }, { 0xc0, 0x60, 0x60 }, + { 0xc0, 0x60, 0x80 }, { 0xc0, 0x60, 0xa0 }, { 0xc0, 0x60, 0xc0 }, { 0xc0, 0x60, 0xe0 }, + { 0xc0, 0x80, 0x00 }, { 0xc0, 0x80, 0x20 }, { 0xc0, 0x80, 0x40 }, { 0xc0, 0x80, 0x60 }, + { 0xc0, 0x80, 0x80 }, { 0xc0, 0x80, 0xa0 }, { 0xc0, 0x80, 0xc0 }, { 0xc0, 0x80, 0xe0 }, + { 0xc0, 0xa0, 0x00 }, { 0xc0, 0xa0, 0x20 }, { 0xc0, 0xa0, 0x40 }, { 0xc0, 0xa0, 0x60 }, + { 0xc0, 0xa0, 0x80 }, { 0xc0, 0xa0, 0xa0 }, { 0xc0, 0xa0, 0xc0 }, { 0xc0, 0xa0, 0xe0 }, + { 0xc0, 0xc0, 0x00 }, { 0xc0, 0xc0, 0x20 }, { 0xc0, 0xc0, 0x40 }, { 0xc0, 0xc0, 0x60 }, + { 0xc0, 0xc0, 0x80 }, { 0xc0, 0xc0, 0xa0 }, { 0xf0, 0xfb, 0xff }, { 0xa4, 0xa0, 0xa0 }, + { 0x80, 0x80, 0x80 }, { 0x00, 0x00, 0xff }, { 0x00, 0xff, 0x00 }, { 0x00, 0xff, 0xff }, + { 0xff, 0x00, 0x00 }, { 0xff, 0x00, 0xff }, { 0xff, 0xff, 0x00 }, { 0xff, 0xff, 0xff } +}; + +HPALETTE create_default_palette( int bpp ) +{ + char pal_buffer[sizeof(LOGPALETTE) + 255 * sizeof(PALETTEENTRY)]; + LOGPALETTE *pal = (LOGPALETTE *)pal_buffer; + PALETTEENTRY *entries = pal->palPalEntry; + int i; + + pal->palVersion = 0x300; + pal->palNumEntries = 1 << bpp; + switch (bpp) + { + case 1: + for (i = 0; i < 2; i++) + { + entries[i].peRed = default_palette_1[i].rgbRed; + entries[i].peGreen = default_palette_1[i].rgbGreen; + entries[i].peBlue = default_palette_1[i].rgbBlue; + entries[i].peFlags = 0; + } + break; + case 4: + for (i = 0; i < 16; i++) + { + entries[i].peRed = default_palette_4[i].rgbRed; + entries[i].peGreen = default_palette_4[i].rgbGreen; + entries[i].peBlue = default_palette_4[i].rgbBlue; + entries[i].peFlags = 0; + } + break; + case 8: + for (i = 0; i < 256; i++) + { + entries[i].peRed = default_palette_8[i].rgbRed; + entries[i].peGreen = default_palette_8[i].rgbGreen; + entries[i].peBlue = default_palette_8[i].rgbBlue; + entries[i].peFlags = 0; + } + break; + } + return CreatePalette( pal ); +} + +void reset_bits( HDC hdc, const BITMAPINFO *bmi, BYTE *bits ) +{ + DWORD size = get_dib_size( bmi ); + if (bits) memset( bits, 0xcc, size ); + else + { + void *ddb_bits = HeapAlloc( GetProcessHeap(), 0, size ); + memset( ddb_bits, 0xcc, size ); + SetBitmapBits( GetCurrentObject(hdc, OBJ_BITMAP), size, ddb_bits ); + HeapFree( GetProcessHeap(), 0, ddb_bits ); + } +} + +char *hash_dib(HDC hdc, const BITMAPINFO *bmi, const void *bits) +{ + DWORD dib_size = get_dib_size(bmi); + HCRYPTHASH hash; + char *buf; + BYTE hash_buf[20]; + DWORD hash_size = sizeof(hash_buf); + int i; + static const char *hex = "0123456789abcdef"; + + if(!crypt_prov) return NULL; + + if(!CryptCreateHash(crypt_prov, CALG_SHA1, 0, 0, &hash)) return NULL; + + if (!bits) + { + void *ddb_bits = HeapAlloc( GetProcessHeap(), 0, dib_size ); + GetBitmapBits( GetCurrentObject(hdc, OBJ_BITMAP), dib_size, ddb_bits ); + CryptHashData(hash, ddb_bits, dib_size, 0); + HeapFree( GetProcessHeap(), 0, ddb_bits ); + } + else CryptHashData(hash, bits, dib_size, 0); + + CryptGetHashParam(hash, HP_HASHVAL, NULL, &hash_size, 0); + if(hash_size != sizeof(hash_buf)) return NULL; + + CryptGetHashParam(hash, HP_HASHVAL, hash_buf, &hash_size, 0); + CryptDestroyHash(hash); + + buf = HeapAlloc(GetProcessHeap(), 0, hash_size * 2 + 1); + + for(i = 0; i < hash_size; i++) + { + buf[i * 2] = hex[hash_buf[i] >> 4]; + buf[i * 2 + 1] = hex[hash_buf[i] & 0xf]; + } + buf[i * 2] = '\0'; + + return buf; +} + +void reset_bounds( HDC hdc ) +{ + current_bounds = graphics_bounds; + SetBoundsRect( hdc, NULL, DCB_RESET | DCB_ENABLE ); +} + +void compare_bounds( HDC hdc, const char *info ) +{ + RECT rect; + + GetBoundsRect( hdc, &rect, DCB_RESET ); + + if (current_bounds->left == -1 && + current_bounds->top == -1 && + current_bounds->right == -1 && + current_bounds->bottom == -1) + { + ok( 0, "missing bounds, got %s,\n", wine_dbgstr_rect( &rect )); + return; + } + + ok( EqualRect( current_bounds, &rect ), "%s: %s: expected bounds %s got %s\n", dst_format, info, + wine_dbgstr_rect( current_bounds ), wine_dbgstr_rect( &rect )); + current_bounds++; +} + +void compare_hash_broken_todo(HDC hdc, const BITMAPINFO *bmi, BYTE *bits, const char *info, int num_broken, BOOL todo) +{ + char *hash = hash_dib(hdc, bmi, bits); + BOOL ok_cond; + int i; + + /* reset the bits for the next test */ + reset_bits( hdc, bmi, bits ); + + if(!hash) + { + skip("SHA1 hashing unavailable on this platform\n"); + return; + } + + for(i = 0; i <= num_broken; i++) + { + if(current_sha1[i] == NULL) + { + ok(current_sha1[i] != NULL, "missing hash, got \"%s\",\n", hash); + HeapFree(GetProcessHeap(), 0, hash); + return; + } + } + + ok_cond = !strcmp(hash, *current_sha1); + + for(i = 1; i <= num_broken; i++) + ok_cond = ok_cond || broken( !strcmp(hash, current_sha1[i]) ); + + todo_wine_if(todo) + ok( ok_cond, "%s: %s: expected hash %s got %s\n", + dst_format, info, *current_sha1, hash ); + + current_sha1 += num_broken + 1; + + HeapFree(GetProcessHeap(), 0, hash); + + compare_bounds( hdc, info ); +} + +void compare_hash(HDC hdc, const BITMAPINFO *bmi, BYTE *bits, const char *info) +{ + compare_hash_broken_todo(hdc, bmi, bits, info, 0, FALSE); +} + +BOOL SaveHBITMAPToFile(HBITMAP hBitmap, LPSTR lpszFileName) +{ + HDC hDC; + int iBits; + WORD wBitCount; + DWORD dwPaletteSize = 0, dwBmBitsSize = 0, dwDIBSize = 0, dwWritten = 0; + BITMAP Bitmap0; + BITMAPFILEHEADER bmfHdr; + BITMAPINFOHEADER bi; + LPBITMAPINFOHEADER lpbi; + HANDLE fh, hDib, hPal, hOldPal2 = NULL; + hDC = CreateDCA("DISPLAY", NULL, NULL, NULL); + iBits = GetDeviceCaps(hDC, BITSPIXEL) * GetDeviceCaps(hDC, PLANES); + DeleteDC(hDC); + if (iBits <= 1) + wBitCount = 1; + else if (iBits <= 4) + wBitCount = 4; + else if (iBits <= 8) + wBitCount = 8; + else + wBitCount = 24; + GetObjectA(hBitmap, sizeof(Bitmap0), (LPSTR)&Bitmap0); + bi.biSize = sizeof(BITMAPINFOHEADER); + bi.biWidth = Bitmap0.bmWidth; + bi.biHeight = -Bitmap0.bmHeight; + bi.biPlanes = 1; + bi.biBitCount = wBitCount; + bi.biCompression = BI_RGB; + bi.biSizeImage = 0; + bi.biXPelsPerMeter = 0; + bi.biYPelsPerMeter = 0; + bi.biClrImportant = 0; + bi.biClrUsed = 256; + dwBmBitsSize = ((Bitmap0.bmWidth * wBitCount + 31) & ~31) / 8 + * Bitmap0.bmHeight; + hDib = GlobalAlloc(GHND, dwBmBitsSize + dwPaletteSize + sizeof(BITMAPINFOHEADER)); + lpbi = (LPBITMAPINFOHEADER)GlobalLock(hDib); + *lpbi = bi; + + hPal = GetStockObject(DEFAULT_PALETTE); + if (hPal) + { + hDC = GetDC(NULL); + hOldPal2 = SelectPalette(hDC, (HPALETTE)hPal, FALSE); + RealizePalette(hDC); + } + + + GetDIBits(hDC, hBitmap, 0, (UINT)Bitmap0.bmHeight, (LPSTR)lpbi + sizeof(BITMAPINFOHEADER) + + dwPaletteSize, (BITMAPINFO *)lpbi, DIB_RGB_COLORS); + + if (hOldPal2) + { + SelectPalette(hDC, (HPALETTE)hOldPal2, TRUE); + RealizePalette(hDC); + ReleaseDC(NULL, hDC); + } + + fh = CreateFileA(lpszFileName, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL); + + if (fh == INVALID_HANDLE_VALUE) + return FALSE; + + bmfHdr.bfType = 0x4D42; // "BM" + dwDIBSize = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER) + dwPaletteSize + dwBmBitsSize; + bmfHdr.bfSize = dwDIBSize; + bmfHdr.bfReserved1 = 0; + bmfHdr.bfReserved2 = 0; + bmfHdr.bfOffBits = (DWORD)sizeof(BITMAPFILEHEADER) + (DWORD)sizeof(BITMAPINFOHEADER) + dwPaletteSize; + + WriteFile(fh, (LPSTR)&bmfHdr, sizeof(BITMAPFILEHEADER), &dwWritten, NULL); + + WriteFile(fh, (LPSTR)lpbi, dwDIBSize, &dwWritten, NULL); + GlobalUnlock(hDib); + GlobalFree(hDib); + CloseHandle(fh); + return TRUE; +} + +void func_misc() +{ +} diff --git a/dlls/gdi32/tests/misc.h b/dlls/gdi32/tests/misc.h new file mode 100644 index 00000000000..719a360d23d --- /dev/null +++ b/dlls/gdi32/tests/misc.h @@ -0,0 +1,31 @@ + +#ifndef MISC_H +#define MISC_H + +#include "windef.h" + +extern const char **current_sha1; +extern const RECT *current_bounds; +extern HCRYPTPROV crypt_prov; + +HPALETTE create_default_palette( int bpp ); + +static inline DWORD get_stride(const BITMAPINFO *bmi) +{ + return ((bmi->bmiHeader.biBitCount * bmi->bmiHeader.biWidth + 31) >> 3) & ~3; +} + +static inline DWORD get_dib_size(const BITMAPINFO *bmi) +{ + return get_stride(bmi) * abs(bmi->bmiHeader.biHeight); +} + +void reset_bits( HDC hdc, const BITMAPINFO *bmi, BYTE *bits ); +char *hash_dib(HDC hdc, const BITMAPINFO *bmi, const void *bits); +void reset_bounds( HDC hdc ); +void compare_bounds( HDC hdc, const char *info ); +void compare_hash_broken_todo(HDC hdc, const BITMAPINFO *bmi, BYTE *bits, const char *info, int num_broken, BOOL todo); +void compare_hash(HDC hdc, const BITMAPINFO *bmi, BYTE *bits, const char *info); + +BOOL SaveHBITMAPToFile(HBITMAP hBitmap, LPSTR lpszFileName); +#endif -- 2.26.2

3 4

[PATCH] widl: Fix handling of output_name in option parsing
by Andrew Boyarshin Feb. 8, 2021

Feb. 8, 2021

Do not overwrite explicitly stated paths, such as header_name or proxy_name. Instead, use output_name when specified as a fallback. Drop inferring output_name from input_name which never worked, because input_name is not yet assigned at the moment of use. This leads to names like "widl.tab" (dup_basename fallbacks to that when given nullptr). Signed-off-by: Andrew Boyarshin <andrew.boyarshin(a)gmail.com> --- tools/widl/widl.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 333351bc11bc..e8240b38584a 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -823,19 +823,20 @@ int main(int argc,char *argv[]) set_everything(TRUE); } - if (!output_name) output_name = dup_basename(input_name, ".idl"); - - if (do_header + do_typelib + do_proxies + do_client + - do_server + do_regscript + do_idfile + do_dlldata == 1) + if (output_name) { - if (do_header) header_name = output_name; - else if (do_typelib) typelib_name = output_name; - else if (do_proxies) proxy_name = output_name; - else if (do_client) client_name = output_name; - else if (do_server) server_name = output_name; - else if (do_regscript) regscript_name = output_name; - else if (do_idfile) idfile_name = output_name; - else if (do_dlldata) dlldata_name = output_name; + if (do_header + do_typelib + do_proxies + do_client + + do_server + do_regscript + do_idfile + do_dlldata == 1) + { + if (do_header && !header_name) header_name = output_name; + else if (do_typelib && !typelib_name) typelib_name = output_name; + else if (do_proxies && !proxy_name) proxy_name = output_name; + else if (do_client && !client_name) client_name = output_name; + else if (do_server && !server_name) server_name = output_name; + else if (do_regscript && !regscript_name) regscript_name = output_name; + else if (do_idfile && !idfile_name) idfile_name = output_name; + else if (do_dlldata && !dlldata_name) dlldata_name = output_name; + } } if (!dlldata_name && do_dlldata) -- 2.30.0.windows.1

1 0

[PATCH] widl: Add an option to specify wpp temporary files folder
by Andrew Boyarshin Feb. 8, 2021

Feb. 8, 2021

All 3 usages of mkstemps now respect a new option that enables customizing temporary files root. This is useful in build systems, where it can simplify running widl using relative paths without polluting source directories. The behavior when a new option is not specified is identical to the one before the patch. Also added a way to identify failing mkstemps by using specialized log messages for each call to mkstemps. Signed-off-by: Andrew Boyarshin <andrew.boyarshin(a)gmail.com> --- tools/widl/parser.l | 33 +++++++++++++++++++++++++++++---- tools/widl/widl.c | 25 ++++++++++++++++++++++--- tools/widl/widl.h | 1 + 3 files changed, 52 insertions(+), 7 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 7e20d30e7f08..2b8389dbd4a7 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -531,6 +531,7 @@ int do_import(char *fname) struct imports *import; int ptr = import_stack_ptr; int ret, fd; + char* base_fname = dup_basename(fname, ".idl"); import = first_import; while (import && strcmp(import->name, fname)) @@ -559,9 +560,22 @@ int do_import(char *fname) input_name = path; line_number = 1; - name = xstrdup( "widl.XXXXXX" ); + name = xmalloc( (temp_dir_name ? strlen(temp_dir_name) : 0) + strlen(base_fname) + 15); + + if (temp_dir_name) + { + strcpy( name, temp_dir_name ); + strcat( name, base_fname ); + } + else + { + strcpy( name, base_fname ); + } + + strcat( name, "_import.XXXXXX" ); + if((fd = mkstemps( name, 0 )) == -1) - error("Could not generate a temp name from %s\n", name); + error("Could not generate an import temp name from %s\n", name); temp_name = name; if (!(f = fdopen(fd, "wt"))) @@ -600,9 +614,20 @@ static void switch_to_acf(void) acf_name = NULL; line_number = 1; - name = xstrdup( "widl.XXXXXX" ); + name = xmalloc( (temp_dir_name ? strlen(temp_dir_name) : 0) + 16 ); + + if (temp_dir_name) + { + strcpy( name, temp_dir_name ); + strcat( name, "widl_acf.XXXXXX" ); + } + else + { + strcpy( name, "widl_acf.XXXXXX" ); + } + if((fd = mkstemps( name, 0 )) == -1) - error("Could not generate a temp name from %s\n", name); + error("Could not generate an ACF temp name from %s\n", name); temp_name = name; if (!(f = fdopen(fd, "wt"))) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 333351bc11bc..ebc55e1864df 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -74,6 +74,7 @@ static const char usage[] = " --sysroot=DIR Prefix include paths with DIR\n" " -s Generate server stub\n" " -t Generate typelib\n" +" --tmp=dir Path to the directory for WPP temporary files\n" " -u Generate interface identifiers file\n" " -V Print version and exit\n" " -W Enable pedantic warnings\n" @@ -151,6 +152,7 @@ char *temp_name; const char *prefix_client = ""; const char *prefix_server = ""; static const char *includedir; +char *temp_dir_name; int line_number = 1; @@ -176,6 +178,7 @@ enum { RT_OPTION, ROBUST_OPTION, SYSROOT_OPTION, + TMP_WPP_OPTION, WIN32_OPTION, WIN64_OPTION, WIN32_ALIGN_OPTION, @@ -201,6 +204,7 @@ static const struct option long_options[] = { { "robust", 0, NULL, ROBUST_OPTION }, { "sysroot", 1, NULL, SYSROOT_OPTION }, { "target", 0, NULL, 'b' }, + { "tmp", 1, NULL, TMP_WPP_OPTION }, { "winrt", 0, NULL, RT_OPTION }, { "win32", 0, NULL, WIN32_OPTION }, { "win64", 0, NULL, WIN64_OPTION }, @@ -647,6 +651,9 @@ int main(int argc,char *argv[]) case SYSROOT_OPTION: sysroot = xstrdup(optarg); break; + case TMP_WPP_OPTION: + temp_dir_name = xstrdup(optarg); + break; case WIN32_OPTION: pointer_size = 4; break; @@ -928,13 +935,25 @@ int main(int argc,char *argv[]) { FILE *output; int fd; - char *name = xmalloc( strlen(header_name) + 8 ); + char* base_input_name = dup_basename(input_name, ".idl"); + char *name = xmalloc( (temp_dir_name ? strlen(temp_dir_name) : 0) + strlen(base_input_name) + 8 ); + + if (temp_dir_name) + { + strcpy( name, temp_dir_name ); + strcat( name, base_input_name ); + } + else + { + strcpy( name, base_input_name ); + } - strcpy( name, header_name ); strcat( name, ".XXXXXX" ); + free(base_input_name); + if ((fd = mkstemps( name, 0 )) == -1) - error("Could not generate a temp name from %s\n", name); + error("Could not generate a root temp name from %s\n", name); temp_name = name; if (!(output = fdopen(fd, "wt"))) diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 4f4252e3ea3a..f35c54210c6c 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -66,6 +66,7 @@ extern char *server_name; extern char *server_token; extern char *regscript_name; extern char *regscript_token; +extern char *temp_dir_name; extern const char *prefix_client; extern const char *prefix_server; extern unsigned int pointer_size; -- 2.30.0.windows.1

1 0

[PATCH] dwrite: Adjust comment regarding digits substitution during shaping.
by Nikolay Sivov Feb. 8, 2021

Feb. 8, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Testing with Arabic font with a glyph for 0x660 removed gives notdef (0) for '0', when used with Arabic substitution locale. dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 2f254607653..7dc4a1f7b55 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -5929,7 +5929,7 @@ static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, c context->glyph_infos[i].mask |= rtlm_mask; } - /* TODO: should this check for glyph availability? */ + /* Glyph availability is not tested for a replacement digit. */ if (*context->u.subst.digits && codepoint >= '0' && codepoint <= '9') codepoint = context->u.subst.digits[codepoint - '0']; -- 2.30.0

1 0