March 2022 - Wine-Commits - list.winehq.org

Austin English : winspool: Add GetSpoolFileHandle() stub.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: db6e5014dedb7edb80fee7f68badd3f228fc2f30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db6e5014dedb7edb80fee7f6… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 21 09:48:14 2022 +0000 winspool: Add GetSpoolFileHandle() stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52623 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 9 +++++++++ dlls/winspool.drv/winspool.drv.spec | 1 + include/winspool.h | 2 ++ 3 files changed, 12 insertions(+) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 52edd362622..a89abd0ced9 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -8076,3 +8076,12 @@ DWORD WINAPI PerfCollect(LPWSTR query, LPVOID *data, LPDWORD size, LPDWORD obj_c *obj_count = 0; return ERROR_SUCCESS; } + +/***************************************************************************** + * GetSpoolFileHandle [WINSPOOL.@] + */ +HANDLE WINAPI GetSpoolFileHandle( HANDLE printer ) +{ + FIXME( "%p: stub\n", printer ); + return INVALID_HANDLE_VALUE; +} diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec index 5d8a62d4695..d7bb49bd34b 100644 --- a/dlls/winspool.drv/winspool.drv.spec +++ b/dlls/winspool.drv/winspool.drv.spec @@ -144,6 +144,7 @@ @ stdcall GetPrinterDriverDirectoryW(wstr wstr long ptr long ptr) @ stdcall GetPrinterDriverW(long wstr long ptr long ptr) @ stdcall GetPrinterW(long long ptr long ptr) +@ stdcall GetSpoolFileHandle(ptr) @ stdcall IsValidDevmodeA(ptr long) @ stdcall IsValidDevmodeW(ptr long) @ stdcall OpenPrinterA(str ptr ptr) diff --git a/include/winspool.h b/include/winspool.h index 68619741f38..db8773ec418 100644 --- a/include/winspool.h +++ b/include/winspool.h @@ -1768,6 +1768,8 @@ BOOL WINAPI XcvDataW(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, BOOL WINAPI IsValidDevmodeA(PDEVMODEA pDevMode, SIZE_T size); BOOL WINAPI IsValidDevmodeW(PDEVMODEW pDevMode, SIZE_T size); +HANDLE WINAPI GetSpoolFileHandle(HANDLE printer); + #ifdef __cplusplus } /* extern "C" */ #endif

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in file.c.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: 9a130ccdb668d94b6096e232667cf2595af54630 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a130ccdb668d94b6096e232… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 19 10:14:31 2022 +0100 ntdll/tests: Enable compilation with long types in file.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 1467 ++++++++++++++++++++++++----------------------- 1 file changed, 734 insertions(+), 733 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9a130ccdb668d94b6096…

1 0

Eric Pouech : winedbg: Get rid of dbg_outputW helper.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: 0046d6eccca704c80f95bfc2e74f39410c85d297 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0046d6eccca704c80f95bfc2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 18 17:25:24 2022 +0100 winedbg: Get rid of dbg_outputW helper. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debugger.h | 1 - programs/winedbg/memory.c | 6 +----- programs/winedbg/winedbg.c | 7 ------- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 0cc2f8b7a6c..b7dcde201d8 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -501,7 +501,6 @@ extern BOOL types_is_integral_type(const struct dbg_lvalue*); extern BOOL types_is_float_type(const struct dbg_lvalue*); /* winedbg.c */ -extern void dbg_outputW(const WCHAR* buffer, int len); extern const char* dbg_W2A(const WCHAR* buffer, unsigned len); #ifdef __GNUC__ extern int WINAPIV dbg_printf(const char* format, ...) __attribute__((format (printf,1,2))); diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index faa5ac9ddcb..208526739e2 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -641,7 +641,6 @@ void print_basic(const struct dbg_lvalue* lvalue, char format) { unsigned size; dbg_lgint_t res = types_extract_as_lgint(lvalue, &size, NULL); - WCHAR wch; switch (format) { @@ -658,10 +657,7 @@ void print_basic(const struct dbg_lvalue* lvalue, char format) return; case 'u': - wch = (WCHAR)(res & 0xFFFF); - dbg_printf("%d = '", wch); - dbg_outputW(&wch, 1); - dbg_printf("'"); + dbg_printf("%d = '%lc'", (WCHAR)(res & 0xFFFF), (WCHAR)(res & 0xFFFF)); return; case 'i': diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 89fb265fc93..dc6355be4cd 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -135,13 +135,6 @@ const char* dbg_W2A(const WCHAR* buffer, unsigned len) return ansi; } -void dbg_outputW(const WCHAR* buffer, int len) -{ - const char* ansi = dbg_W2A(buffer, len); - if (ansi) dbg_outputA(ansi, strlen(ansi)); - /* FIXME: should CP_ACP be GetConsoleCP()? */ -} - int WINAPIV dbg_printf(const char* format, ...) { static char buf[4*1024];

1 0

Hans Leidekker : bcrypt: Merge the various key export Unix calls into one.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: c1ed9ca9b18267b2139fcf7fd68f24d2c6d7a2a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1ed9ca9b18267b2139fcf7f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 21 09:50:08 2022 +0100 bcrypt: Merge the various key export Unix calls into one. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 10 +- dlls/bcrypt/bcrypt_main.c | 46 +++--- dlls/bcrypt/gnutls.c | 336 +++++++++++++++++++++++++++++++----------- 3 files changed, 277 insertions(+), 115 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c1ed9ca9b18267b2139f…

1 0

Zebediah Figura : tests: Rename struct d3d12_shader_context to struct d3d12_shader_runner.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: vkd3d Branch: master Commit: 39459d6c3e90c3cbc070937cb22142fdf96ee104 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=39459d6c3e90c3cbc070937… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Mar 19 12:35:32 2022 -0500 tests: Rename struct d3d12_shader_context to struct d3d12_shader_runner. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner_d3d12.c | 62 ++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index eec9582c..a6db29ff 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -38,18 +38,18 @@ static struct d3d12_texture *d3d12_texture(struct texture *t) return CONTAINING_RECORD(t, struct d3d12_texture, t); } -struct d3d12_shader_context +struct d3d12_shader_runner { - struct shader_runner c; + struct shader_runner r; struct test_context test_context; ID3D12DescriptorHeap *heap; }; -static struct d3d12_shader_context *d3d12_shader_context(struct shader_runner *r) +static struct d3d12_shader_runner *d3d12_shader_runner(struct shader_runner *r) { - return CONTAINING_RECORD(r, struct d3d12_shader_context, c); + return CONTAINING_RECORD(r, struct d3d12_shader_runner, r); } static ID3D10Blob *compile_shader(const char *source, enum shader_model shader_model) @@ -82,14 +82,14 @@ static ID3D10Blob *compile_shader(const char *source, enum shader_model shader_m static struct texture *d3d12_runner_create_texture(struct shader_runner *r, const struct texture_params *params) { - struct d3d12_shader_context *context = d3d12_shader_context(r); - struct test_context *test_context = &context->test_context; + struct d3d12_shader_runner *runner = d3d12_shader_runner(r); + struct test_context *test_context = &runner->test_context; ID3D12Device *device = test_context->device; D3D12_SUBRESOURCE_DATA resource_data; struct d3d12_texture *texture; - if (!context->heap) - context->heap = create_gpu_descriptor_heap(device, + if (!runner->heap) + runner->heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, MAX_RESOURCE_DESCRIPTORS); if (params->slot >= MAX_RESOURCE_DESCRIPTORS) @@ -108,7 +108,7 @@ static struct texture *d3d12_runner_create_texture(struct shader_runner *r, cons transition_resource_state(test_context->list, texture->resource, D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); ID3D12Device_CreateShaderResourceView(device, texture->resource, - NULL, get_cpu_descriptor_handle(test_context, context->heap, params->slot)); + NULL, get_cpu_descriptor_handle(test_context, runner->heap, params->slot)); return &texture->t; } @@ -123,8 +123,8 @@ static void d3d12_runner_destroy_texture(struct shader_runner *r, struct texture static void d3d12_runner_draw_quad(struct shader_runner *r) { - struct d3d12_shader_context *context = d3d12_shader_context(r); - struct test_context *test_context = &context->test_context; + struct d3d12_shader_runner *runner = d3d12_shader_runner(r); + struct test_context *test_context = &runner->test_context; ID3D12GraphicsCommandList *command_list = test_context->list; D3D12_ROOT_SIGNATURE_DESC root_signature_desc = {0}; @@ -140,7 +140,7 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) HRESULT hr; size_t i; - if (!(ps_code = compile_shader(context->c.ps_source, context->c.minimum_shader_model))) + if (!(ps_code = compile_shader(runner->r.ps_source, runner->r.minimum_shader_model))) return; root_signature_desc.NumParameters = 0; @@ -148,20 +148,20 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) root_signature_desc.NumStaticSamplers = 0; root_signature_desc.pStaticSamplers = static_samplers; - if (context->c.uniform_count) + if (runner->r.uniform_count) { uniform_index = root_signature_desc.NumParameters++; root_param = &root_params[uniform_index]; root_param->ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS; root_param->Constants.ShaderRegister = 0; root_param->Constants.RegisterSpace = 0; - root_param->Constants.Num32BitValues = context->c.uniform_count; + root_param->Constants.Num32BitValues = runner->r.uniform_count; root_param->ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; } - for (i = 0; i < context->c.texture_count; ++i) + for (i = 0; i < runner->r.texture_count; ++i) { - struct d3d12_texture *texture = d3d12_texture(context->c.textures[i]); + struct d3d12_texture *texture = d3d12_texture(runner->r.textures[i]); D3D12_DESCRIPTOR_RANGE *range; range = &texture->descriptor_range; @@ -182,10 +182,10 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) assert(root_signature_desc.NumParameters <= ARRAY_SIZE(root_params)); - for (i = 0; i < context->c.sampler_count; ++i) + for (i = 0; i < runner->r.sampler_count; ++i) { D3D12_STATIC_SAMPLER_DESC *sampler_desc = &static_samplers[root_signature_desc.NumStaticSamplers++]; - const struct sampler *sampler = &context->c.samplers[i]; + const struct sampler *sampler = &runner->r.samplers[i]; memset(sampler_desc, 0, sizeof(*sampler_desc)); sampler_desc->Filter = sampler->filter; @@ -214,15 +214,15 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) test_context->pso[test_context->pso_count++] = pso; ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, test_context->root_signature); - if (context->c.uniform_count) + if (runner->r.uniform_count) ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, uniform_index, - context->c.uniform_count, context->c.uniforms, 0); - for (i = 0; i < context->c.texture_count; ++i) + runner->r.uniform_count, runner->r.uniforms, 0); + for (i = 0; i < runner->r.texture_count; ++i) { - struct d3d12_texture *texture = d3d12_texture(context->c.textures[i]); + struct d3d12_texture *texture = d3d12_texture(runner->r.textures[i]); ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, texture->root_index, - get_gpu_descriptor_handle(test_context, context->heap, texture->t.slot)); + get_gpu_descriptor_handle(test_context, runner->heap, texture->t.slot)); } ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &test_context->rtv, false, NULL); @@ -246,8 +246,8 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) static void d3d12_runner_probe_vec4(struct shader_runner *r, const RECT *rect, const struct vec4 *v, unsigned int ulps) { - struct d3d12_shader_context *context = d3d12_shader_context(r); - struct test_context *test_context = &context->test_context; + struct d3d12_shader_runner *runner = d3d12_shader_runner(r); + struct test_context *test_context = &runner->test_context; struct resource_readback rb; get_texture_readback_with_command_list(test_context->render_target, 0, &rb, @@ -274,16 +274,16 @@ void run_shader_tests_d3d12(int argc, char **argv) .no_root_signature = true, .rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT, }; - struct d3d12_shader_context context = {0}; + struct d3d12_shader_runner runner = {0}; parse_args(argc, argv); enable_d3d12_debug_layer(argc, argv); init_adapter_info(); - init_test_context(&context.test_context, &desc); + init_test_context(&runner.test_context, &desc); - run_shader_tests(&context.c, argc, argv, &d3d12_runner_ops); + run_shader_tests(&runner.r, argc, argv, &d3d12_runner_ops); - if (context.heap) - ID3D12DescriptorHeap_Release(context.heap); - destroy_test_context(&context.test_context); + if (runner.heap) + ID3D12DescriptorHeap_Release(runner.heap); + destroy_test_context(&runner.test_context); }

1 0

Zebediah Figura : tests: Use a macro to define the render target size.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: vkd3d Branch: master Commit: 099df706f08200c63a10f0774aba8a52f88c5376 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=099df706f08200c63a10f07… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Mar 19 12:35:34 2022 -0500 tests: Use a macro to define the render target size. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner.c | 2 +- tests/shader_runner.h | 3 +++ tests/shader_runner_d3d11.c | 12 ++++++------ tests/shader_runner_d3d12.c | 4 ++-- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index d68d7f18..910e6ecd 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -293,7 +293,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) } else if (match_string(line, "probe all rgba", &line)) { - static const RECT rect = {0, 0, 640, 480}; + static const RECT rect = {0, 0, RENDER_TARGET_WIDTH, RENDER_TARGET_HEIGHT}; unsigned int ulps; struct vec4 v; int ret; diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 84c17016..26fa2367 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -24,6 +24,9 @@ #include "vkd3d_common.h" #include "utils.h" +#define RENDER_TARGET_WIDTH 640 +#define RENDER_TARGET_HEIGHT 480 + enum shader_model { SHADER_MODEL_2_0, diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index 0a8e0efe..884d86af 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -241,8 +241,8 @@ static IDXGISwapChain *create_swapchain(ID3D11Device *device, HWND window) ok(hr == S_OK, "Failed to get factory, hr %#lx.\n", hr); IDXGIAdapter_Release(adapter); - dxgi_desc.BufferDesc.Width = 640; - dxgi_desc.BufferDesc.Height = 480; + dxgi_desc.BufferDesc.Width = RENDER_TARGET_WIDTH; + dxgi_desc.BufferDesc.Height = RENDER_TARGET_HEIGHT; dxgi_desc.BufferDesc.RefreshRate.Numerator = 60; dxgi_desc.BufferDesc.RefreshRate.Denominator = 1; dxgi_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; @@ -268,8 +268,8 @@ static BOOL init_test_context(struct d3d11_shader_runner *runner) { const D3D11_TEXTURE2D_DESC texture_desc = { - .Width = 640, - .Height = 480, + .Width = RENDER_TARGET_WIDTH, + .Height = RENDER_TARGET_HEIGHT, .MipLevels = 1, .ArraySize = 1, .Format = DXGI_FORMAT_R32G32B32A32_FLOAT, @@ -290,8 +290,8 @@ static BOOL init_test_context(struct d3d11_shader_runner *runner) return FALSE; } - rt_width = 640; - rt_height = 480; + rt_width = RENDER_TARGET_WIDTH; + rt_height = RENDER_TARGET_HEIGHT; SetRect(&rect, 0, 0, rt_width, rt_height); AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); runner->window = CreateWindowA("static", "d3dcompiler_test", WS_OVERLAPPEDWINDOW, diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index a6db29ff..4f077b38 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -269,8 +269,8 @@ void run_shader_tests_d3d12(int argc, char **argv) { static const struct test_context_desc desc = { - .rt_width = 640, - .rt_height = 480, + .rt_width = RENDER_TARGET_WIDTH, + .rt_height = RENDER_TARGET_HEIGHT, .no_root_signature = true, .rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT, };

1 0

Zebediah Figura : tests: Rename struct d3d11_shader_context to struct d3d11_shader_runner.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: vkd3d Branch: master Commit: e5be178fe2a0a3964eb676d0491e3a73c4370902 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e5be178fe2a0a3964eb676d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Mar 19 12:35:33 2022 -0500 tests: Rename struct d3d11_shader_context to struct d3d11_shader_runner. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner_d3d11.c | 114 ++++++++++++++++++++++---------------------- 1 file changed, 57 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=e5be178fe2a0a3964eb…

1 0

Zebediah Figura : tests: Rename struct shader_context to struct shader_runner.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: vkd3d Branch: master Commit: 5841e79102f400839c46462b17e575a7ff399d58 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5841e79102f400839c46462… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Mar 19 12:35:31 2022 -0500 tests: Rename struct shader_context to struct shader_runner. This is a bit clearer, and avoids colliding with other things named "context", e.g. struct test_context, or d3d11 device contexts. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner.c | 90 ++++++++++++++++++++++----------------------- tests/shader_runner.h | 12 +++--- tests/shader_runner_d3d11.c | 20 +++++----- tests/shader_runner_d3d12.c | 20 +++++----- 4 files changed, 71 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=5841e79102f400839c4…

1 0

Zebediah Figura : tests: Remove NULL rect handling from d3d11_runner_probe_vec4().
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: vkd3d Branch: master Commit: 71db328d38899237a788357e6c80870d438d644a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=71db328d38899237a788357… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Mar 19 12:35:35 2022 -0500 tests: Remove NULL rect handling from d3d11_runner_probe_vec4(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner_d3d11.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index 884d86af..c077718c 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -494,8 +494,6 @@ static void d3d11_runner_draw_quad(struct shader_runner *r) struct resource_readback { - uint64_t width; - unsigned int height; ID3D11Resource *resource; D3D11_MAPPED_SUBRESOURCE map_desc; }; @@ -516,9 +514,6 @@ static void init_readback(struct d3d11_shader_runner *runner, struct resource_re ID3D11DeviceContext_CopyResource(runner->immediate_context, rb->resource, (ID3D11Resource *)runner->rt); hr = ID3D11DeviceContext_Map(runner->immediate_context, rb->resource, 0, D3D11_MAP_READ, 0, &rb->map_desc); ok(hr == S_OK, "Failed to map texture, hr %#lx.\n", hr); - - rb->width = texture_desc.Width; - rb->height = texture_desc.Height; } static void release_readback(struct d3d11_shader_runner *runner, struct resource_readback *rb) @@ -535,17 +530,13 @@ static const struct vec4 *get_readback_vec4(struct resource_readback *rb, unsign static void check_readback_data_vec4(struct resource_readback *rb, const RECT *rect, const struct vec4 *expected, unsigned int max_diff) { - RECT r = {0, 0, rb->width, rb->height}; unsigned int x = 0, y = 0; struct vec4 got = {0}; bool all_match = true; - if (rect) - r = *rect; - - for (y = r.top; y < r.bottom; ++y) + for (y = rect->top; y < rect->bottom; ++y) { - for (x = r.left; x < r.right; ++x) + for (x = rect->left; x < rect->right; ++x) { got = *get_readback_vec4(rb, x, y); if (!compare_vec4(&got, expected, max_diff))

1 0

Dmitry Timoshkov : sc: Don't silently fail when something doesn't work as expected.
by Alexandre Julliard March 18, 2022

March 18, 2022

Module: wine Branch: master Commit: 1447872b0c993113b7bd8215967a502e7aa644e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1447872b0c993113b7bd8215… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 18 17:10:52 2022 +0300 sc: Don't silently fail when something doesn't work as expected. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/sc/sc.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index bd3064da2d8..4e642874237 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -207,7 +207,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } if (!parse_create_params( argc - 3, argv + 3, &cp )) { - WINE_WARN("failed to parse create parameters\n"); + WINE_ERR("failed to parse create parameters\n"); CloseServiceHandle( manager ); return 1; } @@ -219,7 +219,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) CloseServiceHandle( service ); ret = TRUE; } - else WINE_TRACE("failed to create service %lu\n", GetLastError()); + else WINE_ERR("failed to create service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"description" )) { @@ -229,10 +229,10 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) SERVICE_DESCRIPTIONW sd; sd.lpDescription = argc > 3 ? (WCHAR *)argv[3] : NULL; ret = ChangeServiceConfig2W( service, SERVICE_CONFIG_DESCRIPTION, &sd ); - if (!ret) WINE_TRACE("failed to set service description %lu\n", GetLastError()); + if (!ret) WINE_ERR("failed to set service description %lu\n", GetLastError()); CloseServiceHandle( service ); } - else WINE_TRACE("failed to open service %lu\n", GetLastError()); + else WINE_ERR("failed to open service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"failure" )) { @@ -247,10 +247,10 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) HeapFree( GetProcessHeap(), 0, sfa.lpsaActions ); } else - WINE_WARN("failed to parse failure parameters\n"); + WINE_ERR("failed to parse failure parameters\n"); CloseServiceHandle( service ); } - else WINE_TRACE("failed to open service %lu\n", GetLastError()); + else WINE_ERR("failed to open service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"delete" )) { @@ -261,7 +261,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (!ret) WINE_TRACE("failed to delete service %lu\n", GetLastError()); CloseServiceHandle( service ); } - else WINE_TRACE("failed to open service %lu\n", GetLastError()); + else WINE_ERR("failed to open service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"start" )) { @@ -272,7 +272,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (!ret) WINE_TRACE("failed to start service %lu\n", GetLastError()); CloseServiceHandle( service ); } - else WINE_TRACE("failed to open service %lu\n", GetLastError()); + else WINE_ERR("failed to open service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"stop" )) { @@ -283,7 +283,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (!ret) WINE_TRACE("failed to stop service %lu\n", GetLastError()); CloseServiceHandle( service ); } - else WINE_TRACE("failed to open service %lu\n", GetLastError()); + else WINE_ERR("failed to open service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"sdset" )) {

1 0