- wine-devel - winehq.org

[PATCH v2] ddraw/tests: Add tests for alpha component in surface format conversions.
by Paul Gofman 07 Nov '19

07 Nov '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: - disable tests which give different results on AMD and Nvidia; - fixed "got" / "expected" and formatting in results mismatch trace. dlls/ddraw/tests/ddraw7.c | 276 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 276 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 279263fe37..13ddf623ee 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16475,6 +16475,281 @@ static void test_d32_support(void) DestroyWindow(window); } +static void test_surface_format_conversion_alpha(void) +{ + static const unsigned int rgba_data[4 * 4] = + { + 0xff00ff00, 0xff0000ff, 0xff0000ff, 0xff0000ff, + 0xff0000ff, 0xff00ff00, 0xff0000ff, 0xff0000ff, + 0xff00ff00, 0xff0000ff, 0xff00ff00, 0xff0000ff, + 0xff00ff00, 0xff0000ff, 0xff0000ff, 0xff00ff00, + }; + static const unsigned int rgbx_data[4 * 4] = + { + 0x0000ff00, 0x000000ff, 0x000000ff, 0x000000ff, + 0x000000ff, 0x0000ff00, 0x000000ff, 0x000000ff, + 0x0000ff00, 0x000000ff, 0x0000ff00, 0x000000ff, + 0x0000ff00, 0x000000ff, 0x000000ff, 0x0000ff00, + }; + static const unsigned short int r5g6b5_data[4 * 4] = + { + 0x07e0, 0x001f, 0x001f, 0x001f, + 0x001f, 0x07e0, 0x001f, 0x001f, + 0x07e0, 0x001f, 0x07e0, 0x001f, + 0x07e0, 0x001f, 0x001f, 0x07e0, + }; + static const unsigned short int r5g5b5x1_data[4 * 4] = + { + 0x03e0, 0x001f, 0x001f, 0x001f, + 0x001f, 0x03e0, 0x001f, 0x001f, + 0x03e0, 0x001f, 0x03e0, 0x001f, + 0x03e0, 0x001f, 0x001f, 0x03e0, + }; + static const unsigned short int r5g5b5a1_data[4 * 4] = + { + 0x83e0, 0x801f, 0x801f, 0x801f, + 0x801f, 0x83e0, 0x801f, 0x801f, + 0x83e0, 0x801f, 0x83e0, 0x801f, + 0x83e0, 0x801f, 0x801f, 0x83e0, + }; + static const unsigned int dxt1_data[8] = + { + 0x001f07e0, 0x14445154, + }; + static const unsigned int dxt2_data[16] = + { + 0xffffffff, 0xffffffff, 0x001f07e0, 0x14445154, + }; + + enum test_format_id + { + FMT_RGBA, + FMT_RGBX, + FMT_R5G6B5, + FMT_R5G5B5X1, + FMT_R5G5B5A1, + FMT_DXT1, + FMT_DXT2, + FMT_DXT3, + }; + + static const struct test_format + { + DDPIXELFORMAT fmt; + const char *name; + unsigned int block_size, x_blocks, y_blocks; + DWORD support_flag; + } + formats[] = + { + { + { + sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, + {32}, {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0xff000000} + }, + "RGBA", 4, 4, 4, + }, + { + { + sizeof(DDPIXELFORMAT), DDPF_RGB, 0, + {32}, {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0x00000000} + }, + "RGBX", 4, 4, 4, + }, + { + { + sizeof(DDPIXELFORMAT), DDPF_RGB, 0, + {16}, {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000} + }, + "R5G6B5", 2, 4, 4, + }, + { + { + sizeof(DDPIXELFORMAT), DDPF_RGB, 0, + {16}, {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00000000} + }, + "R5G5B5X1", 2, 4, 4, + }, + { + { + sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, + {16}, {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00008000} + }, + "R5G5B5A1", 2, 4, 4, + }, + { + { + sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', 'T', '1'), + {0}, {0}, {0}, {0}, {0} + }, + "DXT1", 8, 1, 1, SUPPORT_DXT1, + }, + { + { + sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', 'T', '2'), + {0}, {0}, {0}, {0}, {0} + }, + "DXT2", 16, 1, 1, SUPPORT_DXT2, + }, + { + { + sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', 'T', '3'), + {0}, {0}, {0}, {0}, {0} + }, + "DXT3", 16, 1, 1, SUPPORT_DXT3, + }, + }; + + static const struct + { + enum test_format_id src_format; + const void *src_data; + enum test_format_id dst_format; + const void *expected_data; + BOOL todo; + } + tests[] = + { +#if 0 + /* The following 3 tests give different results on AMD and NVIDIA on Windows, disabling. */ + {FMT_RGBX, rgbx_data, FMT_RGBA, rgba_data}, + {FMT_RGBA, rgba_data, FMT_RGBX, rgbx_data}, + {FMT_R5G5B5X1, r5g5b5x1_data, FMT_RGBA, rgba_data}, +#endif + {FMT_R5G6B5, r5g6b5_data, FMT_RGBA, rgba_data}, + {FMT_R5G6B5, r5g6b5_data, FMT_R5G5B5A1, r5g5b5a1_data}, + {FMT_R5G5B5X1, r5g5b5x1_data, FMT_R5G5B5A1, r5g5b5x1_data, TRUE}, + {FMT_R5G5B5A1, r5g5b5a1_data, FMT_R5G6B5, r5g6b5_data}, + {FMT_RGBA, rgba_data, FMT_DXT1, dxt1_data}, + {FMT_RGBX, rgbx_data, FMT_DXT1, dxt1_data, TRUE}, + {FMT_RGBA, rgba_data, FMT_DXT2, dxt2_data}, + {FMT_RGBX, rgbx_data, FMT_DXT2, dxt2_data, TRUE}, + {FMT_RGBA, rgba_data, FMT_DXT3, dxt2_data}, + {FMT_RGBX, rgbx_data, FMT_DXT3, dxt2_data, TRUE}, + {FMT_DXT1, dxt1_data, FMT_DXT2, dxt2_data, TRUE}, + {FMT_DXT1, dxt1_data, FMT_RGBA, rgba_data}, + {FMT_DXT1, dxt1_data, FMT_RGBX, rgba_data}, + {FMT_DXT3, dxt2_data, FMT_RGBA, rgba_data}, + {FMT_DXT3, dxt2_data, FMT_RGBX, rgba_data}, + }; + + const struct test_format *src_format, *dst_format; + IDirectDrawSurface7 *src_surf, *dst_surf; + DDSURFACEDESC2 surface_desc, lock; + unsigned int i, x, y, pitch; + IDirect3DDevice7 *device; + DWORD supported_fmts; + IDirectDraw7 *ddraw; + ULONG refcount; + HWND window; + BOOL passed; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_EnumTextureFormats(device, test_block_formats_creation_cb, + &supported_fmts); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + surface_desc.dwWidth = 4; + surface_desc.dwHeight = 4; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + src_format = &formats[tests[i].src_format]; + dst_format = &formats[tests[i].dst_format]; + + if (~supported_fmts & dst_format->support_flag) + { + skip("%s format is not supported, skipping test %u.\n", dst_format->name, i); + continue; + } + if (~supported_fmts & src_format->support_flag) + { + skip("%s format is not supported, skipping test %u.\n", src_format->name, i); + continue; + } + + U4(surface_desc).ddpfPixelFormat = src_format->fmt; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &src_surf, NULL); + ok(hr == DD_OK, "Test %u, got unexpected hr %#x.\n", i, hr); + + U4(surface_desc).ddpfPixelFormat = dst_format->fmt; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &dst_surf, NULL); + ok(hr == DD_OK, "Test %u, got unexpected hr %#x.\n", i, hr); + + memset(&lock, 0, sizeof(lock)); + lock.dwSize = sizeof(lock); + hr = IDirectDrawSurface7_Lock(src_surf, NULL, &lock, 0, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + pitch = U1(lock).lPitch; + for (y = 0; y < src_format->y_blocks; ++y) + memcpy((BYTE*)lock.lpSurface + y * pitch, + (BYTE *)tests[i].src_data + y * src_format->x_blocks * src_format->block_size, + src_format->block_size * src_format->x_blocks); + hr = IDirectDrawSurface7_Unlock(src_surf, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDrawSurface7_Blt(dst_surf, NULL, src_surf, NULL, DDBLT_WAIT, NULL); + ok(hr == DD_OK, "Test %s -> %s, got unexpected hr %#x.\n", + src_format->name, dst_format->name, hr); + + memset(&lock, 0, sizeof(lock)); + lock.dwSize = sizeof(lock); + hr = IDirectDrawSurface7_Lock(dst_surf, NULL, &lock, 0, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + pitch = U1(lock).lPitch; + + for (y = 0; y < dst_format->y_blocks; ++y) + { + const void *expected_data = tests[i].expected_data; + + passed = !memcmp((BYTE*)lock.lpSurface + y * pitch, + (BYTE *)expected_data + y * dst_format->x_blocks * dst_format->block_size, + dst_format->block_size * dst_format->x_blocks); + todo_wine_if(tests[i].todo) + ok(passed, "Test %s -> %s, row %u, unexpected surface data.\n", + src_format->name, dst_format->name, y); + + if (!passed && !(!strcmp(winetest_platform, "wine") && tests[i].todo)) + { + for (x = 0; x < dst_format->x_blocks * dst_format->block_size / 4; ++x) + trace("Test %u, x %u, y %u, got 0x%08x, expected 0x%08x.\n", i, x, y, + *(unsigned int *)((BYTE *)lock.lpSurface + y * pitch + x * 4), + *(unsigned int *)((BYTE *)expected_data + y * dst_format->x_blocks + * dst_format->block_size + x * 4)); + } + if (!passed) + break; + } + hr = IDirectDrawSurface7_Unlock(dst_surf, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface7_Release(dst_surf); + IDirectDrawSurface7_Release(src_surf); + } + + IDirect3DDevice7_Release(device); + refcount = IDirectDraw7_Release(ddraw); + ok(!refcount, "%u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -16623,4 +16898,5 @@ START_TEST(ddraw7) test_begin_end_state_block(); test_caps(); test_d32_support(); + test_surface_format_conversion_alpha(); } -- 2.23.0

3 2

[PATCH] user32: Implement case of pointSize == 0x7fff.
by katahiromz . 07 Nov '19

07 Nov '19

See attachment.

2 1

[v4 PATCH 1/2] comctl32/edit: In EM_POSFROMCHAR return correct position for empty lines
by Nikolay Sivov 07 Nov '19

07 Nov '19

From: Fabian Maurer <dark.shadow4(a)web.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47305 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/edit.c | 6 +----- dlls/comctl32/tests/edit.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index bdd3b72558..d02d7af7b9 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -1038,12 +1038,8 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) lw = line_def->width; w = es->format_rect.right - es->format_rect.left; if (line_def->ssa) - { ScriptStringCPtoX(line_def->ssa, (index - 1) - li, TRUE, &x); - x -= es->x_offset; - } - else - x = es->x_offset; + x -= es->x_offset; if (es->style & ES_RIGHT) x = w - (lw - x); diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 3fe208c321..cec6025077 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1189,6 +1189,8 @@ static void test_char_from_pos(void) { int lo, hi, mid, ret, i; HWND hwEdit; + HDC dc; + SIZE size; hwEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa"); @@ -1321,6 +1323,24 @@ static void test_char_from_pos(void) ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); ok(-1 == ret, "expected -1 got %d\n", ret); DestroyWindow(hwEdit); + + /* Scrolled to the right with partially visible line, position on next line. */ + hwEdit = create_editcontrol(ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + dc = GetDC(hwEdit); + GetTextExtentPoint32A(dc, "w", 1, &size); + ReleaseDC(hwEdit, dc); + + SetWindowPos(hwEdit, NULL, 0, 0, size.cx * 15, size.cy * 5, SWP_NOMOVE | SWP_NOZORDER); + SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"wwwwwwwwwwwwwwwwwwww\r\n\r\n"); + SendMessageA(hwEdit, EM_SETSEL, 40, 40); + + lo = (short)SendMessageA(hwEdit, EM_POSFROMCHAR, 22, 0); + ret = (short)SendMessageA(hwEdit, EM_POSFROMCHAR, 20, 0); + ret -= 20 * size.cx; /* Calculate expected position, 20 characters back. */ + ok(ret == lo, "Unexpected position %d vs %d.\n", lo, ret); + + DestroyWindow(hwEdit); } /* Test if creating edit control without ES_AUTOHSCROLL and ES_AUTOVSCROLL -- 2.24.0.rc1

2 2

[PATCH v4 01/10] vbscript: Store global variables in an array.
by Gabriel Ivăncescu 07 Nov '19

07 Nov '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/vbscript/compile.c | 29 +++++++++++++++++++---------- dlls/vbscript/interp.c | 33 ++++++++++++++++++++++++++++++--- dlls/vbscript/vbdisp.c | 4 ++-- dlls/vbscript/vbscript.c | 9 +++++++-- dlls/vbscript/vbscript.h | 5 ++++- 5 files changed, 62 insertions(+), 18 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index e52b081..3f700a4 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1786,11 +1786,10 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) static BOOL lookup_script_identifier(script_ctx_t *script, const WCHAR *identifier) { class_desc_t *class; - dynamic_var_t *var; unsigned i; - for(var = script->global_vars; var; var = var->next) { - if(!wcsicmp(var->name, identifier)) + for(i = 0; i < script->global_vars_cnt; i++) { + if(!wcsicmp(script->global_vars[i]->name, identifier)) return TRUE; } @@ -1894,6 +1893,7 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli function_t *new_func, *func_iter; function_decl_t *func_decl; class_decl_t *class_decl; + dynamic_var_t *var_iter; compile_ctx_t ctx; vbscode_t *code; size_t cnt; @@ -1951,13 +1951,22 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli return compile_error(script, hres); } - if(ctx.global_vars) { - dynamic_var_t *var; - - for(var = ctx.global_vars; var->next; var = var->next); - - var->next = script->global_vars; - script->global_vars = ctx.global_vars; + cnt = script->global_vars_cnt; + for(var_iter = ctx.global_vars; var_iter; var_iter = var_iter->next) + cnt++; + if(cnt > script->global_vars_size) { + dynamic_var_t **new_vars; + if(script->global_vars) + new_vars = heap_realloc(script->global_vars, cnt * sizeof(*new_vars)); + else + new_vars = heap_alloc(cnt * sizeof(*new_vars)); + if(!new_vars) + return compile_error(script, E_OUTOFMEMORY); + script->global_vars = new_vars; + script->global_vars_size = cnt; + } + for(var_iter = ctx.global_vars; var_iter; var_iter = var_iter->next) { + script->global_vars[script->global_vars_cnt++] = var_iter; } cnt = script->global_funcs_cnt; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 89f9d35..7076d21 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -94,6 +94,22 @@ static BOOL lookup_dynamic_vars(dynamic_var_t *var, const WCHAR *name, ref_t *re return FALSE; } +static BOOL lookup_global_vars(script_ctx_t *script, const WCHAR *name, ref_t *ref) +{ + dynamic_var_t **vars = script->global_vars; + size_t i, cnt = script->global_vars_cnt; + + for(i = 0; i < cnt; i++) { + if(!wcsicmp(vars[i]->name, name)) { + ref->type = vars[i]->is_const ? REF_CONST : REF_VAR; + ref->u.v = &vars[i]->v; + return TRUE; + } + } + + return FALSE; +} + static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_t invoke_type, ref_t *ref) { named_item_t *item; @@ -159,7 +175,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } } - if(lookup_dynamic_vars(ctx->script->global_vars, name, ref)) + if(lookup_global_vars(ctx->script, name, ref)) return S_OK; for(i = 0; i < ctx->script->global_funcs_cnt; i++) { @@ -226,8 +242,19 @@ static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, V_VT(&new_var->v) = VT_EMPTY; if(ctx->func->type == FUNC_GLOBAL) { - new_var->next = ctx->script->global_vars; - ctx->script->global_vars = new_var; + size_t cnt = ctx->script->global_vars_cnt + 1; + if(cnt > ctx->script->global_vars_size) { + dynamic_var_t **new_vars; + if(ctx->script->global_vars) + new_vars = heap_realloc(ctx->script->global_vars, cnt * 2 * sizeof(*new_vars)); + else + new_vars = heap_alloc(cnt * 2 * sizeof(*new_vars)); + if(!new_vars) + return E_OUTOFMEMORY; + ctx->script->global_vars = new_vars; + ctx->script->global_vars_size = cnt * 2; + } + ctx->script->global_vars[ctx->script->global_vars_cnt++] = new_var; }else { new_var->next = ctx->dynamic_vars; ctx->dynamic_vars = new_var; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index a5ae40d..00e975e 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -675,7 +675,6 @@ static HRESULT WINAPI ScriptDisp_Invoke(IDispatchEx *iface, DISPID dispIdMember, static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); - dynamic_var_t *var; ident_map_t *ident; unsigned i; @@ -691,7 +690,8 @@ static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DW } } - for(var = This->ctx->global_vars; var; var = var->next) { + for(i = 0; i < This->ctx->global_vars_cnt; i++) { + dynamic_var_t *var = This->ctx->global_vars[i]; if(!wcsicmp(var->name, bstrName)) { ident = add_ident(This, var->name); if(!ident) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 886c9d0..6d2bb54 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -131,14 +131,19 @@ IDispatch *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned flag static void release_script(script_ctx_t *ctx) { class_desc_t *class_desc; + unsigned i; collect_objects(ctx); clear_ei(&ctx->ei); - release_dynamic_vars(ctx->global_vars); - ctx->global_vars = NULL; + for(i = 0; i < ctx->global_vars_cnt; i++) + VariantClear(&ctx->global_vars[i]->v); + heap_free(ctx->global_vars); heap_free(ctx->global_funcs); + ctx->global_vars = NULL; + ctx->global_vars_cnt = 0; + ctx->global_vars_size = 0; ctx->global_funcs = NULL; ctx->global_funcs_cnt = 0; ctx->global_funcs_size = 0; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 0bd1fce..1b20af8 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -187,11 +187,14 @@ struct _script_ctx_t { EXCEPINFO ei; + dynamic_var_t **global_vars; + size_t global_vars_cnt; + size_t global_vars_size; + function_t **global_funcs; size_t global_funcs_cnt; size_t global_funcs_size; - dynamic_var_t *global_vars; class_desc_t *classes; class_desc_t *procs; -- 2.21.0

2 12

[PATCH v2] ddraw: implement Pick() and GetPickRecords().
by MattKC 07 Nov '19

07 Nov '19

3 5

[PATCH] vbscript: Fix destroying safearrays in release_exec.
by Jacek Caban 07 Nov '19

07 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/interp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH v7] user32: Implement DM_REPOSITION message.
by katahiromz . 07 Nov '19

07 Nov '19

See attachment.

3 2

[PATCH] kernel32: Output a message in GetVolumeInformationW() when device has no read access.
by Paul Gofman 07 Nov '19

07 Nov '19

A lot of applications fail to install from CDs or mounted ISO images when Wine does not return correct volume label from GetVolumeInformation() repeatedly asking to insert correct disk. Most of the time it happens because the block device is read only for user (which is typical default behaviour) and FS info cannot be read. It looks like the hint about what went wrong will simplify things in this common case. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/kernel32/volume.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 2c8a668b73..f877d15647 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -772,8 +772,12 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, CloseHandle( handle ); goto fill_fs_info; } - else TRACE( "cannot open device %s: %x\n", debugstr_w(nt_name.Buffer), status ); - + else + { + TRACE( "cannot open device %s: %x\n", debugstr_w(nt_name.Buffer), status ); + if (status == STATUS_ACCESS_DENIED) + MESSAGE( "Read access denied for device %s, FS volume label and serial are not available.\n", debugstr_w(nt_name.Buffer) ); + } /* we couldn't open the device, fallback to default strategy */ if (!set_ntstatus( NtOpenFile( &handle, SYNCHRONIZE, &attr, &io, 0, -- 2.23.0

2 1

[PATCH v6] user32: Implement DM_REPOSITION message
by katahiromz . 07 Nov '19

07 Nov '19

See attachment.

2 1

[PATCH] comctl32/listbox: Do no limit item height to 255.
by Nikolay Sivov 07 Nov '19

07 Nov '19

From: Francois Gouget <fgouget(a)free.fr> The change happened between Windows 10 1607 and 1709 in comctl32 v6. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/listbox.c | 2 +- dlls/comctl32/tests/listbox.c | 22 +++++++++++++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index ab4c481aab..0d6dcd6a0b 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1280,7 +1280,7 @@ static LRESULT LISTBOX_GetItemHeight( const LB_DESCR *descr, INT index ) */ static LRESULT LISTBOX_SetItemHeight( LB_DESCR *descr, INT index, INT height, BOOL repaint ) { - if (height > MAXBYTE) + if (height > MAXWORD) return -1; if (!height) height = 1; diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 70e212892a..dc3b247fb6 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -769,11 +769,27 @@ static void test_listbox_height(void) r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); ok( r == 20, "height wrong\n"); + /* Before Windows 10 1709 (or 1703?) the item height was limited to 255. + * Since then, with comctl32 V6 the limit is 65535. + */ r = SendMessageA( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 256, 0 )); - ok( r == -1, "Failed to set item height, %d.\n", r); + ok(r == 0 || broken(r == -1), "Failed to set item height, %d.\n", r); + if (r == -1) + { + r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); + ok( r == 20, "Unexpected item height %d.\n", r); + } + else + { + r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); + ok( r == 256, "Unexpected item height %d.\n", r); - r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); - ok( r == 20, "Unexpected item height %d.\n", r); + r = SendMessageA( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 65535, 0 )); + ok(r == 0, "Failed to set item height, %d.\n", r); + + r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); + ok( r == 65535, "Unexpected item height %d.\n", r); + } r = SendMessageA( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 0xff, 0 )); ok( r == 0, "send message failed\n"); -- 2.24.0.rc1

1 0

[PATCH] xmllite: Update current pointer after reader_skipn call.
by Jacek Caban 07 Nov '19

07 Nov '19

The buffer may be reallocated. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/xmllite/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH v5] user32: Implement DM_REPOSITION message
by katahiromz . 07 Nov '19

07 Nov '19

See attachment.

2 1

[PATCH v2] user32/tests: Tests for DM_REPOSITION message
by katahiromz . 07 Nov '19

07 Nov '19

>user32: >dialog.c:1987: Test failed: dialog doesn't use message box font Why it failed? This is not related to message box.

1 0

[PATCH v2] user32/tests: Tests for DM_REPOSITION message
by katahiromz . 07 Nov '19

07 Nov '19

See attachment.

2 1

Re: [PATCH] user32: Implement DM_REPOSITION message
by Marvin 07 Nov '19

07 Nov '19

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=59376 Your paranoid android. === debian10 (64 bit WoW report) === user32: clipboard.c:833: Test failed: 2: gle 5 clipboard.c:838: Test failed: 2.0: got 0000 instead of 000d clipboard.c:868: Test failed: 2: gle 1418 clipboard.c:717: Test failed: 3: gle 5 clipboard.c:719: Test failed: 3: gle 1418 clipboard.c:746: Test failed: 3: count 5 clipboard.c:749: Test failed: 3: gle 1418 clipboard.c:755: Test failed: 3: 0003 not available clipboard.c:757: Test failed: 3: count 5 instead of 2 clipboard.c:760: Test failed: 3: gle 5 clipboard.c:765: Test failed: 3.0: got 0000 instead of 000e clipboard.c:805: Test failed: 3: gle 1418 clipboard.c:815: Test failed: 3: count 5 clipboard.c:818: Test failed: 3: gle 1418 clipboard.c:826: Test failed: 3: 0003 not available clipboard.c:828: Test failed: 3: count 5 instead of 2 clipboard.c:833: Test failed: 3: gle 5 clipboard.c:838: Test failed: 3.0: got 0000 instead of 000e clipboard.c:868: Test failed: 3: gle 1418 clipboard.c:717: Test failed: 4: gle 5 clipboard.c:719: Test failed: 4: gle 1418 clipboard.c:746: Test failed: 4: count 6 clipboard.c:749: Test failed: 4: gle 1418 clipboard.c:757: Test failed: 4: count 6 instead of 2 clipboard.c:760: Test failed: 4: gle 5 clipboard.c:765: Test failed: 4.0: got 0000 instead of 0003 clipboard.c:805: Test failed: 4: gle 1418 clipboard.c:815: Test failed: 4: count 6 clipboard.c:818: Test failed: 4: gle 1418 clipboard.c:828: Test failed: 4: count 6 instead of 2 clipboard.c:833: Test failed: 4: gle 5 clipboard.c:838: Test failed: 4.0: got 0000 instead of 0003 clipboard.c:868: Test failed: 4: gle 1418 clipboard.c:717: Test failed: 5: gle 5 clipboard.c:719: Test failed: 5: gle 1418 clipboard.c:746: Test failed: 5: count 7 clipboard.c:749: Test failed: 5: gle 1418 clipboard.c:755: Test failed: 5: 0008 not available clipboard.c:755: Test failed: 5: 0011 not available clipboard.c:757: Test failed: 5: count 7 instead of 3 clipboard.c:760: Test failed: 5: gle 5 clipboard.c:765: Test failed: 5.0: got 0000 instead of 0002 clipboard.c:805: Test failed: 5: gle 1418 clipboard.c:815: Test failed: 5: count 7 clipboard.c:818: Test failed: 5: gle 1418 clipboard.c:826: Test failed: 5: 0008 not available clipboard.c:826: Test failed: 5: 0011 not available clipboard.c:828: Test failed: 5: count 7 instead of 3 clipboard.c:833: Test failed: 5: gle 5 clipboard.c:838: Test failed: 5.0: got 0000 instead of 0002 clipboard.c:868: Test failed: 5: gle 1418 clipboard.c:717: Test failed: 6: gle 5 clipboard.c:719: Test failed: 6: gle 1418 clipboard.c:746: Test failed: 6: count 8 clipboard.c:749: Test failed: 6: gle 1418 clipboard.c:755: Test failed: 6: 0011 not available clipboard.c:757: Test failed: 6: count 8 instead of 3 clipboard.c:760: Test failed: 6: gle 5 clipboard.c:765: Test failed: 6.0: got 0000 instead of 0008 clipboard.c:805: Test failed: 6: gle 1418 clipboard.c:815: Test failed: 6: count 8 clipboard.c:818: Test failed: 6: gle 1418 clipboard.c:826: Test failed: 6: 0011 not available clipboard.c:828: Test failed: 6: count 8 instead of 3 clipboard.c:833: Test failed: 6: gle 5 clipboard.c:838: Test failed: 6.0: got 0000 instead of 0008 clipboard.c:868: Test failed: 6: gle 1418 clipboard.c:717: Test failed: 7: gle 5 clipboard.c:719: Test failed: 7: gle 1418 clipboard.c:746: Test failed: 7: count 9 clipboard.c:749: Test failed: 7: gle 1418 clipboard.c:757: Test failed: 7: count 9 instead of 3 clipboard.c:760: Test failed: 7: gle 5 clipboard.c:765: Test failed: 7.0: got 0000 instead of 0011 clipboard.c:805: Test failed: 7: gle 1418 clipboard.c:815: Test failed: 7: count 9 clipboard.c:818: Test failed: 7: gle 1418 clipboard.c:828: Test failed: 7: count 9 instead of 3 clipboard.c:833: Test failed: 7: gle 5 clipboard.c:838: Test failed: 7.0: got 0000 instead of 0011 clipboard.c:868: Test failed: 7: gle 1418 clipboard.c:874: Test failed: gle 5 clipboard.c:876: Test failed: gle 1418 clipboard.c:878: Test failed: gle 1418

1 0

[PATCH v4] user32: Implement DM_REPOSITION message
by katahiromz . 07 Nov '19

07 Nov '19

See attachment.

2 1

[PATCH] user32/tests: Tests for DM_REPOSITION message
by katahiromz . 07 Nov '19

07 Nov '19

See attachment.

2 1

[PATCH] dmband: Handle the DirectX 7 version of DMUS_IO_INSTRUMENT structure.
by Alistair Leslie-Hughes 07 Nov '19

07 Nov '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmband/band.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 4338791971b..b6c22186cce 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -171,6 +171,10 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = { band_IDirectMusicObject_ParseDescriptor }; +#define CCSIZEOF_STRUCT(type,field) ((INT_PTR)&(((type *)0)->field) + sizeof(((type*)0)->field)) + +#define DMUS_IO_INSTRUMENT_DX7_SIZE CCSIZEOF_STRUCT(DMUS_IO_INSTRUMENT, dwChannelPriority) + /* IDirectMusicBandImpl IPersistStream part: */ static HRESULT parse_instrument(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) @@ -199,8 +203,14 @@ static HRESULT parse_instrument(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK * switch (Chunk.fccID) { case DMUS_FOURCC_INSTRUMENT_CHUNK: { TRACE_(dmfile)(": Instrument chunk\n"); - if (Chunk.dwSize != sizeof(DMUS_IO_INSTRUMENT)) return E_FAIL; - IStream_Read (pStm, &inst, sizeof(DMUS_IO_INSTRUMENT), NULL); + if (Chunk.dwSize != sizeof(DMUS_IO_INSTRUMENT) && Chunk.dwSize != DMUS_IO_INSTRUMENT_DX7_SIZE) { + ERR_(dmfile)("unexpected size %d\n", Chunk.dwSize); + return E_FAIL; + } + IStream_Read (pStm, &inst, Chunk.dwSize, NULL); + if (Chunk.dwSize != sizeof(DMUS_IO_INSTRUMENT)) + inst.nPitchBendRange = 0; + TRACE_(dmfile)(" - dwPatch: %u\n", inst.dwPatch); TRACE_(dmfile)(" - dwAssignPatch: %u\n", inst.dwAssignPatch); TRACE_(dmfile)(" - dwNoteRanges[0]: %u\n", inst.dwNoteRanges[0]); -- 2.24.0.rc1

1 0

[PATCH v3] user32: Implement DM_REPOSITION message
by katahiromz . 07 Nov '19

07 Nov '19

See attachment.

2 1

[PATCH resend] user32: Implement DM_REPOSITION message
by katahiromz . 07 Nov '19

07 Nov '19

See attachment.

3 2

[PATCH] user32: Implement DM_REPOSITION message
by katahiromz . 07 Nov '19

07 Nov '19

See attachment.

2 1

[PATCH resend 1/8] winebus.inf: Add new INF file and copy it to the INF directory.
by Zebediah Figura 07 Nov '19

07 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- loader/Makefile.in | 1 + loader/wine.inf.in | 1 + loader/winebus.inf.in | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 loader/winebus.inf.in diff --git a/loader/Makefile.in b/loader/Makefile.in index 3ada656408b..11a476103c1 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -10,6 +10,7 @@ SOURCES = \ wine.man.in \ wine.pl.UTF-8.man.in \ wine_info.plist.in \ + winebus.inf.in \ winehid.inf.in PROGRAMS = $(WINELOADER_PROGRAMS) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 6356081d82a..ae48ca7ca86 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3861,4 +3861,5 @@ inf_section = 17 l_intl.nls [inf_section] +winebus.inf winehid.inf diff --git a/loader/winebus.inf.in b/loader/winebus.inf.in new file mode 100644 index 00000000000..3950c3dfc4e --- /dev/null +++ b/loader/winebus.inf.in @@ -0,0 +1,22 @@ +[Version] +Signature="$CHICAGO$" +ClassGuid={4d36e97d-e325-11ce-bfc1-08002be10318} +Class=System + +[Manufacturer] +Wine=mfg_section + +[mfg_section] +Wine HID bus driver=device_section,root\winebus + +[device_section.Services] +AddService = winebus,0x2,svc_section + +[svc_section] +Description="Wine HID bus driver" +DisplayName="Wine HID bus" +ServiceBinary="%12%\winebus.sys" +LoadOrderGroup="WinePlugPlay" +ServiceType=1 +StartType=3 +ErrorControl=1 -- 2.23.0

1 7

[PATCH 1/2] kernel32/tests: Windows 10 dropped support for GetConsoleFontInfo().
by Francois Gouget 07 Nov '19

07 Nov '19

Windows 10 1507 still supports it but not 1607+. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- I don't know what's up with returning the low word of E_NOTIMPL rather than ERROR_CALL_NOT_IMPLEMENTED. Seemed better to write it that way than to use a magic 0x4001. Note that the SetConsoleFont() tests need the same treatment so there will still be 3 or so test failures on recent Windows 10. If this approach is validated I'll send a similar patch for SetConsoleFont(). dlls/kernel32/tests/console.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index f85cd44ca73..97bea44e195 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2865,6 +2865,14 @@ static void test_GetConsoleFontInfo(HANDLE std_output) SetLastError(0xdeadbeef); ret = pGetConsoleFontInfo(NULL, FALSE, 0, cfi); ok(!ret, "got %d, expected zero\n", ret); + if (GetLastError() == LOWORD(E_NOTIMPL) /* win10 1709+ */ || + broken(GetLastError() == ERROR_GEN_FAILURE) /* win10 1607 */) + { + skip("GetConsoleFontInfo is not implemented\n"); + SetConsoleScreenBufferSize(std_output, orig_sb_size); + HeapFree(GetProcessHeap(), 0, cfi); + return; + } todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); @@ -2887,14 +2895,11 @@ static void test_GetConsoleFontInfo(HANDLE std_output) memset(cfi, 0, memsize); ret = pGetConsoleFontInfo(std_output, FALSE, num_fonts, cfi); - todo_wine ok(ret || broken(!ret) /* win10 1809 */, "got %d, expected non-zero\n", ret); - if (ret) - { - todo_wine ok(cfi[index].dwFontSize.X == win_width, "got %d, expected %d\n", - cfi[index].dwFontSize.X, win_width); - todo_wine ok(cfi[index].dwFontSize.Y == win_height, "got %d, expected %d\n", - cfi[index].dwFontSize.Y, win_height); - } + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(cfi[index].dwFontSize.X == win_width, "got %d, expected %d\n", + cfi[index].dwFontSize.X, win_width); + todo_wine ok(cfi[index].dwFontSize.Y == win_height, "got %d, expected %d\n", + cfi[index].dwFontSize.Y, win_height); for (i = 0; i < num_fonts; i++) { @@ -2923,14 +2928,11 @@ static void test_GetConsoleFontInfo(HANDLE std_output) memset(cfi, 0, memsize); ret = pGetConsoleFontInfo(std_output, TRUE, num_fonts, cfi); - todo_wine ok(ret || broken(!ret) /* win10 1809 */, "got %d, expected non-zero\n", ret); - if (ret) - { - todo_wine ok(cfi[index].dwFontSize.X == csbi.dwMaximumWindowSize.X, "got %d, expected %d\n", - cfi[index].dwFontSize.X, csbi.dwMaximumWindowSize.X); - todo_wine ok(cfi[index].dwFontSize.Y == csbi.dwMaximumWindowSize.Y, "got %d, expected %d\n", - cfi[index].dwFontSize.Y, csbi.dwMaximumWindowSize.Y); - } + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(cfi[index].dwFontSize.X == csbi.dwMaximumWindowSize.X, "got %d, expected %d\n", + cfi[index].dwFontSize.X, csbi.dwMaximumWindowSize.X); + todo_wine ok(cfi[index].dwFontSize.Y == csbi.dwMaximumWindowSize.Y, "got %d, expected %d\n", + cfi[index].dwFontSize.Y, csbi.dwMaximumWindowSize.Y); for (i = 0; i < num_fonts; i++) { -- 2.20.1

3 3

[PATCH] ntdll: Fix a typo.
by Zebediah Figura 07 Nov '19

07 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Spotted by <programmerjake(a)gmail.com>. dlls/ntdll/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 03c0a206248..3224f76dc9c 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -372,7 +372,7 @@ static void set_wow64_environment( WCHAR **env ) static const WCHAR commondirW[] = {'C','o','m','m','o','n','F','i','l','e','s','D','i','r',0}; static const WCHAR commondir86W[] = {'C','o','m','m','o','n','F','i','l','e','s','D','i','r',' ','(','x','8','6',')',0}; static const WCHAR commonfilesW[] = {'C','o','m','m','o','n','P','r','o','g','r','a','m','F','i','l','e','s',0}; - static const WCHAR commonfiles86W[] = {'C','o','m','m','o','n','P','r','o','g','r','a','m','F','i','l','e','s','(','8','6',')',0}; + static const WCHAR commonfiles86W[] = {'C','o','m','m','o','n','P','r','o','g','r','a','m','F','i','l','e','s','(','x','8','6',')',0}; static const WCHAR commonw6432W[] = {'C','o','m','m','o','n','P','r','o','g','r','a','m','W','6','4','3','2',0}; static const WCHAR winedlldirW[] = {'W','I','N','E','D','L','L','D','I','R','%','u',0}; static const WCHAR winehomedirW[] = {'W','I','N','E','H','O','M','E','D','I','R',0}; -- 2.23.0

1 0

[PATCH 1/1] wininet: Ensure ssl_ctx are empty in case of error
by Roberto Pungartnik 06 Nov '19

06 Nov '19

2 2

[PATCH v2] dsdmo: Added dll
by Alistair Leslie-Hughes 06 Nov '19

06 Nov '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure | 2 ++ configure.ac | 1 + dlls/dsdmo/Makefile.in | 6 ++++ dlls/dsdmo/dsdmo.spec | 4 +++ dlls/dsdmo/main.c | 82 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 95 insertions(+) create mode 100644 dlls/dsdmo/Makefile.in create mode 100644 dlls/dsdmo/dsdmo.spec create mode 100644 dlls/dsdmo/main.c diff --git a/configure b/configure index 8ddfb4ecdd..d69d1ac4a3 100755 --- a/configure +++ b/configure @@ -1257,6 +1257,7 @@ enable_dpnlobby enable_dpvoice enable_dpwsockx enable_drmclien +enable_dsdmo enable_dsound enable_dsquery enable_dssenh @@ -20384,6 +20385,7 @@ wine_fn_config_makefile dlls/dpvoice enable_dpvoice wine_fn_config_makefile dlls/dpvoice/tests enable_tests wine_fn_config_makefile dlls/dpwsockx enable_dpwsockx wine_fn_config_makefile dlls/drmclien enable_drmclien +wine_fn_config_makefile dlls/dsdmo enable_dsdmo wine_fn_config_makefile dlls/dsound enable_dsound wine_fn_config_makefile dlls/dsound/tests enable_tests wine_fn_config_makefile dlls/dsquery enable_dsquery diff --git a/configure.ac b/configure.ac index 31aac11d31..c99db6984b 100644 --- a/configure.ac +++ b/configure.ac @@ -3237,6 +3237,7 @@ WINE_CONFIG_MAKEFILE(dlls/dpvoice) WINE_CONFIG_MAKEFILE(dlls/dpvoice/tests) WINE_CONFIG_MAKEFILE(dlls/dpwsockx) WINE_CONFIG_MAKEFILE(dlls/drmclien) +WINE_CONFIG_MAKEFILE(dlls/dsdmo) WINE_CONFIG_MAKEFILE(dlls/dsound) WINE_CONFIG_MAKEFILE(dlls/dsound/tests) WINE_CONFIG_MAKEFILE(dlls/dsquery) diff --git a/dlls/dsdmo/Makefile.in b/dlls/dsdmo/Makefile.in new file mode 100644 index 0000000000..99816ae0c0 --- /dev/null +++ b/dlls/dsdmo/Makefile.in @@ -0,0 +1,6 @@ +MODULE = dsdmo.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + main.c diff --git a/dlls/dsdmo/dsdmo.spec b/dlls/dsdmo/dsdmo.spec new file mode 100644 index 0000000000..b16365d0c9 --- /dev/null +++ b/dlls/dsdmo/dsdmo.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c new file mode 100644 index 0000000000..788381b7a4 --- /dev/null +++ b/dlls/dsdmo/main.c @@ -0,0 +1,82 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#define COBJMACROS + +#include "ole2.h" +#include "rpcproxy.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dsdmo); + +static HINSTANCE dsdmo_instance; + +/****************************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) +{ + TRACE("(%p %d %p)\n", inst, reason, reserved); + + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + dsdmo_instance = inst; + DisableThreadLibraryCalls(dsdmo_instance); + break; + } + + return TRUE; +} + +/*********************************************************************** + * DllGetClassObject + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllCanUnloadNow + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer + */ +HRESULT WINAPI DllRegisterServer(void) +{ + TRACE("()\n"); + return __wine_register_resources(dsdmo_instance); +} + +/*********************************************************************** + * DllUnregisterServer + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + TRACE("()\n"); + return __wine_unregister_resources(dsdmo_instance); +} -- 2.17.1

1 0

[PATCH 0/2] Add emulation for UMIP instructions
by Brendan Shanks 06 Nov '19

06 Nov '19

This patch adds emulation for instructions protected by User-Mode Instruction Prevention (currently implemented by AMD Ryzen 3000 CPUs and some rare Intel CPUs). Changes from previous RFC patch that was sent: emulation is now done from the signal handler rather than in an exception handler, and tests are included for every instruction and operand size/type. Brendan Shanks (2): ntdll: Add emulation for UMIP instructions ntdll/tests: Add tests for UMIP instructions dlls/ntdll/Makefile.in | 1 + dlls/ntdll/signal_i386.c | 6 + dlls/ntdll/signal_x86_64.c | 6 + dlls/ntdll/tests/Makefile.in | 1 + dlls/ntdll/tests/umip.c | 301 ++++++++++++++ dlls/ntdll/umip.c | 739 +++++++++++++++++++++++++++++++++++ dlls/ntdll/umip.h | 21 + 7 files changed, 1075 insertions(+) create mode 100644 dlls/ntdll/tests/umip.c create mode 100644 dlls/ntdll/umip.c create mode 100644 dlls/ntdll/umip.h -- 2.23.0

2 3

Ubuntu and Multiarch?
by Thales 06 Nov '19

06 Nov '19

Hello! I'm wondering it if it is possible to compile with mulitarch yet? I have Ubuntu 16.04, and have recently also installed Ubuntu 18.04. I noticed it says you can at the very top of this page, next to "NOTICE" : https://wiki.winehq.org/Building_Biarch_Wine_On_Ubuntu And says that you can't at the very bottom of this one under "Compiling WoW64":https://wiki.winehq.org/Ubuntu I'm assuming the second one is out of date? If I can, how do I supply the 32-bit dependencies in the 64-bit environment? Thanks!...John Alway

4 3

[PATCH] winex11.drv, winemac.drv: Only send WM_CANCELMODE if a menu is active.
by Rémi Bernon 06 Nov '19

06 Nov '19

From: Zebediah Figura <z.figura12(a)gmail.com> The ShowWindow(SW_SHOWMINIMIZED):overlapped test shows that the message should not be sent in general. The additional test -which doesn't pass yet on wine for other reasons- shows that we should still send the message if a menu is active. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This supersedes https://source.winehq.org/patches/data/172893. The other user32/tests patches in the series should still apply. Notes: While testing I could see some cases when WM_CANCELMODE is not sent on some Windows versions although a menu is open -and it then stays open- but it also depends on the cursor location and the previous keyboard events that have been sent, so it's not reliable at all. Moving the cursor on top of a window beforehand seems to give consistent results. dlls/user32/tests/msg.c | 71 ++++++++++++++++++++++++++++++++++++++- dlls/winemac.drv/window.c | 7 +++- dlls/winex11.drv/event.c | 8 ++++- 3 files changed, 83 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 477661ab623..59721056acd 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1927,6 +1927,41 @@ static const struct message WmSHOWNATopInvisible[] = { { 0 } }; +static const struct message WmTrackPopupMenuMinimizeWindow[] = { + { HCBT_CREATEWND, hook }, + { WM_ENTERMENULOOP, sent|wparam|lparam, TRUE, 0 }, + { WM_INITMENU, sent|lparam, 0, 0 }, + { WM_INITMENUPOPUP, sent|lparam, 0, 0 }, + { 0x0093, sent|optional }, + { 0x0094, sent|optional }, + { 0x0094, sent|optional }, + { WM_ENTERIDLE, sent|wparam, 2 }, + { HCBT_MINMAX, hook }, + { HCBT_SETFOCUS, hook }, + { WM_KILLFOCUS, sent|wparam, 0 }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent|wparam|optional, 1 }, + { WM_WINDOWPOSCHANGED, sent }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_GETTEXT, sent|optional }, + { WM_NCCALCSIZE, sent|wparam|optional, 1 }, + { WM_CANCELMODE, sent }, + { WM_CAPTURECHANGED, sent|defwinproc }, + { HCBT_DESTROYWND, hook }, + { WM_UNINITMENUPOPUP, sent|defwinproc|lparam, 0, 0 }, + { WM_MENUSELECT, sent|defwinproc|wparam|lparam, 0xffff0000, 0 }, + { WM_EXITMENULOOP, sent|defwinproc|wparam|lparam, 1, 0 }, + { WM_NCACTIVATE, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ACTIVATE, sent }, + { WM_ACTIVATEAPP, sent|wparam, 0 }, + { 0 } +}; + static const struct message WmTrackPopupMenu[] = { { HCBT_CREATEWND, hook }, { WM_ENTERMENULOOP, sent|wparam|lparam, TRUE, 0 }, @@ -5163,7 +5198,7 @@ static void test_messages(void) ShowWindow(hwnd, SW_MINIMIZE); flush_events(); - ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", TRUE); + ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", FALSE); flush_sequence(); if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_MINIMIZE) @@ -17279,6 +17314,25 @@ static void test_layered_window(void) static HMENU hpopupmenu; +static LRESULT WINAPI minimize_popup_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + LRESULT ret; + + if (ignore_message( message )) return 0; + ret = MsgCheckProc( FALSE, hwnd, message, wParam, lParam ); + + switch (message) { + case WM_ENTERIDLE: + ShowWindow(hwnd, SW_MINIMIZE); + break; + case WM_TIMER: + EndMenu(); + break; + } + + return ret; +} + static LRESULT WINAPI cancel_popup_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { if (ignore_message( message )) return 0; @@ -17361,6 +17415,21 @@ static void test_TrackPopupMenu(void) ok_sequence(WmTrackPopupMenuAbort, "WmTrackPopupMenuAbort", TRUE); ok(ret == TRUE, "TrackPopupMenu failed\n"); + SetWindowLongPtrA( hwnd, GWLP_WNDPROC, (LONG_PTR)minimize_popup_proc); + + /* set cursor over the window, otherwise the WM_CANCELMODE message may not always be sent */ + SetCursorPos( 0, 0 ); + ShowWindow( hwnd, SW_SHOW ); + + flush_events(); + flush_sequence(); + SetTimer( hwnd, TIMER_ID, 500, NULL ); + ret = TrackPopupMenu( hpopupmenu, 0, 100,100, 0, hwnd, NULL ); + ok_sequence( WmTrackPopupMenuMinimizeWindow, "TrackPopupMenuMinimizeWindow", TRUE ); + ok( ret == 1, "TrackPopupMenu failed with error %i\n", GetLastError() ); + KillTimer( hwnd, TIMER_ID ); + ShowWindow( hwnd, SW_RESTORE ); + SetWindowLongPtrA( hwnd, GWLP_WNDPROC, (LONG_PTR)cancel_popup_proc); SetCapture(hwnd); diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 605c0c87f16..8091f5249fe 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2368,13 +2368,18 @@ void macdrv_window_got_focus(HWND hwnd, const macdrv_event *event) */ void macdrv_window_lost_focus(HWND hwnd, const macdrv_event *event) { + GUITHREADINFO threadinfo; if (!hwnd) return; TRACE("win %p/%p fg %p\n", hwnd, event->window, GetForegroundWindow()); if (hwnd == GetForegroundWindow()) { - SendMessageW(hwnd, WM_CANCELMODE, 0, 0); + threadinfo.cbSize = sizeof(threadinfo); + GetGUIThreadInfo(0, &threadinfo); + if (threadinfo.flags & (GUI_INMENUMODE|GUI_INMOVESIZE|GUI_POPUPMENUMODE|GUI_SYSTEMMENUMODE)) + SendMessageW(hwnd, WM_CANCELMODE, 0, 0); + if (hwnd == GetForegroundWindow()) SetForegroundWindow(GetDesktopWindow()); } diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index dd8837c11da..c18b97f5360 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -819,6 +819,7 @@ static void focus_out( Display *display , HWND hwnd ) { HWND hwnd_tmp; Window focus_win; + GUITHREADINFO threadinfo; int revert; XIC xic; @@ -833,7 +834,12 @@ static void focus_out( Display *display , HWND hwnd ) return; } if (hwnd != GetForegroundWindow()) return; - SendMessageW( hwnd, WM_CANCELMODE, 0, 0 ); + + threadinfo.cbSize = sizeof(threadinfo); + GetGUIThreadInfo(0, &threadinfo); + + if (threadinfo.flags & (GUI_INMENUMODE|GUI_INMOVESIZE|GUI_POPUPMENUMODE|GUI_SYSTEMMENUMODE)) + SendMessageW( hwnd, WM_CANCELMODE, 0, 0 ); /* don't reset the foreground window, if the window which is getting the focus is a Wine window */ -- 2.24.0.rc2

3 2

[PATCH] vkd3d: Implement ID3D12Device::GetCustomHeapProperties
by Derek Lesho 06 Nov '19

06 Nov '19

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- Based solely off the documentation for the function on MSDN, assuming the UMA and CacheCoherentUMA features are TRUE. --- libs/vkd3d/device.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 4d6f7c9..df81226 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2974,11 +2974,33 @@ invalid: static D3D12_HEAP_PROPERTIES * STDMETHODCALLTYPE d3d12_device_GetCustomHeapProperties(ID3D12Device *iface, D3D12_HEAP_PROPERTIES *heap_properties, UINT node_mask, D3D12_HEAP_TYPE heap_type) { - FIXME("iface %p, heap_properties %p, node_mask 0x%08x, heap_type %#x stub!\n", + TRACE("iface %p, heap_properties %p, node_mask 0x%08x, heap_type %#x stub!\n", iface, heap_properties, node_mask, heap_type); debug_ignored_node_mask(node_mask); + heap_properties->Type = heap_type; + heap_properties->CreationNodeMask = 1; + heap_properties->VisibleNodeMask = 1; + + switch (heap_type) + { + case D3D12_HEAP_TYPE_UPLOAD: + heap_properties->CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_WRITE_BACK; + heap_properties->MemoryPoolPreference = D3D12_MEMORY_POOL_L0; + break; + case D3D12_HEAP_TYPE_DEFAULT: + heap_properties->CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_NOT_AVAILABLE; + heap_properties->MemoryPoolPreference = D3D12_MEMORY_POOL_L0; + break; + case D3D12_HEAP_TYPE_READBACK: + heap_properties->CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_WRITE_BACK; + heap_properties->MemoryPoolPreference = D3D12_MEMORY_POOL_L0; + break; + default: + FIXME("Unhandled heap type: %#x\n", heap_type); + }; + return heap_properties; } -- 2.23.0

1 3

[PATCH 3/3] vbscript: Get rid of ident_map.
by Jacek Caban 06 Nov '19

06 Nov '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/vbdisp.c | 116 ++++++++++----------------------------- dlls/vbscript/vbscript.h | 6 -- 2 files changed, 28 insertions(+), 94 deletions(-)

1 0

[PATCH 2/3] vbscript: Store global variables in an array.
by Jacek Caban 06 Nov '19

06 Nov '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This version is rebased on top of my today's patch. I also reordered things inside compile_script to avoid possible failure after global context is half-modified. dlls/vbscript/compile.c | 30 ++++++++++++++++++--------- dlls/vbscript/interp.c | 45 ++++++++++++++++++++++++++++++++-------- dlls/vbscript/vbdisp.c | 4 ++-- dlls/vbscript/vbscript.c | 9 ++++++-- dlls/vbscript/vbscript.h | 5 ++++- 5 files changed, 69 insertions(+), 24 deletions(-)

1 0

[PATCH 1/3] vbscript: Store global static arrays together with global variables.
by Jacek Caban 06 Nov '19

06 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This is unchanged version of my previous patch. I send it together with Gabriel's patches that needed to be rebased on top of it. dlls/vbscript/compile.c | 1 + dlls/vbscript/interp.c | 59 +++++++++++++++++++++++++++------------- dlls/vbscript/vbscript.h | 1 + 3 files changed, 42 insertions(+), 19 deletions(-)

1 0

[PATCH] dsdmo: Added dll
by Alistair Leslie-Hughes 06 Nov '19

06 Nov '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure | 2 + configure.ac | 1 + dlls/dsdmo/Makefile.in | 6 +++ dlls/dsdmo/dsdmo.spec | 4 ++ dlls/dsdmo/main.c | 85 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 98 insertions(+) create mode 100644 dlls/dsdmo/Makefile.in create mode 100644 dlls/dsdmo/dsdmo.spec create mode 100644 dlls/dsdmo/main.c diff --git a/configure b/configure index 8ddfb4ecdd..d69d1ac4a3 100755 --- a/configure +++ b/configure @@ -1257,6 +1257,7 @@ enable_dpnlobby enable_dpvoice enable_dpwsockx enable_drmclien +enable_dsdmo enable_dsound enable_dsquery enable_dssenh @@ -20384,6 +20385,7 @@ wine_fn_config_makefile dlls/dpvoice enable_dpvoice wine_fn_config_makefile dlls/dpvoice/tests enable_tests wine_fn_config_makefile dlls/dpwsockx enable_dpwsockx wine_fn_config_makefile dlls/drmclien enable_drmclien +wine_fn_config_makefile dlls/dsdmo enable_dsdmo wine_fn_config_makefile dlls/dsound enable_dsound wine_fn_config_makefile dlls/dsound/tests enable_tests wine_fn_config_makefile dlls/dsquery enable_dsquery diff --git a/configure.ac b/configure.ac index 31aac11d31..c99db6984b 100644 --- a/configure.ac +++ b/configure.ac @@ -3237,6 +3237,7 @@ WINE_CONFIG_MAKEFILE(dlls/dpvoice) WINE_CONFIG_MAKEFILE(dlls/dpvoice/tests) WINE_CONFIG_MAKEFILE(dlls/dpwsockx) WINE_CONFIG_MAKEFILE(dlls/drmclien) +WINE_CONFIG_MAKEFILE(dlls/dsdmo) WINE_CONFIG_MAKEFILE(dlls/dsound) WINE_CONFIG_MAKEFILE(dlls/dsound/tests) WINE_CONFIG_MAKEFILE(dlls/dsquery) diff --git a/dlls/dsdmo/Makefile.in b/dlls/dsdmo/Makefile.in new file mode 100644 index 0000000000..99816ae0c0 --- /dev/null +++ b/dlls/dsdmo/Makefile.in @@ -0,0 +1,6 @@ +MODULE = dsdmo.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + main.c diff --git a/dlls/dsdmo/dsdmo.spec b/dlls/dsdmo/dsdmo.spec new file mode 100644 index 0000000000..b16365d0c9 --- /dev/null +++ b/dlls/dsdmo/dsdmo.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c new file mode 100644 index 0000000000..61a67f44d8 --- /dev/null +++ b/dlls/dsdmo/main.c @@ -0,0 +1,85 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#define COBJMACROS + +#include "ole2.h" +#include "rpcproxy.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dsdmo); + +static HINSTANCE dsdmo_instance; + +/****************************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv); + + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + dsdmo_instance = hInstDLL; + DisableThreadLibraryCalls(dsdmo_instance); + break; + case DLL_PROCESS_DETACH: + if (lpv) break; + break; + } + + return TRUE; +} + +/*********************************************************************** + * DllGetClassObject + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllCanUnloadNow + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer + */ +HRESULT WINAPI DllRegisterServer(void) +{ + TRACE("()\n"); + return __wine_register_resources(dsdmo_instance); +} + +/*********************************************************************** + * DllUnregisterServer + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + TRACE("()\n"); + return __wine_unregister_resources(dsdmo_instance); +} -- 2.17.1

2 1

[PATCH] ddraw/tests: Add tests for alpha component in surface format conversions.
by Paul Gofman 06 Nov '19

06 Nov '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ddraw/tests/ddraw7.c | 277 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 277 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 279263fe37..5a2b9c6e13 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16475,6 +16475,282 @@ static void test_d32_support(void) DestroyWindow(window); } +static void test_surface_format_conversion_alpha(void) +{ + static const unsigned int rgba_data[4 * 4] = + { + 0xff00ff00, 0xff0000ff, 0xff0000ff, 0xff0000ff, + 0xff0000ff, 0xff00ff00, 0xff0000ff, 0xff0000ff, + 0xff00ff00, 0xff0000ff, 0xff00ff00, 0xff0000ff, + 0xff00ff00, 0xff0000ff, 0xff0000ff, 0xff00ff00, + }; + static const unsigned int rgbx_data[4 * 4] = + { + 0x0000ff00, 0x000000ff, 0x000000ff, 0x000000ff, + 0x000000ff, 0x0000ff00, 0x000000ff, 0x000000ff, + 0x0000ff00, 0x000000ff, 0x0000ff00, 0x000000ff, + 0x0000ff00, 0x000000ff, 0x000000ff, 0x0000ff00, + }; + static const unsigned short int r5g6b5_data[4 * 4] = + { + 0x07e0, 0x001f, 0x001f, 0x001f, + 0x001f, 0x07e0, 0x001f, 0x001f, + 0x07e0, 0x001f, 0x07e0, 0x001f, + 0x07e0, 0x001f, 0x001f, 0x07e0, + }; + static const unsigned short int r5g5b5x1_data[4 * 4] = + { + 0x03e0, 0x001f, 0x001f, 0x001f, + 0x001f, 0x03e0, 0x001f, 0x001f, + 0x03e0, 0x001f, 0x03e0, 0x001f, + 0x03e0, 0x001f, 0x001f, 0x03e0, + }; + static const unsigned short int r5g5b5a1_data[4 * 4] = + { + 0x83e0, 0x801f, 0x801f, 0x801f, + 0x801f, 0x83e0, 0x801f, 0x801f, + 0x83e0, 0x801f, 0x83e0, 0x801f, + 0x83e0, 0x801f, 0x801f, 0x83e0, + }; + static const unsigned int dxt1_data[8] = + { + 0x001f07e0, 0x14445154, + }; + static const unsigned int dxt2_data[16] = + { + 0xffffffff, 0xffffffff, 0x001f07e0, 0x14445154, + }; + + enum test_format_id + { + FMT_RGBA, + FMT_RGBX, + FMT_R5G6B5, + FMT_R5G5B5X1, + FMT_R5G5B5A1, + FMT_DXT1, + FMT_DXT2, + FMT_DXT3, + }; + + static const struct test_format + { + DDPIXELFORMAT fmt; + const char *name; + unsigned int block_size, x_blocks, y_blocks; + DWORD support_flag; + } + formats[] = + { + { + { + sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, + {32}, {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0xff000000} + }, + "RGBA", 4, 4, 4, + }, + { + { + sizeof(DDPIXELFORMAT), DDPF_RGB, 0, + {32}, {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0x00000000} + }, + "RGBX", 4, 4, 4, + }, + { + { + sizeof(DDPIXELFORMAT), DDPF_RGB, 0, + {16}, {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000} + }, + "R5G6B5", 2, 4, 4, + }, + { + { + sizeof(DDPIXELFORMAT), DDPF_RGB, 0, + {16}, {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00000000} + }, + "R5G5B5X1", 2, 4, 4, + }, + { + { + sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, + {16}, {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00008000} + }, + "R5G5B5A1", 2, 4, 4, + }, + { + { + sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', 'T', '1'), + {0}, {0}, {0}, {0}, {0} + }, + "DXT1", 8, 1, 1, SUPPORT_DXT1, + }, + { + { + sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', 'T', '2'), + {0}, {0}, {0}, {0}, {0} + }, + "DXT2", 16, 1, 1, SUPPORT_DXT2, + }, + { + { + sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', 'T', '3'), + {0}, {0}, {0}, {0}, {0} + }, + "DXT3", 16, 1, 1, SUPPORT_DXT3, + }, + }; + + static const struct + { + enum test_format_id src_format; + const void *src_data; + enum test_format_id dst_format; + const void *expected_data; + BOOL todo, broken_warp; + const void *expected_broken; + } + tests[] = + { + {FMT_RGBX, rgbx_data, FMT_RGBA, rgba_data, FALSE, TRUE, rgbx_data}, + {FMT_RGBA, rgba_data, FMT_RGBX, rgbx_data, TRUE, TRUE, rgba_data}, + {FMT_R5G6B5, r5g6b5_data, FMT_RGBA, rgba_data}, + {FMT_R5G5B5X1, r5g5b5x1_data, FMT_RGBA, rgba_data}, + {FMT_R5G6B5, r5g6b5_data, FMT_R5G5B5A1, r5g5b5a1_data}, + {FMT_R5G5B5X1, r5g5b5x1_data, FMT_R5G5B5A1, r5g5b5x1_data, TRUE}, + {FMT_R5G5B5A1, r5g5b5a1_data, FMT_R5G6B5, r5g6b5_data}, + {FMT_RGBA, rgba_data, FMT_DXT1, dxt1_data}, + {FMT_RGBX, rgbx_data, FMT_DXT1, dxt1_data, TRUE}, + {FMT_RGBA, rgba_data, FMT_DXT2, dxt2_data}, + {FMT_RGBX, rgbx_data, FMT_DXT2, dxt2_data, TRUE}, + {FMT_RGBA, rgba_data, FMT_DXT3, dxt2_data}, + {FMT_RGBX, rgbx_data, FMT_DXT3, dxt2_data, TRUE}, + {FMT_DXT1, dxt1_data, FMT_DXT2, dxt2_data, TRUE}, + {FMT_DXT1, dxt1_data, FMT_RGBA, rgba_data}, + {FMT_DXT1, dxt1_data, FMT_RGBX, rgba_data}, + {FMT_DXT3, dxt2_data, FMT_RGBA, rgba_data}, + {FMT_DXT3, dxt2_data, FMT_RGBX, rgba_data}, + }; + + const struct test_format *src_format, *dst_format; + IDirectDrawSurface7 *src_surf, *dst_surf; + DDSURFACEDESC2 surface_desc, lock; + unsigned int i, x, y, pitch; + IDirect3DDevice7 *device; + DWORD supported_fmts; + BOOL passed, is_warp; + IDirectDraw7 *ddraw; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + is_warp = ddraw_is_warp(ddraw); + + hr = IDirect3DDevice7_EnumTextureFormats(device, test_block_formats_creation_cb, + &supported_fmts); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + surface_desc.dwWidth = 4; + surface_desc.dwHeight = 4; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + src_format = &formats[tests[i].src_format]; + dst_format = &formats[tests[i].dst_format]; + + if (~supported_fmts & dst_format->support_flag) + { + skip("%s format is not supported, skipping test %u.\n", dst_format->name, i); + continue; + } + if (~supported_fmts & src_format->support_flag) + { + skip("%s format is not supported, skipping test %u.\n", src_format->name, i); + continue; + } + + U4(surface_desc).ddpfPixelFormat = src_format->fmt; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &src_surf, NULL); + ok(hr == DD_OK, "Test %u, got unexpected hr %#x.\n", i, hr); + + U4(surface_desc).ddpfPixelFormat = dst_format->fmt; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &dst_surf, NULL); + ok(hr == DD_OK, "Test %u, got unexpected hr %#x.\n", i, hr); + + memset(&lock, 0, sizeof(lock)); + lock.dwSize = sizeof(lock); + hr = IDirectDrawSurface7_Lock(src_surf, NULL, &lock, 0, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + pitch = U1(lock).lPitch; + for (y = 0; y < src_format->y_blocks; ++y) + memcpy((BYTE*)lock.lpSurface + y * pitch, + (BYTE *)tests[i].src_data + y * src_format->x_blocks * src_format->block_size, + src_format->block_size * src_format->x_blocks); + hr = IDirectDrawSurface7_Unlock(src_surf, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDrawSurface7_Blt(dst_surf, NULL, src_surf, NULL, DDBLT_WAIT, NULL); + ok(hr == DD_OK, "Test %s -> %s, got unexpected hr %#x.\n", + src_format->name, dst_format->name, hr); + + memset(&lock, 0, sizeof(lock)); + lock.dwSize = sizeof(lock); + hr = IDirectDrawSurface7_Lock(dst_surf, NULL, &lock, 0, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + pitch = U1(lock).lPitch; + + for (y = 0; y < dst_format->y_blocks; ++y) + { + const void *expected_data = is_warp && tests[i].broken_warp ? tests[i].expected_broken + : tests[i].expected_data; + + passed = !memcmp((BYTE*)lock.lpSurface + y * pitch, + (BYTE *)expected_data + y * dst_format->x_blocks * dst_format->block_size, + dst_format->block_size * dst_format->x_blocks); + todo_wine_if(tests[i].todo) + ok(passed, "Test %s -> %s, row %u, unexpected surface data.\n", + src_format->name, dst_format->name, y); + + if (!passed && !(!strcmp(winetest_platform, "wine") && tests[i].todo)) + { + for (x = 0; x < dst_format->x_blocks * dst_format->block_size / 4; ++x) + trace("Test %u, x %u, y %u, expected 0x%08x, got 0x%08x.\n", i, x, y, + *(unsigned int *)((BYTE*)lock.lpSurface + y * pitch + x * 4), + *(unsigned int*)((BYTE *)tests[i].expected_data + + y * dst_format->x_blocks * dst_format->block_size + x * 4)); + } + if (!passed) + break; + } + hr = IDirectDrawSurface7_Unlock(dst_surf, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface7_Release(dst_surf); + IDirectDrawSurface7_Release(src_surf); + } + + IDirect3DDevice7_Release(device); + refcount = IDirectDraw7_Release(ddraw); + ok(!refcount, "%u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -16623,4 +16899,5 @@ START_TEST(ddraw7) test_begin_end_state_block(); test_caps(); test_d32_support(); + test_surface_format_conversion_alpha(); } -- 2.23.0

3 2

[PATCH 2/2] msvcrt: Use %ls format for wchar strings in DoMessageBox.
by Piotr Caban 06 Nov '19

06 Nov '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/exit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 1/2 v2] msvcrt: Use %ls format for wchar strings in _wassert.
by Piotr Caban 06 Nov '19

06 Nov '19

From: Jacek Caban <jacek(a)codeweavers.com> %s does not do the right thing in ucrtbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - use %ls format - change format_msgbox string dlls/msvcrt/exit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH] vbscript: Store global static arrays together with global variables.
by Jacek Caban 06 Nov '19

06 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 1 + dlls/vbscript/interp.c | 61 ++++++++++++++++++++++++++------------- dlls/vbscript/tests/run.c | 11 +++++++ dlls/vbscript/vbscript.h | 1 + 4 files changed, 54 insertions(+), 20 deletions(-)

1 0

[PATCH] user32: Remove unused GetAsyncKeyState() driver entry.
by Huw Davies 06 Nov '19

06 Nov '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/driver.c | 13 -------- dlls/user32/input.c | 68 ++++++++++++++++++-------------------- dlls/user32/user_private.h | 1 - 3 files changed, 32 insertions(+), 50 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 921ea2c962..66b26ca51a 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -106,7 +106,6 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(ActivateKeyboardLayout); GET_USER_FUNC(Beep); - GET_USER_FUNC(GetAsyncKeyState); GET_USER_FUNC(GetKeyNameText); GET_USER_FUNC(GetKeyboardLayout); GET_USER_FUNC(GetKeyboardLayoutList); @@ -206,11 +205,6 @@ static void CDECL nulldrv_Beep(void) { } -static SHORT CDECL nulldrv_GetAsyncKeyState( INT key ) -{ - return -1; -} - static UINT CDECL nulldrv_GetKeyboardLayoutList( INT size, HKL *layouts ) { HKEY hKeyKeyboard; @@ -494,7 +488,6 @@ static USER_DRIVER null_driver = /* keyboard functions */ nulldrv_ActivateKeyboardLayout, nulldrv_Beep, - nulldrv_GetAsyncKeyState, nulldrv_GetKeyNameText, nulldrv_GetKeyboardLayout, nulldrv_GetKeyboardLayoutList, @@ -566,11 +559,6 @@ static void CDECL loaderdrv_Beep(void) load_driver()->pBeep(); } -static SHORT CDECL loaderdrv_GetAsyncKeyState( INT key ) -{ - return load_driver()->pGetAsyncKeyState( key ); -} - static INT CDECL loaderdrv_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) { return load_driver()->pGetKeyNameText( lparam, buffer, size ); @@ -715,7 +703,6 @@ static USER_DRIVER lazy_load_driver = /* keyboard functions */ loaderdrv_ActivateKeyboardLayout, loaderdrv_Beep, - loaderdrv_GetAsyncKeyState, loaderdrv_GetKeyNameText, loaderdrv_GetKeyboardLayout, loaderdrv_GetKeyboardLayoutList, diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 8b2ae805aa..0325e2ce3d 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -401,51 +401,47 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) check_for_events( QS_INPUT ); - if ((ret = USER_Driver->pGetAsyncKeyState( key )) == -1) + if (key_state_info && !(key_state_info->state[key] & 0xc0) && + key_state_info->counter == counter && GetTickCount() - key_state_info->time < 50) { - if (key_state_info && - !(key_state_info->state[key] & 0xc0) && - key_state_info->counter == counter && - GetTickCount() - key_state_info->time < 50) - { - /* use cached value */ - return 0; - } - else if (!key_state_info) + /* use cached value */ + return 0; + } + else if (!key_state_info) + { + key_state_info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*key_state_info) ); + get_user_thread_info()->key_state = key_state_info; + } + + ret = 0; + SERVER_START_REQ( get_key_state ) + { + req->tid = 0; + req->key = key; + if (key_state_info) { - key_state_info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*key_state_info) ); - get_user_thread_info()->key_state = key_state_info; + prev_key_state = key_state_info->state[key]; + wine_server_set_reply( req, key_state_info->state, sizeof(key_state_info->state) ); } - - ret = 0; - SERVER_START_REQ( get_key_state ) + if (!wine_server_call( req )) { - req->tid = 0; - req->key = key; + if (reply->state & 0x40) ret |= 0x0001; + if (reply->state & 0x80) ret |= 0x8000; if (key_state_info) { - prev_key_state = key_state_info->state[key]; - wine_server_set_reply( req, key_state_info->state, sizeof(key_state_info->state) ); - } - if (!wine_server_call( req )) - { - if (reply->state & 0x40) ret |= 0x0001; - if (reply->state & 0x80) ret |= 0x8000; - if (key_state_info) - { - /* force refreshing the key state cache - some multithreaded programs - * (like Adobe Photoshop CS5) expect that changes to the async key state - * are also immediately available in other threads. */ - if (prev_key_state != key_state_info->state[key]) - counter = interlocked_xchg_add( &global_key_state_counter, 1 ) + 1; - - key_state_info->time = GetTickCount(); - key_state_info->counter = counter; - } + /* force refreshing the key state cache - some multithreaded programs + * (like Adobe Photoshop CS5) expect that changes to the async key state + * are also immediately available in other threads. */ + if (prev_key_state != key_state_info->state[key]) + counter = interlocked_xchg_add( &global_key_state_counter, 1 ) + 1; + + key_state_info->time = GetTickCount(); + key_state_info->counter = counter; } } - SERVER_END_REQ; } + SERVER_END_REQ; + return ret; } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index c11aae707c..7e294558ef 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -64,7 +64,6 @@ typedef struct tagUSER_DRIVER { /* keyboard functions */ HKL (CDECL *pActivateKeyboardLayout)(HKL, UINT); void (CDECL *pBeep)(void); - SHORT (CDECL *pGetAsyncKeyState)(INT); INT (CDECL *pGetKeyNameText)(LONG, LPWSTR, INT); HKL (CDECL *pGetKeyboardLayout)(DWORD); UINT (CDECL *pGetKeyboardLayoutList)(INT, HKL *); -- 2.23.0

1 0

[PATCH 1/2] msvcrt/tests: Fix 2 MSVC warnings about result.
by Serge Gautherie 06 Nov '19

06 Nov '19

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- "...\scanf.c(204): warning C4477: 'sscanf' : format string '%hd' requires an argument of type 'short *', but variadic argument 1 has type 'int *'" "...\scanf.c(209): warning C4477: 'sscanf' : format string '%hhd' requires an argument of type 'signed char *', but variadic argument 1 has type 'int *'" --- dlls/msvcrt/tests/scanf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 5db9d43..07132e4 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -201,12 +201,12 @@ static void test_sscanf( void ) result = 0xdeadbeef; strcpy(buffer,"12345678"); - ret = p_sscanf(buffer, "%hd", &result); + ret = p_sscanf(buffer, "%hd", (short *)&result); ok(ret == 1, "Wrong number of arguments read: %d\n", ret); ok(result == 0xdead614e, "Wrong number read (%x)\n", result); result = 0xdeadbeef; - ret = p_sscanf(buffer, "%hhd", &result); + ret = p_sscanf(buffer, "%hhd", (char *)&result); ok(ret == 1, "Wrong number of arguments read: %d\n", ret); ok(result == 0xbc614e, "Wrong number read (%x)\n", result); -- 2.10.0.windows.1

3 5

[PATCH] bcrypt: Avoid recreating cipher handles when the initialization vector doesn't change.
by Hans Leidekker 06 Nov '19

06 Nov '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_internal.h | 9 ++++- dlls/bcrypt/bcrypt_main.c | 28 ++++++++++---- dlls/bcrypt/gnutls.c | 62 ++++++++++++++++++++++++------- dlls/bcrypt/macos.c | 57 ++++++++++++++++++++++------- dlls/bcrypt/tests/bcrypt.c | 69 +++++++++++++++++++++++++++++++++++ 5 files changed, 189 insertions(+), 36 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index c6f5aebe1c..d026dab729 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -163,6 +163,8 @@ struct key_symmetric enum mode_id mode; ULONG block_size; gnutls_cipher_hd_t handle; + UCHAR *vector; + ULONG vector_len; UCHAR *secret; ULONG secret_len; }; @@ -192,6 +194,8 @@ struct key_symmetric ULONG block_size; CCCryptorRef ref_encrypt; CCCryptorRef ref_decrypt; + UCHAR *vector; + ULONG vector_len; UCHAR *secret; ULONG secret_len; }; @@ -234,7 +238,7 @@ NTSTATUS get_alg_property( const struct algorithm *, const WCHAR *, UCHAR *, ULO NTSTATUS key_set_property( struct key *, const WCHAR *, UCHAR *, ULONG, ULONG ) DECLSPEC_HIDDEN; NTSTATUS key_symmetric_init( struct key *, struct algorithm *, const UCHAR *, ULONG ) DECLSPEC_HIDDEN; -NTSTATUS key_symmetric_set_params( struct key *, UCHAR *, ULONG ) DECLSPEC_HIDDEN; +NTSTATUS key_symmetric_set_vector( struct key *, UCHAR *, ULONG ) DECLSPEC_HIDDEN; NTSTATUS key_symmetric_set_auth_data( struct key *, UCHAR *, ULONG ) DECLSPEC_HIDDEN; NTSTATUS key_symmetric_encrypt( struct key *, const UCHAR *, ULONG, UCHAR *, ULONG ) DECLSPEC_HIDDEN; NTSTATUS key_symmetric_decrypt( struct key *, const UCHAR *, ULONG, UCHAR *, ULONG ) DECLSPEC_HIDDEN; @@ -248,6 +252,9 @@ BOOL key_is_symmetric( struct key * ) DECLSPEC_HIDDEN; NTSTATUS key_export_ecc( struct key *, UCHAR *, ULONG, ULONG * ) DECLSPEC_HIDDEN; NTSTATUS key_import_ecc( struct key *, UCHAR *, ULONG ) DECLSPEC_HIDDEN; +BOOL is_zero_vector( const UCHAR *, ULONG ) DECLSPEC_HIDDEN; +BOOL is_equal_vector( const UCHAR *, ULONG, const UCHAR *, ULONG ) DECLSPEC_HIDDEN; + BOOL gnutls_initialize(void) DECLSPEC_HIDDEN; void gnutls_uninitialize(void) DECLSPEC_HIDDEN; diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index d87c9fc49f..079eaebe6e 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -834,6 +834,21 @@ BOOL key_is_symmetric( struct key *key ) return builtin_algorithms[key->alg_id].class == BCRYPT_CIPHER_INTERFACE; } +BOOL is_zero_vector( const UCHAR *vector, ULONG len ) +{ + ULONG i; + if (!vector) return FALSE; + for (i = 0; i < len; i++) if (vector[i]) return FALSE; + return TRUE; +} + +BOOL is_equal_vector( const UCHAR *vector, ULONG len, const UCHAR *vector2, ULONG len2 ) +{ + if (!vector && !vector2) return TRUE; + if (len != len2) return FALSE; + return !memcmp( vector, vector2, len ); +} + static NTSTATUS key_import( BCRYPT_ALG_HANDLE algorithm, const WCHAR *type, BCRYPT_KEY_HANDLE *key, UCHAR *object, ULONG object_len, UCHAR *input, ULONG input_len ) { @@ -968,7 +983,7 @@ static NTSTATUS key_encrypt( struct key *key, UCHAR *input, ULONG input_len, vo if (auth_info->dwFlags & BCRYPT_AUTH_MODE_CHAIN_CALLS_FLAG) FIXME( "call chaining not implemented\n" ); - if ((status = key_symmetric_set_params( key, auth_info->pbNonce, auth_info->cbNonce ))) + if ((status = key_symmetric_set_vector( key, auth_info->pbNonce, auth_info->cbNonce ))) return status; *ret_len = input_len; @@ -983,7 +998,6 @@ static NTSTATUS key_encrypt( struct key *key, UCHAR *input, ULONG input_len, vo return key_symmetric_get_tag( key, auth_info->pbTag, auth_info->cbTag ); } - if ((status = key_symmetric_set_params( key, iv, iv_len ))) return status; *ret_len = input_len; if (flags & BCRYPT_BLOCK_PADDING) @@ -994,6 +1008,7 @@ static NTSTATUS key_encrypt( struct key *key, UCHAR *input, ULONG input_len, vo if (!output) return STATUS_SUCCESS; if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; if (key->u.s.mode == MODE_ID_ECB && iv) return STATUS_INVALID_PARAMETER; + if ((status = key_symmetric_set_vector( key, iv, iv_len ))) return status; src = input; dst = output; @@ -1001,7 +1016,7 @@ static NTSTATUS key_encrypt( struct key *key, UCHAR *input, ULONG input_len, vo { if ((status = key_symmetric_encrypt( key, src, key->u.s.block_size, dst, key->u.s.block_size ))) return status; - if (key->u.s.mode == MODE_ID_ECB && (status = key_symmetric_set_params( key, NULL, 0 ))) return status; + if (key->u.s.mode == MODE_ID_ECB && (status = key_symmetric_set_vector( key, NULL, 0 ))) return status; bytes_left -= key->u.s.block_size; src += key->u.s.block_size; dst += key->u.s.block_size; @@ -1036,7 +1051,7 @@ static NTSTATUS key_decrypt( struct key *key, UCHAR *input, ULONG input_len, voi if (!auth_info->pbTag) return STATUS_INVALID_PARAMETER; if (auth_info->cbTag < 12 || auth_info->cbTag > 16) return STATUS_INVALID_PARAMETER; - if ((status = key_symmetric_set_params( key, auth_info->pbNonce, auth_info->cbNonce ))) + if ((status = key_symmetric_set_vector( key, auth_info->pbNonce, auth_info->cbNonce ))) return status; *ret_len = input_len; @@ -1054,8 +1069,6 @@ static NTSTATUS key_decrypt( struct key *key, UCHAR *input, ULONG input_len, voi return STATUS_SUCCESS; } - if ((status = key_symmetric_set_params( key, iv, iv_len ))) return status; - *ret_len = input_len; if (input_len & (key->u.s.block_size - 1)) return STATUS_INVALID_BUFFER_SIZE; @@ -1069,6 +1082,7 @@ static NTSTATUS key_decrypt( struct key *key, UCHAR *input, ULONG input_len, voi else if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; if (key->u.s.mode == MODE_ID_ECB && iv) return STATUS_INVALID_PARAMETER; + if ((status = key_symmetric_set_vector( key, iv, iv_len ))) return status; src = input; dst = output; @@ -1076,7 +1090,7 @@ static NTSTATUS key_decrypt( struct key *key, UCHAR *input, ULONG input_len, voi { if ((status = key_symmetric_decrypt( key, src, key->u.s.block_size, dst, key->u.s.block_size ))) return status; - if (key->u.s.mode == MODE_ID_ECB && (status = key_symmetric_set_params( key, NULL, 0 ))) return status; + if (key->u.s.mode == MODE_ID_ECB && (status = key_symmetric_set_vector( key, NULL, 0 ))) return status; bytes_left -= key->u.s.block_size; src += key->u.s.block_size; dst += key->u.s.block_size; diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 41bba0b821..a6a07fff19 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -441,6 +441,8 @@ NTSTATUS key_symmetric_init( struct key *key, struct algorithm *alg, const UCHAR key->alg_id = alg->id; key->u.s.mode = alg->mode; key->u.s.handle = 0; /* initialized on first use */ + key->u.s.vector = NULL; + key->u.s.vector_len = 0; return STATUS_SUCCESS; } @@ -475,30 +477,45 @@ static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) } } -NTSTATUS key_symmetric_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) +NTSTATUS key_symmetric_set_vector( struct key *key, UCHAR *vector, ULONG vector_len ) { - gnutls_cipher_algorithm_t cipher; - gnutls_datum_t secret, vector; - int ret; - - if (key->u.s.handle) + if (key->u.s.handle && (!is_zero_vector( vector, vector_len ) || + !is_equal_vector( key->u.s.vector, key->u.s.vector_len, vector, vector_len ))) { + TRACE( "invalidating cipher handle\n" ); pgnutls_cipher_deinit( key->u.s.handle ); key->u.s.handle = NULL; } - if ((cipher = get_gnutls_cipher( key )) == GNUTLS_CIPHER_UNKNOWN) - return STATUS_NOT_SUPPORTED; + heap_free( key->u.s.vector ); + key->u.s.vector = NULL; + key->u.s.vector_len = 0; + if (vector) + { + if (!(key->u.s.vector = heap_alloc( vector_len ))) return STATUS_NO_MEMORY; + memcpy( key->u.s.vector, vector, vector_len ); + key->u.s.vector_len = vector_len; + } + + return STATUS_SUCCESS; +} + +static NTSTATUS init_cipher_handle( struct key *key ) +{ + gnutls_cipher_algorithm_t cipher; + gnutls_datum_t secret, vector; + int ret; + + if (key->u.s.handle) return STATUS_SUCCESS; + if ((cipher = get_gnutls_cipher( key )) == GNUTLS_CIPHER_UNKNOWN) return STATUS_NOT_SUPPORTED; secret.data = key->u.s.secret; secret.size = key->u.s.secret_len; - if (iv) - { - vector.data = iv; - vector.size = iv_len; - } - if ((ret = pgnutls_cipher_init( &key->u.s.handle, cipher, &secret, iv ? &vector : NULL ))) + vector.data = key->u.s.vector; + vector.size = key->u.s.vector_len; + + if ((ret = pgnutls_cipher_init( &key->u.s.handle, cipher, &secret, key->u.s.vector ? &vector : NULL ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -509,8 +526,12 @@ NTSTATUS key_symmetric_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) NTSTATUS key_symmetric_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len ) { + NTSTATUS status; int ret; + if (!auth_data) return STATUS_SUCCESS; + if ((status = init_cipher_handle( key ))) return status; + if ((ret = pgnutls_cipher_add_auth( key->u.s.handle, auth_data, len ))) { pgnutls_perror( ret ); @@ -521,7 +542,11 @@ NTSTATUS key_symmetric_set_auth_data( struct key *key, UCHAR *auth_data, ULONG l NTSTATUS key_symmetric_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, ULONG output_len ) { + NTSTATUS status; int ret; + + if ((status = init_cipher_handle( key ))) return status; + if ((ret = pgnutls_cipher_encrypt2( key->u.s.handle, input, input_len, output, output_len ))) { pgnutls_perror( ret ); @@ -532,7 +557,11 @@ NTSTATUS key_symmetric_encrypt( struct key *key, const UCHAR *input, ULONG input NTSTATUS key_symmetric_decrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, ULONG output_len ) { + NTSTATUS status; int ret; + + if ((status = init_cipher_handle( key ))) return status; + if ((ret = pgnutls_cipher_decrypt2( key->u.s.handle, input, input_len, output, output_len ))) { pgnutls_perror( ret ); @@ -543,7 +572,11 @@ NTSTATUS key_symmetric_decrypt( struct key *key, const UCHAR *input, ULONG input NTSTATUS key_symmetric_get_tag( struct key *key, UCHAR *tag, ULONG len ) { + NTSTATUS status; int ret; + + if ((status = init_cipher_handle( key ))) return status; + if ((ret = pgnutls_cipher_tag( key->u.s.handle, tag, len ))) { pgnutls_perror( ret ); @@ -1128,6 +1161,7 @@ NTSTATUS key_destroy( struct key *key ) if (key_is_symmetric( key )) { if (key->u.s.handle) pgnutls_cipher_deinit( key->u.s.handle ); + heap_free( key->u.s.vector ); heap_free( key->u.s.secret ); } else diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c index fbd0321021..9ff9772c15 100644 --- a/dlls/bcrypt/macos.c +++ b/dlls/bcrypt/macos.c @@ -106,6 +106,8 @@ NTSTATUS key_symmetric_init( struct key *key, struct algorithm *alg, const UCHAR key->u.s.mode = alg->mode; key->u.s.ref_encrypt = NULL; /* initialized on first use */ key->u.s.ref_decrypt = NULL; + key->u.s.vector = NULL; + key->u.s.vector_len = 0; return STATUS_SUCCESS; } @@ -122,32 +124,50 @@ static CCMode get_cryptor_mode( struct key *key ) } } -NTSTATUS key_symmetric_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) +NTSTATUS key_symmetric_set_vector( struct key *key, UCHAR *vector, ULONG vector_len ) { - CCCryptorStatus status; - CCMode mode; - - if (!(mode = get_cryptor_mode( key ))) return STATUS_NOT_SUPPORTED; - - if (key->u.s.ref_encrypt) + if (key->u.s.ref_encrypt && (!is_zero_vector( vector, vector_len ) || + !is_equal_vector( key->u.s.vector, key->u.s.vector_len, vector, vector_len ))) { + TRACE( "invalidating cryptor handles\n" ); CCCryptorRelease( key->u.s.ref_encrypt ); key->u.s.ref_encrypt = NULL; - } - if (key->u.s.ref_decrypt) - { + CCCryptorRelease( key->u.s.ref_decrypt ); key->u.s.ref_decrypt = NULL; } - if ((status = CCCryptorCreateWithMode( kCCEncrypt, mode, kCCAlgorithmAES128, ccNoPadding, iv, key->u.s.secret, - key->u.s.secret_len, NULL, 0, 0, 0, &key->u.s.ref_encrypt )) != kCCSuccess) + heap_free( key->u.s.vector ); + key->u.s.vector = NULL; + key->u.s.vector_len = 0; + if (vector) + { + if (!(key->u.s.vector = heap_alloc( vector_len ))) return STATUS_NO_MEMORY; + memcpy( key->u.s.vector, vector, vector_len ); + key->u.s.vector_len = vector_len; + } + + return STATUS_SUCCESS; +} + +static NTSTATUS init_cryptor_handles( struct key *key ) +{ + CCCryptorStatus status; + CCMode mode; + + if (key->u.s.ref_encrypt) return STATUS_SUCCESS; + if (!(mode = get_cryptor_mode( key ))) return STATUS_NOT_SUPPORTED; + + if ((status = CCCryptorCreateWithMode( kCCEncrypt, mode, kCCAlgorithmAES128, ccNoPadding, key->u.s.vector, + key->u.s.secret, key->u.s.secret_len, NULL, 0, 0, 0, + &key->u.s.ref_encrypt )) != kCCSuccess) { WARN( "CCCryptorCreateWithMode failed %d\n", status ); return STATUS_INTERNAL_ERROR; } - if ((status = CCCryptorCreateWithMode( kCCDecrypt, mode, kCCAlgorithmAES128, ccNoPadding, iv, key->u.s.secret, - key->u.s.secret_len, NULL, 0, 0, 0, &key->u.s.ref_decrypt )) != kCCSuccess) + if ((status = CCCryptorCreateWithMode( kCCDecrypt, mode, kCCAlgorithmAES128, ccNoPadding, key->u.s.vector, + key->u.s.secret, key->u.s.secret_len, NULL, 0, 0, 0, + &key->u.s.ref_decrypt )) != kCCSuccess) { WARN( "CCCryptorCreateWithMode failed %d\n", status ); CCCryptorRelease( key->u.s.ref_encrypt ); @@ -167,6 +187,10 @@ NTSTATUS key_symmetric_set_auth_data( struct key *key, UCHAR *auth_data, ULONG l NTSTATUS key_symmetric_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, ULONG output_len ) { CCCryptorStatus status; + NTSTATUS ret; + + if ((ret = init_cryptor_handles( key ))) return ret; + if ((status = CCCryptorUpdate( key->u.s.ref_encrypt, input, input_len, output, output_len, NULL )) != kCCSuccess) { WARN( "CCCryptorUpdate failed %d\n", status ); @@ -178,6 +202,10 @@ NTSTATUS key_symmetric_encrypt( struct key *key, const UCHAR *input, ULONG input NTSTATUS key_symmetric_decrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, ULONG output_len ) { CCCryptorStatus status; + NTSTATUS ret; + + if ((ret = init_cryptor_handles( key ))) return ret; + if ((status = CCCryptorUpdate( key->u.s.ref_decrypt, input, input_len, output, output_len, NULL )) != kCCSuccess) { WARN( "CCCryptorUpdate failed %d\n", status ); @@ -235,6 +263,7 @@ NTSTATUS key_destroy( struct key *key ) { if (key->u.s.ref_encrypt) CCCryptorRelease( key->u.s.ref_encrypt ); if (key->u.s.ref_decrypt) CCCryptorRelease( key->u.s.ref_decrypt ); + heap_free( key->u.s.vector ); heap_free( key->u.s.secret ); heap_free( key ); return STATUS_SUCCESS; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 5ae847ca6e..d125e0c89d 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2128,6 +2128,74 @@ static void test_BCryptEnumAlgorithms(void) pBCryptFreeBuffer( list ); } +static void test_aes_vector(void) +{ + static const UCHAR secret[] = {0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10}; + static const UCHAR expect[] = {0xb0,0xcb,0xf5,0x80,0xd4,0xe3,0x55,0x23,0x6e,0x19,0x5b,0xdb,0xfe,0xe0,0x6c,0xd3}; + static const UCHAR expect2[] = {0x06,0x0c,0x81,0xab,0xd4,0x28,0x80,0x42,0xce,0x30,0x56,0x17,0x15,0x00,0x9e,0xc1}; + static const UCHAR expect3[] = {0x3e,0x99,0xbf,0x02,0xf5,0xd3,0xb8,0x81,0x91,0x4d,0x93,0xea,0xd4,0x92,0x93,0x46}; + static UCHAR iv[16], input[] = {'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p'}; + UCHAR output[16]; + BCRYPT_ALG_HANDLE alg; + BCRYPT_KEY_HANDLE key; + UCHAR data[sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) + sizeof(secret)]; + BCRYPT_KEY_DATA_BLOB_HEADER *blob = (BCRYPT_KEY_DATA_BLOB_HEADER *)data; + ULONG size; + NTSTATUS ret; + + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_AES_ALGORITHM, NULL, 0); + ok(!ret, "got %08x\n", ret); + + size = sizeof(BCRYPT_CHAIN_MODE_CBC); + ret = pBCryptSetProperty(alg, BCRYPT_CHAINING_MODE, (UCHAR *)BCRYPT_CHAIN_MODE_CBC, size, 0); + ok(!ret, "got %08x\n", ret); + + blob->dwMagic = BCRYPT_KEY_DATA_BLOB_MAGIC; + blob->dwVersion = BCRYPT_KEY_DATA_BLOB_VERSION1; + blob->cbKeyData = sizeof(secret); + memcpy(data + sizeof(*blob), secret, sizeof(secret)); + size = sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) + sizeof(secret); + ret = pBCryptImportKey(alg, NULL, BCRYPT_KEY_DATA_BLOB, &key, NULL, 0, data, size, 0); + ok(!ret || broken(ret == STATUS_INVALID_PARAMETER) /* vista */, "got %08x\n", ret); + if (ret == STATUS_INVALID_PARAMETER) + { + win_skip("broken BCryptImportKey\n"); + pBCryptCloseAlgorithmProvider(alg, 0); + return; + } + + /* zero initialization vector */ + size = 0; + memset(output, 0, sizeof(output)); + ret = pBCryptEncrypt(key, input, sizeof(input), NULL, iv, sizeof(iv), output, sizeof(output), &size, 0); + ok(!ret, "got %08x\n", ret); + ok(size == 16, "got %u\n", size); + ok(!memcmp(output, expect, sizeof(expect)), "wrong cipher text\n"); + + /* same initialization vector */ + size = 0; + memset(output, 0, sizeof(output)); + ret = pBCryptEncrypt(key, input, sizeof(input), NULL, iv, sizeof(iv), output, sizeof(output), &size, 0); + ok(!ret, "got %08x\n", ret); + ok(size == 16, "got %u\n", size); + ok(!memcmp(output, expect2, sizeof(expect2)), "wrong cipher text\n"); + + /* different initialization vector */ + iv[0] = 0x1; + size = 0; + memset(output, 0, sizeof(output)); + ret = pBCryptEncrypt(key, input, sizeof(input), NULL, iv, sizeof(iv), output, sizeof(output), &size, 0); + ok(!ret, "got %08x\n", ret); + ok(size == 16, "got %u\n", size); + todo_wine ok(!memcmp(output, expect3, sizeof(expect3)), "wrong cipher text\n"); + + ret = pBCryptDestroyKey(key); + ok(!ret, "got %08x\n", ret); + + ret = pBCryptCloseAlgorithmProvider(alg, 0); + ok(!ret, "got %08x\n", ret); +} + START_TEST(bcrypt) { HMODULE module; @@ -2186,6 +2254,7 @@ START_TEST(bcrypt) test_BCryptEnumContextFunctions(); test_BCryptSignHash(); test_BCryptEnumAlgorithms(); + test_aes_vector(); FreeLibrary(module); } -- 2.20.1

1 0

[PATCH 1/4] ntoskrnl.exe: Implement many more properties in IoGetDeviceProperty().
by Zebediah Figura 06 Nov '19

06 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/pnp.c | 81 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 56b1cac3cc..1fda026310 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -480,7 +480,12 @@ void WINAPI IoInvalidateDeviceRelations( DEVICE_OBJECT *device_object, DEVICE_RE NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROPERTY property, ULONG length, void *buffer, ULONG *needed ) { - NTSTATUS status = STATUS_NOT_IMPLEMENTED; + SP_DEVINFO_DATA sp_device = {sizeof(sp_device)}; + WCHAR device_instance_id[MAX_DEVICE_ID_LEN]; + DWORD sp_property = -1; + NTSTATUS status; + HDEVINFO set; + TRACE("device %p, property %u, length %u, buffer %p, needed %p.\n", device, property, length, buffer, needed); @@ -508,7 +513,7 @@ NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROP status = STATUS_BUFFER_TOO_SMALL; ExFreePool( id ); - break; + return status; } case DevicePropertyPhysicalDeviceObjectName: { @@ -543,11 +548,81 @@ NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROP *needed = 0; } HeapFree(GetProcessHeap(), 0, name); - break; + return status; } + case DevicePropertyDeviceDescription: + sp_property = SPDRP_DEVICEDESC; + break; + case DevicePropertyHardwareID: + sp_property = SPDRP_HARDWAREID; + break; + case DevicePropertyCompatibleIDs: + sp_property = SPDRP_COMPATIBLEIDS; + break; + case DevicePropertyClassName: + sp_property = SPDRP_CLASS; + break; + case DevicePropertyClassGuid: + sp_property = SPDRP_CLASSGUID; + break; + case DevicePropertyManufacturer: + sp_property = SPDRP_MFG; + break; + case DevicePropertyFriendlyName: + sp_property = SPDRP_FRIENDLYNAME; + break; + case DevicePropertyLocationInformation: + sp_property = SPDRP_LOCATION_INFORMATION; + break; + case DevicePropertyBusTypeGuid: + sp_property = SPDRP_BUSTYPEGUID; + break; + case DevicePropertyLegacyBusType: + sp_property = SPDRP_LEGACYBUSTYPE; + break; + case DevicePropertyBusNumber: + sp_property = SPDRP_BUSNUMBER; + break; + case DevicePropertyAddress: + sp_property = SPDRP_ADDRESS; + break; + case DevicePropertyUINumber: + sp_property = SPDRP_UI_NUMBER; + break; + case DevicePropertyInstallState: + sp_property = SPDRP_INSTALL_STATE; + break; + case DevicePropertyRemovalPolicy: + sp_property = SPDRP_REMOVAL_POLICY; + break; default: FIXME("Unhandled property %u.\n", property); + return STATUS_NOT_IMPLEMENTED; + } + + if ((status = get_device_instance_id( device, device_instance_id ))) + return status; + + if ((set = SetupDiCreateDeviceInfoList( &GUID_NULL, NULL )) == INVALID_HANDLE_VALUE) + { + ERR("Failed to create device list, error %#x.\n", GetLastError()); + return GetLastError(); } + + if (!SetupDiOpenDeviceInfoW( set, device_instance_id, NULL, 0, &sp_device)) + { + ERR("Failed to open device, error %#x.\n", GetLastError()); + SetupDiDestroyDeviceInfoList( set ); + return GetLastError(); + } + + if (SetupDiGetDeviceRegistryPropertyW( set, &sp_device, sp_property, NULL, buffer, length, needed )) + status = STATUS_SUCCESS; + else + status = GetLastError(); + + SetupDiDestroyDeviceInfoList( set ); + return status; } -- 2.23.0

1 3

[PATCH 1/5] userenv: Fix a copy-paste error.
by Zebediah Figura 06 Nov '19

06 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/userenv/userenv_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index b811c8315f..005166e5f4 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -281,7 +281,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, if (!GetEnvironmentVariableW(SystemDriveW, buf, UNICODE_STRING_MAX_CHARS)) { - if (!get_reg_value(env, hkey, SystemRootW, buf, UNICODE_STRING_MAX_CHARS)) + if (!get_reg_value(env, hkey, SystemDriveW, buf, UNICODE_STRING_MAX_CHARS)) { buf[0] = 0; WARN("SystemDrive variable not set\n"); -- 2.23.0

2 5

[PATCH v2] dmstyle: IDirectMusicTrack GetParam add pointer check.
by Michael Stefaniuc 06 Nov '19

06 Nov '19

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Re-indent a missed FIXME() dlls/dmstyle/auditiontrack.c | 10 +++++++--- dlls/dmstyle/chordtrack.c | 10 +++++++--- dlls/dmstyle/commandtrack.c | 10 +++++++--- dlls/dmstyle/motiftrack.c | 10 +++++++--- dlls/dmstyle/mutetrack.c | 10 +++++++--- dlls/dmstyle/styletrack.c | 10 +++++++--- dlls/dmstyle/tests/dmstyle.c | 6 +++--- 7 files changed, 45 insertions(+), 21 deletions(-) diff --git a/dlls/dmstyle/auditiontrack.c b/dlls/dmstyle/auditiontrack.c index 3c304ca574..ca975093fb 100644 --- a/dlls/dmstyle/auditiontrack.c +++ b/dlls/dmstyle/auditiontrack.c @@ -121,9 +121,13 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { - IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); + FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); + + if (!rguidType) + return E_POINTER; + + return S_OK; } static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c index fd290bf7a9..70056e5677 100644 --- a/dlls/dmstyle/chordtrack.c +++ b/dlls/dmstyle/chordtrack.c @@ -124,9 +124,13 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { - IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); + FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); + + if (!rguidType) + return E_POINTER; + + return S_OK; } static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c index e326241c4b..0afac074c7 100644 --- a/dlls/dmstyle/commandtrack.c +++ b/dlls/dmstyle/commandtrack.c @@ -123,9 +123,13 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { - IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); + FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); + + if (!rguidType) + return E_POINTER; + + return S_OK; } static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, diff --git a/dlls/dmstyle/motiftrack.c b/dlls/dmstyle/motiftrack.c index d4a4effec7..526a28111d 100644 --- a/dlls/dmstyle/motiftrack.c +++ b/dlls/dmstyle/motiftrack.c @@ -121,9 +121,13 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { - IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); + FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); + + if (!rguidType) + return E_POINTER; + + return S_OK; } static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, diff --git a/dlls/dmstyle/mutetrack.c b/dlls/dmstyle/mutetrack.c index 67bfbc30dc..5d85a1b61e 100644 --- a/dlls/dmstyle/mutetrack.c +++ b/dlls/dmstyle/mutetrack.c @@ -121,9 +121,13 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { - IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); + FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); + + if (!rguidType) + return E_POINTER; + + return S_OK; } static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index 79b4787ca0..a75853bf16 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -123,9 +123,13 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { - IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); + FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); + + if (!rguidType) + return E_POINTER; + + return S_OK; } static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index a94640d13d..6b2275866c 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -279,12 +279,12 @@ static void test_track(void) else todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); } - todo_wine { + hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); - } + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); + hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); if (class[i].clsid == &CLSID_DirectMusicMuteTrack) { -- 2.20.1

2 1

[PATCH 1/6] user32/tests: Wait more for ShowWindow(SW_SHOWMINIMIZED):overlapped test.
by Rémi Bernon 06 Nov '19

06 Nov '19

The first messages in the sequence are generated right away by the SW_MINIMIZE request, but the last ones are only a result of the native driver implementation of the window minimization and may take some time to be received, or may not be received at all. The test spuriously succeeds in the case where the driver messages are not received and only the optional messages at the end of the sequence are missing. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Notes: The test actually passes on all the testbot runs I could start. It fails locally though -testing with fvwm in Xephyr- from time to time because the WM sometimes reacts fast enough. I'm not sure if that's a specificity of the testbot WM configuration, it looks like minimizing windows there does not trigger anymore messages not matter how long we wait. dlls/user32/tests/msg.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 477661ab623..d0de1c6d8bd 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5101,6 +5101,7 @@ static void test_messages(void) LRESULT res; POINT pos; BOOL ret; + DWORD minimize_timeout; flush_sequence(); @@ -5163,7 +5164,13 @@ static void test_messages(void) ShowWindow(hwnd, SW_MINIMIZE); flush_events(); - ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", TRUE); + + /* Minimizing may take some time to complete or may not be supported + * at all and this spuriously failed because everything after the 16th + * message of the sequence is optional. */ + minimize_timeout = GetTickCount() + 500; + while (sequence_cnt <= 16 && GetTickCount() < minimize_timeout) flush_events(); + ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", sequence_cnt > 16); flush_sequence(); if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_MINIMIZE) -- 2.24.0.rc2

3 12

[PATCH v4 2/7] kernel32: Handle GEOCLASS_REGION in Get/SetUserGeoID.
by João Diogo Ferreira 05 Nov '19

05 Nov '19

Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- Supersedes: 172368 V4: Include documentation. V3: Fix build error. V2: Introduce trace logs. --- dlls/kernel32/locale.c | 66 ++++++++++++++++++++++++++++++++---------- 1 file changed, 50 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 884709730c..cee501278a 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3996,12 +3996,22 @@ static const struct geoinfo_t *get_geoinfo_dataptr(GEOID geoid) /****************************************************************************** * GetUserGeoID (KERNEL32.@) + * + * Retrieves the ID of the user's geographic nation or region. + * + * PARAMS + * GeoClass [I] One of GEOCLASS_NATION or GEOCLASS_REGION (SYSGEOCLASS enum from "winnls.h"). + * + * RETURNS + * SUCCESS: The ID of the specified geographic class. + * FAILURE: GEOID_NOT_AVAILABLE. */ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) { GEOID ret = GEOID_NOT_AVAILABLE; static const WCHAR geoW[] = {'G','e','o',0}; static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; + static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; WCHAR bufferW[40], *end; HANDLE hkey, hsubkey = 0; UNICODE_STRING keyW; @@ -4009,20 +4019,29 @@ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) DWORD count = sizeof(bufferW); RtlInitUnicodeString(&keyW, nationW); + if (geoclass == GEOCLASS_NATION) + { + TRACE("(GEOCLASS_NATION)\n"); + RtlInitUnicodeString(&keyW, nationW); + } + else if (geoclass == GEOCLASS_REGION) + { + TRACE("(GEOCLASS_REGION)\n"); + RtlInitUnicodeString(&keyW, regionW); + } + else + { + WARN("Unknown geoclass %d\n", geoclass); + return ret; + } + if (!(hkey = create_registry_key())) return ret; - switch (geoclass) { - case GEOCLASS_NATION: - if ((hsubkey = NLS_RegOpenKey(hkey, geoW))) - { - if ((NtQueryValueKey(hsubkey, &keyW, KeyValuePartialInformation, - bufferW, count, &count) == STATUS_SUCCESS ) && info->DataLength) - ret = strtolW((const WCHAR*)info->Data, &end, 10); - } - break; - case GEOCLASS_REGION: - FIXME("GEOCLASS_REGION not handled yet\n"); - break; + if ((hsubkey = NLS_RegOpenKey(hkey, geoW))) + { + if((NtQueryValueKey(hsubkey, &keyW, KeyValuePartialInformation, + bufferW, count, &count) == STATUS_SUCCESS ) && info->DataLength) + ret = strtolW((const WCHAR*)info->Data, &end, 10); } NtClose(hkey); @@ -4035,15 +4054,26 @@ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) */ BOOL WINAPI SetUserGeoID(GEOID geoid) { + const struct geoinfo_t *geoinfo = get_geoinfo_dataptr(geoid); static const WCHAR geoW[] = {'G','e','o',0}; static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; + static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; static const WCHAR formatW[] = {'%','i',0}; UNICODE_STRING nameW, keyW; WCHAR bufferW[10]; OBJECT_ATTRIBUTES attr; HANDLE hkey; - if (!(hkey = create_registry_key())) return FALSE; + if (!geoinfo) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (!(hkey = create_registry_key())) + { + SetLastError(ERROR_INTERNAL_ERROR); + return FALSE; + } attr.Length = sizeof(attr); attr.RootDirectory = hkey; @@ -4052,16 +4082,20 @@ BOOL WINAPI SetUserGeoID(GEOID geoid) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; RtlInitUnicodeString(&nameW, geoW); - RtlInitUnicodeString(&keyW, nationW); - if (NtCreateKey(&hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL) != STATUS_SUCCESS) + if (geoinfo->kind == LOCATION_NATION) + RtlInitUnicodeString(&keyW, nationW); + else + RtlInitUnicodeString(&keyW, regionW); + if (NtCreateKey(&hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL) != STATUS_SUCCESS) { NtClose(attr.RootDirectory); + SetLastError(ERROR_INTERNAL_ERROR); return FALSE; } - sprintfW(bufferW, formatW, geoid); + sprintfW(bufferW, formatW, geoinfo->id); NtSetValueKey(hkey, &keyW, 0, REG_SZ, bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR)); NtClose(attr.RootDirectory); NtClose(hkey); -- 2.23.0

3 3

[PATCH] wine.inf: add registry value for DigitalProductId
by Louis Lenders 05 Nov '19

05 Nov '19

2 2

[PATCH v2] wine.inf: add value for DigitalProductId
by Louis Lenders 05 Nov '19

05 Nov '19

1 0

[PATCH] msvcrt: Use %ws format for wchar strings in _wassert.
by Jacek Caban 05 Nov '19

05 Nov '19

%s does not do the right thing in ucrtbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/exit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH V2 1/1] secur32: reset phCredential->dwUpper at AcquireCredentialsHandleA
by Roberto Pungartnik 05 Nov '19

05 Nov '19

Supercedes: 172629

2 1

[PATCH 0/4] Add support for Vulkan shared memory in wine.
by Derek Lesho 05 Nov '19

05 Nov '19

This patchset adds support for Vulkan shared memory in wine, which can in turn be used by API layers like DXVK or D9VK to support D3D shared resources. The final commit in the patchset adds a wine extension allowing layers to associate a custom struct describing a resource, so that they can recreate it with no outside information. In the case of DXVK and D3D11 shared resources, this is a D3D11_COMMON_TEXTURE_DESC. While this is the simplest solution, it may be a better idea to define a standard structure/s, so that interop between i.e. DXVK and vkd3d would be possible. Keep in mind that this functionality may also be used for resources other than textures/surfaces, like synchronization primtives. Derek Lesho (4): server: Implement GPU Resource object type. ntdll: Add custom helpers for interfacing with GPU Resource objects. winevulkan: Add support for VK_KHR_external_memory_fd. server,ntdll: Allow storage of API data inside of GPU Resource objects. dlls/ntdll/Makefile.in | 1 + dlls/ntdll/gpu_resource.c | 128 ++++++++++++ dlls/ntdll/ntdll.spec | 6 + dlls/winevulkan/make_vulkan | 11 +- dlls/winevulkan/vulkan.c | 336 +++++++++++++++++++++++++++++- dlls/winevulkan/vulkan_private.h | 26 +++ server/Makefile.in | 1 + server/gpu_resource.c | 339 +++++++++++++++++++++++++++++++ server/protocol.def | 41 ++++ 9 files changed, 878 insertions(+), 11 deletions(-) create mode 100644 dlls/ntdll/gpu_resource.c create mode 100644 server/gpu_resource.c -- 2.23.0

2 12

[PATCH 1/2] kernelbase: Add stub for SetThreadDescription().
by Conor McCarthy 05 Nov '19

05 Nov '19

Required by Hitman 2. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- .../api-ms-win-core-processthreads-l1-1-3.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/thread.c | 10 ++++++++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec b/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec index 3b57e1c8..f8f5a870 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec @@ -5,6 +5,6 @@ @ stub GetThreadSelectedCpuSets @ stub SetProcessDefaultCpuSets @ stub SetProcessInformation -@ stub SetThreadDescription +@ stdcall SetThreadDescription(ptr ptr) kernel32.SetThreadDescription @ stdcall SetThreadIdealProcessor(long long) kernel32.SetThreadIdealProcessor @ stub SetThreadSelectedCpuSets diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 23c25b7a..347d2da2 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1447,6 +1447,7 @@ @ stdcall SetTermsrvAppInstallMode(long) @ stdcall SetThreadAffinityMask(long long) @ stdcall -import SetThreadContext(long ptr) +@ stdcall -import SetThreadDescription(ptr ptr) @ stdcall -import SetThreadErrorMode(long ptr) @ stdcall SetThreadExecutionState(long) @ stdcall -import SetThreadGroupAffinity(long ptr ptr) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index c1fa4795..743c48c2 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1478,7 +1478,7 @@ @ stdcall SetSystemTime(ptr) @ stdcall SetSystemTimeAdjustment(long long) kernel32.SetSystemTimeAdjustment @ stdcall SetThreadContext(long ptr) -# @ stub SetThreadDescription +@ stdcall SetThreadDescription(ptr ptr) @ stdcall SetThreadErrorMode(long ptr) @ stdcall SetThreadGroupAffinity(long ptr ptr) @ stdcall SetThreadIdealProcessor(long long) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 0cac2b69..f6823640 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -387,6 +387,16 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetThreadContext( HANDLE thread, const CONTEXT *co } +/*********************************************************************** + * SetThreadDescription (kernelbase.@) + */ +HRESULT WINAPI DECLSPEC_HOTPATCH SetThreadDescription( HANDLE thread, PCWSTR description ) +{ + FIXME( "(%p %p): stub\n", thread, description ); + return E_NOTIMPL; +} + + /*********************************************************************** * SetThreadErrorMode (kernelbase.@) */ -- 2.23.0

4 5

[PATCH 7/7] vbscript: Clean up lookup_identifier.
by Jacek Caban 05 Nov '19

05 Nov '19

Be more explicit about what applies only to non-global code. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/interp.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)

1 0

[PATCH 6/7] vbscript: Store only VBScript this objects in execution context.
by Jacek Caban 05 Nov '19

05 Nov '19

If it's an implicit this, we can handle that in interp_me. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/interp.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)

1 0

[PATCH 5/7] vbscript: Lookup this object in lookup_identifier only if it's an actual VBScript object.
by Jacek Caban 05 Nov '19

05 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/interp.c | 14 +++++++------- dlls/vbscript/tests/run.c | 6 ++++++ 2 files changed, 13 insertions(+), 7 deletions(-)

1 0

[PATCH 4/7] vbscript: Fix parsing call expressions.
by Jacek Caban 05 Nov '19

05 Nov '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41119 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 15 --------------- dlls/vbscript/lex.c | 8 +++++++- dlls/vbscript/parser.y | 22 ++++++++++++++++------ dlls/vbscript/tests/lang.vbs | 19 +++++++++++++++++++ 4 files changed, 42 insertions(+), 22 deletions(-)

1 0

[PATCH 3/7] vbscript: Support changing script state to SCRIPTSTATE_INITIALIZED.
by Jacek Caban 05 Nov '19

05 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/tests/vbscript.c | 29 +++++++++++++++++++++++++++++ dlls/vbscript/vbscript.c | 9 ++++----- 2 files changed, 33 insertions(+), 5 deletions(-)

1 0

[PATCH 2/7] vbscript: Don't allow changing script state when script site is not set.
by Jacek Caban 05 Nov '19

05 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/tests/vbscript.c | 5 +++++ dlls/vbscript/vbscript.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[PATCH 1/7] vbscript: Add Replace function implementation.
by Jacek Caban 05 Nov '19

05 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/global.c | 76 +++++++++++++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 68 ++++++++++++++++++++++++++++++--- dlls/vbscript/vbregexp.c | 42 ++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 4 files changed, 179 insertions(+), 8 deletions(-)

1 0

[PATCH 5/5] winex11.drv: Fix NoRes mode handler having an empty mode.
by Zhiyi Zhang 05 Nov '19

05 Nov '19

After 25167fb286822c93582457815bcf069fef040976 get_primary_monitor_rect() returns an empty rectangle before X11DRV_DisplayDevices_Init() is called. So use get_host_primary_monitor_rect() to get the current X desktop size. It's also more intuitive this way. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 800b65dbfd..a4f172037c 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -146,7 +146,7 @@ static LONG X11DRV_nores_SetCurrentMode(int mode) /* default handler only gets the current X desktop resolution */ void X11DRV_Settings_Init(void) { - RECT primary = get_primary_monitor_rect(); + RECT primary = get_host_primary_monitor_rect(); X11DRV_Settings_SetHandlers("NoRes", X11DRV_nores_GetCurrentMode, X11DRV_nores_SetCurrentMode, -- 2.23.0

1 0

[PATCH 4/5] winex11.drv: Move the desktop fullscreen check after desktop init.
by Zhiyi Zhang 05 Nov '19

05 Nov '19

After 25167fb286822c93582457815bcf069fef040976, get_primary_monitor_rect(), which is used in is_window_rect_fullscreen(), may return the primary screen size set by the last explorer instance if wineserver didn't fully shuts down. Also get_primary_monitor_rect() no longer reports the host primary monitor rect before virtual desktop initialization now. So move the desktop fullscreen check after desktop initialization so that primary screen size is updated and valid. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 2428293c4f..d70b38b2b3 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -281,7 +281,6 @@ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) XSetWindowAttributes win_attr; Window win; Display *display = thread_init_display(); - RECT rect; WCHAR name[MAX_PATH]; if (!GetUserObjectInformationW( GetThreadDesktop( GetCurrentThreadId() ), @@ -308,18 +307,17 @@ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) 0, 0, width, height, 0, default_visual.depth, InputOutput, default_visual.visual, CWEventMask | CWCursor | CWColormap, &win_attr ); if (!win) return FALSE; + if (!create_desktop_win_data( win )) return FALSE; - SetRect( &rect, 0, 0, width, height ); - if (is_window_rect_fullscreen( &rect )) + X11DRV_init_desktop( win, width, height ); + if (is_desktop_fullscreen()) { TRACE("setting desktop to fullscreen\n"); XChangeProperty( display, win, x11drv_atom(_NET_WM_STATE), XA_ATOM, 32, PropModeReplace, (unsigned char*)&x11drv_atom(_NET_WM_STATE_FULLSCREEN), 1); } - if (!create_desktop_win_data( win )) return FALSE; XFlush( display ); - X11DRV_init_desktop( win, width, height ); return TRUE; } -- 2.23.0

1 0

[PATCH 3/5] winex11.drv: Get virtual desktop size limit from the host primary display.
by Zhiyi Zhang 05 Nov '19

05 Nov '19

After 25167fb286822c93582457815bcf069fef040976, get_primary_monitor_rect() maybe invalid before display device initialization or returns the desktop rectangle after desktop initialization in virtual desktop mode, which is wrong. The desktop size limit should come from host system. This fixes a regression from efbbe66669a060dd01b3ae399f5a9e7328312f03. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47815 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 8 +++----- dlls/winex11.drv/display.c | 21 +++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index a3b2f0cbf2..2428293c4f 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -238,12 +238,14 @@ static void X11DRV_desktop_free_monitors( struct x11drv_monitor *monitors ) */ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) { - RECT primary_rect; + RECT primary_rect = get_host_primary_monitor_rect(); root_window = win; managed_mode = FALSE; /* no managed windows in desktop mode */ desktop_width = width; desktop_height = height; + max_width = primary_rect.right; + max_height = primary_rect.bottom; /* Initialize virtual desktop mode display device handler */ desktop_handler.name = "Virtual Desktop"; @@ -257,10 +259,6 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) TRACE("Display device functions are now handled by: Virtual Desktop\n"); X11DRV_DisplayDevices_Init( TRUE ); - primary_rect = get_primary_monitor_rect(); - max_width = primary_rect.right - primary_rect.left; - max_height = primary_rect.bottom - primary_rect.top; - /* initialize the available resolutions */ dd_modes = X11DRV_Settings_SetHandlers("desktop", X11DRV_desktop_GetCurrentMode, diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index d3ee653f21..7ad74c9b4e 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -233,6 +233,27 @@ RECT get_primary_monitor_rect(void) return primary; } +/* Get the primary monitor rect from the host system */ +RECT get_host_primary_monitor_rect(void) +{ + INT gpu_count, adapter_count, monitor_count; + struct x11drv_gpu *gpus = NULL; + struct x11drv_adapter *adapters = NULL; + struct x11drv_monitor *monitors = NULL; + RECT rect = {0}; + + /* The first monitor is always primary */ + if (host_handler.get_gpus(&gpus, &gpu_count) && gpu_count && + host_handler.get_adapters(gpus[0].id, &adapters, &adapter_count) && adapter_count && + host_handler.get_monitors(adapters[0].id, &monitors, &monitor_count) && monitor_count) + rect = monitors[0].rc_monitor; + + if (gpus) host_handler.free_gpus(gpus); + if (adapters) host_handler.free_adapters(adapters); + if (monitors) host_handler.free_monitors(monitors); + return rect; +} + void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *new_handler) { if (new_handler->priority > host_handler.priority) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 4a6de9053d..ef8a42d609 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -643,6 +643,7 @@ extern POINT virtual_screen_to_root( INT x, INT y ) DECLSPEC_HIDDEN; extern POINT root_to_virtual_screen( INT x, INT y ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; extern RECT get_primary_monitor_rect(void) DECLSPEC_HIDDEN; +extern RECT get_host_primary_monitor_rect(void) DECLSPEC_HIDDEN; extern void query_work_area( RECT *rc_work ) DECLSPEC_HIDDEN; extern void xinerama_init( unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; -- 2.23.0

1 0

[PATCH 2/5] winex11.drv: Use a separate virtual desktop display device handler.
by Zhiyi Zhang 05 Nov '19

05 Nov '19

If we want to query host monitor dimensions, we need to use XRandR or Xinerama handler. However when in virtual desktop mode, its display device handler overrides other handlers. So we need to separate them. Then we can implement features that require host monitor dimensions like checking whether the virtual desktop window is fullscreen. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 102 ++++++++++++++++++++++++++++++++++-- dlls/winex11.drv/display.c | 34 ++++++------ dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/xinerama.c | 31 +++-------- 4 files changed, 127 insertions(+), 42 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index e4eb61f7bd..a3b2f0cbf2 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -27,6 +27,7 @@ /* avoid conflict with field names in included win32 headers */ #undef Status #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); @@ -36,6 +37,8 @@ static unsigned int dd_mode_count; static unsigned int max_width; static unsigned int max_height; +static unsigned int desktop_width; +static unsigned int desktop_height; static struct screen_size { unsigned int width; @@ -146,6 +149,88 @@ static LONG X11DRV_desktop_SetCurrentMode(int mode) return DISP_CHANGE_SUCCESSFUL; } +static void query_desktop_work_area( RECT *rc_work ) +{ + static const WCHAR trayW[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; + RECT rect; + HWND hwnd = FindWindowW( trayW, NULL ); + + if (!hwnd || !IsWindowVisible( hwnd )) return; + if (!GetWindowRect( hwnd, &rect )) return; + if (rect.top) rc_work->bottom = rect.top; + else rc_work->top = rect.bottom; + TRACE( "found tray %p %s work area %s\n", hwnd, wine_dbgstr_rect( &rect ), wine_dbgstr_rect( rc_work ) ); +} + +static BOOL X11DRV_desktop_get_gpus( struct x11drv_gpu **new_gpus, int *count ) +{ + static const WCHAR wine_adapterW[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; + struct x11drv_gpu *gpu; + + gpu = heap_calloc( 1, sizeof(*gpu) ); + if (!gpu) return FALSE; + + lstrcpyW( gpu->name, wine_adapterW ); + *new_gpus = gpu; + *count = 1; + return TRUE; +} + +static void X11DRV_desktop_free_gpus( struct x11drv_gpu *gpus ) +{ + heap_free( gpus ); +} + +/* TODO: Support multi-head virtual desktop */ +static BOOL X11DRV_desktop_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new_adapters, int *count ) +{ + struct x11drv_adapter *adapter; + + adapter = heap_calloc( 1, sizeof(*adapter) ); + if (!adapter) return FALSE; + + adapter->state_flags = DISPLAY_DEVICE_PRIMARY_DEVICE; + if (desktop_width && desktop_height) + adapter->state_flags |= DISPLAY_DEVICE_ATTACHED_TO_DESKTOP; + + *new_adapters = adapter; + *count = 1; + return TRUE; +} + +static void X11DRV_desktop_free_adapters( struct x11drv_adapter *adapters ) +{ + heap_free( adapters ); +} + +static BOOL X11DRV_desktop_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor **new_monitors, int *count ) +{ + static const WCHAR generic_nonpnp_monitorW[] = { + 'G','e','n','e','r','i','c',' ', + 'N','o','n','-','P','n','P',' ','M','o','n','i','t','o','r',0}; + struct x11drv_monitor *monitor; + + monitor = heap_calloc( 1, sizeof(*monitor) ); + if (!monitor) return FALSE; + + lstrcpyW( monitor->name, generic_nonpnp_monitorW ); + SetRect( &monitor->rc_monitor, 0, 0, desktop_width, desktop_height ); + SetRect( &monitor->rc_work, 0, 0, desktop_width, desktop_height ); + query_desktop_work_area( &monitor->rc_work ); + monitor->state_flags = DISPLAY_DEVICE_ATTACHED; + if (desktop_width && desktop_height) + monitor->state_flags |= DISPLAY_DEVICE_ACTIVE; + + *new_monitors = monitor; + *count = 1; + return TRUE; +} + +static void X11DRV_desktop_free_monitors( struct x11drv_monitor *monitors ) +{ + heap_free( monitors ); +} + /*********************************************************************** * X11DRV_init_desktop * @@ -157,8 +242,19 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) root_window = win; managed_mode = FALSE; /* no managed windows in desktop mode */ + desktop_width = width; + desktop_height = height; - xinerama_init( width, height ); + /* Initialize virtual desktop mode display device handler */ + desktop_handler.name = "Virtual Desktop"; + desktop_handler.get_gpus = X11DRV_desktop_get_gpus; + desktop_handler.get_adapters = X11DRV_desktop_get_adapters; + desktop_handler.get_monitors = X11DRV_desktop_get_monitors; + desktop_handler.free_gpus = X11DRV_desktop_free_gpus; + desktop_handler.free_adapters = X11DRV_desktop_free_adapters; + desktop_handler.free_monitors = X11DRV_desktop_free_monitors; + desktop_handler.register_event_handlers = NULL; + TRACE("Display device functions are now handled by: Virtual Desktop\n"); X11DRV_DisplayDevices_Init( TRUE ); primary_rect = get_primary_monitor_rect(); @@ -311,8 +407,8 @@ void X11DRV_resize_desktop( unsigned int width, unsigned int height ) struct desktop_resize_data resize_data; resize_data.old_virtual_rect = get_virtual_screen_rect(); - - xinerama_init( width, height ); + desktop_width = width; + desktop_height = height; X11DRV_DisplayDevices_Init( TRUE ); resize_data.new_virtual_rect = get_virtual_screen_rect(); diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index ee867343ae..d3ee653f21 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -103,7 +103,8 @@ static const WCHAR monitor_hardware_idW[] = { 'M','O','N','I','T','O','R','\\', 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; -static struct x11drv_display_device_handler handler; +static struct x11drv_display_device_handler host_handler; +struct x11drv_display_device_handler desktop_handler; /* Cached screen information, protected by screen_section */ static HKEY video_key; @@ -234,17 +235,19 @@ RECT get_primary_monitor_rect(void) void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *new_handler) { - if (new_handler->priority > handler.priority) + if (new_handler->priority > host_handler.priority) { - handler = *new_handler; - TRACE("Display device functions are now handled by: %s\n", handler.name); + host_handler = *new_handler; + TRACE("Display device functions are now handled by: %s\n", host_handler.name); } } void X11DRV_DisplayDevices_RegisterEventHandlers(void) { - if (handler.register_event_handlers) - handler.register_event_handlers(); + struct x11drv_display_device_handler *handler = is_virtual_desktop() ? &desktop_handler : &host_handler; + + if (handler->register_event_handlers) + handler->register_event_handlers(); } /* Initialize a GPU instance and return its GUID string in guid_string and driver value in driver parameter */ @@ -501,6 +504,7 @@ static void cleanup_devices(void) void X11DRV_DisplayDevices_Init(BOOL force) { HANDLE mutex; + struct x11drv_display_device_handler *handler = is_virtual_desktop() ? &desktop_handler : &host_handler; struct x11drv_gpu *gpus = NULL; struct x11drv_adapter *adapters = NULL; struct x11drv_monitor *monitors = NULL; @@ -526,7 +530,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) if (!force && disposition != REG_CREATED_NEW_KEY) goto done; - TRACE("via %s\n", wine_dbgstr_a(handler.name)); + TRACE("via %s\n", wine_dbgstr_a(handler->name)); prepare_devices(video_hkey); @@ -534,7 +538,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) monitor_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_MONITOR, NULL); /* Initialize GPUs */ - if (!handler.get_gpus(&gpus, &gpu_count)) + if (!handler->get_gpus(&gpus, &gpu_count)) goto done; TRACE("GPU count: %d\n", gpu_count); @@ -544,13 +548,13 @@ void X11DRV_DisplayDevices_Init(BOOL force) goto done; /* Initialize adapters */ - if (!handler.get_adapters(gpus[gpu].id, &adapters, &adapter_count)) + if (!handler->get_adapters(gpus[gpu].id, &adapters, &adapter_count)) goto done; TRACE("GPU: %#lx %s, adapter count: %d\n", gpus[gpu].id, wine_dbgstr_w(gpus[gpu].name), adapter_count); for (adapter = 0; adapter < adapter_count; adapter++) { - if (!handler.get_monitors(adapters[adapter].id, &monitors, &monitor_count)) + if (!handler->get_monitors(adapters[adapter].id, &monitors, &monitor_count)) goto done; TRACE("adapter: %#lx, monitor count: %d\n", adapters[adapter].id, monitor_count); @@ -566,12 +570,12 @@ void X11DRV_DisplayDevices_Init(BOOL force) goto done; } - handler.free_monitors(monitors); + handler->free_monitors(monitors); monitors = NULL; video_index++; } - handler.free_adapters(adapters); + handler->free_adapters(adapters); adapters = NULL; } @@ -582,9 +586,9 @@ done: RegCloseKey(video_hkey); release_display_device_init_mutex(mutex); if (gpus) - handler.free_gpus(gpus); + handler->free_gpus(gpus); if (adapters) - handler.free_adapters(adapters); + handler->free_adapters(adapters); if (monitors) - handler.free_monitors(monitors); + handler->free_monitors(monitors); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a96f57dc37..4a6de9053d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -753,6 +753,8 @@ struct x11drv_display_device_handler extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; extern void X11DRV_DisplayDevices_Init(BOOL force) DECLSPEC_HIDDEN; extern void X11DRV_DisplayDevices_RegisterEventHandlers(void) DECLSPEC_HIDDEN; +/* Display device handler used in virtual desktop mode */ +extern struct x11drv_display_device_handler desktop_handler DECLSPEC_HIDDEN; /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index bd607f3006..4903f52b23 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -75,20 +75,6 @@ void query_work_area( RECT *rc_work ) } } -static void query_desktop_work_area( RECT *rc_work ) -{ - static const WCHAR trayW[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; - RECT rect; - HWND hwnd = FindWindowW( trayW, NULL ); - - if (!hwnd || !IsWindowVisible( hwnd )) return; - if (!GetWindowRect( hwnd, &rect )) return; - if (rect.top) rc_work->bottom = rect.top; - else rc_work->top = rect.bottom; - TRACE( "found tray %p %s work area %s\n", hwnd, - wine_dbgstr_rect( &rect ), wine_dbgstr_rect( rc_work )); -} - #ifdef SONAME_LIBXINERAMA #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -304,22 +290,19 @@ void xinerama_init( unsigned int width, unsigned int height ) { struct x11drv_display_device_handler handler; MONITORINFOEXW *primary; - BOOL desktop_mode = FALSE; int i; RECT rect; - SetRect( &rect, 0, 0, width, height ); + if (is_virtual_desktop()) + return; - if (is_virtual_desktop() || !query_screens()) + SetRect( &rect, 0, 0, width, height ); + if (!query_screens()) { default_monitor.rcWork = default_monitor.rcMonitor = rect; - if (!is_virtual_desktop()) - query_work_area( &default_monitor.rcWork ); - else - query_desktop_work_area( &default_monitor.rcWork ); + query_work_area( &default_monitor.rcWork ); nb_monitors = 1; monitors = &default_monitor; - desktop_mode = TRUE; } primary = get_primary(); @@ -336,8 +319,8 @@ void xinerama_init( unsigned int width, unsigned int height ) (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); } - handler.name = desktop_mode ? "Desktop" : "Xinerama"; - handler.priority = desktop_mode ? 1000 : 100; + handler.name = "Xinerama"; + handler.priority = 100; handler.get_gpus = xinerama_get_gpus; handler.get_adapters = xinerama_get_adapters; handler.get_monitors = xinerama_get_monitors; -- 2.23.0

1 0

[PATCH 1/5] winex11.drv: Introduce is_virtual_desktop().
by Zhiyi Zhang 05 Nov '19

05 Nov '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 8 +++++++- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/mouse.c | 2 +- dlls/winex11.drv/palette.c | 2 +- dlls/winex11.drv/systray.c | 2 +- dlls/winex11.drv/window.c | 4 ++-- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xinerama.c | 4 ++-- dlls/winex11.drv/xrandr.c | 2 +- dlls/winex11.drv/xvidmode.c | 2 +- 10 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index fed8dd32e9..e4eb61f7bd 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -77,6 +77,12 @@ static struct screen_size { #define _NET_WM_STATE_REMOVE 0 #define _NET_WM_STATE_ADD 1 +/* Return TRUE if Wine is currently in virtual desktop mode */ +BOOL is_virtual_desktop(void) +{ + return root_window != DefaultRootWindow( gdi_display ); +} + /* create the mode structures */ static void make_modes(void) { @@ -268,7 +274,7 @@ static void update_desktop_fullscreen( unsigned int width, unsigned int height) Display *display = thread_display(); XEvent xev; - if (!display || root_window == DefaultRootWindow( display )) return; + if (!display || !is_virtual_desktop()) return; xev.xclient.type = ClientMessage; xev.xclient.window = root_window; diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 25730192d3..dd8837c11d 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -827,7 +827,7 @@ static void focus_out( Display *display , HWND hwnd ) x11drv_thread_data()->last_focus = hwnd; if ((xic = X11DRV_get_ic( hwnd ))) XUnsetICFocus( xic ); - if (root_window != DefaultRootWindow(display)) + if (is_virtual_desktop()) { if (hwnd == GetDesktopWindow()) reset_clipping_window(); return; diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 15e5c04a41..290732fa93 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -572,7 +572,7 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) { RECT virtual_rect = get_virtual_screen_rect(); if (!EqualRect( &rect, &virtual_rect )) return FALSE; - if (root_window != DefaultRootWindow( gdi_display )) return FALSE; + if (is_virtual_desktop()) return FALSE; } TRACE( "win %p clipping fullscreen\n", hwnd ); return grab_clipping_window( &rect ); diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index 073761a5ee..25bdb5f2bf 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -217,7 +217,7 @@ int X11DRV_PALETTE_Init(void) { X11DRV_PALETTE_PaletteFlags |= X11DRV_PALETTE_PRIVATE; - if( root_window != DefaultRootWindow(gdi_display) ) + if (is_virtual_desktop()) { win_attr.colormap = default_colormap; XChangeWindowAttributes( gdi_display, root_window, CWColormap, &win_attr ); diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index d4262c43cf..3be4bd6534 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -587,7 +587,7 @@ static BOOL init_systray(void) WNDCLASSEXW class; Display *display; - if (root_window != DefaultRootWindow( gdi_display )) return FALSE; + if (is_virtual_desktop()) return FALSE; if (init_done) return TRUE; icon_cx = GetSystemMetrics( SM_CXSMICON ) + 2 * ICON_BORDER; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index f3c6a1b3cb..99e4094ebd 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2474,7 +2474,7 @@ static BOOL hide_icon( struct x11drv_win_data *data ) if (data->managed) return TRUE; /* hide icons in desktop mode when the taskbar is active */ - if (root_window == DefaultRootWindow( gdi_display )) return FALSE; + if (!is_virtual_desktop()) return FALSE; return IsWindowVisible( FindWindowW( trayW, NULL )); } @@ -2781,7 +2781,7 @@ static BOOL is_netwm_supported( Display *display, Atom atom ) */ static LRESULT start_screensaver(void) { - if (root_window == DefaultRootWindow(gdi_display)) + if (!is_virtual_desktop()) { const char *argv[3] = { "xdg-screensaver", "activate", NULL }; int pid = _spawnvp( _P_DETACH, argv[0], argv ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 35e27334db..a96f57dc37 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -656,6 +656,7 @@ struct x11drv_mode_info extern void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; extern void X11DRV_resize_desktop(unsigned int width, unsigned int height) DECLSPEC_HIDDEN; +extern BOOL is_virtual_desktop(void) DECLSPEC_HIDDEN; extern BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; extern BOOL create_desktop_win_data( Window win ) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddDepthModes(void) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 57c77d6273..bd607f3006 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -310,10 +310,10 @@ void xinerama_init( unsigned int width, unsigned int height ) SetRect( &rect, 0, 0, width, height ); - if (root_window != DefaultRootWindow( gdi_display ) || !query_screens()) + if (is_virtual_desktop() || !query_screens()) { default_monitor.rcWork = default_monitor.rcMonitor = rect; - if (root_window == DefaultRootWindow( gdi_display )) + if (!is_virtual_desktop()) query_work_area( &default_monitor.rcWork ); else query_desktop_work_area( &default_monitor.rcWork ); diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 0a64613fac..5616857347 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1099,7 +1099,7 @@ void X11DRV_XRandR_Init(void) if (major) return; /* already initialized? */ if (!usexrandr) return; /* disabled in config */ - if (root_window != DefaultRootWindow( gdi_display )) return; + if (is_virtual_desktop()) return; if (!(ret = load_xrandr())) return; /* can't load the Xrandr library */ /* see if Xrandr is available */ diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 975575fe77..5acc95bd2e 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -210,7 +210,7 @@ void X11DRV_XF86VM_Init(void) #endif /* X_XF86VidModeSetGammaRamp */ /* retrieve modes */ - if (usexvidmode && root_window == DefaultRootWindow( gdi_display )) + if (usexvidmode && !is_virtual_desktop()) { X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); ok = pXF86VidModeGetAllModeLines(gdi_display, DefaultScreen(gdi_display), &nmodes, &real_xf86vm_modes); -- 2.23.0

1 0

[PATCH] user32/tests: Wait and flush messages after window creation.
by Rémi Bernon 05 Nov '19

05 Nov '19

The window created in the separate thread in test_Input_mouse sometimes fails to catch the mouse input in time. Waiting and flushing the initial messages seems to make the issue harder to reproduce. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Notes: This is hard to reproduce even without the patch, and it seems to only happen on the w1064v1809_ar VM for some reason. These runs where started with the original test_Input_mouse code: https://testbot.winehq.org/JobDetails.pl?Key=59109 (3 failures) https://testbot.winehq.org/JobDetails.pl?Key=59110 (0 failures) https://testbot.winehq.org/JobDetails.pl?Key=59111 (0 failures) https://testbot.winehq.org/JobDetails.pl?Key=59112 (3 failures) https://testbot.winehq.org/JobDetails.pl?Key=59127 (0 failures) https://testbot.winehq.org/JobDetails.pl?Key=59128 (0 failures) https://testbot.winehq.org/JobDetails.pl?Key=59129 (0 failures) https://testbot.winehq.org/JobDetails.pl?Key=59130 (0 failures) https://testbot.winehq.org/JobDetails.pl?Key=59131 (0 failures) https://testbot.winehq.org/JobDetails.pl?Key=59132 (0 failures) https://testbot.winehq.org/JobDetails.pl?Key=59145 (0 failures) https://testbot.winehq.org/JobDetails.pl?Key=59146 (3 failures) https://testbot.winehq.org/JobDetails.pl?Key=59147 (0 failures) https://testbot.winehq.org/JobDetails.pl?Key=59148 (0 failures) https://testbot.winehq.org/JobDetails.pl?Key=59149 (3 failures) These runs with the patched version: https://testbot.winehq.org/JobDetails.pl?Key=59113 (0 failures) https://testbot.winehq.org/JobDetails.pl?Key=59114 (0 failures) https://testbot.winehq.org/JobDetails.pl?Key=59115 (0 failures) https://testbot.winehq.org/JobDetails.pl?Key=59116 (0 failures) https://testbot.winehq.org/JobDetails.pl?Key=59121 (0 failures) https://testbot.winehq.org/JobDetails.pl?Key=59122 (0 failures) https://testbot.winehq.org/JobDetails.pl?Key=59123 (0 failures) https://testbot.winehq.org/JobDetails.pl?Key=59124 (0 failures) https://testbot.winehq.org/JobDetails.pl?Key=59125 (0 failures) https://testbot.winehq.org/JobDetails.pl?Key=59126 (0 failures) https://testbot.winehq.org/JobDetails.pl?Key=59140 (0 failures) https://testbot.winehq.org/JobDetails.pl?Key=59141 (0 failures) https://testbot.winehq.org/JobDetails.pl?Key=59142 (0 failures) https://testbot.winehq.org/JobDetails.pl?Key=59143 (0 failures) https://testbot.winehq.org/JobDetails.pl?Key=59144 (0 failures) dlls/user32/tests/input.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 1e6be311eeb..d0e76038115 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2196,6 +2196,7 @@ static DWORD WINAPI create_static_win(void *arg) { struct thread_data *thread_data = arg; HWND win; + MSG msg; win = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, 100, 100, 100, 100, 0, NULL, NULL, NULL); @@ -2204,6 +2205,7 @@ static DWORD WINAPI create_static_win(void *arg) GWLP_WNDPROC, (LONG_PTR)static_hook_proc); thread_data->win = win; + while (wait_for_message(&msg)) DispatchMessageA(&msg); SetEvent(thread_data->start_event); wait_for_event(thread_data->end_event, 5000); return 0; -- 2.24.0.rc2

1 0

[PATCH] msxml3: Remove "stub" from traces.
by Nikolay Sivov 05 Nov '19

05 Nov '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/parseerror.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c index 438c9eb3c4..2ca0885708 100644 --- a/dlls/msxml3/parseerror.c +++ b/dlls/msxml3/parseerror.c @@ -224,7 +224,7 @@ static HRESULT WINAPI parseError_get_line( { parse_error_t *This = impl_from_IXMLDOMParseError2( iface ); - TRACE("(%p)->(%p): stub\n", This, line); + TRACE("%p, %p.\n", This, line); if (!line) return E_INVALIDARG; -- 2.24.0.rc1

1 0

[PATCH] ole32: Remove "stub" from traces.
by Nikolay Sivov 05 Nov '19

05 Nov '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/classmoniker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 3837a1f74c..07d55e2f94 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -142,7 +142,7 @@ static ULONG WINAPI ClassMoniker_Release(IMoniker* iface) ******************************************************************************/ static HRESULT WINAPI ClassMoniker_GetClassID(IMoniker* iface,CLSID *pClassID) { - TRACE("(%p,%p),stub!\n",iface,pClassID); + TRACE("(%p, %p)\n", iface, pClassID); if (pClassID==NULL) return E_POINTER; -- 2.24.0.rc1

1 0

[PATCH] shell32: Remove "stub" from traces.
by Nikolay Sivov 05 Nov '19

05 Nov '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/pidl.c | 4 ++-- dlls/shell32/shellstring.c | 2 +- dlls/shell32/shlview.c | 19 +++++++------------ 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 54fb818526..e2746deb48 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1105,7 +1105,7 @@ HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPSTR filename, shortname; WIN32_FIND_DATAA * pfd; - TRACE_(shell)("sf=%p pidl=%p 0x%04x %p 0x%04x stub\n",psf,pidl,nFormat,dest,len); + TRACE_(shell)("%p, %p, %d, %p, %d.\n", psf, pidl, nFormat, dest, len); pdump(pidl); if (!psf || !dest) @@ -1163,7 +1163,7 @@ HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPSTR filename, shortname; WIN32_FIND_DATAW * pfd = dest; - TRACE_(shell)("sf=%p pidl=%p 0x%04x %p 0x%04x stub\n",psf,pidl,nFormat,dest,len); + TRACE_(shell)("%p, %p, %d, %p, %d.\n", psf, pidl, nFormat, dest, len); pdump(pidl); diff --git a/dlls/shell32/shellstring.c b/dlls/shell32/shellstring.c index 956fd50871..3b70a2a94b 100644 --- a/dlls/shell32/shellstring.c +++ b/dlls/shell32/shellstring.c @@ -269,7 +269,7 @@ DWORD WINAPI CheckEscapesW( DWORD size = lstrlenW(string); LPWSTR s, d; - TRACE("(%s %d) stub\n", debugstr_w(string), len); + TRACE("%s, %u.\n", debugstr_w(string), len); if (StrPBrkW(string, strEscapedChars) && size + 2 <= len) { diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index bcb9466315..ff1332087d 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -778,13 +778,9 @@ static HMENU ShellView_BuildFileMenu(IShellViewImpl * This) TRACE("-- return (menu=%p)\n",hSubMenu); return hSubMenu; } -/********************************************************** -* ShellView_MergeFileMenu() -*/ + static void ShellView_MergeFileMenu(IShellViewImpl *This, HMENU hSubMenu) { - TRACE("(%p)->(submenu=%p) stub\n",This,hSubMenu); - if (hSubMenu) { static const WCHAR dummyW[] = {'d','u','m','m','y','4','5',0}; @@ -806,8 +802,6 @@ static void ShellView_MergeFileMenu(IShellViewImpl *This, HMENU hSubMenu) mii.fType = MFT_STRING; InsertMenuItemW(hSubMenu, 0, TRUE, &mii); } - - TRACE("--\n"); } /********************************************************** @@ -989,7 +983,7 @@ static void ShellView_DoContextMenu(IShellViewImpl * This, WORD x, WORD y, BOOL LPCONTEXTMENU pContextMenu = NULL; CMINVOKECOMMANDINFO cmi; - TRACE("(%p)->(0x%08x 0x%08x 0x%08x) stub\n",This, x, y, bDefault); + TRACE("%p, %d, %d, %d.\n", This, x, y, bDefault); /* look, what's selected and create a context menu object of it*/ if( ShellView_GetSelections(This) ) @@ -1230,7 +1224,7 @@ static LRESULT ShellView_OnSetFocus(IShellViewImpl * This) */ static LRESULT ShellView_OnKillFocus(IShellViewImpl * This) { - TRACE("(%p) stub\n",This); + TRACE("%p.\n", This); ShellView_OnActivate(This, SVUIA_ACTIVATE_NOFOCUS); /* Notify the ICommDlgBrowser */ @@ -1870,7 +1864,7 @@ static HRESULT WINAPI IShellView_fnUIActivate(IShellView3 *iface, UINT uState) LRESULT lResult; int nPartArray[1] = {-1}; - TRACE("(%p)->(state=%x) stub\n",This, uState); + TRACE("%p, %d.\n", This, uState); /*don't do anything if the state isn't really changing*/ if(This->uState == uState) @@ -2677,7 +2671,7 @@ static ULONG WINAPI FolderView_Release(IFolderView2 *iface) static HRESULT WINAPI FolderView_GetCurrentViewMode(IFolderView2 *iface, UINT *mode) { IShellViewImpl *This = impl_from_IFolderView2(iface); - TRACE("(%p)->(%p), stub\n", This, mode); + TRACE("%p, %p.\n", This, mode); if(!mode) return E_INVALIDARG; @@ -2690,7 +2684,8 @@ static HRESULT WINAPI FolderView_SetCurrentViewMode(IFolderView2 *iface, UINT mo { IShellViewImpl *This = impl_from_IFolderView2(iface); DWORD dwStyle; - TRACE("(%p)->(%u), stub\n", This, mode); + + TRACE("%p, %u.\n", This, mode); if((mode < FVM_FIRST || mode > FVM_LAST) && (mode != FVM_AUTO)) -- 2.24.0.rc1

1 0

[PATCH] ole32/tests: Remove Win9x workarounds from moniker tests.
by Nikolay Sivov 05 Nov '19

05 Nov '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/moniker.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 18ea4d465b..9e2c23b421 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -708,11 +708,8 @@ static void test_ROT(void) ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT, (IUnknown*)&Test_ClassFactory, pMoniker, &dwCookie); todo_wine { - ok(hr == CO_E_WRONG_SERVER_IDENTITY || - broken(hr == S_OK) /* Win9x */, - "IRunningObjectTable_Register should have returned CO_E_WRONG_SERVER_IDENTITY instead of 0x%08x\n", hr); + ok(hr == CO_E_WRONG_SERVER_IDENTITY, "Unexpected hr %#x.\n", hr); } - if (hr == S_OK) IRunningObjectTable_Revoke(pROT, dwCookie); hr = IRunningObjectTable_Register(pROT, 0xdeadbeef, (IUnknown*)&Test_ClassFactory, pMoniker, &dwCookie); @@ -919,8 +916,8 @@ static void test_MkParseDisplayName(void) eaten = 0xdeadbeef; pmk = (IMoniker *)0xdeadbeef; hr = MkParseDisplayName(pbc, wszNonExistentProgId, &eaten, &pmk); - ok(hr == MK_E_SYNTAX || hr == MK_E_CANTOPENFILE /* Win9x */, - "MkParseDisplayName should have failed with MK_E_SYNTAX or MK_E_CANTOPENFILE instead of 0x%08x\n", hr); +todo_wine + ok(hr == MK_E_SYNTAX, "Unexpected hr %#x.\n", hr); ok(eaten == 0, "Processed character count should have been 0 instead of %u\n", eaten); ok(pmk == NULL, "Output moniker pointer should have been NULL instead of %p\n", pmk); @@ -929,8 +926,8 @@ static void test_MkParseDisplayName(void) eaten = 0xdeadbeef; pmk = (IMoniker *)0xdeadbeef; hr = MkParseDisplayName(pbc, wszDisplayNameClsid, &eaten, &pmk); - ok(hr == MK_E_SYNTAX || hr == MK_E_CANTOPENFILE /* Win9x */, - "MkParseDisplayName should have failed with MK_E_SYNTAX or MK_E_CANTOPENFILE instead of 0x%08x\n", hr); +todo_wine + ok(hr == MK_E_SYNTAX, "Unexpected hr %#x.\n", hr); ok(eaten == 0, "Processed character count should have been 0 instead of %u\n", eaten); ok(pmk == NULL, "Output moniker pointer should have been NULL instead of %p\n", pmk); @@ -1009,8 +1006,8 @@ static void test_MkParseDisplayName(void) eaten = 0xdeadbeef; pmk = (IMoniker *)0xdeadbeef; hr = MkParseDisplayName(pbc, wszDisplayNameProgIdFail, &eaten, &pmk); - ok(hr == MK_E_SYNTAX || hr == MK_E_CANTOPENFILE /* Win9x */, - "MkParseDisplayName with ProgId without marker should fail with MK_E_SYNTAX or MK_E_CANTOPENFILE instead of 0x%08x\n", hr); +todo_wine + ok(hr == MK_E_SYNTAX, "Unexpected hr %#x.\n", hr); ok(eaten == 0, "Processed character count should have been 0 instead of %u\n", eaten); ok(pmk == NULL, "Output moniker pointer should have been NULL instead of %p\n", pmk); @@ -2054,11 +2051,6 @@ static void test_save_load_filemoniker(void) START_TEST(moniker) { - if (!GetProcAddress(GetModuleHandleA("ole32.dll"), "CoRegisterSurrogateEx")) { - win_skip("skipping test on win9x\n"); - return; - } - CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); test_ROT(); -- 2.24.0.rc1

1 0

[PATCH 1/3] mfreadwrite: Use separate helpers for sync/async ReadSample().
by Nikolay Sivov 05 Nov '19

05 Nov '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/main.c | 114 ++++++++++++++++++-------------- dlls/mfreadwrite/tests/mfplat.c | 4 -- 2 files changed, 65 insertions(+), 53 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 3467746bb8..6fb00b4d37 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -778,14 +778,17 @@ static IMFSample *media_stream_pop_sample(struct media_stream *stream, DWORD *st return ret; } -static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, DWORD flags, DWORD *actual_index, +static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD index, DWORD flags, DWORD *actual_index, DWORD *stream_flags, LONGLONG *timestamp, IMFSample **sample) { - struct source_reader *reader = impl_from_IMFSourceReader(iface); + struct media_stream *stream; DWORD stream_index; - HRESULT hr; + HRESULT hr = S_OK; - TRACE("%p, %#x, %#x, %p, %p, %p, %p\n", iface, index, flags, actual_index, stream_flags, timestamp, sample); + if (!stream_flags || !sample) + return E_POINTER; + + *sample = NULL; switch (index) { @@ -802,68 +805,81 @@ static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, stream_index = index; } - /* FIXME: probably should happen once */ - IMFMediaSource_Start(reader->source, reader->descriptor, NULL, NULL); - - if (reader->async_callback) + if (stream_index >= reader->stream_count) { - FIXME("Async mode is not implemented.\n"); - return E_NOTIMPL; + *stream_flags = MF_SOURCE_READERF_ERROR; + if (actual_index) + *actual_index = index; + return MF_E_INVALIDSTREAMNUMBER; } - else - { - struct media_stream *stream; - if (!stream_flags || !sample) - return E_POINTER; + if (actual_index) + *actual_index = stream_index; - *sample = NULL; + stream = &reader->streams[stream_index]; - if (stream_index >= reader->stream_count) + EnterCriticalSection(&stream->cs); + + if (!(flags & MF_SOURCE_READER_CONTROLF_DRAIN)) + { + while (list_empty(&stream->samples) && stream->state != STREAM_STATE_EOS) { - *stream_flags = MF_SOURCE_READERF_ERROR; - if (actual_index) - *actual_index = index; - return MF_E_INVALIDSTREAMNUMBER; + if (stream->stream) + { + if (FAILED(hr = IMFMediaStream_RequestSample(stream->stream, NULL))) + WARN("Sample request failed, hr %#x.\n", hr); + } + SleepConditionVariableCS(&stream->sample_event, &stream->cs, INFINITE); } + } - if (actual_index) - *actual_index = stream_index; + *sample = media_stream_pop_sample(stream, stream_flags); - stream = &reader->streams[stream_index]; + LeaveCriticalSection(&stream->cs); - EnterCriticalSection(&stream->cs); + TRACE("Got sample %p.\n", *sample); - if (!(flags & MF_SOURCE_READER_CONTROLF_DRAIN)) - { - while (list_empty(&stream->samples) && stream->state != STREAM_STATE_EOS) - { - if (stream->stream) - { - if (FAILED(hr = IMFMediaStream_RequestSample(stream->stream, NULL))) - WARN("Sample request failed, hr %#x.\n", hr); - } - SleepConditionVariableCS(&stream->sample_event, &stream->cs, INFINITE); - } - } + if (timestamp) + { + /* TODO: it's possible timestamp has to be set for some events. + For MEEndOfStream it's correct to return 0. */ + *timestamp = 0; + if (*sample) + IMFSample_GetSampleTime(*sample, timestamp); + } - *sample = media_stream_pop_sample(stream, stream_flags); + return hr; +} - LeaveCriticalSection(&stream->cs); +static HRESULT source_reader_read_sample_async(struct source_reader *reader, DWORD index, DWORD flags) +{ + FIXME("Async mode is not implemented.\n"); - TRACE("Got sample %p.\n", *sample); + return E_NOTIMPL; +} - if (timestamp) - { - /* TODO: it's possible timestamp has to be set for some events. - For MEEndOfStream it's correct to return 0. */ - *timestamp = 0; - if (*sample) - IMFSample_GetSampleTime(*sample, timestamp); - } +static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, DWORD flags, DWORD *actual_index, + DWORD *stream_flags, LONGLONG *timestamp, IMFSample **sample) +{ + struct source_reader *reader = impl_from_IMFSourceReader(iface); + HRESULT hr; + + TRACE("%p, %#x, %#x, %p, %p, %p, %p\n", iface, index, flags, actual_index, stream_flags, timestamp, sample); + + /* FIXME: probably should happen once */ + IMFMediaSource_Start(reader->source, reader->descriptor, NULL, NULL); + + if (reader->async_callback) + { + if (actual_index || stream_flags || timestamp || sample) + return E_INVALIDARG; + + hr = source_reader_read_sample_async(reader, index, flags); } + else + hr = source_reader_read_sample(reader, index, flags, actual_index, stream_flags, timestamp, sample); - return S_OK; + return hr; } static HRESULT WINAPI src_reader_Flush(IMFSourceReader *iface, DWORD index) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 27ceb0faf1..16bb92b80e 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -894,19 +894,15 @@ todo_wine /* Return values are delivered to callback only. */ hr = IMFSourceReader_ReadSample(reader, 0, 0, &actual_index, &stream_flags, &timestamp, &sample); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = IMFSourceReader_ReadSample(reader, 0, 0, NULL, &stream_flags, &timestamp, &sample); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = IMFSourceReader_ReadSample(reader, 0, 0, NULL, NULL, &timestamp, &sample); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = IMFSourceReader_ReadSample(reader, 0, 0, NULL, NULL, NULL, &sample); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); IMFSourceReader_Release(reader); -- 2.24.0.rc1

1 2

[PATCH 1/4] comsvcs: Add GetTimeOfLastChange() for "new" moniker.
by Nikolay Sivov 05 Nov '19

05 Nov '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comsvcs/main.c | 4 ++-- dlls/comsvcs/tests/comsvcs.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 6b292844d9..ee75893561 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -577,9 +577,9 @@ static HRESULT WINAPI new_moniker_IsRunning(IMoniker* iface, IBindCtx *pbc, IMon static HRESULT WINAPI new_moniker_GetTimeOfLastChange(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, FILETIME *itemtime) { - FIXME("%p, %p, %p, %p.\n", iface, pbc, pmkToLeft, itemtime); + TRACE("%p, %p, %p, %p.\n", iface, pbc, pmkToLeft, itemtime); - return E_NOTIMPL; + return MK_E_UNAVAILABLE; } static HRESULT WINAPI new_moniker_Inverse(IMoniker *iface, IMoniker **inverse) diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index 37fce3dab4..bdb817a144 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -344,7 +344,6 @@ todo_wine ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); hr = IMoniker_GetTimeOfLastChange(moniker, bindctx, NULL, &filetime); -todo_wine ok(hr == MK_E_UNAVAILABLE, "Unexpected hr %#x.\n", hr); hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&obj); -- 2.24.0.rc1

1 3

[PATCH] msi: Use integers internally for MSIDBOPEN constants.
by Vincent Povirk 05 Nov '19

05 Nov '19

This fixes a bug where some verions of mingw and probably gcc assume that the result of pointer subtraction will be non-NULL, causing MSI_OpenDatabaseW to break when given the mode MSIDBOPEN_READONLY + MSIDBOPEN_PATCHFILE. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/msi/database.c | 40 ++++++++++++++++++++++------------------ dlls/msi/msipriv.h | 10 +++++++++- dlls/msi/msiquery.c | 2 +- 3 files changed, 32 insertions(+), 20 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 776fe53e163..f7c70aeead7 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -144,7 +144,8 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) HRESULT r; MSIDATABASE *db = NULL; UINT ret = ERROR_FUNCTION_FAILED; - LPCWSTR szMode, save_path; + LPCWSTR save_path; + UINT mode; STATSTG stat; BOOL created = FALSE, patch = FALSE; WCHAR path[MAX_PATH]; @@ -154,31 +155,34 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) if( !pdb ) return ERROR_INVALID_PARAMETER; - if (szPersist - MSIDBOPEN_PATCHFILE <= MSIDBOPEN_CREATEDIRECT) + save_path = szDBPath; + if ( IS_INTMSIDBOPEN(szPersist) ) { - TRACE("Database is a patch\n"); - szPersist -= MSIDBOPEN_PATCHFILE; - patch = TRUE; + mode = LOWORD(szPersist); } - - save_path = szDBPath; - szMode = szPersist; - if( !IS_INTMSIDBOPEN(szPersist) ) + else { if (!CopyFileW( szDBPath, szPersist, FALSE )) return ERROR_OPEN_FAILED; szDBPath = szPersist; - szPersist = MSIDBOPEN_TRANSACT; + mode = MSI_OPEN_TRANSACT; created = TRUE; } - if( szPersist == MSIDBOPEN_READONLY ) + if ((mode & MSI_OPEN_PATCHFILE) == MSI_OPEN_PATCHFILE) + { + TRACE("Database is a patch\n"); + mode &= ~MSI_OPEN_PATCHFILE; + patch = TRUE; + } + + if( mode == MSI_OPEN_READONLY ) { r = StgOpenStorage( szDBPath, NULL, STGM_DIRECT|STGM_READ|STGM_SHARE_DENY_WRITE, NULL, 0, &stg); } - else if( szPersist == MSIDBOPEN_CREATE ) + else if( mode == MSI_OPEN_CREATE ) { r = StgCreateDocfile( szDBPath, STGM_CREATE|STGM_TRANSACTED|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, 0, &stg ); @@ -187,7 +191,7 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) r = db_initialize( stg, patch ? &CLSID_MsiPatch : &CLSID_MsiDatabase ); created = TRUE; } - else if( szPersist == MSIDBOPEN_CREATEDIRECT ) + else if( mode == MSI_OPEN_CREATEDIRECT ) { r = StgCreateDocfile( szDBPath, STGM_CREATE|STGM_DIRECT|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, 0, &stg ); @@ -196,19 +200,19 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) r = db_initialize( stg, patch ? &CLSID_MsiPatch : &CLSID_MsiDatabase ); created = TRUE; } - else if( szPersist == MSIDBOPEN_TRANSACT ) + else if( mode == MSI_OPEN_TRANSACT ) { r = StgOpenStorage( szDBPath, NULL, STGM_TRANSACTED|STGM_READWRITE|STGM_SHARE_DENY_WRITE, NULL, 0, &stg); } - else if( szPersist == MSIDBOPEN_DIRECT ) + else if( mode == MSI_OPEN_DIRECT ) { r = StgOpenStorage( szDBPath, NULL, STGM_DIRECT|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, NULL, 0, &stg); } else { - ERR("unknown flag %p\n",szPersist); + ERR("unknown flag %x\n",mode); return ERROR_INVALID_PARAMETER; } @@ -267,7 +271,7 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) enum_stream_names( stg ); db->storage = stg; - db->mode = szMode; + db->mode = mode; if (created) db->deletefile = strdupW( szDBPath ); list_init( &db->tables ); @@ -1977,7 +1981,7 @@ MSIDBSTATE WINAPI MsiGetDatabaseState( MSIHANDLE handle ) if (!(db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE ))) return MSIDBSTATE_ERROR; - if (db->mode != MSIDBOPEN_READONLY ) + if (db->mode != MSI_OPEN_READONLY ) ret = MSIDBSTATE_WRITE; msiobj_release( &db->hdr ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 0732973341c..fca2f9e7b4d 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -95,6 +95,14 @@ typedef struct tagMSITRANSFORM IStorage *stg; } MSITRANSFORM; +/* integer versions of the MSIDBOPEN_* constants */ +#define MSI_OPEN_READONLY 0 +#define MSI_OPEN_TRANSACT 1 +#define MSI_OPEN_DIRECT 2 +#define MSI_OPEN_CREATE 3 +#define MSI_OPEN_CREATEDIRECT 4 +#define MSI_OPEN_PATCHFILE 32 + typedef struct tagMSIDATABASE { MSIOBJECTHDR hdr; @@ -104,7 +112,7 @@ typedef struct tagMSIDATABASE LPWSTR path; LPWSTR deletefile; LPWSTR tempfolder; - LPCWSTR mode; + UINT mode; UINT media_transform_offset; UINT media_transform_disk_id; struct list tables; diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index cf8b2b2b4db..526589c320c 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -981,7 +981,7 @@ UINT WINAPI MsiDatabaseCommit( MSIHANDLE hdb ) return ERROR_SUCCESS; } - if (db->mode == MSIDBOPEN_READONLY) + if (db->mode == MSI_OPEN_READONLY) { msiobj_release( &db->hdr ); return ERROR_SUCCESS; -- 2.17.1

2 1

[PATCH 1/5] d3d9/tests: Add another flush to work around an intermittent test failure on fvwm2.
by Zebediah Figura 05 Nov '19

05 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Much like 2b29d02aa. dlls/d3d9/tests/d3d9ex.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 38f49572fe..d0967f0ac0 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3124,6 +3124,7 @@ static void test_wndproc(void) "Expected IsIconic %u, got %u, i=%u.\n", tests[i].iconic, IsIconic(focus_window), i); ShowWindow(focus_window, SW_SHOWNOACTIVATE); + flush_events(); ShowWindow(focus_window, SW_SHOWMINNOACTIVE); flush_events(); -- 2.23.0

2 5

[PATCH v3 1/2] user32/edit: In EM_POSFROMCHAR return correct position for empty lines
by Fabian Maurer 04 Nov '19

04 Nov '19

Fix with permission from ROS Jira Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47305 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/edit.c | 2 +- dlls/user32/tests/edit.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 00900e648b..87f0cebeab 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1102,7 +1102,7 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) x -= es->x_offset; } else - x = es->x_offset; + x = -es->x_offset; if (es->style & ES_RIGHT) x = w - (lw - x); diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index d0374c02a3..b9ca2617c6 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1142,6 +1142,8 @@ static void test_edit_control_4(void) int lo, hi, mid; int ret; int i; + HDC dc; + SIZE size; trace("EDIT: Test EM_CHARFROMPOS and EM_POSFROMCHAR\n"); hwEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); @@ -1251,6 +1253,21 @@ static void test_edit_control_4(void) ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); ok(-1 == ret, "expected -1 got %d\n", ret); DestroyWindow(hwEdit); + + /* Test newline when the edit control is scrolled to the right */ + + hwEdit = create_editcontrol(ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww\r\n\r\n"); + SendMessageA(hwEdit, EM_SETSEL, 40, 40); + + dc = GetDC(hwEdit); + GetTextExtentPoint32A(dc, "w", 1, &size); + ReleaseDC(hwEdit, dc); + lo = (short)LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 42, 0)); + ret = (short)LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 40, 0)); + ret += size.cx * (-40); /* Calculate expected position, 40 characters to the left */ + ok(ret == lo, "expected %d got %d\n", ret, lo); + DestroyWindow(hwEdit); } /* Test if creating edit control without ES_AUTOHSCROLL and ES_AUTOVSCROLL -- 2.22.0

2 3

[PATCH] mfreadwrite/tests: Add some tests for "any"-stream requests.
by Nikolay Sivov 04 Nov '19

04 Nov '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/tests/mfplat.c | 511 ++++++++++++++++++++++++++++++++ 1 file changed, 511 insertions(+) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index b86fb060fd..ba9023b289 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -52,6 +52,412 @@ static void init_functions(void) #undef X } +enum source_state +{ + SOURCE_STOPPED = 0, + SOURCE_RUNNING, +}; + +struct test_media_stream +{ + IMFMediaStream IMFMediaStream_iface; + LONG refcount; + IMFMediaSource *source; + IMFStreamDescriptor *sd; + IMFMediaEventQueue *event_queue; + BOOL is_new; +}; + +static struct test_media_stream *impl_from_IMFMediaStream(IMFMediaStream *iface) +{ + return CONTAINING_RECORD(iface, struct test_media_stream, IMFMediaStream_iface); +} + +static HRESULT WINAPI test_media_stream_QueryInterface(IMFMediaStream *iface, REFIID riid, void **out) +{ + if (IsEqualIID(riid, &IID_IMFMediaStream) + || IsEqualIID(riid, &IID_IMFMediaEventGenerator) + || IsEqualIID(riid, &IID_IUnknown)) + { + *out = iface; + } + else + { + *out = NULL; + return E_NOINTERFACE; + } + + IMFMediaStream_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI test_media_stream_AddRef(IMFMediaStream *iface) +{ + struct test_media_stream *stream = impl_from_IMFMediaStream(iface); + return InterlockedIncrement(&stream->refcount); +} + +static ULONG WINAPI test_media_stream_Release(IMFMediaStream *iface) +{ + struct test_media_stream *stream = impl_from_IMFMediaStream(iface); + ULONG refcount = InterlockedDecrement(&stream->refcount); + + if (!refcount) + { + IMFMediaEventQueue_Release(stream->event_queue); + heap_free(stream); + } + + return refcount; +} + +static HRESULT WINAPI test_media_stream_GetEvent(IMFMediaStream *iface, DWORD flags, IMFMediaEvent **event) +{ + struct test_media_stream *stream = impl_from_IMFMediaStream(iface); + return IMFMediaEventQueue_GetEvent(stream->event_queue, flags, event); +} + +static HRESULT WINAPI test_media_stream_BeginGetEvent(IMFMediaStream *iface, IMFAsyncCallback *callback, IUnknown *state) +{ + struct test_media_stream *stream = impl_from_IMFMediaStream(iface); + ok(callback != NULL && state == (IUnknown *)iface, "Unexpected arguments.\n"); + return IMFMediaEventQueue_BeginGetEvent(stream->event_queue, callback, state); +} + +static HRESULT WINAPI test_media_stream_EndGetEvent(IMFMediaStream *iface, IMFAsyncResult *result, IMFMediaEvent **event) +{ + struct test_media_stream *stream = impl_from_IMFMediaStream(iface); + ok(!!result && !!event, "Unexpected arguments.\n"); + return IMFMediaEventQueue_EndGetEvent(stream->event_queue, result, event); +} + +static HRESULT WINAPI test_media_stream_QueueEvent(IMFMediaStream *iface, MediaEventType event_type, REFGUID ext_type, + HRESULT hr, const PROPVARIANT *value) +{ + struct test_media_stream *stream = impl_from_IMFMediaStream(iface); + return IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, event_type, ext_type, hr, value); +} + +static HRESULT WINAPI test_media_stream_GetMediaSource(IMFMediaStream *iface, IMFMediaSource **source) +{ + struct test_media_stream *stream = impl_from_IMFMediaStream(iface); + + *source = stream->source; + IMFMediaSource_AddRef(*source); + + return S_OK; +} + +static HRESULT WINAPI test_media_stream_GetStreamDescriptor(IMFMediaStream *iface, IMFStreamDescriptor **sd) +{ + struct test_media_stream *stream = impl_from_IMFMediaStream(iface); + + *sd = stream->sd; + IMFStreamDescriptor_AddRef(*sd); + + return S_OK; +} + +static HRESULT WINAPI test_media_stream_RequestSample(IMFMediaStream *iface, IUnknown *token) +{ + struct test_media_stream *stream = impl_from_IMFMediaStream(iface); + IMFMediaBuffer *buffer; + IMFSample *sample; + HRESULT hr; + + hr = MFCreateSample(&sample); + ok(hr == S_OK, "Failed to create a sample, hr %#x.\n", hr); + hr = IMFSample_SetSampleTime(sample, 123); + ok(hr == S_OK, "Failed to set sample time, hr %#x.\n", hr); + if (token) + IMFSample_SetUnknown(sample, &MFSampleExtension_Token, token); + + /* Reader expects buffers, empty samples are considered an error. */ + hr = MFCreateMemoryBuffer(8, &buffer); + ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + hr = IMFSample_AddBuffer(sample, buffer); + ok(hr == S_OK, "Failed to add a buffer, hr %#x.\n", hr); + IMFMediaBuffer_Release(buffer); + + hr = IMFMediaEventQueue_QueueEventParamUnk(stream->event_queue, MEMediaSample, &GUID_NULL, S_OK, + (IUnknown *)sample); + ok(hr == S_OK, "Failed to submit event, hr %#x.\n", hr); + IMFSample_Release(sample); + + return S_OK; +} + +static const IMFMediaStreamVtbl test_media_stream_vtbl = +{ + test_media_stream_QueryInterface, + test_media_stream_AddRef, + test_media_stream_Release, + test_media_stream_GetEvent, + test_media_stream_BeginGetEvent, + test_media_stream_EndGetEvent, + test_media_stream_QueueEvent, + test_media_stream_GetMediaSource, + test_media_stream_GetStreamDescriptor, + test_media_stream_RequestSample, +}; + +#define TEST_SOURCE_NUM_STREAMS 3 + +struct test_source +{ + IMFMediaSource IMFMediaSource_iface; + LONG refcount; + IMFMediaEventQueue *event_queue; + IMFPresentationDescriptor *pd; + struct test_media_stream *streams[TEST_SOURCE_NUM_STREAMS]; + enum source_state state; + CRITICAL_SECTION cs; +}; + +static struct test_source *impl_from_IMFMediaSource(IMFMediaSource *iface) +{ + return CONTAINING_RECORD(iface, struct test_source, IMFMediaSource_iface); +} + +static HRESULT WINAPI test_source_QueryInterface(IMFMediaSource *iface, REFIID riid, void **out) +{ + if (IsEqualIID(riid, &IID_IMFMediaSource) + || IsEqualIID(riid, &IID_IMFMediaEventGenerator) + || IsEqualIID(riid, &IID_IUnknown)) + { + *out = iface; + } + else + { + *out = NULL; + return E_NOINTERFACE; + } + + IMFMediaSource_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI test_source_AddRef(IMFMediaSource *iface) +{ + struct test_source *source = impl_from_IMFMediaSource(iface); + return InterlockedIncrement(&source->refcount); +} + +static ULONG WINAPI test_source_Release(IMFMediaSource *iface) +{ + struct test_source *source = impl_from_IMFMediaSource(iface); + ULONG refcount = InterlockedDecrement(&source->refcount); + + if (!refcount) + { + IMFMediaEventQueue_Release(source->event_queue); + heap_free(source); + } + + return refcount; +} + +static HRESULT WINAPI test_source_GetEvent(IMFMediaSource *iface, DWORD flags, IMFMediaEvent **event) +{ + struct test_source *source = impl_from_IMFMediaSource(iface); + return IMFMediaEventQueue_GetEvent(source->event_queue, flags, event); +} + +static HRESULT WINAPI test_source_BeginGetEvent(IMFMediaSource *iface, IMFAsyncCallback *callback, IUnknown *state) +{ + struct test_source *source = impl_from_IMFMediaSource(iface); + ok(callback != NULL && state == (IUnknown *)iface, "Unexpected arguments source %p, %p, state %p.\n", iface, callback, state); + return IMFMediaEventQueue_BeginGetEvent(source->event_queue, callback, state); +} + +static HRESULT WINAPI test_source_EndGetEvent(IMFMediaSource *iface, IMFAsyncResult *result, IMFMediaEvent **event) +{ + struct test_source *source = impl_from_IMFMediaSource(iface); + return IMFMediaEventQueue_EndGetEvent(source->event_queue, result, event); +} + +static HRESULT WINAPI test_source_QueueEvent(IMFMediaSource *iface, MediaEventType event_type, REFGUID ext_type, + HRESULT hr, const PROPVARIANT *value) +{ + struct test_source *source = impl_from_IMFMediaSource(iface); + return IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, ext_type, hr, value); +} + +static HRESULT WINAPI test_source_GetCharacteristics(IMFMediaSource *iface, DWORD *flags) +{ + *flags = MFMEDIASOURCE_CAN_SEEK; + + return S_OK; +} + +static HRESULT WINAPI test_source_CreatePresentationDescriptor(IMFMediaSource *iface, IMFPresentationDescriptor **pd) +{ + struct test_source *source = impl_from_IMFMediaSource(iface); + IMFStreamDescriptor *sds[ARRAY_SIZE(source->streams)]; + IMFMediaType *media_type; + HRESULT hr = S_OK; + int i; + + EnterCriticalSection(&source->cs); + + if (source->pd) + { + *pd = source->pd; + IMFPresentationDescriptor_AddRef(*pd); + } + else + { + for (i = 0; i < ARRAY_SIZE(source->streams); ++i) + { + MFCreateMediaType(&media_type); + + IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + + MFCreateStreamDescriptor(i, 1, &media_type, &sds[i]); + + IMFMediaType_Release(media_type); + } + + MFCreatePresentationDescriptor(ARRAY_SIZE(sds), sds, &source->pd); + for (i = 0; i < ARRAY_SIZE(sds); ++i) + IMFStreamDescriptor_Release(sds[i]); + + *pd = source->pd; + IMFPresentationDescriptor_AddRef(*pd); + } + + LeaveCriticalSection(&source->cs); + + return hr; +} + +static BOOL is_stream_selected(IMFPresentationDescriptor *pd, DWORD index) +{ + IMFStreamDescriptor *sd; + BOOL selected = FALSE; + + if (SUCCEEDED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, index, &selected, &sd))) + IMFStreamDescriptor_Release(sd); + + return selected; +} + +static HRESULT WINAPI test_source_Start(IMFMediaSource *iface, IMFPresentationDescriptor *pd, const GUID *time_format, + const PROPVARIANT *start_position) +{ + struct test_source *source = impl_from_IMFMediaSource(iface); + MediaEventType event_type; + PROPVARIANT var; + int i; + +todo_wine { + ok(time_format && IsEqualGUID(time_format, &GUID_NULL), "Unexpected time format %s.\n", wine_dbgstr_guid(time_format)); + ok(start_position && (start_position->vt == VT_I8 || start_position->vt == VT_EMPTY), "Unexpected position type.\n"); +} + EnterCriticalSection(&source->cs); + + event_type = source->state == SOURCE_RUNNING ? MESourceSeeked : MESourceStarted; + IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, &GUID_NULL, S_OK, NULL); + + for (i = 0; i < ARRAY_SIZE(source->streams); ++i) + { + if (!is_stream_selected(pd, i)) + continue; + + var.vt = VT_UNKNOWN; + var.punkVal = (IUnknown *)&source->streams[i]->IMFMediaStream_iface; + event_type = source->streams[i]->is_new ? MENewStream : MEUpdatedStream; + source->streams[i]->is_new = FALSE; + IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, &GUID_NULL, S_OK, &var); + + event_type = source->state == SOURCE_RUNNING ? MEStreamSeeked : MEStreamStarted; + IMFMediaEventQueue_QueueEventParamVar(source->streams[i]->event_queue, event_type, &GUID_NULL, + S_OK, NULL); + } + + source->state = SOURCE_RUNNING; + + LeaveCriticalSection(&source->cs); + + return S_OK; +} + +static HRESULT WINAPI test_source_Stop(IMFMediaSource *iface) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_source_Pause(IMFMediaSource *iface) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_source_Shutdown(IMFMediaSource *iface) +{ + struct test_source *source = impl_from_IMFMediaSource(iface); + + IMFMediaEventQueue_Shutdown(source->event_queue); + + return S_OK; +} + +static const IMFMediaSourceVtbl test_source_vtbl = +{ + test_source_QueryInterface, + test_source_AddRef, + test_source_Release, + test_source_GetEvent, + test_source_BeginGetEvent, + test_source_EndGetEvent, + test_source_QueueEvent, + test_source_GetCharacteristics, + test_source_CreatePresentationDescriptor, + test_source_Start, + test_source_Stop, + test_source_Pause, + test_source_Shutdown, +}; + +static struct test_media_stream *create_test_stream(DWORD stream_index, IMFMediaSource *source) +{ + struct test_media_stream *stream; + IMFPresentationDescriptor *pd; + BOOL selected; + + stream = heap_alloc_zero(sizeof(*stream)); + stream->IMFMediaStream_iface.lpVtbl = &test_media_stream_vtbl; + stream->refcount = 1; + MFCreateEventQueue(&stream->event_queue); + stream->source = source; + IMFMediaSource_AddRef(stream->source); + stream->is_new = TRUE; + + IMFMediaSource_CreatePresentationDescriptor(source, &pd); + IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, stream_index, &selected, &stream->sd); + IMFPresentationDescriptor_Release(pd); + + return stream; +} + +static IMFMediaSource *create_test_source(void) +{ + struct test_source *source; + int i; + + source = heap_alloc_zero(sizeof(*source)); + source->IMFMediaSource_iface.lpVtbl = &test_source_vtbl; + source->refcount = 1; + MFCreateEventQueue(&source->event_queue); + InitializeCriticalSection(&source->cs); + for (i = 0; i < ARRAY_SIZE(source->streams); ++i) + source->streams[i] = create_test_stream(i, &source->IMFMediaSource_iface); + + return &source->IMFMediaSource_iface; +} + static IMFByteStream *get_resource_stream(const char *name) { IMFByteStream *bytestream; @@ -402,6 +808,110 @@ todo_wine IMFByteStream_Release(stream); } +static void test_source_reader_from_media_source(void) +{ + struct async_callback *callback; + IMFSourceReader *reader; + IMFMediaSource *source; + HRESULT hr; + DWORD actual_index, stream_flags; + IMFSample *sample; + LONGLONG timestamp; + IMFAttributes *attributes; + int i; + + source = create_test_source(); + ok(!!source, "Failed to create test source.\n"); + + callback = create_async_callback(); + + hr = MFCreateAttributes(&attributes, 1); + ok(hr == S_OK, "Failed to create attributes object, hr %#x.\n", hr); + + hr = IMFAttributes_SetUnknown(attributes, &MF_SOURCE_READER_ASYNC_CALLBACK, + (IUnknown *)&callback->IMFSourceReaderCallback_iface); + ok(hr == S_OK, "Failed to set attribute value, hr %#x.\n", hr); + IMFSourceReaderCallback_Release(&callback->IMFSourceReaderCallback_iface); + + hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader); + ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + + /* MF_SOURCE_READER_ANY_STREAM */ + hr = IMFSourceReader_SetStreamSelection(reader, 0, FALSE); + ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + + hr = IMFSourceReader_SetStreamSelection(reader, 1, TRUE); + ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, 0, &actual_index, &stream_flags, + &timestamp, &sample); +todo_wine { + ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(actual_index == 1, "Unexpected stream index %u\n", actual_index); + ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); + ok(timestamp == 123, "Unexpected timestamp.\n"); + ok(!!sample, "Expected sample object.\n"); + IMFSample_Release(sample); + } +} + hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); + ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + + hr = IMFSourceReader_SetStreamSelection(reader, 2, TRUE); + ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + + for (i = 0; i < 2 * TEST_SOURCE_NUM_STREAMS; ++i) + { + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, 0, &actual_index, &stream_flags, + &timestamp, &sample); +todo_wine + ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(actual_index == (i < TEST_SOURCE_NUM_STREAMS ? i : 0), "%d: Unexpected stream index %u\n", + i, actual_index); + ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); + ok(timestamp == 123, "Unexpected timestamp.\n"); + ok(!!sample, "Expected sample object.\n"); + IMFSample_Release(sample); + } + } + + IMFSourceReader_Release(reader); + IMFMediaSource_Release(source); + + /* Async mode. */ + source = create_test_source(); + ok(!!source, "Failed to create test source.\n"); + + hr = MFCreateSourceReaderFromMediaSource(source, attributes, &reader); + ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + + hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); + ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + + /* Return values are delivered to callback only. */ + hr = IMFSourceReader_ReadSample(reader, 0, 0, &actual_index, &stream_flags, &timestamp, &sample); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFSourceReader_ReadSample(reader, 0, 0, NULL, &stream_flags, &timestamp, &sample); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFSourceReader_ReadSample(reader, 0, 0, NULL, NULL, &timestamp, &sample); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFSourceReader_ReadSample(reader, 0, 0, NULL, NULL, NULL, &sample); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + IMFSourceReader_Release(reader); +} + START_TEST(mfplat) { HRESULT hr; @@ -413,6 +923,7 @@ START_TEST(mfplat) test_factory(); test_source_reader(); + test_source_reader_from_media_source(); hr = MFShutdown(); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); -- 2.24.0.rc1

1 0

[PATCH] d3d9/tests: Reorder two occlusion query tests to work around a timeout with llvmpipe.
by Zebediah Figura 04 Nov '19

04 Nov '19

llvmpipe is extraordinarily slow to execute glBeginQuery() [as much as 10ms per call] when the regression test for bug 45932 is run after the previous test drawing a 33-bit number of samples. Swap the two tests to work around this. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- I haven't fully debugged it to determine what happens, but naïvely judging from LP_DEBUG output, the previous scene is re-rasterized on every call to glBeginQuery(). This is almost certainly a bug in llvmpipe. However, since by all apperances these two tests are unrelated, it seems far more prudent to me to work around it by reordering them than to spend time optimizing llvmpipe for speed. For reference, the tests in question were added in 2dc3d2454 and 6b80fe509. dlls/d3d9/tests/device.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 40ca639001..75cddbb6db 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6007,6 +6007,26 @@ static void test_occlusion_query(void) if (broken_occlusion) goto done; + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Failed to begin scene, hr %#x.\n", hr); + for (i = 0; i < 50000; ++i) + { + hr = IDirect3DQuery9_Issue(query, D3DISSUE_BEGIN); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Failed to end scene, hr %#x.\n", hr); + + wait_query(query); + + memset(&data, 0xff, sizeof(data)); + hr = IDirect3DQuery9_GetData(query, &data, sizeof(data), D3DGETDATA_FLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(data.dword[0] == 0 && data.dword[1] == 0, + "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); @@ -6062,26 +6082,6 @@ static void test_occlusion_query(void) || broken(data.dword[0] < 0xffffffff && !data.dword[1]), "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); - hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - for (i = 0; i < 50000; ++i) - { - hr = IDirect3DQuery9_Issue(query, D3DISSUE_BEGIN); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - } - hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - - wait_query(query); - - memset(&data, 0xff, sizeof(data)); - hr = IDirect3DQuery9_GetData(query, &data, sizeof(data), D3DGETDATA_FLUSH); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ok(data.dword[0] == 0 && data.dword[1] == 0, - "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); - IDirect3DSurface9_Release(rt); done: -- 2.23.0

3 2

[PATCH] d3d8/tests: Flush events after sending SC_MAXIMIZE.
by Zebediah Figura 04 Nov '19

04 Nov '19

For some reason, on fvwm2 sometimes focus_window will be restored and activated between the subsequent call to SetForegroundWindow() and the next call to ShowWindow(SW_RESTORE), causing the next test to fail. Flushing first seems to reliably work around this. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- I don't know why this occurs. The messages sent suggest that a WM_STATE is received from fvwm2, and this triggers handle_wm_state_notify() to call SetActiveWindow() and send SC_RESTORE. But it's not clear why WM_STATE would be sent at that point. I can't reproduce the problem on my end more than once in a large number of times, so debugging is rather difficult. dlls/d3d8/tests/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 819c1cd944..9fc06c3c9d 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3151,6 +3151,7 @@ static void test_wndproc(void) ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", expect_messages->message, expect_messages->window); expect_messages = NULL; + flush_events(); SetForegroundWindow(GetDesktopWindow()); flush_events(); -- 2.23.0

3 2

[PATCH 2/2] Revert "mscoree: Call mono_thread_manage in GC Unsafe mode."
by Vincent Povirk 04 Nov '19

04 Nov '19

This reverts commit d10f2c0723585da66a7b1e822e852ce54d56c5f1. The bug we were working around has been fixed in upstream Mono and in Wine Mono 4.9.4. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/mscoree/corruntimehost.c | 2 -- dlls/mscoree/metahost.c | 2 -- dlls/mscoree/mscoree_private.h | 1 - 3 files changed, 5 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index b72af709c03..e932a7f58be 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1544,8 +1544,6 @@ __int32 WINAPI _CorExeMain(void) if (domain) { - int dummy; - mono_threads_enter_gc_unsafe_region(&dummy); mono_thread_manage(); mono_runtime_quit(); } diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 575d6ce1d39..18232a45686 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -124,7 +124,6 @@ MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); static char* (CDECL *mono_stringify_assembly_name)(MonoAssemblyName *aname); MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain); void (CDECL *mono_thread_manage)(void); -void (CDECL *mono_threads_enter_gc_unsafe_region)(void *stackdata); void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback); void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback); @@ -225,7 +224,6 @@ static HRESULT load_mono(LPCWSTR mono_path) LOAD_MONO_FUNCTION(mono_string_new); LOAD_MONO_FUNCTION(mono_thread_attach); LOAD_MONO_FUNCTION(mono_thread_manage); - LOAD_MONO_FUNCTION(mono_threads_enter_gc_unsafe_region); #undef LOAD_MONO_FUNCTION diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 5847126b3ec..d5f78b61f0b 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -177,7 +177,6 @@ extern void (CDECL *mono_runtime_quit)(void) DECLSPEC_HIDDEN; extern MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str) DECLSPEC_HIDDEN; extern MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain) DECLSPEC_HIDDEN; extern void (CDECL *mono_thread_manage)(void) DECLSPEC_HIDDEN; -extern void (CDECL *mono_threads_enter_gc_unsafe_region)(void *stackdata) DECLSPEC_HIDDEN; extern void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback) DECLSPEC_HIDDEN; extern void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback) DECLSPEC_HIDDEN; -- 2.17.1

1 0

[PATCH 1/2] mscoree: Update Wine Mono to 4.9.4.
by Vincent Povirk 04 Nov '19

04 Nov '19

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index e501054e16d..350c25ef905 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -58,8 +58,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.9.3" -#define MONO_SHA "7cf6b7674697f9de9cd1630ceb1de4c56adebb617fcca4d179a22cb7e1b2476d" +#define MONO_VERSION "4.9.4" +#define MONO_SHA "51a6ff38323fcda71d70ead90c252b5eaeacec542ba737dbd1d676787b210fdd" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 250bd24ad10..5847126b3ec 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "4.9.3" +#define WINE_MONO_VERSION "4.9.4" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; -- 2.17.1

1 0

vkd3d: Thoughts on how to include shaders in the project?
by Philip Rebohle 04 Nov '19

04 Nov '19

Hello, I'm currently looking into getting Deus Ex: Mankind Divided to run on vkd3d. Among other issues, it uses ClearUnorderedAccessView for typed buffer views, which is currently not supported and will require the use of a compute shader. There are also a few other areas where shader-based implementations might become necessary in the future, e.g. for copies between depth and color images, ResolveSubresource with typeless images, etc. What would be the preferred way to integrate shaders for this purpose in vkd3d? One option would be to compile GLSL shaders at build-time to a C header containing the SPIR-V code, which could then be included in the vkd3d source files directly. This would introduce glslangValidator as a new build-time dependency, is that acceptable? Also, how would this be implemented in the build system? I don't have much experience with autoconf, so some help in that regard would be highly appreciated. I'd like to avoid including pre-compiled SPIR-V binaries in the source tree directly or installing them as separate files if possible, since doing so would complicate the workflow significantly. Regards, - Philip

3 6

[PATCH v3 1/9] vbscript: Use arrays for global variable and function lists.
by Gabriel Ivăncescu 04 Nov '19

04 Nov '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Supersedes 172426 to 172433. DISPID_FUNCTION_MASK has been chosen to be the same bit used in TypeLibs to separate functions from variables in MEMBERIDs. dlls/vbscript/compile.c | 31 +++++----- dlls/vbscript/interp.c | 56 ++++++++++++----- dlls/vbscript/vbdisp.c | 127 ++++++++++++--------------------------- dlls/vbscript/vbscript.c | 10 ++- dlls/vbscript/vbscript.h | 52 +++++++++++++--- 5 files changed, 149 insertions(+), 127 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 0727979..f7bceeb 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1780,17 +1780,18 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) static BOOL lookup_script_identifier(script_ctx_t *script, const WCHAR *identifier) { + dynamic_var_t **vars = script->global_vars; + function_t **funcs = script->global_funcs; class_desc_t *class; - dynamic_var_t *var; - function_t *func; + UINT i; - for(var = script->global_vars; var; var = var->next) { - if(!wcsicmp(var->name, identifier)) + for(i = 0; i < script->global_vars_num; i++) { + if(!wcsicmp(vars[i]->name, identifier)) return TRUE; } - for(func = script->global_funcs; func; func = func->next) { - if(!wcsicmp(func->name, identifier)) + for(i = 0; i < script->global_funcs_num; i++) { + if(!wcsicmp(funcs[i]->name, identifier)) return TRUE; } @@ -1956,17 +1957,19 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli if(ctx.global_vars) { dynamic_var_t *var; - for(var = ctx.global_vars; var->next; var = var->next); - - var->next = script->global_vars; - script->global_vars = ctx.global_vars; + for (var = ctx.global_vars; var; var = var->next) + if (!add_global_var(script, var)) { + release_compiler(&ctx); + return compile_error(script, E_OUTOFMEMORY); + } } if(ctx.funcs) { - for(new_func = ctx.funcs; new_func->next; new_func = new_func->next); - - new_func->next = script->global_funcs; - script->global_funcs = ctx.funcs; + for (new_func = ctx.funcs; new_func; new_func = new_func->next) + if (!add_global_func(script, new_func)) { + release_compiler(&ctx); + return compile_error(script, E_OUTOFMEMORY); + } } if(ctx.classes) { diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index ad6454a..acd524f 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -95,10 +95,41 @@ static BOOL lookup_dynamic_vars(dynamic_var_t *var, const WCHAR *name, ref_t *re return FALSE; } +static BOOL lookup_global_vars(script_ctx_t *script, const WCHAR *name, ref_t *ref) +{ + dynamic_var_t **vars = script->global_vars; + UINT i, num = script->global_vars_num; + + for (i = 0; i < num; i++) { + if (!wcsicmp(vars[i]->name, name)) { + ref->type = vars[i]->is_const ? REF_CONST : REF_VAR; + ref->u.v = &vars[i]->v; + return TRUE; + } + } + + return FALSE; +} + +static BOOL lookup_global_funcs(script_ctx_t *script, const WCHAR *name, ref_t *ref) +{ + function_t **funcs = script->global_funcs; + UINT i, num = script->global_funcs_num; + + for (i = 0; i < num; i++) { + if (!wcsicmp(funcs[i]->name, name)) { + ref->type = REF_FUNC; + ref->u.f = funcs[i]; + return TRUE; + } + } + + return FALSE; +} + static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_t invoke_type, ref_t *ref) { named_item_t *item; - function_t *func; IDispatch *disp; unsigned i; DISPID id; @@ -128,10 +159,13 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } } - if(lookup_dynamic_vars(ctx->func->type == FUNC_GLOBAL ? ctx->script->global_vars : ctx->dynamic_vars, name, ref)) - return S_OK; + if(ctx->func->type == FUNC_GLOBAL) { + if(lookup_global_vars(ctx->script, name, ref)) + return S_OK; + }else { + if(lookup_dynamic_vars(ctx->dynamic_vars, name, ref)) + return S_OK; - if(ctx->func->type != FUNC_GLOBAL) { if(ctx->vbthis) { /* FIXME: Bind such identifier while generating bytecode. */ for(i=0; i < ctx->vbthis->desc->prop_cnt; i++) { @@ -162,16 +196,11 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } } - if(ctx->func->type != FUNC_GLOBAL && lookup_dynamic_vars(ctx->script->global_vars, name, ref)) + if(ctx->func->type != FUNC_GLOBAL && lookup_global_vars(ctx->script, name, ref)) return S_OK; - for(func = ctx->script->global_funcs; func; func = func->next) { - if(!wcsicmp(func->name, name)) { - ref->type = REF_FUNC; - ref->u.f = func; - return S_OK; - } - } + if(lookup_global_funcs(ctx->script, name, ref)) + return S_OK; hres = get_builtin_id(ctx->script->global_obj, name, &id); if(SUCCEEDED(hres)) { @@ -228,8 +257,7 @@ static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, V_VT(&new_var->v) = VT_EMPTY; if(ctx->func->type == FUNC_GLOBAL) { - new_var->next = ctx->script->global_vars; - ctx->script->global_vars = new_var; + add_global_var(ctx->script, new_var); }else { new_var->next = ctx->dynamic_vars; ctx->dynamic_vars = new_var; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 25a80fc..7b5e28f 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -24,6 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); +#define DISPID_FUNCTION_MASK 0x20000000 #define FDEX_VERSION_MASK 0xf0000000 static inline BOOL is_func_id(vbdisp_t *This, DISPID id) @@ -526,49 +527,6 @@ HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) return S_OK; } -struct _ident_map_t { - const WCHAR *name; - BOOL is_var; - union { - dynamic_var_t *var; - function_t *func; - } u; -}; - -static inline DISPID ident_to_id(ScriptDisp *This, ident_map_t *ident) -{ - return (ident-This->ident_map)+1; -} - -static inline ident_map_t *id_to_ident(ScriptDisp *This, DISPID id) -{ - return 0 < id && id <= This->ident_map_cnt ? This->ident_map+id-1 : NULL; -} - -static ident_map_t *add_ident(ScriptDisp *This, const WCHAR *name) -{ - ident_map_t *ret; - - if(!This->ident_map_size) { - This->ident_map = heap_alloc(4 * sizeof(*This->ident_map)); - if(!This->ident_map) - return NULL; - This->ident_map_size = 4; - }else if(This->ident_map_cnt == This->ident_map_size) { - ident_map_t *new_map; - - new_map = heap_realloc(This->ident_map, 2*This->ident_map_size*sizeof(*new_map)); - if(!new_map) - return NULL; - This->ident_map = new_map; - This->ident_map_size *= 2; - } - - ret = This->ident_map + This->ident_map_cnt++; - ret->name = name; - return ret; -} - static inline ScriptDisp *ScriptDisp_from_IDispatchEx(IDispatchEx *iface) { return CONTAINING_RECORD(iface, ScriptDisp, IDispatchEx_iface); @@ -616,7 +574,6 @@ static ULONG WINAPI ScriptDisp_Release(IDispatchEx *iface) if(!ref) { assert(!This->ctx); - heap_free(This->ident_map); heap_free(This); } @@ -675,44 +632,29 @@ static HRESULT WINAPI ScriptDisp_Invoke(IDispatchEx *iface, DISPID dispIdMember, static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); - dynamic_var_t *var; - ident_map_t *ident; - function_t *func; + dynamic_var_t **vars; + function_t **funcs; + UINT i, num; TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); if(!This->ctx) return E_UNEXPECTED; - for(ident = This->ident_map; ident < This->ident_map+This->ident_map_cnt; ident++) { - if(!wcsicmp(ident->name, bstrName)) { - *pid = ident_to_id(This, ident); + vars = This->ctx->global_vars; + num = This->ctx->global_vars_num; + for(i = 0; i < num; i++) { + if(!wcsicmp(vars[i]->name, bstrName)) { + *pid = i + 1; return S_OK; } } - for(var = This->ctx->global_vars; var; var = var->next) { - if(!wcsicmp(var->name, bstrName)) { - ident = add_ident(This, var->name); - if(!ident) - return E_OUTOFMEMORY; - - ident->is_var = TRUE; - ident->u.var = var; - *pid = ident_to_id(This, ident); - return S_OK; - } - } - - for(func = This->ctx->global_funcs; func; func = func->next) { - if(!wcsicmp(func->name, bstrName)) { - ident = add_ident(This, func->name); - if(!ident) - return E_OUTOFMEMORY; - - ident->is_var = FALSE; - ident->u.func = func; - *pid = ident_to_id(This, ident); + funcs = This->ctx->global_funcs; + num = This->ctx->global_funcs_num; + for(i = 0; i < num; i++) { + if(!wcsicmp(funcs[i]->name, bstrName)) { + *pid = i + 1 + DISPID_FUNCTION_MASK; return S_OK; } } @@ -725,35 +667,40 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); - ident_map_t *ident; HRESULT hres; TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); - ident = id_to_ident(This, id); - if(!ident) - return DISP_E_MEMBERNOTFOUND; + if (id & DISPID_FUNCTION_MASK) + { + id &= ~DISPID_FUNCTION_MASK; + if (id > This->ctx->global_funcs_num) + return DISP_E_MEMBERNOTFOUND; - if(ident->is_var) { - if(ident->u.var->is_const) { - FIXME("const not supported\n"); - return E_NOTIMPL; + switch (wFlags) + { + case DISPATCH_METHOD: + case DISPATCH_METHOD | DISPATCH_PROPERTYGET: + hres = exec_script(This->ctx, TRUE, This->ctx->global_funcs[id - 1], NULL, pdp, pvarRes); + break; + default: + FIXME("Unsupported flags %x\n", wFlags); + hres = E_NOTIMPL; } - return invoke_variant_prop(This->ctx, &ident->u.var->v, wFlags, pdp, pvarRes); + return hres; } - switch(wFlags) { - case DISPATCH_METHOD: - case DISPATCH_METHOD|DISPATCH_PROPERTYGET: - hres = exec_script(This->ctx, TRUE, ident->u.func, NULL, pdp, pvarRes); - break; - default: - FIXME("Unsupported flags %x\n", wFlags); - hres = E_NOTIMPL; + if (id > This->ctx->global_vars_num) + return DISP_E_MEMBERNOTFOUND; + + if (This->ctx->global_vars[id - 1]->is_const) + { + FIXME("const not supported\n"); + return E_NOTIMPL; } - return hres; + return invoke_variant_prop(This->ctx, &This->ctx->global_vars[id - 1]->v, wFlags, pdp, pvarRes); } static HRESULT WINAPI ScriptDisp_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 56c53b4..1f8c48e 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -131,12 +131,20 @@ IDispatch *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned flag static void release_script(script_ctx_t *ctx) { class_desc_t *class_desc; + UINT i; collect_objects(ctx); clear_ei(&ctx->ei); - release_dynamic_vars(ctx->global_vars); + for(i = 0; i < ctx->global_vars_num; i++) + VariantClear(&ctx->global_vars[i]->v); + + heap_free(ctx->global_vars); + heap_free(ctx->global_funcs); ctx->global_vars = NULL; + ctx->global_funcs = NULL; + ctx->global_vars_num = 0; + ctx->global_funcs_num = 0; while(!list_empty(&ctx->named_items)) { named_item_t *iter = LIST_ENTRY(list_head(&ctx->named_items), named_item_t, entry); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index fefed63..38fb874 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -34,6 +34,11 @@ #include "wine/heap.h" #include "wine/list.h" +static inline BOOL is_power_of_2(unsigned x) +{ + return !(x & (x - 1)); +} + typedef struct { void **blocks; DWORD block_cnt; @@ -120,16 +125,10 @@ struct _vbdisp_t { VARIANT props[1]; }; -typedef struct _ident_map_t ident_map_t; - typedef struct { IDispatchEx IDispatchEx_iface; LONG ref; - ident_map_t *ident_map; - unsigned ident_map_cnt; - unsigned ident_map_size; - script_ctx_t *ctx; } ScriptDisp; @@ -187,8 +186,11 @@ struct _script_ctx_t { EXCEPINFO ei; - dynamic_var_t *global_vars; - function_t *global_funcs; + UINT global_vars_num; + UINT global_funcs_num; + + dynamic_var_t **global_vars; + function_t **global_funcs; class_desc_t *classes; class_desc_t *procs; @@ -350,6 +352,40 @@ struct _vbscode_t { struct list entry; }; +static inline BOOL add_global_var(script_ctx_t *obj, dynamic_var_t *var) +{ + dynamic_var_t **vars; + + if (is_power_of_2(obj->global_vars_num)) + { + UINT num = max(16, obj->global_vars_num * 2); + + vars = heap_realloc(obj->global_vars, num * sizeof(*obj->global_vars)); + if (!vars) return FALSE; + obj->global_vars = vars; + } + obj->global_vars[obj->global_vars_num++] = var; + + return TRUE; +} + +static inline BOOL add_global_func(script_ctx_t *obj, function_t *func) +{ + function_t **funcs; + + if (is_power_of_2(obj->global_funcs_num)) + { + UINT num = max(16, obj->global_funcs_num * 2); + + funcs = heap_realloc(obj->global_funcs, num * sizeof(*obj->global_funcs)); + if (!funcs) return FALSE; + obj->global_funcs = funcs; + } + obj->global_funcs[obj->global_funcs_num++] = func; + + return TRUE; +} + void release_vbscode(vbscode_t*) DECLSPEC_HIDDEN; HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD,vbscode_t**) DECLSPEC_HIDDEN; HRESULT compile_procedure(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD,class_desc_t**) DECLSPEC_HIDDEN; -- 2.21.0

2 9

[PATCH 4/4] vbscript: Allow arbitrary number of arguments in builtin functions.
by Jacek Caban 04 Nov '19

04 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/global.c | 16 +++++++++++++--- dlls/vbscript/tests/api.vbs | 5 +++++ 2 files changed, 18 insertions(+), 3 deletions(-)

1 0

[PATCH 3/4] vbscript: Replace existing function for duplicated functions.
by Jacek Caban 04 Nov '19

04 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 24 +++++++++++---------- dlls/vbscript/tests/lang.vbs | 15 +++++++++++++ dlls/vbscript/tests/run.c | 42 ++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 11 deletions(-)

1 0

[PATCH 2/4] vbscript: Store global functions in an array.
by Jacek Caban 04 Nov '19

04 Nov '19

Based on patch by Gabriel Ivăncescu. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 31 +++++++++++++++++++++---------- dlls/vbscript/interp.c | 4 ++-- dlls/vbscript/vbdisp.c | 5 +++-- dlls/vbscript/vbscript.c | 5 +++++ dlls/vbscript/vbscript.h | 5 ++++- 5 files changed, 35 insertions(+), 15 deletions(-)

1 0

[PATCH 1/4] vbscript: Support assigning to object default value.
by Jacek Caban 04 Nov '19

04 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/interp.c | 5 +++ dlls/vbscript/tests/run.c | 64 +++++++++++++++++++++++++++------------ 2 files changed, 50 insertions(+), 19 deletions(-)

1 0

[PATCH] comctl32: Listbox item height is no longer limited to 255.
by Francois Gouget 04 Nov '19

04 Nov '19

The change happened between Windows 10 1607 and 1709 in comctl32 v6. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- I confirmed the change in behavior by running ControlSpyV6.exe and manually sending the LB_SETITEMHEIGHT and LB_GETITEMHEIGHT messages, and also observing the impact on the rendering. I also ran the test in ControlSpyV5.exe which shows that comctl32 v5 still enforces the 255 height limit. I chose to have Wine implement the new behavior but maybe that should be dependent on v5 vs v6. Not sure how that's handled though. dlls/comctl32/listbox.c | 2 +- dlls/comctl32/tests/listbox.c | 25 ++++++++++++++++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index ab4c481aabc..0d6dcd6a0b8 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1280,7 +1280,7 @@ static LRESULT LISTBOX_GetItemHeight( const LB_DESCR *descr, INT index ) */ static LRESULT LISTBOX_SetItemHeight( LB_DESCR *descr, INT index, INT height, BOOL repaint ) { - if (height > MAXBYTE) + if (height > MAXWORD) return -1; if (!height) height = 1; diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 70e212892a4..d547fecc588 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -769,11 +769,30 @@ static void test_listbox_height(void) r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); ok( r == 20, "height wrong\n"); + /* Before Windows 10 1709 (or 1703?) the item height was limited to 255. + * Since then, with comctl32 V6 the limit is 65535. + */ r = SendMessageA( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 256, 0 )); - ok( r == -1, "Failed to set item height, %d.\n", r); + if (r == -1) + { + ok(broken(r == -1), "Failed to set item height, %d.\n", r); - r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); - ok( r == 20, "Unexpected item height %d.\n", r); + r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); + ok( r == 20, "Unexpected item height %d.\n", r); + } + else + { + ok(r == 0, "Failed to set item height, %d.\n", r); + + r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); + ok( r == 256, "Unexpected item height %d.\n", r); + + r = SendMessageA( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 65535, 0 )); + ok(r == 0, "Failed to set item height, %d.\n", r); + + r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); + ok( r == 65535, "Unexpected item height %d.\n", r); + } r = SendMessageA( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 0xff, 0 )); ok( r == 0, "send message failed\n"); -- 2.20.1

1 0

[PATCH] vkd3d: Support RS 1.0 VOLATILE descriptors.
by Hans-Kristian Arntzen 04 Nov '19

04 Nov '19

Use EXT_descriptor_indexing's UPDATE_AFTER_BIND feature to support semantics required by RS 1.0 VOLATILE descriptors. We implement this by deferring all updates of desciptor sets until Submit time. This is fine, as command buffers cannot be executed simultaneously on D3D12, so at Submit time, we know that the command buffer is not being executed on the GPU, and updating descriptors for multiple submissions is correct. If EXT_descriptor_indexing is not available, the fallback is the older method, which matches RS 1.1 STATIC descriptor model. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> --- libs/vkd3d/command.c | 358 +++++++++++++++++++++++++++++-------- libs/vkd3d/device.c | 20 ++- libs/vkd3d/state.c | 22 +++ libs/vkd3d/vkd3d_private.h | 19 +- tests/d3d12.c | 2 +- 5 files changed, 338 insertions(+), 83 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 0532ec0..3f78d17 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1341,7 +1341,7 @@ static VkDescriptorPool d3d12_command_allocator_allocate_descriptor_pool( { pool_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO; pool_desc.pNext = NULL; - pool_desc.flags = 0; + pool_desc.flags = device->vk_info.EXT_descriptor_indexing ? VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT : 0; pool_desc.maxSets = 512; pool_desc.poolSizeCount = ARRAY_SIZE(pool_sizes); pool_desc.pPoolSizes = pool_sizes; @@ -1865,6 +1865,10 @@ static void d3d12_command_list_invalidate_bindings(struct d3d12_command_list *li if (!state) return; + /* Each pipeline state has its own set layout for UAV counters + * based on their implicit usage in the shader. + * Binding a different pipeline state means having to re-remit + * UAV counters in a new descriptor set (and layout). */ if (state->uav_counter_mask) { struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[state->vk_bind_point]; @@ -2196,6 +2200,7 @@ static ULONG STDMETHODCALLTYPE d3d12_command_list_Release(ID3D12GraphicsCommandL if (list->allocator) d3d12_command_allocator_free_command_buffer(list->allocator, list); + vkd3d_free(list->descriptor_updates); vkd3d_free(list); d3d12_device_release(device); @@ -2334,6 +2339,9 @@ static void d3d12_command_list_reset_state(struct d3d12_command_list *list, list->state = NULL; + /* Recycle deferred descriptor update memory if possible. */ + list->descriptor_updates_count = 0; + memset(list->so_counter_buffers, 0, sizeof(list->so_counter_buffers)); memset(list->so_counter_buffer_offsets, 0, sizeof(list->so_counter_buffer_offsets)); @@ -2534,15 +2542,54 @@ static void d3d12_command_list_prepare_descriptors(struct d3d12_command_list *li * time in between. Thus, the contents must not be altered (overwritten * by an update command, or freed) between when the command is recorded * and when the command completes executing on the queue." + * + * Even if we have descriptor indexing and UPDATE_AFTER_BIND, + * we need at the very least a new descriptor set. */ bindings->descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator, root_signature->vk_set_layout); + bindings->in_use = false; bindings->descriptor_table_dirty_mask |= bindings->descriptor_table_active_mask & root_signature->descriptor_table_mask; bindings->push_descriptor_dirty_mask |= bindings->push_descriptor_active_mask & root_signature->push_descriptor_mask; } +static void d3d12_command_list_prepare_uav_counter_descriptors(struct d3d12_command_list *list, + VkPipelineBindPoint bind_point) +{ + struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; + + if (bindings->uav_counter_descriptor_set && !bindings->uav_counter_in_use) + return; + + /* We cannot modify bound descriptor sets. We need a new descriptor set if + * we are about to update resource bindings. + * + * The Vulkan spec says: + * + * "The descriptor set contents bound by a call to + * vkCmdBindDescriptorSets may be consumed during host execution of the + * command, or during shader execution of the resulting draws, or any + * time in between. Thus, the contents must not be altered (overwritten + * by an update command, or freed) between when the command is recorded + * and when the command completes executing on the queue." + * + * Even if we have descriptor indexing and UPDATE_AFTER_BIND, + * we need at the very least a new descriptor set. + */ + + if (list->state->uav_counter_mask) + { + bindings->uav_counter_descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator, + list->state->vk_set_layout); + } + else + bindings->uav_counter_descriptor_set = VK_NULL_HANDLE; + + bindings->uav_counter_in_use = false; +} + static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_descriptor_write, VkDescriptorImageInfo *vk_image_info, const struct d3d12_desc *descriptor, uint32_t descriptor_range_magic, VkDescriptorSet vk_descriptor_set, @@ -2611,26 +2658,61 @@ static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_des return true; } -static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list *list, - VkPipelineBindPoint bind_point, unsigned int index, struct d3d12_desc *base_descriptor) +static void d3d12_command_list_defer_update_descriptor_table(struct d3d12_command_list *list, + VkPipelineBindPoint bind_point, uint64_t table_mask, bool uav) { + const struct d3d12_desc *base_descriptor; + unsigned i; + struct d3d12_deferred_descriptor_set_update *update; struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; - struct VkWriteDescriptorSet descriptor_writes[24], *current_descriptor_write; - const struct d3d12_root_signature *root_signature = bindings->root_signature; + + for (i = 0; i < ARRAY_SIZE(bindings->descriptor_tables); ++i) + { + if (table_mask & ((uint64_t)1 << i)) + { + if ((base_descriptor = d3d12_desc_from_gpu_handle(bindings->descriptor_tables[i]))) + { + vkd3d_array_reserve((void **)&list->descriptor_updates, &list->descriptor_updates_size, + list->descriptor_updates_count + 1, sizeof(*list->descriptor_updates)); + update = &list->descriptor_updates[list->descriptor_updates_count]; + + update->base_descriptor = base_descriptor; + update->index = i; + update->root_signature = bindings->root_signature; + update->descriptor_set = uav ? bindings->uav_counter_descriptor_set : bindings->descriptor_set; + update->uav = uav; + list->descriptor_updates_count++; + } + else + WARN("Descriptor table %u is not set.\n", i); + } + } +} + +static void d3d12_command_list_resolve_descriptor_table_uav(struct d3d12_command_list *list, + const struct d3d12_deferred_descriptor_set_update *update) +{ + const struct d3d12_root_signature *root_signature = update->root_signature; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; - struct VkDescriptorImageInfo image_infos[24], *current_image_info; const struct d3d12_root_descriptor_table *descriptor_table; const struct d3d12_root_descriptor_table_range *range; VkDevice vk_device = list->device->vk_device; - unsigned int i, j, descriptor_count; - struct d3d12_desc *descriptor; - - descriptor_table = root_signature_get_descriptor_table(root_signature, index); + unsigned int i, j; + unsigned int uav_counter_count; + const struct d3d12_desc *descriptor; + VkWriteDescriptorSet vk_descriptor_writes[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS]; + VkBufferView vk_uav_counter_views[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS]; + VkDescriptorSet vk_descriptor_set; + const struct d3d12_desc *base_descriptor = update->base_descriptor; + descriptor_table = root_signature_get_descriptor_table(root_signature, update->index); descriptor = base_descriptor; - descriptor_count = 0; - current_descriptor_write = descriptor_writes; - current_image_info = image_infos; + + vk_descriptor_set = update->descriptor_set; + if (!vk_descriptor_set) + return; + + /* FIXME: There should be a smarter way than scanning through all the descriptor table ranges for this. */ for (i = 0; i < descriptor_table->range_count; ++i) { range = &descriptor_table->ranges[i]; @@ -2644,20 +2726,74 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list { unsigned int register_idx = range->base_register_idx + j; - /* Track UAV counters. */ + /* Fish out UAV counters. */ if (range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_UAV - && register_idx < ARRAY_SIZE(bindings->vk_uav_counter_views)) + && register_idx < ARRAY_SIZE(vk_uav_counter_views)) { VkBufferView vk_counter_view = descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV - ? descriptor->u.view->vk_counter_view : VK_NULL_HANDLE; - if (bindings->vk_uav_counter_views[register_idx] != vk_counter_view) - bindings->uav_counter_dirty_mask |= 1u << register_idx; - bindings->vk_uav_counter_views[register_idx] = vk_counter_view; + ? descriptor->u.view->vk_counter_view : VK_NULL_HANDLE; + vk_uav_counter_views[register_idx] = vk_counter_view; } + } + } + + uav_counter_count = vkd3d_popcount(list->state->uav_counter_mask); + assert(uav_counter_count <= ARRAY_SIZE(vk_descriptor_writes)); + + for (i = 0; i < uav_counter_count; ++i) + { + const struct vkd3d_shader_uav_counter_binding *uav_counter = &list->state->uav_counters[i]; + assert(vk_uav_counter_views[uav_counter->register_index]); + + vk_descriptor_writes[i].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; + vk_descriptor_writes[i].pNext = NULL; + vk_descriptor_writes[i].dstSet = vk_descriptor_set; + vk_descriptor_writes[i].dstBinding = uav_counter->binding.binding; + vk_descriptor_writes[i].dstArrayElement = 0; + vk_descriptor_writes[i].descriptorCount = 1; + vk_descriptor_writes[i].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; + vk_descriptor_writes[i].pImageInfo = NULL; + vk_descriptor_writes[i].pBufferInfo = NULL; + vk_descriptor_writes[i].pTexelBufferView = &vk_uav_counter_views[uav_counter->register_index]; + } + + VK_CALL(vkUpdateDescriptorSets(vk_device, uav_counter_count, vk_descriptor_writes, 0, NULL)); +} + +static void d3d12_command_list_resolve_descriptor_table_normal(struct d3d12_command_list *list, + const struct d3d12_deferred_descriptor_set_update *update) +{ + const struct d3d12_root_descriptor_table *descriptor_table; + struct VkWriteDescriptorSet descriptor_writes[24], *current_descriptor_write; + struct VkDescriptorImageInfo image_infos[24], *current_image_info; + const struct d3d12_root_signature *root_signature = update->root_signature; + const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + const struct d3d12_root_descriptor_table_range *range; + VkDevice vk_device = list->device->vk_device; + unsigned int i, j, descriptor_count; + const struct d3d12_desc *descriptor; + const struct d3d12_desc *base_descriptor = update->base_descriptor; + + descriptor_table = root_signature_get_descriptor_table(root_signature, update->index); + + descriptor = update->base_descriptor; + descriptor_count = 0; + current_descriptor_write = descriptor_writes; + current_image_info = image_infos; + for (i = 0; i < descriptor_table->range_count; ++i) + { + range = &descriptor_table->ranges[i]; + if (range->offset != D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND) + { + descriptor = base_descriptor + range->offset; + } + + for (j = 0; j < range->descriptor_count; ++j, ++descriptor) + { if (!vk_write_descriptor_set_from_d3d12_desc(current_descriptor_write, - current_image_info, descriptor, range->descriptor_magic, - bindings->descriptor_set, range->binding, j)) + current_image_info, descriptor, range->descriptor_magic, + update->descriptor_set, range->binding, j)) continue; ++descriptor_count; @@ -2677,6 +2813,52 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list VK_CALL(vkUpdateDescriptorSets(vk_device, descriptor_count, descriptor_writes, 0, NULL)); } +static void d3d12_command_list_resolve_descriptor_table(struct d3d12_command_list *list, + const struct d3d12_deferred_descriptor_set_update *update) +{ + if (update->uav) + d3d12_command_list_resolve_descriptor_table_uav(list, update); + else + d3d12_command_list_resolve_descriptor_table_normal(list, update); +} + +static void d3d12_command_list_resolve_descriptor_tables(struct d3d12_command_list *list) +{ + unsigned i; + for (i = 0; i < list->descriptor_updates_count; i++) + d3d12_command_list_resolve_descriptor_table(list, &list->descriptor_updates[i]); +} + +static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list *list, + VkPipelineBindPoint bind_point, unsigned int index, struct d3d12_desc *base_descriptor) +{ + struct d3d12_deferred_descriptor_set_update update; + struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; + const struct d3d12_root_signature *root_signature = bindings->root_signature; + + update.descriptor_set = bindings->descriptor_set; + update.index = index; + update.root_signature = root_signature; + update.base_descriptor = base_descriptor; + update.uav = false; + d3d12_command_list_resolve_descriptor_table_normal(list, &update); +} + +static void d3d12_command_list_update_uav_counter_descriptor_table(struct d3d12_command_list *list, + VkPipelineBindPoint bind_point, unsigned int index, struct d3d12_desc *base_descriptor) +{ + struct d3d12_deferred_descriptor_set_update update; + struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; + const struct d3d12_root_signature *root_signature = bindings->root_signature; + + update.descriptor_set = bindings->uav_counter_descriptor_set; + update.index = index; + update.root_signature = root_signature; + update.base_descriptor = base_descriptor; + update.uav = true; + d3d12_command_list_resolve_descriptor_table_uav(list, &update); +} + static bool vk_write_descriptor_set_from_root_descriptor(VkWriteDescriptorSet *vk_descriptor_write, const struct d3d12_root_parameter *root_parameter, VkDescriptorSet vk_descriptor_set, VkBufferView *vk_buffer_view, const VkDescriptorBufferInfo *vk_buffer_info) @@ -2781,55 +2963,6 @@ done: vkd3d_free(buffer_infos); } -static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_command_list *list, - VkPipelineBindPoint bind_point) -{ - VkWriteDescriptorSet vk_descriptor_writes[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS]; - struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; - const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; - const struct d3d12_pipeline_state *state = list->state; - VkDevice vk_device = list->device->vk_device; - VkDescriptorSet vk_descriptor_set; - unsigned int uav_counter_count; - unsigned int i; - - if (!state || !(state->uav_counter_mask & bindings->uav_counter_dirty_mask)) - return; - - uav_counter_count = vkd3d_popcount(state->uav_counter_mask); - assert(uav_counter_count <= ARRAY_SIZE(vk_descriptor_writes)); - - vk_descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator, state->vk_set_layout); - if (!vk_descriptor_set) - return; - - for (i = 0; i < uav_counter_count; ++i) - { - const struct vkd3d_shader_uav_counter_binding *uav_counter = &state->uav_counters[i]; - const VkBufferView *vk_uav_counter_views = bindings->vk_uav_counter_views; - - assert(vk_uav_counter_views[uav_counter->register_index]); - - vk_descriptor_writes[i].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; - vk_descriptor_writes[i].pNext = NULL; - vk_descriptor_writes[i].dstSet = vk_descriptor_set; - vk_descriptor_writes[i].dstBinding = uav_counter->binding.binding; - vk_descriptor_writes[i].dstArrayElement = 0; - vk_descriptor_writes[i].descriptorCount = 1; - vk_descriptor_writes[i].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; - vk_descriptor_writes[i].pImageInfo = NULL; - vk_descriptor_writes[i].pBufferInfo = NULL; - vk_descriptor_writes[i].pTexelBufferView = &vk_uav_counter_views[uav_counter->register_index]; - } - - VK_CALL(vkUpdateDescriptorSets(vk_device, uav_counter_count, vk_descriptor_writes, 0, NULL)); - - VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point, - state->vk_pipeline_layout, state->set_index, 1, &vk_descriptor_set, 0, NULL)); - - bindings->uav_counter_dirty_mask = 0; -} - static void d3d12_command_list_update_descriptors(struct d3d12_command_list *list, VkPipelineBindPoint bind_point) { @@ -2842,31 +2975,86 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis if (!rs || !rs->vk_set_layout) return; + if ((bindings->descriptor_table_active_mask | bindings->push_descriptor_dirty_mask | + (list->state->uav_counter_mask & bindings->uav_counter_dirty_mask)) == 0) + { + /* Nothing is dirty, so just return early. */ + return; + } + if (bindings->descriptor_table_dirty_mask || bindings->push_descriptor_dirty_mask) d3d12_command_list_prepare_descriptors(list, bind_point); + if (list->state->uav_counter_mask & bindings->uav_counter_dirty_mask) + d3d12_command_list_prepare_uav_counter_descriptors(list, bind_point); - for (i = 0; i < ARRAY_SIZE(bindings->descriptor_tables); ++i) + if (list->device->vk_info.EXT_descriptor_indexing) + { + d3d12_command_list_defer_update_descriptor_table(list, bind_point, bindings->descriptor_table_dirty_mask, + false); + } + else { - if (bindings->descriptor_table_dirty_mask & ((uint64_t)1 << i)) + /* FIXME: FOR_EACH_BIT */ + for (i = 0; i < ARRAY_SIZE(bindings->descriptor_tables); ++i) { - if ((base_descriptor = d3d12_desc_from_gpu_handle(bindings->descriptor_tables[i]))) - d3d12_command_list_update_descriptor_table(list, bind_point, i, base_descriptor); - else - WARN("Descriptor table %u is not set.\n", i); + if (bindings->descriptor_table_dirty_mask & ((uint64_t) 1 << i)) + { + if ((base_descriptor = d3d12_desc_from_gpu_handle(bindings->descriptor_tables[i]))) + d3d12_command_list_update_descriptor_table(list, bind_point, i, base_descriptor); + else + WARN("Descriptor table %u is not set.\n", i); + } } } bindings->descriptor_table_dirty_mask = 0; + /* Need to go through all descriptor tables here in the root signature, + * not just descriptor_table_dirty_mask. Binding a different shader may not invalidate descriptor tables, + * but it may invalidate the UAV counter set. */ + if (bindings->uav_counter_dirty_mask) + { + if (list->device->vk_info.EXT_descriptor_indexing) + { + d3d12_command_list_defer_update_descriptor_table(list, bind_point, bindings->descriptor_table_active_mask, + true); + } + else + { + /* FIXME: FOR_EACH_BIT */ + for (i = 0; i < ARRAY_SIZE(bindings->descriptor_tables); i++) + { + if (bindings->descriptor_table_active_mask & ((uint64_t) 1 << i)) + { + if ((base_descriptor = d3d12_desc_from_gpu_handle(bindings->descriptor_tables[i]))) + d3d12_command_list_update_uav_counter_descriptor_table(list, bind_point, i, base_descriptor); + else + WARN("Descriptor table %u is not set.\n", i); + } + } + } + } + bindings->uav_counter_dirty_mask = 0; + d3d12_command_list_update_push_descriptors(list, bind_point); - if (bindings->descriptor_set) + /* Don't rebind the same descriptor set as long as we're in same pipeline layout. */ + if (bindings->descriptor_set && bindings->descriptor_set != bindings->descriptor_set_bound) { VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point, rs->vk_pipeline_layout, rs->main_set, 1, &bindings->descriptor_set, 0, NULL)); bindings->in_use = true; + bindings->descriptor_set_bound = bindings->descriptor_set; } - d3d12_command_list_update_uav_counter_descriptors(list, bind_point); + /* Don't rebind the same descriptor set as long as we're in same pipeline layout. */ + if (bindings->uav_counter_descriptor_set && + bindings->uav_counter_descriptor_set != bindings->uav_counter_descriptor_set_bound) + { + VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point, + list->state->vk_pipeline_layout, list->state->set_index, 1, &bindings->uav_counter_descriptor_set, 0, NULL)); + bindings->uav_counter_in_use = true; + bindings->uav_counter_descriptor_set_bound = bindings->uav_counter_descriptor_set; + } } static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list) @@ -4032,6 +4220,10 @@ static void d3d12_command_list_set_root_signature(struct d3d12_command_list *lis bindings->descriptor_set = VK_NULL_HANDLE; bindings->descriptor_table_dirty_mask = bindings->descriptor_table_active_mask & root_signature->descriptor_table_mask; bindings->push_descriptor_dirty_mask = bindings->push_descriptor_active_mask & root_signature->push_descriptor_mask; + + bindings->uav_counter_descriptor_set = VK_NULL_HANDLE; + bindings->descriptor_set_bound = VK_NULL_HANDLE; + bindings->uav_counter_descriptor_set_bound = VK_NULL_HANDLE; } static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootSignature(ID3D12GraphicsCommandList1 *iface, @@ -5405,6 +5597,9 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d d3d12_device_add_ref(list->device = device); list->allocator = allocator; + list->descriptor_updates = NULL; + list->descriptor_updates_count = 0; + list->descriptor_updates_size = 0; if (SUCCEEDED(hr = d3d12_command_allocator_allocate_command_buffer(allocator, list))) { @@ -5642,6 +5837,13 @@ static void STDMETHODCALLTYPE d3d12_command_queue_ExecuteCommandLists(ID3D12Comm return; } + /* Descriptors in root signature in 1.0 are VOLATILE by default, so + * the descriptor heap only need to be valid right before we submit them to the GPU. + * If we have EXT_descriptor_indexing enabled with UpdateAfterBind, we update + * descriptor sets here rather than while we're recording the command buffer. + * For each submission of the command buffer, we can modify the descriptor heap as we please. */ + d3d12_command_list_resolve_descriptor_tables(cmd_list); + buffers[i] = cmd_list->vk_command_buffer; } diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 13ebc70..e159c1f 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1436,11 +1436,25 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, } if (vulkan_info->EXT_descriptor_indexing && descriptor_indexing - && (descriptor_indexing->descriptorBindingUniformBufferUpdateAfterBind - || descriptor_indexing->descriptorBindingStorageBufferUpdateAfterBind + && descriptor_indexing->descriptorBindingUniformBufferUpdateAfterBind + && descriptor_indexing->descriptorBindingSampledImageUpdateAfterBind + && descriptor_indexing->descriptorBindingStorageImageUpdateAfterBind + && descriptor_indexing->descriptorBindingUniformTexelBufferUpdateAfterBind) + { + TRACE("Enabling VK_EXT_descriptor_indexing for volatile descriptor updates.\n"); + } + else + { + WARN("VK_EXT_descriptor indexing not supported in sufficient capacity. Volatile descriptor updates will not work.\n"); + vulkan_info->EXT_descriptor_indexing = false; + } + + if (vulkan_info->EXT_descriptor_indexing && descriptor_indexing + && (descriptor_indexing->descriptorBindingUniformBufferUpdateAfterBind || descriptor_indexing->descriptorBindingUniformTexelBufferUpdateAfterBind + || descriptor_indexing->descriptorBindingStorageBufferUpdateAfterBind || descriptor_indexing->descriptorBindingStorageTexelBufferUpdateAfterBind) - && !physical_device_info->descriptor_indexing_properties.robustBufferAccessUpdateAfterBind) + && !physical_device_info->descriptor_indexing_properties.robustBufferAccessUpdateAfterBind) { WARN("Disabling robust buffer access for the update after bind feature.\n"); features->robustBufferAccess = VK_FALSE; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index a321fa4..50cff1f 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -745,21 +745,43 @@ static HRESULT vkd3d_create_descriptor_set_layout(struct d3d12_device *device, VkDescriptorSetLayoutCreateFlags flags, unsigned int binding_count, const VkDescriptorSetLayoutBinding *bindings, VkDescriptorSetLayout *set_layout) { + unsigned int i; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; VkDescriptorSetLayoutCreateInfo set_desc; VkResult vr; + VkDescriptorSetLayoutBindingFlagsCreateInfoEXT flags_info; + VkDescriptorBindingFlagsEXT *binding_flags = NULL; set_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO; set_desc.pNext = NULL; set_desc.flags = flags; set_desc.bindingCount = binding_count; set_desc.pBindings = bindings; + + if (!(flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR) && device->vk_info.EXT_descriptor_indexing) + { + set_desc.flags |= VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT; + flags_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO_EXT; + flags_info.pNext = NULL; + flags_info.bindingCount = binding_count; + binding_flags = vkd3d_malloc(sizeof(*binding_flags) * binding_count); + for (i = 0; i < binding_count; i++) + { + binding_flags[i] = VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT_EXT | + VK_DESCRIPTOR_BINDING_UPDATE_UNUSED_WHILE_PENDING_BIT_EXT; + } + flags_info.pBindingFlags = binding_flags; + set_desc.pNext = &flags_info; + } + if ((vr = VK_CALL(vkCreateDescriptorSetLayout(device->vk_device, &set_desc, NULL, set_layout))) < 0) { WARN("Failed to create Vulkan descriptor set layout, vr %d.\n", vr); + vkd3d_free(binding_flags); return hresult_from_vk_result(vr); } + vkd3d_free(binding_flags); return S_OK; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 2d62fda..58e9aa9 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -888,13 +888,16 @@ struct vkd3d_pipeline_bindings const struct d3d12_root_signature *root_signature; VkDescriptorSet descriptor_set; + VkDescriptorSet uav_counter_descriptor_set; + VkDescriptorSet descriptor_set_bound; + VkDescriptorSet uav_counter_descriptor_set_bound; bool in_use; + bool uav_counter_in_use; D3D12_GPU_DESCRIPTOR_HANDLE descriptor_tables[D3D12_MAX_ROOT_COST]; uint64_t descriptor_table_dirty_mask; uint64_t descriptor_table_active_mask; - VkBufferView vk_uav_counter_views[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS]; uint8_t uav_counter_dirty_mask; /* Needed when VK_KHR_push_descriptor is not available. */ @@ -903,6 +906,16 @@ struct vkd3d_pipeline_bindings uint32_t push_descriptor_active_mask; }; +struct d3d12_deferred_descriptor_set_update +{ + const struct d3d12_desc *base_descriptor; + unsigned int index; + + const struct d3d12_root_signature *root_signature; + VkDescriptorSet descriptor_set; + bool uav; +}; + /* ID3D12CommandList */ struct d3d12_command_list { @@ -946,6 +959,10 @@ struct d3d12_command_list VkBuffer so_counter_buffers[D3D12_SO_BUFFER_SLOT_COUNT]; VkDeviceSize so_counter_buffer_offsets[D3D12_SO_BUFFER_SLOT_COUNT]; + struct d3d12_deferred_descriptor_set_update *descriptor_updates; + size_t descriptor_updates_size; + size_t descriptor_updates_count; + struct vkd3d_private_store private_store; }; diff --git a/tests/d3d12.c b/tests/d3d12.c index 858cf99..16a048c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -15799,7 +15799,7 @@ static void test_update_descriptor_heap_after_closing_command_list(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); value = get_readback_uint(&rb, 0, 0, 0); - todo ok(value == 0xff00ff00, "Got unexpected value %#x.\n", value); + ok(value == 0xff00ff00, "Got unexpected value %#x.\n", value); release_resource_readback(&rb); ID3D12DescriptorHeap_Release(cpu_heap); -- 2.23.0

3 7

[PATCH] ntdll: Fix find_free_area outside of reserved areas with zero_bits != 0.
by Rémi Bernon 04 Nov '19

04 Nov '19

From: Paul Gofman <gofmanp(a)gmail.com> The search was initiated with base == 0, which returns NULL immediately if MEM_TOP_DOWN is not used. Using address_space_start instead fixes this issue. Then we assumed that all mmapped regions are known by Wine view tree, which is obviously not the case with external allocations. This could lead to memory corruption when find_free_area returns an expected free region which is already mmapped. Using MAP_FIXED forces mmap to succeed and corrupts the mapping. This patch uses safe mmap calls to check if the expected free memory is actually free, and iterates over the expected free ranges until it succeeds. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Based on a patch from Paul Gofman <gofmanp(a)gmail.com> dlls/ntdll/virtual.c | 60 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 50 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 68249de902e..bf8dab0e7f3 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -496,6 +496,33 @@ static struct file_view *find_view_range( const void *addr, size_t size ) return NULL; } +/*********************************************************************** + * try_map_free_area + * + * Try mmaping some expected free memory region, eventually stepping and + * retrying inside it, and return where it actually succeeded, or NULL. + */ +static void* try_map_free_area( void *base, void *end, ptrdiff_t step, + void *start, size_t size, int unix_prot ) +{ + void *ptr; + + while (start && base <= start && (char*)start + size <= (char*)end) + { + if ((ptr = wine_anon_mmap( start, size, unix_prot, 0 )) == start) + return start; + TRACE( "Found free area is already mapped, start %p.\n", start ); + + if (ptr != (void *)-1) + munmap( ptr, size ); + + if ((char *)end - (char *)start < step || (char *)start - (char *)base < step) + break; + start = (char *)start + step; + } + + return NULL; +} /*********************************************************************** * find_free_area @@ -503,9 +530,11 @@ static struct file_view *find_view_range( const void *addr, size_t size ) * Find a free area between views inside the specified range. * The csVirtual section must be held by caller. */ -static void *find_free_area( void *base, void *end, size_t size, size_t mask, int top_down ) +static void *find_free_area( void *base, void *end, size_t size, size_t mask, int top_down, + int map_area, int unix_prot ) { struct wine_rb_entry *first = NULL, *ptr = views_tree.root; + ptrdiff_t step = top_down ? -(mask + 1) : (mask + 1); void *start; /* find the first (resp. last) view inside the range */ @@ -538,7 +567,10 @@ static void *find_free_area( void *base, void *end, size_t size, size_t mask, in { struct file_view *view = WINE_RB_ENTRY_VALUE( first, struct file_view, entry ); - if ((char *)view->base + view->size <= (char *)start) break; + if (!map_area && (char *)view->base + view->size <= (char *)start) break; + if (map_area && (start = try_map_free_area( (char *)view->base + view->size, + (char *)start + size, step, + start, size, unix_prot ))) break; start = ROUND_ADDR( (char *)view->base - size, mask ); /* stop if remaining space is not large enough */ if (!start || start >= end || start < base) return NULL; @@ -554,13 +586,17 @@ static void *find_free_area( void *base, void *end, size_t size, size_t mask, in { struct file_view *view = WINE_RB_ENTRY_VALUE( first, struct file_view, entry ); - if ((char *)view->base >= (char *)start + size) break; + if (!map_area && (char *)view->base >= (char *)start + size) break; + if (map_area && (start = try_map_free_area( start, view->base, step, + start, size, unix_prot ))) break; start = ROUND_ADDR( (char *)view->base + view->size + mask, mask ); /* stop if remaining space is not large enough */ if (!start || start >= end || (char *)end - (char *)start < size) return NULL; first = wine_rb_next( first ); } } + + if (!first && map_area) return try_map_free_area( base, end, step, start, size, unix_prot ); return start; } @@ -1054,13 +1090,13 @@ static int alloc_reserved_area_callback( void *start, size_t size, void *arg ) { /* range is split in two by the preloader reservation, try first part */ if ((alloc->result = find_free_area( start, preload_reserve_start, alloc->size, - alloc->mask, alloc->top_down ))) + alloc->mask, alloc->top_down, FALSE, 0 ))) return 1; /* then fall through to try second part */ start = preload_reserve_end; } } - if ((alloc->result = find_free_area( start, end, alloc->size, alloc->mask, alloc->top_down ))) + if ((alloc->result = find_free_area( start, end, alloc->size, alloc->mask, alloc->top_down, FALSE, 0 ))) return 1; return 0; @@ -1163,14 +1199,18 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, goto done; } - for (;;) + if (zero_bits_64) { - if (!zero_bits_64) - ptr = NULL; - else if (!(ptr = find_free_area( (void*)0, alloc.limit, view_size, mask, top_down ))) + if (!(ptr = find_free_area( address_space_start, alloc.limit, size, + mask, top_down, TRUE, VIRTUAL_GetUnixProt(vprot) ))) return STATUS_NO_MEMORY; + TRACE( "got mem with find_free_area %p-%p\n", ptr, (char *)ptr + size ); + goto done; + } - if ((ptr = wine_anon_mmap( ptr, view_size, VIRTUAL_GetUnixProt(vprot), ptr ? MAP_FIXED : 0 )) == (void *)-1) + for (;;) + { + if ((ptr = wine_anon_mmap( NULL, view_size, VIRTUAL_GetUnixProt(vprot), 0 )) == (void *)-1) { if (errno == ENOMEM) return STATUS_NO_MEMORY; return STATUS_INVALID_PARAMETER; -- 2.24.0.rc2

1 1

[PATCH v3] shcore: Add GetScaleFactorForMonitor stub
by Esdras Tarsis 04 Nov '19

04 Nov '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48016 Signed-off-by: Esdras Tarsis <esdrastarsis(a)gmail.com> --- v3: Fix non-HRESULT return value. --- dlls/shcore/main.c | 10 ++++++++++ dlls/shcore/shcore.spec | 2 +- include/shellscalingapi.h | 22 ++++++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 6a6247930f..04812dd113 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -1517,6 +1517,16 @@ void WINAPI SetProcessReference(IUnknown *obj) process_ref = obj; } +/************************************************************************* + * GetScaleFactorForMonitor [SHCORE.@] + */ +HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR monitor, DEVICE_SCALE_FACTOR *scale) +{ + FIXME("(%p, %p) - stub!\n", monitor, scale); + *scale = SCALE_100_PERCENT; + return S_OK; +} + struct thread_data { LPTHREAD_START_ROUTINE thread_proc; diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 6a634bdee5..d5b7a342e3 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -12,7 +12,7 @@ @ stdcall GetProcessDpiAwareness(long ptr) @ stdcall GetProcessReference(ptr) @ stub GetScaleFactorForDevice -@ stub GetScaleFactorForMonitor +@ stdcall GetScaleFactorForMonitor(long ptr) @ stub IStream_Copy @ stdcall IStream_Read(ptr ptr long) _IStream_Read @ stub IStream_ReadStr diff --git a/include/shellscalingapi.h b/include/shellscalingapi.h index 1df85d5982..80dab0178f 100644 --- a/include/shellscalingapi.h +++ b/include/shellscalingapi.h @@ -34,8 +34,30 @@ typedef enum PROCESS_DPI_AWARENESS PROCESS_PER_MONITOR_DPI_AWARE } PROCESS_DPI_AWARENESS; +typedef enum DEVICE_SCALE_FACTOR +{ + DEVICE_SCALE_FACTOR_INVALID, + SCALE_100_PERCENT, + SCALE_120_PERCENT, + SCALE_125_PERCENT, + SCALE_140_PERCENT, + SCALE_150_PERCENT, + SCALE_160_PERCENT, + SCALE_175_PERCENT, + SCALE_180_PERCENT, + SCALE_200_PERCENT, + SCALE_225_PERCENT, + SCALE_250_PERCENT, + SCALE_300_PERCENT, + SCALE_350_PERCENT, + SCALE_400_PERCENT, + SCALE_450_PERCENT, + SCALE_500_PERCENT +} DEVICE_SCALE_FACTOR; + HRESULT WINAPI GetDpiForMonitor(HMONITOR,MONITOR_DPI_TYPE,UINT*,UINT*); HRESULT WINAPI GetProcessDpiAwareness(HANDLE,PROCESS_DPI_AWARENESS*); HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS); +HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR,DEVICE_SCALE_FACTOR*); #endif /* __WINE_SHELLSCALINGAPI_H */ -- 2.23.0

2 1

[PATCH v3 1/2] vkd3d: Allocate one large buffer for a heap and offset into it.
by Hans-Kristian Arntzen 04 Nov '19

04 Nov '19

Greatly reduce VA allocations we have to make and makes returned VA more sensible, and better matches returned VAs we see on native drivers. D3D12 usage flags for buffers seem generic enough that there is no obvious benefit to place smaller VkBuffers on top of VkDeviceMemory. Ideally, physical_buffer_address is used here, but this works as a good fallback if that path is added later. With this patch and previous VA optimization, I'm observing a 2.0-2.5% FPS uplift on SOTTR when CPU bound. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> --- libs/vkd3d/command.c | 15 +++-- libs/vkd3d/resource.c | 135 ++++++++++++++++++++++++++++++++----- libs/vkd3d/vkd3d_private.h | 2 + 3 files changed, 130 insertions(+), 22 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d420863..4f74fa4 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3031,8 +3031,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyBufferRegion(ID3D12Graphics d3d12_command_list_end_current_render_pass(list); - buffer_copy.srcOffset = src_offset; - buffer_copy.dstOffset = dst_offset; + buffer_copy.srcOffset = src_offset + src_resource->heap_offset; + buffer_copy.dstOffset = dst_offset + dst_resource->heap_offset; buffer_copy.size = byte_count; VK_CALL(vkCmdCopyBuffer(list->vk_command_buffer, @@ -3341,6 +3341,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic vk_image_buffer_copy_from_d3d12(&buffer_image_copy, &dst->u.PlacedFootprint, src->u.SubresourceIndex, &src_resource->desc, dst_format, src_box, dst_x, dst_y, dst_z); + buffer_image_copy.bufferOffset += dst_resource->heap_offset; VK_CALL(vkCmdCopyImageToBuffer(list->vk_command_buffer, src_resource->u.vk_image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, dst_resource->u.vk_buffer, 1, &buffer_image_copy)); @@ -3370,6 +3371,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic vk_buffer_image_copy_from_d3d12(&buffer_image_copy, &src->u.PlacedFootprint, dst->u.SubresourceIndex, &dst_resource->desc, src_format, src_box, dst_x, dst_y, dst_z); + buffer_image_copy.bufferOffset += src_resource->heap_offset; VK_CALL(vkCmdCopyBufferToImage(list->vk_command_buffer, src_resource->u.vk_buffer, dst_resource->u.vk_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &buffer_image_copy)); @@ -3450,8 +3452,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm assert(d3d12_resource_is_buffer(src_resource)); assert(src_resource->desc.Width == dst_resource->desc.Width); - vk_buffer_copy.srcOffset = 0; - vk_buffer_copy.dstOffset = 0; + vk_buffer_copy.srcOffset = src_resource->heap_offset; + vk_buffer_copy.dstOffset = dst_resource->heap_offset; vk_buffer_copy.size = dst_resource->desc.Width; VK_CALL(vkCmdCopyBuffer(list->vk_command_buffer, src_resource->u.vk_buffer, dst_resource->u.vk_buffer, 1, &vk_buffer_copy)); @@ -3842,8 +3844,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.buffer = resource->u.vk_buffer; - vk_barrier.offset = 0; - vk_barrier.size = VK_WHOLE_SIZE; + vk_barrier.offset = resource->heap_offset; + vk_barrier.size = resource->desc.Width; VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer, src_stage_mask, dst_stage_mask, 0, 0, NULL, 1, &vk_barrier, 0, NULL)); @@ -4728,6 +4730,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID return; } + /* Offset from heap with placed buffers is already applied in CPU descriptor. */ VK_CALL(vkCmdFillBuffer(list->vk_command_buffer, resource_impl->u.vk_buffer, cpu_descriptor->uav.buffer.offset, cpu_descriptor->uav.buffer.size, values[0])); diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 6c9564b..c289fa8 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -292,6 +292,8 @@ static ULONG STDMETHODCALLTYPE d3d12_heap_AddRef(ID3D12Heap *iface) return refcount; } +static ULONG d3d12_resource_decref(struct d3d12_resource *resource); + static void d3d12_heap_destroy(struct d3d12_heap *heap) { struct d3d12_device *device = heap->device; @@ -299,6 +301,9 @@ static void d3d12_heap_destroy(struct d3d12_heap *heap) TRACE("Destroying heap %p.\n", heap); + if (heap->buffer_resource) + d3d12_resource_decref(heap->buffer_resource); + vkd3d_private_store_destroy(&heap->private_store); VK_CALL(vkFreeMemory(device->vk_device, heap->vk_memory, NULL)); @@ -539,6 +544,12 @@ static HRESULT validate_heap_desc(const D3D12_HEAP_DESC *desc, const struct d3d1 return S_OK; } +static HRESULT d3d12_resource_create(struct d3d12_device *device, + const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, + const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, + const D3D12_CLEAR_VALUE *optimized_clear_value, bool placed, + struct d3d12_resource **resource); + static HRESULT d3d12_heap_init(struct d3d12_heap *heap, struct d3d12_device *device, const D3D12_HEAP_DESC *desc, const struct d3d12_resource *resource) { @@ -546,6 +557,9 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, VkDeviceSize vk_memory_size; HRESULT hr; int rc; + bool buffers_allowed; + D3D12_RESOURCE_DESC resource_desc; + D3D12_RESOURCE_STATES initial_resource_state; heap->ID3D12Heap_iface.lpVtbl = &d3d12_heap_vtbl; heap->refcount = 1; @@ -556,6 +570,7 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, heap->map_ptr = NULL; heap->map_count = 0; + heap->buffer_resource = NULL; if (!heap->desc.Properties.CreationNodeMask) heap->desc.Properties.CreationNodeMask = 1; @@ -583,6 +598,53 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, return hr; } + buffers_allowed = !(heap->desc.Flags & D3D12_HEAP_FLAG_DENY_BUFFERS); + if (buffers_allowed && !resource) + { + /* Create a single omnipotent buffer which fills the entire heap. + * Whenever we place buffer resources on this heap, we'll just offset this VkBuffer. + * This allows us to keep VA space somewhat sane, and keeps number of (limited) VA allocations down. + * One possible downside is that the buffer might be slightly slower to access, + * but D3D12 has very lenient usage flags for buffers. */ + + memset(&resource_desc, 0, sizeof(resource_desc)); + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; + resource_desc.Width = desc->SizeInBytes; + resource_desc.Height = 1; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.SampleDesc.Count = 1; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; + + switch (desc->Properties.Type) + { + case D3D12_HEAP_TYPE_UPLOAD: + initial_resource_state = D3D12_RESOURCE_STATE_GENERIC_READ; + break; + + case D3D12_HEAP_TYPE_READBACK: + initial_resource_state = D3D12_RESOURCE_STATE_COPY_DEST; + break; + + default: + /* Upload and readback heaps do not allow UAV access, only enable this flag for other heaps. */ + resource_desc.Flags |= D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS; + initial_resource_state = D3D12_RESOURCE_STATE_COMMON; + break; + } + + if (FAILED(hr = d3d12_resource_create(device, &desc->Properties, desc->Flags, + &resource_desc, initial_resource_state, + NULL, false, &heap->buffer_resource))) + { + heap->buffer_resource = NULL; + return hr; + } + /* This internal resource should not own a reference on the device. + * d3d12_resource_create takes a reference on the device. */ + d3d12_device_release(device); + } + if (resource) { if (d3d12_resource_is_buffer(resource)) @@ -600,8 +662,16 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, heap->desc.SizeInBytes = vk_memory_size; } + else if (heap->buffer_resource) + { + hr = vkd3d_allocate_buffer_memory(device, heap->buffer_resource->u.vk_buffer, + &heap->desc.Properties, heap->desc.Flags, + &heap->vk_memory, &heap->vk_memory_type, &vk_memory_size); + } else { + /* Allocate generic memory which should hopefully match up with whatever resources + * we want to place here. */ memory_requirements.size = heap->desc.SizeInBytes; memory_requirements.alignment = heap->desc.Alignment; memory_requirements.memoryTypeBits = ~(uint32_t)0; @@ -614,6 +684,11 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, { vkd3d_private_store_destroy(&heap->private_store); pthread_mutex_destroy(&heap->mutex); + if (heap->buffer_resource) + { + d3d12_resource_decref(heap->buffer_resource); + heap->buffer_resource = NULL; + } return hr; } @@ -1003,13 +1078,16 @@ static void d3d12_resource_destroy(struct d3d12_resource *resource, struct d3d12 if (resource->flags & VKD3D_RESOURCE_EXTERNAL) return; - if (resource->gpu_address) - vkd3d_gpu_va_allocator_free(&device->gpu_va_allocator, resource->gpu_address); + if (!(resource->flags & VKD3D_RESOURCE_PLACED_BUFFER)) + { + if (resource->gpu_address) + vkd3d_gpu_va_allocator_free(&device->gpu_va_allocator, resource->gpu_address); - if (d3d12_resource_is_buffer(resource)) - VK_CALL(vkDestroyBuffer(device->vk_device, resource->u.vk_buffer, NULL)); - else - VK_CALL(vkDestroyImage(device->vk_device, resource->u.vk_image, NULL)); + if (d3d12_resource_is_buffer(resource)) + VK_CALL(vkDestroyBuffer(device->vk_device, resource->u.vk_buffer, NULL)); + else + VK_CALL(vkDestroyImage(device->vk_device, resource->u.vk_image, NULL)); + } if (resource->flags & VKD3D_RESOURCE_DEDICATED_HEAP) d3d12_heap_destroy(resource->heap); @@ -1669,7 +1747,7 @@ static bool d3d12_resource_validate_heap_properties(const struct d3d12_resource static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, - const D3D12_CLEAR_VALUE *optimized_clear_value) + const D3D12_CLEAR_VALUE *optimized_clear_value, bool placed) { HRESULT hr; @@ -1699,6 +1777,8 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 resource->gpu_address = 0; resource->flags = 0; + if (placed && d3d12_resource_is_buffer(resource)) + resource->flags |= VKD3D_RESOURCE_PLACED_BUFFER; if (FAILED(hr = d3d12_resource_validate_desc(&resource->desc))) return hr; @@ -1706,6 +1786,13 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 switch (desc->Dimension) { case D3D12_RESOURCE_DIMENSION_BUFFER: + /* We'll inherit a VkBuffer reference from the heap with an implied offset. */ + if (placed) + { + resource->u.vk_buffer = VK_NULL_HANDLE; + break; + } + if (FAILED(hr = vkd3d_create_buffer(device, heap_properties, heap_flags, &resource->desc, &resource->u.vk_buffer))) return hr; @@ -1755,7 +1842,7 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 static HRESULT d3d12_resource_create(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, - const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) + const D3D12_CLEAR_VALUE *optimized_clear_value, bool placed, struct d3d12_resource **resource) { struct d3d12_resource *object; HRESULT hr; @@ -1764,7 +1851,7 @@ static HRESULT d3d12_resource_create(struct d3d12_device *device, return E_OUTOFMEMORY; if (FAILED(hr = d3d12_resource_init(object, device, heap_properties, heap_flags, - desc, initial_state, optimized_clear_value))) + desc, initial_state, optimized_clear_value, placed))) { vkd3d_free(object); return hr; @@ -1806,7 +1893,7 @@ HRESULT d3d12_committed_resource_create(struct d3d12_device *device, } if (FAILED(hr = d3d12_resource_create(device, heap_properties, heap_flags, - desc, initial_state, optimized_clear_value, &object))) + desc, initial_state, optimized_clear_value, false, &object))) return hr; if (FAILED(hr = vkd3d_allocate_resource_memory(device, object, heap_properties, heap_flags))) @@ -1830,6 +1917,16 @@ static HRESULT vkd3d_bind_heap_memory(struct d3d12_device *device, VkMemoryRequirements requirements; VkResult vr; + if (resource->flags & VKD3D_RESOURCE_PLACED_BUFFER) + { + /* Just inherit the buffer from the heap. */ + resource->u.vk_buffer = heap->buffer_resource->u.vk_buffer; + resource->heap = heap; + resource->heap_offset = heap_offset; + resource->gpu_address = heap->buffer_resource->gpu_address + heap_offset; + return S_OK; + } + if (d3d12_resource_is_buffer(resource)) VK_CALL(vkGetBufferMemoryRequirements(vk_device, resource->u.vk_buffer, &requirements)); else @@ -1879,7 +1976,7 @@ HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_h HRESULT hr; if (FAILED(hr = d3d12_resource_create(device, &heap->desc.Properties, heap->desc.Flags, - desc, initial_state, optimized_clear_value, &object))) + desc, initial_state, optimized_clear_value, true, &object))) return hr; if (FAILED(hr = vkd3d_bind_heap_memory(device, object, heap, heap_offset))) @@ -1903,7 +2000,7 @@ HRESULT d3d12_reserved_resource_create(struct d3d12_device *device, HRESULT hr; if (FAILED(hr = d3d12_resource_create(device, NULL, 0, - desc, initial_state, optimized_clear_value, &object))) + desc, initial_state, optimized_clear_value, false, &object))) return hr; TRACE("Created reserved resource %p.\n", object); @@ -2205,7 +2302,7 @@ static bool vkd3d_create_buffer_view_for_resource(struct d3d12_device *device, assert(d3d12_resource_is_buffer(resource)); return vkd3d_create_buffer_view(device, resource->u.vk_buffer, - format, offset * element_size, size * element_size, view); + format, resource->heap_offset + offset * element_size, size * element_size, view); } static void vkd3d_set_view_swizzle_for_format(VkComponentMapping *components, @@ -2807,7 +2904,7 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ format = vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false); if (!vkd3d_create_vk_buffer_view(device, counter_resource->u.vk_buffer, format, - desc->u.Buffer.CounterOffsetInBytes, sizeof(uint32_t), &view->vk_counter_view)) + desc->u.Buffer.CounterOffsetInBytes + resource->heap_offset, sizeof(uint32_t), &view->vk_counter_view)) { WARN("Failed to create counter buffer view.\n"); view->vk_counter_view = VK_NULL_HANDLE; @@ -2821,7 +2918,7 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ { const struct vkd3d_format *format = vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false); - descriptor->uav.buffer.offset = desc->u.Buffer.FirstElement * format->byte_count; + descriptor->uav.buffer.offset = desc->u.Buffer.FirstElement * format->byte_count + resource->heap_offset; descriptor->uav.buffer.size = desc->u.Buffer.NumElements * format->byte_count; } } @@ -2913,12 +3010,18 @@ bool vkd3d_create_raw_buffer_view(struct d3d12_device *device, { const struct vkd3d_format *format; struct d3d12_resource *resource; + uint64_t range; + uint64_t offset; format = vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false); resource = vkd3d_gpu_va_allocator_dereference(&device->gpu_va_allocator, gpu_address); assert(d3d12_resource_is_buffer(resource)); + + offset = gpu_address - resource->gpu_address; + range = min(resource->desc.Width - offset, device->vk_info.device_limits.maxStorageBufferRange); + return vkd3d_create_vk_buffer_view(device, resource->u.vk_buffer, format, - gpu_address - resource->gpu_address, VK_WHOLE_SIZE, vk_buffer_view); + offset, range, vk_buffer_view); } /* samplers */ diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index a5f7c81..2b1ae30 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -380,6 +380,7 @@ struct d3d12_heap unsigned int map_count; uint32_t vk_memory_type; + struct d3d12_resource *buffer_resource; struct d3d12_device *device; struct vkd3d_private_store private_store; @@ -394,6 +395,7 @@ struct d3d12_heap *unsafe_impl_from_ID3D12Heap(ID3D12Heap *iface) DECLSPEC_HIDDE #define VKD3D_RESOURCE_EXTERNAL 0x00000004 #define VKD3D_RESOURCE_DEDICATED_HEAP 0x00000008 #define VKD3D_RESOURCE_LINEAR_TILING 0x00000010 +#define VKD3D_RESOURCE_PLACED_BUFFER 0x00000020 /* ID3D12Resource */ struct d3d12_resource -- 2.23.0

2 2

[PATCH] mf: Add MFCreateVideoRendererActivate().
by Nikolay Sivov 04 Nov '19

04 Nov '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/main.c | 24 ++++++++++++++++++++++++ dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 12 ++++++++++++ include/mfidl.idl | 1 + 4 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 2e6dc78290..251d59e1c0 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -1144,3 +1144,27 @@ HRESULT WINAPI MFEnumDeviceSources(IMFAttributes *attributes, IMFActivate ***sou return S_OK; } + +static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) +{ + FIXME("%p, %p, %p.\n", attributes, user_context, obj); + + return E_NOTIMPL; +} + +static void evr_free_private(void *user_context) +{ +} + +static const struct activate_funcs evr_activate_funcs = +{ + evr_create_object, + evr_free_private, +}; + +HRESULT WINAPI MFCreateVideoRendererActivate(HWND hwnd, IMFActivate **activate) +{ + TRACE("%p, %p.\n", hwnd, activate); + + return create_activation_object(hwnd, &evr_activate_funcs, activate); +} diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index f13a2451fb..a8dd314aa3 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -67,7 +67,7 @@ @ stub MFCreateTranscodeTopology @ stub MFCreateUrlmonSchemePlugin @ stub MFCreateVideoRenderer -@ stub MFCreateVideoRendererActivate +@ stdcall MFCreateVideoRendererActivate(long ptr) @ stub MFCreateWMAEncoderActivate @ stub MFCreateWMVEncoderActivate @ stdcall MFEnumDeviceSources(ptr ptr ptr) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 0428c22ed3..b353df780b 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2584,6 +2584,17 @@ if (SUCCEEDED(hr)) CoUninitialize(); } +static void test_evr(void) +{ + IMFActivate *activate; + HRESULT hr; + + hr = MFCreateVideoRendererActivate(NULL, &activate); + ok(hr == S_OK, "Failed to create activate object, hr %#x.\n", hr); + + IMFActivate_Release(activate); +} + START_TEST(mf) { test_topology(); @@ -2597,4 +2608,5 @@ START_TEST(mf) test_video_processor(); test_quality_manager(); test_sar(); + test_evr(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index 9c14c5604b..da43399828 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -586,6 +586,7 @@ cpp_quote("HRESULT WINAPI MFCreateSystemTimeSource(IMFPresentationTimeSource **t cpp_quote("HRESULT WINAPI MFCreateTopology(IMFTopology **topology);") cpp_quote("HRESULT WINAPI MFCreateTopologyNode(MF_TOPOLOGY_TYPE node_type, IMFTopologyNode **node);") cpp_quote("HRESULT WINAPI MFCreateTopoLoader(IMFTopoLoader **loader);") +cpp_quote("HRESULT WINAPI MFCreateVideoRendererActivate(HWND hwnd, IMFActivate **activate);") cpp_quote("HRESULT WINAPI MFEnumDeviceSources(IMFAttributes *attributes, IMFActivate ***sources, UINT32 *count);") cpp_quote("HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array);") cpp_quote("HRESULT WINAPI MFGetService(IUnknown *object, REFGUID service, REFIID iid, void **obj);") -- 2.24.0.rc1

1 0

[v2 PATCH 1/4] comctl32/tests: Add combo tests for WM_CTLCOLOR*.
by Nikolay Sivov 04 Nov '19

04 Nov '19

From: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/combo.c | 98 +++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 923d826b30..be4ee53c22 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -46,6 +46,8 @@ static HWND hComboExParentWnd, hMainWnd; static HINSTANCE hMainHinst; static const char ComboExTestClass[] = "ComboExTestClass"; +static HBRUSH brush_red; + static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); #define MAX_CHARS 100 @@ -507,6 +509,8 @@ static BOOL init(void) wc.lpfnWndProc = ComboExTestWndProc; RegisterClassA(&wc); + brush_red = CreateSolidBrush(RGB(255, 0, 0)); + hMainWnd = CreateWindowA(WC_STATICA, "Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); ShowWindow(hMainWnd, SW_SHOW); @@ -533,6 +537,7 @@ static void cleanup(void) UnregisterClassA(ComboExTestClass, GetModuleHandleA(NULL)); DestroyWindow(hMainWnd); + DeleteObject(brush_red); } static void test_comboex_subclass(void) @@ -717,6 +722,7 @@ static LRESULT (CALLBACK *old_parent_proc)(HWND hwnd, UINT msg, WPARAM wparam, L static LPCSTR expected_edit_text; static LPCSTR expected_list_text; static BOOL selchange_fired; +static HWND lparam_for_WM_CTLCOLOR; static LRESULT CALLBACK parent_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { @@ -748,6 +754,20 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPAR break; } break; + case WM_CTLCOLOR: + case WM_CTLCOLORMSGBOX: + case WM_CTLCOLOREDIT: + case WM_CTLCOLORLISTBOX: + case WM_CTLCOLORBTN: + case WM_CTLCOLORDLG: + case WM_CTLCOLORSCROLLBAR: + case WM_CTLCOLORSTATIC: + if (lparam_for_WM_CTLCOLOR) + { + ok(lparam_for_WM_CTLCOLOR == (HWND)lparam, "Expected %p, got %p\n", lparam_for_WM_CTLCOLOR, (HWND)lparam); + return (LRESULT) brush_red; + } + break; } return CallWindowProcA(old_parent_proc, hwnd, msg, wparam, lparam); @@ -1254,6 +1274,83 @@ static void test_combo_dropdown_size(DWORD style) } } +static void test_combo_ctlcolor(void) +{ + static const int messages[] = + { + WM_CTLCOLOR, + WM_CTLCOLORMSGBOX, + WM_CTLCOLOREDIT, + WM_CTLCOLORLISTBOX, + WM_CTLCOLORBTN, + WM_CTLCOLORDLG, + WM_CTLCOLORSCROLLBAR, + WM_CTLCOLORSTATIC, + }; + + HBRUSH brush, global_brush; + COMBOBOXINFO info; + unsigned int i; + HWND combo; + + combo = create_combobox(CBS_DROPDOWN); + ok(!!combo, "Failed to create combo window.\n"); + + old_parent_proc = (void *)SetWindowLongPtrA(hMainWnd, GWLP_WNDPROC, (ULONG_PTR)parent_wnd_proc); + + get_combobox_info(combo, &info); + + lparam_for_WM_CTLCOLOR = info.hwndItem; + + /* Parent returns valid brush handle. */ + for (i = 0; i < ARRAY_SIZE(messages); ++i) + { + brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "%u: unexpected brush %p, expected got %p.\n", i, brush, brush_red); + } + + /* Parent returns NULL brush. */ + global_brush = brush_red; + brush_red = NULL; + + for (i = 0; i < ARRAY_SIZE(messages); ++i) + { + brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem); + todo_wine + ok(!brush, "%u: unexpected brush %p.\n", i, brush); + } + + brush_red = global_brush; + + lparam_for_WM_CTLCOLOR = 0; + + /* Parent does default processing. */ + for (i = 0; i < ARRAY_SIZE(messages); ++i) + { + brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem); + ok(!!brush && brush != brush_red, "%u: unexpected brush %p.\n", i, brush); + } + + SetWindowLongPtrA(hMainWnd, GWLP_WNDPROC, (ULONG_PTR)old_parent_proc); + DestroyWindow(combo); + + /* Combo without a parent. */ + combo = CreateWindowA(WC_COMBOBOXA, "Combo", CBS_DROPDOWN, 5, 5, 100, 100, NULL, NULL, NULL, 0); + ok(!!combo, "Failed to create combo window.\n"); + + get_combobox_info(combo, &info); + + for (i = 0; i < ARRAY_SIZE(messages); ++i) + { + brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem); + todo_wine + ok(!brush, "%u: unexpected brush %p.\n", i, brush); + } + + DestroyWindow(combo); +} + START_TEST(combo) { ULONG_PTR ctx_cookie; @@ -1297,6 +1394,7 @@ START_TEST(combo) test_combo_listbox_styles(CBS_DROPDOWNLIST); test_combo_dropdown_size(0); test_combo_dropdown_size(CBS_NOINTEGRALHEIGHT); + test_combo_ctlcolor(); cleanup(); unload_v6_module(ctx_cookie, hCtx); -- 2.24.0.rc1

1 3

[PATCH v3 1/6] xmllite: Use empty_element to store various names.
by Jeff Smith 04 Nov '19

04 Nov '19

Rather than maintain global state for prefix, local name, and qualified name, always determine the value based on node type. For the xml declaration, DTD, and processing instruction nodes it is reasonable to place those into empty_element fields. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/xmllite/reader.c | 171 +++++++++++++++--------------------- dlls/xmllite/tests/reader.c | 5 +- 2 files changed, 72 insertions(+), 104 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index e813ca37fe..dd033f37c5 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -74,15 +74,6 @@ typedef enum XmlReadResume_Last } XmlReaderResume; -typedef enum -{ - StringValue_LocalName, - StringValue_Prefix, - StringValue_QualifiedName, - StringValue_Value, - StringValue_Last -} XmlReaderStringValue; - static const WCHAR usasciiW[] = {'U','S','-','A','S','C','I','I',0}; static const WCHAR utf16W[] = {'U','T','F','-','1','6',0}; static const WCHAR utf8W[] = {'U','T','F','-','8',0}; @@ -289,12 +280,12 @@ typedef struct struct list ns; struct list elements; int chunk_read_off; - strval strvalues[StringValue_Last]; + strval strvalue; UINT depth; UINT max_depth; BOOL is_empty_element; struct element empty_element; /* used for empty elements without end tag <a />, - and to keep <?xml reader position */ + xml declaration, DTD, and processing instructions */ UINT resume[XmlReadResume_Last]; /* offsets used to resume reader */ } xmlreader; @@ -484,18 +475,6 @@ static inline void reader_init_cstrvalue(WCHAR *str, UINT len, strval *v) v->str = str; } -static void reader_free_strvalue(xmlreader *reader, XmlReaderStringValue type) -{ - reader_free_strvalued(reader, &reader->strvalues[type]); -} - -static void reader_free_strvalues(xmlreader *reader) -{ - int type; - for (type = 0; type < StringValue_Last; type++) - reader_free_strvalue(reader, type); -} - /* This helper should only be used to test if strings are the same, it doesn't try to sort. */ static inline int strval_eq(const xmlreader *reader, const strval *str1, const strval *str2) @@ -515,6 +494,7 @@ static void reader_clear_elements(xmlreader *reader) reader_free(reader, elem); } list_init(&reader->elements); + reader_free_strvalued(reader, &reader->empty_element.prefix); reader_free_strvalued(reader, &reader->empty_element.localname); reader_free_strvalued(reader, &reader->empty_element.qname); reader->is_empty_element = FALSE; @@ -669,37 +649,27 @@ static void reader_pop_element(xmlreader *reader) /* Always make a copy, cause strings are supposed to be null terminated. Null pointer for 'value' means node value is to be determined. */ -static void reader_set_strvalue(xmlreader *reader, XmlReaderStringValue type, const strval *value) +static void reader_set_strvalue(xmlreader *reader, const strval *value) { - strval *v = &reader->strvalues[type]; + strval *v = &reader->strvalue; - reader_free_strvalue(reader, type); + reader_free_strvalued(reader, v); if (!value) { v->str = NULL; v->start = 0; v->len = 0; - return; } - - if (value->str == strval_empty.str) + else if (value->str == strval_empty.str) + { *v = *value; + } else { - if (type == StringValue_Value) - { - /* defer allocation for value string */ - v->str = NULL; - v->start = value->start; - v->len = value->len; - } - else - { - v->str = reader_alloc(reader, (value->len + 1)*sizeof(WCHAR)); - memcpy(v->str, reader_get_strptr(reader, value), value->len*sizeof(WCHAR)); - v->str[value->len] = 0; - v->len = value->len; - } + /* defer allocation for value string */ + v->str = NULL; + v->start = value->start; + v->len = value->len; } } @@ -1414,8 +1384,8 @@ static HRESULT reader_parse_xmldecl(xmlreader *reader) reader->nodetype = XmlNodeType_XmlDeclaration; reader->empty_element.position = position; - reader_set_strvalue(reader, StringValue_LocalName, &strval_xml); - reader_set_strvalue(reader, StringValue_QualifiedName, &strval_xml); + reader_strvaldup(reader, &strval_xml, &reader->empty_element.localname); + reader_strvaldup(reader, &strval_xml, &reader->empty_element.qname); return S_OK; } @@ -1441,7 +1411,7 @@ static HRESULT reader_parse_comment(xmlreader *reader) reader->nodetype = XmlNodeType_Comment; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_Comment; - reader_set_strvalue(reader, StringValue_Value, NULL); + reader_set_strvalue(reader, NULL); } /* will exit when there's no more data, it won't attempt to @@ -1462,7 +1432,7 @@ static HRESULT reader_parse_comment(xmlreader *reader) /* skip rest of markup '->' */ reader_skipn(reader, 3); - reader_set_strvalue(reader, StringValue_Value, &value); + reader_set_strvalue(reader, &value); reader->resume[XmlReadResume_Body] = 0; reader->resumestate = XmlReadResumeState_Initial; return S_OK; @@ -1648,9 +1618,11 @@ static HRESULT reader_parse_pi(xmlreader *reader) case XmlReadResumeState_PITarget: hr = reader_parse_pitarget(reader, &target); if (FAILED(hr)) return hr; - reader_set_strvalue(reader, StringValue_LocalName, &target); - reader_set_strvalue(reader, StringValue_QualifiedName, &target); - reader_set_strvalue(reader, StringValue_Value, &strval_empty); + reader_free_strvalued(reader, &reader->empty_element.localname); + reader_strvaldup(reader, &target, &reader->empty_element.localname); + reader_free_strvalued(reader, &reader->empty_element.qname); + reader_strvaldup(reader, &target, &reader->empty_element.qname); + reader_set_strvalue(reader, &strval_empty); reader->resumestate = XmlReadResumeState_PIBody; reader->resume[XmlReadResume_Body] = reader_get_cur(reader); default: @@ -1684,7 +1656,7 @@ static HRESULT reader_parse_pi(xmlreader *reader) reader->nodetype = XmlNodeType_ProcessingInstruction; reader->resumestate = XmlReadResumeState_Initial; reader->resume[XmlReadResume_Body] = 0; - reader_set_strvalue(reader, StringValue_Value, &value); + reader_set_strvalue(reader, &value); return S_OK; } } @@ -1706,9 +1678,7 @@ static HRESULT reader_parse_whitespace(xmlreader *reader) reader->resumestate = XmlReadResumeState_Whitespace; reader->resume[XmlReadResume_Body] = reader_get_cur(reader); reader->nodetype = XmlNodeType_Whitespace; - reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); - reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); - reader_set_strvalue(reader, StringValue_Value, &strval_empty); + reader_set_strvalue(reader, &strval_empty); /* fallthrough */ case XmlReadResumeState_Whitespace: { @@ -1720,7 +1690,7 @@ static HRESULT reader_parse_whitespace(xmlreader *reader) start = reader->resume[XmlReadResume_Body]; reader_init_strvalue(start, reader_get_cur(reader)-start, &value); - reader_set_strvalue(reader, StringValue_Value, &value); + reader_set_strvalue(reader, &value); TRACE("%s\n", debug_strval(reader, &value)); reader->resumestate = XmlReadResumeState_Initial; } @@ -1919,8 +1889,10 @@ static HRESULT reader_parse_dtd(xmlreader *reader) reader_skipn(reader, 1); reader->nodetype = XmlNodeType_DocumentType; - reader_set_strvalue(reader, StringValue_LocalName, &name); - reader_set_strvalue(reader, StringValue_QualifiedName, &name); + reader_free_strvalued(reader, &reader->empty_element.localname); + reader_strvaldup(reader, &name, &reader->empty_element.localname); + reader_free_strvalued(reader, &reader->empty_element.qname); + reader_strvaldup(reader, &name, &reader->empty_element.qname); return S_OK; } @@ -2342,9 +2314,7 @@ static HRESULT reader_parse_element(xmlreader *reader) reader->nodetype = XmlNodeType_Element; reader->resumestate = XmlReadResumeState_Initial; - reader_set_strvalue(reader, StringValue_Prefix, &prefix); - reader_set_strvalue(reader, StringValue_QualifiedName, &qname); - reader_set_strvalue(reader, StringValue_Value, &strval_empty); + reader_set_strvalue(reader, &strval_empty); break; } default: @@ -2386,7 +2356,6 @@ static HRESULT reader_parse_endtag(xmlreader *reader) reader->nodetype = XmlNodeType_EndElement; reader->is_empty_element = FALSE; - reader_set_strvalue(reader, StringValue_Prefix, &prefix); return S_OK; } @@ -2415,7 +2384,7 @@ static HRESULT reader_parse_cdata(xmlreader *reader) reader->nodetype = XmlNodeType_CDATA; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_CDATA; - reader_set_strvalue(reader, StringValue_Value, NULL); + reader_set_strvalue(reader, NULL); } while (*ptr) @@ -2430,7 +2399,7 @@ static HRESULT reader_parse_cdata(xmlreader *reader) reader_skipn(reader, 3); TRACE("%s\n", debug_strval(reader, &value)); - reader_set_strvalue(reader, StringValue_Value, &value); + reader_set_strvalue(reader, &value); reader->resume[XmlReadResume_Body] = 0; reader->resumestate = XmlReadResumeState_Initial; return S_OK; @@ -2467,7 +2436,7 @@ static HRESULT reader_parse_chardata(xmlreader *reader) reader->nodetype = is_wchar_space(*ptr) ? XmlNodeType_Whitespace : XmlNodeType_Text; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_CharData; - reader_set_strvalue(reader, StringValue_Value, NULL); + reader_set_strvalue(reader, NULL); } position = reader->position; @@ -2486,7 +2455,7 @@ static HRESULT reader_parse_chardata(xmlreader *reader) reader->empty_element.position = position; reader_init_strvalue(start, reader_get_cur(reader)-start, &value); - reader_set_strvalue(reader, StringValue_Value, &value); + reader_set_strvalue(reader, &value); reader->resume[XmlReadResume_Body] = 0; reader->resumestate = XmlReadResumeState_Initial; return S_OK; @@ -2732,7 +2701,7 @@ static void reader_reset_parser(xmlreader *reader) reader_clear_elements(reader); reader_clear_attrs(reader); reader_clear_ns(reader); - reader_free_strvalues(reader); + reader_free_strvalued(reader, &reader->strvalue); reader->depth = 0; reader->nodetype = XmlNodeType_None; @@ -2954,9 +2923,7 @@ static void reader_set_current_attribute(xmlreader *reader, struct attribute *at { reader->attr = attr; reader->chunk_read_off = 0; - reader_set_strvalue(reader, StringValue_Prefix, &attr->prefix); - reader_set_strvalue(reader, StringValue_QualifiedName, &attr->qname); - reader_set_strvalue(reader, StringValue_Value, &attr->value); + reader_set_strvalue(reader, &attr->value); } static HRESULT reader_move_to_first_attribute(xmlreader *reader) @@ -3115,20 +3082,8 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) This->attr = NULL; - /* FIXME: support other node types with 'attributes' like DTD */ - if (This->is_empty_element) { - reader_set_strvalue(This, StringValue_Prefix, &This->empty_element.prefix); - reader_set_strvalue(This, StringValue_QualifiedName, &This->empty_element.qname); - } - else { - struct element *element = LIST_ENTRY(list_head(&This->elements), struct element, entry); - if (element) { - reader_set_strvalue(This, StringValue_Prefix, &element->prefix); - reader_set_strvalue(This, StringValue_QualifiedName, &element->qname); - } - } This->chunk_read_off = 0; - reader_set_strvalue(This, StringValue_Value, &strval_empty); + reader_set_strvalue(This, &strval_empty); return S_OK; } @@ -3136,6 +3091,7 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *name, UINT *len) { xmlreader *This = impl_from_IXmlReader(iface); + XmlNodeType nodetype; struct attribute *attribute = This->attr; struct element *element; UINT length; @@ -3145,7 +3101,7 @@ static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *nam if (!len) len = &length; - switch (reader_get_nodetype(This)) + switch ((nodetype = reader_get_nodetype(This))) { case XmlNodeType_Text: case XmlNodeType_CDATA: @@ -3175,8 +3131,8 @@ static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *nam *len = 5; } else if (attribute->prefix.len) { - *name = This->strvalues[StringValue_QualifiedName].str; - *len = This->strvalues[StringValue_QualifiedName].len; + *name = attribute->qname.str; + *len = attribute->qname.len; } else { @@ -3184,10 +3140,17 @@ static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *nam *len = attribute->localname.len; } break; - default: - *name = This->strvalues[StringValue_QualifiedName].str; - *len = This->strvalues[StringValue_QualifiedName].len; + case XmlNodeType_DocumentType: + case XmlNodeType_XmlDeclaration: + case XmlNodeType_ProcessingInstruction: + *name = This->empty_element.qname.str; + *len = This->empty_element.qname.len; break; + default: + FIXME("Unhandled node type %d\n", nodetype); + *name = NULL; + *len = 0; + return E_NOTIMPL; } return S_OK; @@ -3204,7 +3167,6 @@ static struct ns *reader_lookup_nsdef(xmlreader *reader) static HRESULT WINAPI xmlreader_GetNamespaceUri(IXmlReader* iface, const WCHAR **uri, UINT *len) { xmlreader *This = impl_from_IXmlReader(iface); - const strval *prefix = &This->strvalues[StringValue_Prefix]; XmlNodeType nodetype; struct ns *ns; UINT length; @@ -3222,7 +3184,8 @@ static HRESULT WINAPI xmlreader_GetNamespaceUri(IXmlReader* iface, const WCHAR * case XmlNodeType_Element: case XmlNodeType_EndElement: { - ns = reader_lookup_ns(This, prefix); + struct element *element = reader_get_element(This); + ns = reader_lookup_ns(This, &element->prefix); /* pick top default ns if any */ if (!ns) @@ -3260,6 +3223,7 @@ static HRESULT WINAPI xmlreader_GetNamespaceUri(IXmlReader* iface, const WCHAR * static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, UINT *len) { xmlreader *This = impl_from_IXmlReader(iface); + XmlNodeType nodetype; struct element *element; UINT length; @@ -3268,7 +3232,7 @@ static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, U if (!len) len = &length; - switch (reader_get_nodetype(This)) + switch ((nodetype = reader_get_nodetype(This))) { case XmlNodeType_Text: case XmlNodeType_CDATA: @@ -3286,10 +3250,17 @@ static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, U case XmlNodeType_Attribute: reader_get_attribute_local_name(This, This->attr, name, len); break; - default: - *name = This->strvalues[StringValue_LocalName].str; - *len = This->strvalues[StringValue_LocalName].len; + case XmlNodeType_DocumentType: + case XmlNodeType_XmlDeclaration: + case XmlNodeType_ProcessingInstruction: + *name = This->empty_element.localname.str; + *len = This->empty_element.localname.len; break; + default: + FIXME("Unhandled node type %d\n", nodetype); + *name = NULL; + *len = 0; + return E_NOTIMPL; } return S_OK; @@ -3315,8 +3286,10 @@ static HRESULT WINAPI xmlreader_GetPrefix(IXmlReader* iface, const WCHAR **ret, case XmlNodeType_EndElement: case XmlNodeType_Attribute: { - const strval *prefix = &This->strvalues[StringValue_Prefix]; struct ns *ns; + struct element *element = reader_get_element(This); + const strval *prefix = (nodetype == XmlNodeType_Attribute) ? + &This->attr->prefix : &element->prefix; if (strval_eq(This, prefix, &strval_xml)) { @@ -3369,7 +3342,7 @@ static const strval *reader_get_value(xmlreader *reader, BOOL ensure_allocated) break; } - val = &reader->strvalues[StringValue_Value]; + val = &reader->strvalue; if (!val->str && ensure_allocated) { WCHAR *ptr = reader_alloc(reader, (val->len+1)*sizeof(WCHAR)); @@ -3385,7 +3358,7 @@ static const strval *reader_get_value(xmlreader *reader, BOOL ensure_allocated) static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, UINT *len) { xmlreader *reader = impl_from_IXmlReader(iface); - const strval *val = &reader->strvalues[StringValue_Value]; + const strval *val = &reader->strvalue; UINT off; TRACE("(%p)->(%p %p)\n", reader, value, len); @@ -3651,7 +3624,6 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) { xmlreader *reader; HRESULT hr; - int i; TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), obj, imalloc); @@ -3679,8 +3651,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) reader->max_depth = 256; reader->chunk_read_off = 0; - for (i = 0; i < StringValue_Last; i++) - reader->strvalues[i] = strval_empty; + reader->strvalue = strval_empty; hr = IXmlReader_QueryInterface(&reader->IXmlReader_iface, riid, obj); IXmlReader_Release(&reader->IXmlReader_iface); diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 41adad1598..c93ee01fa1 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1320,10 +1320,9 @@ static void test_read_public_dtd(void) str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine { ok(len == lstrlenW(dtdnameW), "got %u\n", len); ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); -} + IXmlReader_Release(reader); } @@ -1373,10 +1372,8 @@ static void test_read_system_dtd(void) str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine { ok(len == lstrlenW(dtdnameW), "got %u\n", len); ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); -} read_node(reader, XmlNodeType_Comment); -- 2.21.0

2 7

Source of Bug Found.
by Thales 04 Nov '19

04 Nov '19

Hello everyone, I was able to figure out the source of a bug for one of the bugs listed in Bugzilla. I wrote a little demo app with Windows API functions to show it. I hesitated to fix the problem in Wine, because the code is complex and therefore wasn't sure what the ramifications would be. How do I go about presenting this to those who deal with bugs? Many thanks for any feedback! Regards,John Alway

2 3

[PATCH] dmstyle: IDirectMusicTrack GetParam add pointer check.
by Alistair Leslie-Hughes 04 Nov '19

04 Nov '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- The other option we have, is use a Single Track structure for these types and override only the function(s) that are required for that type. dlls/dmstyle/auditiontrack.c | 8 ++++++-- dlls/dmstyle/chordtrack.c | 10 +++++++--- dlls/dmstyle/commandtrack.c | 10 +++++++--- dlls/dmstyle/motiftrack.c | 10 +++++++--- dlls/dmstyle/mutetrack.c | 10 +++++++--- dlls/dmstyle/styletrack.c | 10 +++++++--- dlls/dmstyle/tests/dmstyle.c | 6 +++--- 7 files changed, 44 insertions(+), 20 deletions(-) diff --git a/dlls/dmstyle/auditiontrack.c b/dlls/dmstyle/auditiontrack.c index 3c304ca574..190b2111aa 100644 --- a/dlls/dmstyle/auditiontrack.c +++ b/dlls/dmstyle/auditiontrack.c @@ -121,9 +121,13 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { - IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); + IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + + if (!rguidType) + return E_POINTER; + + return S_OK; } static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c index fd290bf7a9..70056e5677 100644 --- a/dlls/dmstyle/chordtrack.c +++ b/dlls/dmstyle/chordtrack.c @@ -124,9 +124,13 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { - IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); + FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); + + if (!rguidType) + return E_POINTER; + + return S_OK; } static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c index e326241c4b..0afac074c7 100644 --- a/dlls/dmstyle/commandtrack.c +++ b/dlls/dmstyle/commandtrack.c @@ -123,9 +123,13 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { - IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); + FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); + + if (!rguidType) + return E_POINTER; + + return S_OK; } static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, diff --git a/dlls/dmstyle/motiftrack.c b/dlls/dmstyle/motiftrack.c index d4a4effec7..526a28111d 100644 --- a/dlls/dmstyle/motiftrack.c +++ b/dlls/dmstyle/motiftrack.c @@ -121,9 +121,13 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { - IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); + FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); + + if (!rguidType) + return E_POINTER; + + return S_OK; } static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, diff --git a/dlls/dmstyle/mutetrack.c b/dlls/dmstyle/mutetrack.c index 67bfbc30dc..5d85a1b61e 100644 --- a/dlls/dmstyle/mutetrack.c +++ b/dlls/dmstyle/mutetrack.c @@ -121,9 +121,13 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { - IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); + FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); + + if (!rguidType) + return E_POINTER; + + return S_OK; } static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index 79b4787ca0..a75853bf16 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -123,9 +123,13 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { - IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); + FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); + + if (!rguidType) + return E_POINTER; + + return S_OK; } static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index a94640d13d..6b2275866c 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -279,12 +279,12 @@ static void test_track(void) else todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); } - todo_wine { + hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); - } + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); + hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); if (class[i].clsid == &CLSID_DirectMusicMuteTrack) { -- 2.17.1

1 0

[PATCH v3 1/4] ntoskrnl.exe: Pass the correct output size to IoBuildDeviceIoControlRequest().
by Zebediah Figura 04 Nov '19

04 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 3 --- dlls/ntoskrnl.exe/tests/driver.c | 9 +++------ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 9 ++++++++- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 8e6b60e2c4..f7a3f8aced 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -721,10 +721,7 @@ static NTSTATUS dispatch_ioctl( struct dispatch_context *context ) context->in_buff = out_buff; } else - { out_buff = context->in_buff; - out_size = context->in_size; - } } irp = IoBuildDeviceIoControlRequest( context->params.ioctl.code, device, context->in_buff, diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 0506011ce5..67f22a4b2b 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1777,17 +1777,14 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st static NTSTATUS test_basic_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { - ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; + ULONG length = min(stack->Parameters.DeviceIoControl.OutputBufferLength, sizeof(teststr)); char *buffer = irp->AssociatedIrp.SystemBuffer; if (!buffer) return STATUS_ACCESS_VIOLATION; - if (length < sizeof(teststr)) - return STATUS_BUFFER_TOO_SMALL; - - memcpy(buffer, teststr, sizeof(teststr)); - *info = sizeof(teststr); + memcpy(buffer, teststr, length); + *info = length; return STATUS_SUCCESS; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index eb58878cec..76bcf0d0ce 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -190,8 +190,8 @@ static void main_test(void) static void test_basic_ioctl(void) { + char inbuf[64], buf[32]; DWORD written; - char buf[32]; BOOL res; res = DeviceIoControl(device, IOCTL_WINETEST_BASIC_IOCTL, NULL, 0, buf, @@ -199,6 +199,13 @@ static void test_basic_ioctl(void) ok(res, "DeviceIoControl failed: %u\n", GetLastError()); ok(written == sizeof(teststr), "got size %d\n", written); ok(!strcmp(buf, teststr), "got '%s'\n", buf); + + memset(buf, 0, sizeof(buf)); + res = DeviceIoControl(device, IOCTL_WINETEST_BASIC_IOCTL, inbuf, + sizeof(inbuf), buf, 10, &written, NULL); + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + ok(written == 10, "got size %d\n", written); + ok(!strcmp(buf, "Wine is no"), "got '%s'\n", buf); } static void test_overlapped(void) -- 2.23.0

1 3

[PATCH] ole32: Support BIND_OPTS3 in bind context.
by Nikolay Sivov 03 Nov '19

03 Nov '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/bindctx.c | 38 +++++++++++++++----------------------- dlls/ole32/tests/moniker.c | 13 ++++++++----- 2 files changed, 23 insertions(+), 28 deletions(-) diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index 1951100b0b..24229568f1 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -57,7 +57,7 @@ typedef struct BindCtxImpl{ DWORD bindCtxTableLastIndex; /* first free index in the table */ DWORD bindCtxTableSize; /* size table */ - BIND_OPTS2 bindOption2; /* a structure which contains the bind options*/ + BIND_OPTS3 options; } BindCtxImpl; @@ -246,17 +246,17 @@ BindCtxImpl_SetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts) { BindCtxImpl *This = impl_from_IBindCtx(iface); - TRACE("(%p,%p)\n",This,pbindopts); + TRACE("(%p,%p)\n",This, pbindopts); if (pbindopts==NULL) return E_POINTER; - if (pbindopts->cbStruct > sizeof(BIND_OPTS2)) + if (pbindopts->cbStruct > sizeof(This->options)) { - WARN("invalid size\n"); - return E_INVALIDARG; /* FIXME : not verified */ + WARN("invalid size %u.\n", pbindopts->cbStruct); + return E_INVALIDARG; } - memcpy(&This->bindOption2, pbindopts, pbindopts->cbStruct); + memcpy(&This->options, pbindopts, pbindopts->cbStruct); return S_OK; } @@ -267,19 +267,16 @@ static HRESULT WINAPI BindCtxImpl_GetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts) { BindCtxImpl *This = impl_from_IBindCtx(iface); - ULONG cbStruct; + DWORD size; TRACE("(%p,%p)\n",This,pbindopts); if (pbindopts==NULL) return E_POINTER; - cbStruct = pbindopts->cbStruct; - if (cbStruct > sizeof(BIND_OPTS2)) - cbStruct = sizeof(BIND_OPTS2); - - memcpy(pbindopts, &This->bindOption2, cbStruct); - pbindopts->cbStruct = cbStruct; + size = min(pbindopts->cbStruct, sizeof(This->options)); + memcpy(pbindopts, &This->options, size); + pbindopts->cbStruct = size; return S_OK; } @@ -520,16 +517,11 @@ static HRESULT BindCtxImpl_Construct(BindCtxImpl* This) This->IBindCtx_iface.lpVtbl = &VT_BindCtxImpl; This->ref = 0; - /* Initialize the BIND_OPTS2 structure */ - This->bindOption2.cbStruct = sizeof(BIND_OPTS2); - This->bindOption2.grfFlags = 0; - This->bindOption2.grfMode = STGM_READWRITE; - This->bindOption2.dwTickCountDeadline = 0; - - This->bindOption2.dwTrackFlags = 0; - This->bindOption2.dwClassContext = CLSCTX_SERVER; - This->bindOption2.locale = GetThreadLocale(); - This->bindOption2.pServerInfo = 0; + memset(&This->options, 0, sizeof(This->options)); + This->options.cbStruct = sizeof(This->options); + This->options.grfMode = STGM_READWRITE; + This->options.dwClassContext = CLSCTX_SERVER; + This->options.locale = GetThreadLocale(); /* Initialize the bindctx table */ This->bindCtxTableSize=0; diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 5bcc136a36..18ea4d465b 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1888,7 +1888,7 @@ static void test_bind_context(void) HRESULT hr; IBindCtx *pBindCtx; IEnumString *pEnumString; - BIND_OPTS2 bind_opts; + BIND_OPTS3 bind_opts; HeapUnknown *unknown; HeapUnknown *unknown2; IUnknown *param_obj; @@ -1908,19 +1908,20 @@ static void test_bind_context(void) bind_opts.cbStruct = -1; hr = IBindCtx_GetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); ok_ole_success(hr, "IBindCtx_GetBindOptions"); - ok(bind_opts.cbStruct == sizeof(bind_opts) || - bind_opts.cbStruct == sizeof(bind_opts) + sizeof(void*), /* Vista */ - "bind_opts.cbStruct was %d\n", bind_opts.cbStruct); + ok(bind_opts.cbStruct == sizeof(BIND_OPTS3) || broken(bind_opts.cbStruct == sizeof(BIND_OPTS2)) /* XP */, + "Unexpected bind_opts.cbStruct %d.\n", bind_opts.cbStruct); bind_opts.cbStruct = sizeof(BIND_OPTS); hr = IBindCtx_GetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); ok_ole_success(hr, "IBindCtx_GetBindOptions"); ok(bind_opts.cbStruct == sizeof(BIND_OPTS), "bind_opts.cbStruct was %d\n", bind_opts.cbStruct); + memset(&bind_opts, 0xfe, sizeof(bind_opts)); bind_opts.cbStruct = sizeof(bind_opts); hr = IBindCtx_GetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); ok_ole_success(hr, "IBindCtx_GetBindOptions"); - ok(bind_opts.cbStruct == sizeof(bind_opts), "bind_opts.cbStruct was %d\n", bind_opts.cbStruct); + ok(bind_opts.cbStruct == sizeof(bind_opts) || bind_opts.cbStruct == sizeof(BIND_OPTS2) /* XP */, + "Unexpected bind_opts.cbStruct %d.\n", bind_opts.cbStruct); ok(bind_opts.grfFlags == 0, "bind_opts.grfFlags was 0x%x instead of 0\n", bind_opts.grfFlags); ok(bind_opts.grfMode == STGM_READWRITE, "bind_opts.grfMode was 0x%x instead of STGM_READWRITE\n", bind_opts.grfMode); ok(bind_opts.dwTickCountDeadline == 0, "bind_opts.dwTickCountDeadline was %d instead of 0\n", bind_opts.dwTickCountDeadline); @@ -1929,6 +1930,8 @@ static void test_bind_context(void) "bind_opts.dwClassContext should have been 0x15 instead of 0x%x\n", bind_opts.dwClassContext); ok(bind_opts.locale == GetThreadLocale(), "bind_opts.locale should have been 0x%x instead of 0x%x\n", GetThreadLocale(), bind_opts.locale); ok(bind_opts.pServerInfo == NULL, "bind_opts.pServerInfo should have been NULL instead of %p\n", bind_opts.pServerInfo); + if (bind_opts.cbStruct >= sizeof(BIND_OPTS3)) + ok(bind_opts.hwnd == NULL, "Unexpected bind_opts.hwnd %p.\n", bind_opts.hwnd); bind_opts.cbStruct = -1; hr = IBindCtx_SetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); -- 2.24.0.rc1

1 0

[PATCH 1/6] comsvcs/tests: Rename test file.
by Nikolay Sivov 03 Nov '19

03 Nov '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comsvcs/tests/Makefile.in | 2 +- dlls/comsvcs/tests/{dispenser.c => comsvcs.c} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename dlls/comsvcs/tests/{dispenser.c => comsvcs.c} (99%) diff --git a/dlls/comsvcs/tests/Makefile.in b/dlls/comsvcs/tests/Makefile.in index 9a7047ebaf..86da9fda66 100644 --- a/dlls/comsvcs/tests/Makefile.in +++ b/dlls/comsvcs/tests/Makefile.in @@ -2,4 +2,4 @@ TESTDLL = comsvcs.dll IMPORTS = uuid oleaut32 ole32 C_SRCS = \ - dispenser.c + comsvcs.c diff --git a/dlls/comsvcs/tests/dispenser.c b/dlls/comsvcs/tests/comsvcs.c similarity index 99% rename from dlls/comsvcs/tests/dispenser.c rename to dlls/comsvcs/tests/comsvcs.c index 10bce8e849..77d3224366 100644 --- a/dlls/comsvcs/tests/dispenser.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -268,7 +268,7 @@ static void create_dispenser(void) } -START_TEST(dispenser) +START_TEST(comsvcs) { HRESULT hr; -- 2.24.0.rc1

2 11

[PATCH] tapi/tests: add initial tests for lineInitialize
by Vijay Kiran Kamuju 03 Nov '19

03 Nov '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- configure | 1 + configure.ac | 1 + dlls/tapi32/tests/Makefile.in | 5 +++ dlls/tapi32/tests/line.c | 63 +++++++++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+) create mode 100644 dlls/tapi32/tests/Makefile.in create mode 100644 dlls/tapi32/tests/line.c diff --git a/configure b/configure index 8ddfb4ecdd..af37617bd8 100755 --- a/configure +++ b/configure @@ -20846,6 +20846,7 @@ wine_fn_config_makefile dlls/system.drv16 enable_win16 wine_fn_config_makefile dlls/t2embed enable_t2embed wine_fn_config_makefile dlls/t2embed/tests enable_tests wine_fn_config_makefile dlls/tapi32 enable_tapi32 +wine_fn_config_makefile dlls/tapi32/tests enable_tests wine_fn_config_makefile dlls/taskschd enable_taskschd wine_fn_config_makefile dlls/taskschd/tests enable_tests wine_fn_config_makefile dlls/tdh enable_tdh diff --git a/configure.ac b/configure.ac index 31aac11d31..0eec89e3df 100644 --- a/configure.ac +++ b/configure.ac @@ -3699,6 +3699,7 @@ WINE_CONFIG_MAKEFILE(dlls/system.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/t2embed) WINE_CONFIG_MAKEFILE(dlls/t2embed/tests) WINE_CONFIG_MAKEFILE(dlls/tapi32) +WINE_CONFIG_MAKEFILE(dlls/tapi32/tests) WINE_CONFIG_MAKEFILE(dlls/taskschd) WINE_CONFIG_MAKEFILE(dlls/taskschd/tests) WINE_CONFIG_MAKEFILE(dlls/tdh) diff --git a/dlls/tapi32/tests/Makefile.in b/dlls/tapi32/tests/Makefile.in new file mode 100644 index 0000000000..4193f0808e --- /dev/null +++ b/dlls/tapi32/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = tapi32.dll +IMPORTS = tapi32 + +C_SRCS = \ + line.c diff --git a/dlls/tapi32/tests/line.c b/dlls/tapi32/tests/line.c new file mode 100644 index 0000000000..e94b68ba30 --- /dev/null +++ b/dlls/tapi32/tests/line.c @@ -0,0 +1,63 @@ +/* + * TAPI32 API tests + * + * Copyright 2019 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "tapi.h" + +#include "wine/test.h" + +static void CALLBACK line_callback(DWORD hDev, DWORD dwMsg, DWORD_PTR dwInst, DWORD_PTR param1, DWORD_PTR param2, DWORD_PTR param3) +{ + ok(1, "Received notification (%d, %d, %ld, %ld, %ld %ld)\n", hDev, dwMsg, dwInst, param1, param2, param3); +} + +static void test_lineInitialize(void) +{ + ULONG ret; + DWORD dev; + HLINEAPP lnApp; + + ret = lineInitialize(NULL, NULL, NULL, NULL, NULL); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + + ret = lineInitialize(&lnApp, NULL, NULL, NULL, NULL); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + + ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), NULL, NULL, NULL); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + + ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), (LINECALLBACK) line_callback, NULL, NULL); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + + ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), (LINECALLBACK) line_callback, NULL, &dev); + ok(!ret, "unexpected return valuei, got %u.\n", ret); + + ret = lineShutdown(NULL); + todo_wine ok(ret == LINEERR_INVALAPPHANDLE, "Expected return value LINEERR_INVALAPPHANDLE, got %x.\n", ret); + + ret = lineShutdown(lnApp); + ok(!ret, "unexpected return valuei, got %u.\n", ret); +} + +START_TEST(line) +{ + test_lineInitialize(); +} -- 2.20.1

1 0

[PATCH 2/2] msvcrt/tests: Work around sscanf("%hhd") not working yet.
by Serge Gautherie 03 Nov '19

03 Nov '19

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- The only correct result is 0xdeadbe4e, as in dlls/ucrtbase/tests/scanf.c, but test fails on Windows/ReactOS too, until Wine code is fixed... --- dlls/msvcrt/tests/scanf.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 07132e4..e2c619c 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -201,14 +201,24 @@ static void test_sscanf( void ) result = 0xdeadbeef; strcpy(buffer,"12345678"); + ret = p_sscanf(buffer, "%d", &result); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + /* int */ + ok(result == 0x00bc614e, "Wrong number read (%08x)\n", result); + + result = 0xdeadbeef; ret = p_sscanf(buffer, "%hd", (short *)&result); ok(ret == 1, "Wrong number of arguments read: %d\n", ret); - ok(result == 0xdead614e, "Wrong number read (%x)\n", result); + /* int, truncated to short int */ + ok(result == 0xdead614e, "Wrong number read (%08x)\n", result); result = 0xdeadbeef; ret = p_sscanf(buffer, "%hhd", (char *)&result); ok(ret == 1, "Wrong number of arguments read: %d\n", ret); - ok(result == 0xbc614e, "Wrong number read (%x)\n", result); + /* int, NOT truncated to char: overflow! */ + ok(result == 0x00bc614e, "Wrong number read (%08x)\n", result); + /* int, truncated to char: intended, but not working yet! */ + todo_wine ok(result == 0xdeadbe4e || broken(result == 0x00bc614e), "Wrong number read (%08x)\n", result); strcpy(buffer,"12345678901234"); ret = p_sscanf(buffer, "%lld", &result64); -- 2.10.0.windows.1

2 3

[PATCH] strmbase/transform: Reimplement IQualityControl for the source pin.
by Zebediah Figura 03 Nov '19

03 Nov '19

There is not enough common code between renderers and transforms to be worth duplicating. This fixes a regression introduced by db7eb3327. The wrong impl_from_*() helper was used in IQualityControl::Notify(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/transform.c | 105 +++++++++++++++++++++++++++----------- include/wine/strmbase.h | 5 +- 2 files changed, 80 insertions(+), 30 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 266232f57a..f4c2c4be72 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -28,7 +28,6 @@ static const WCHAR wcsOutputPinName[] = {'O','u','t',0}; static const IPinVtbl TransformFilter_InputPin_Vtbl; static const IPinVtbl TransformFilter_OutputPin_Vtbl; -static const IQualityControlVtbl TransformFilter_QualityControl_Vtbl; static inline TransformFilter *impl_from_IBaseFilter( IBaseFilter *iface ) { @@ -149,7 +148,6 @@ static void transform_destroy(struct strmbase_filter *iface) filter->csReceive.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&filter->csReceive); FreeMediaType(&filter->pmt); - QualityControlImpl_Destroy(filter->qcimpl); IUnknown_Release(filter->seekthru_unk); strmbase_filter_cleanup(&filter->filter); CoTaskMemFree(filter); @@ -225,7 +223,7 @@ static HRESULT source_query_interface(struct strmbase_pin *iface, REFIID iid, vo TransformFilter *filter = impl_from_source_IPin(&iface->IPin_iface); if (IsEqualGUID(iid, &IID_IQualityControl)) - *out = &filter->qcimpl->IQualityControl_iface; + *out = &filter->source_IQualityControl_iface; else if (IsEqualGUID(iid, &IID_IMediaSeeking)) return IUnknown_QueryInterface(filter->seekthru_unk, iid, out); else @@ -265,6 +263,80 @@ static const IBaseFilterVtbl transform_vtbl = BaseFilterImpl_QueryVendorInfo }; +static TransformFilter *impl_from_source_IQualityControl(IQualityControl *iface) +{ + return CONTAINING_RECORD(iface, TransformFilter, source_IQualityControl_iface); +} + +static HRESULT WINAPI transform_source_qc_QueryInterface(IQualityControl *iface, + REFIID iid, void **out) +{ + TransformFilter *filter = impl_from_source_IQualityControl(iface); + return IPin_QueryInterface(&filter->source.pin.IPin_iface, iid, out); +} + +static ULONG WINAPI transform_source_qc_AddRef(IQualityControl *iface) +{ + TransformFilter *filter = impl_from_source_IQualityControl(iface); + return IPin_AddRef(&filter->source.pin.IPin_iface); +} + +static ULONG WINAPI transform_source_qc_Release(IQualityControl *iface) +{ + TransformFilter *filter = impl_from_source_IQualityControl(iface); + return IPin_Release(&filter->source.pin.IPin_iface); +} + +HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *filter, IBaseFilter *sender, Quality q) +{ + IQualityControl *peer; + HRESULT hr = S_FALSE; + + if (filter->source_qc_sink) + return IQualityControl_Notify(filter->source_qc_sink, &filter->filter.IBaseFilter_iface, q); + + if (filter->sink.pin.peer + && SUCCEEDED(IPin_QueryInterface(filter->sink.pin.peer, &IID_IQualityControl, (void **)&peer))) + { + hr = IQualityControl_Notify(peer, &filter->filter.IBaseFilter_iface, q); + IQualityControl_Release(peer); + } + return hr; +} + +static HRESULT WINAPI transform_source_qc_Notify(IQualityControl *iface, + IBaseFilter *sender, Quality q) +{ + TransformFilter *filter = impl_from_source_IQualityControl(iface); + + TRACE("filter %p, sender %p, type %#x, proportion %u, late %s, timestamp %s.\n", + filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp)); + + if (filter->pFuncsTable->pfnNotify) + return filter->pFuncsTable->pfnNotify(filter, sender, q); + return TransformFilterImpl_Notify(filter, sender, q); +} + +static HRESULT WINAPI transform_source_qc_SetSink(IQualityControl *iface, IQualityControl *sink) +{ + TransformFilter *filter = impl_from_source_IQualityControl(iface); + + TRACE("filter %p, sink %p.\n", filter, sink); + + filter->source_qc_sink = sink; + + return S_OK; +} + +static const IQualityControlVtbl source_qc_vtbl = +{ + transform_source_qc_QueryInterface, + transform_source_qc_AddRef, + transform_source_qc_Release, + transform_source_qc_Notify, + transform_source_qc_SetSink, +}; + static HRESULT strmbase_transform_init(IUnknown *outer, const CLSID *clsid, const TransformFilterFuncTable *func_table, TransformFilter *filter) { @@ -285,9 +357,7 @@ static HRESULT strmbase_transform_init(IUnknown *outer, const CLSID *clsid, strmbase_source_init(&filter->source, &TransformFilter_OutputPin_Vtbl, &filter->filter, wcsOutputPinName, &source_ops); - - QualityControlImpl_Create(&filter->sink.pin, &filter->qcimpl); - filter->qcimpl->IQualityControl_iface.lpVtbl = &TransformFilter_QualityControl_Vtbl; + filter->source_IQualityControl_iface.lpVtbl = &source_qc_vtbl; filter->seekthru_unk = NULL; hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown *)&filter->filter.IBaseFilter_iface, @@ -335,11 +405,6 @@ HRESULT strmbase_transform_create(LONG filter_size, IUnknown *outer, const CLSID return E_FAIL; } -HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *filter, IBaseFilter *sender, Quality qm) -{ - return QualityControlImpl_Notify(&filter->qcimpl->IQualityControl_iface, sender, qm); -} - static HRESULT WINAPI TransformFilter_InputPin_EndOfStream(IPin * iface) { TransformFilter *filter = impl_from_sink_IPin(iface); @@ -479,21 +544,3 @@ static const IPinVtbl TransformFilter_OutputPin_Vtbl = BaseOutputPinImpl_EndFlush, BasePinImpl_NewSegment }; - -static HRESULT WINAPI TransformFilter_QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { - QualityControlImpl *qc = (QualityControlImpl*)iface; - TransformFilter *This = impl_from_source_IPin(&qc->pin->IPin_iface); - - if (This->pFuncsTable->pfnNotify) - return This->pFuncsTable->pfnNotify(This, sender, qm); - else - return TransformFilterImpl_Notify(This, sender, qm); -} - -static const IQualityControlVtbl TransformFilter_QualityControl_Vtbl = { - QualityControlImpl_QueryInterface, - QualityControlImpl_AddRef, - QualityControlImpl_Release, - TransformFilter_QualityControlImpl_Notify, - QualityControlImpl_SetSink -}; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index a4920054e6..f92a375a56 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -204,14 +204,17 @@ void strmbase_filter_cleanup(struct strmbase_filter *filter); typedef struct TransformFilter { struct strmbase_filter filter; + struct strmbase_source source; + IQualityControl source_IQualityControl_iface; + IQualityControl *source_qc_sink; + BaseInputPin sink; AM_MEDIA_TYPE pmt; CRITICAL_SECTION csReceive; const struct TransformFilterFuncTable * pFuncsTable; - struct QualityControlImpl *qcimpl; /* IMediaSeeking and IMediaPosition are implemented by ISeekingPassThru */ IUnknown *seekthru_unk; } TransformFilter; -- 2.23.0

1 0

[PATCH] winetest: Disable indexing of the WineTest website.
by Francois Gouget 02 Nov '19

02 Nov '19

All the data on the website is transient in nature and not worth indexing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/robots.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 winetest/robots.txt diff --git a/winetest/robots.txt b/winetest/robots.txt new file mode 100644 index 000000000..1f53798bb --- /dev/null +++ b/winetest/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: / -- 2.20.1

1 0

[PATCH] testbot/web: Disable indexing of the TestBot site.
by Francois Gouget 02 Nov '19

02 Nov '19

All the data on the website is transient in nature and not worth indexing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/robots.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 testbot/web/robots.txt diff --git a/testbot/web/robots.txt b/testbot/web/robots.txt new file mode 100644 index 000000000..1f53798bb --- /dev/null +++ b/testbot/web/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: / -- 2.20.1

1 0

[PATCH] msrle32: Return expected flags from GetInfo.
by Jeff Smith 02 Nov '19

02 Nov '19

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/msrle32/msrle32.c | 2 +- dlls/msrle32/tests/msrle.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 5b17b25a0b..b68a50514f 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1179,7 +1179,7 @@ static LRESULT GetInfo(const CodecInfo *pi, ICINFO *icinfo, DWORD dwSize) icinfo->dwSize = sizeof(ICINFO); icinfo->fccType = ICTYPE_VIDEO; icinfo->fccHandler = (pi != NULL ? pi->fccHandler : FOURCC_MRLE); - icinfo->dwFlags = VIDCF_QUALITY | VIDCF_TEMPORAL | VIDCF_CRUNCH | VIDCF_FASTTEMPORALC; + icinfo->dwFlags = VIDCF_QUALITY | VIDCF_TEMPORAL | VIDCF_CRUNCH; icinfo->dwVersion = ICVERSION; icinfo->dwVersionICM = ICVERSION; diff --git a/dlls/msrle32/tests/msrle.c b/dlls/msrle32/tests/msrle.c index 4a442a0b90..84c5c21510 100644 --- a/dlls/msrle32/tests/msrle.c +++ b/dlls/msrle32/tests/msrle.c @@ -65,7 +65,7 @@ static void test_encode(void) ok(res == sizeof(info), "res = %ld\n", res); ok(info.dwSize == sizeof(info), "dwSize = %d\n", info.dwSize); ok(info.fccHandler == FCC('M','R','L','E'), "fccHandler = %x\n", info.fccHandler); - todo_wine ok(info.dwFlags == (VIDCF_QUALITY|VIDCF_CRUNCH|VIDCF_TEMPORAL), "dwFlags = %x\n", info.dwFlags); + ok(info.dwFlags == (VIDCF_QUALITY|VIDCF_CRUNCH|VIDCF_TEMPORAL), "dwFlags = %x\n", info.dwFlags); ok(info.dwVersionICM == ICVERSION, "dwVersionICM = %d\n", info.dwVersionICM); quality = 0xdeadbeef; -- 2.21.0

1 0

[PATCH v2 1/4] ntoskrnl.exe: Pass the correct output size to IoBuildDeviceIoControlRequest().
by Zebediah Figura 02 Nov '19

02 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 3 --- dlls/ntoskrnl.exe/tests/driver.c | 9 +++------ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 9 ++++++++- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 8e6b60e2c4..f7a3f8aced 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -721,10 +721,7 @@ static NTSTATUS dispatch_ioctl( struct dispatch_context *context ) context->in_buff = out_buff; } else - { out_buff = context->in_buff; - out_size = context->in_size; - } } irp = IoBuildDeviceIoControlRequest( context->params.ioctl.code, device, context->in_buff, diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 0506011ce5..67f22a4b2b 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1777,17 +1777,14 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st static NTSTATUS test_basic_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { - ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; + ULONG length = min(stack->Parameters.DeviceIoControl.OutputBufferLength, sizeof(teststr)); char *buffer = irp->AssociatedIrp.SystemBuffer; if (!buffer) return STATUS_ACCESS_VIOLATION; - if (length < sizeof(teststr)) - return STATUS_BUFFER_TOO_SMALL; - - memcpy(buffer, teststr, sizeof(teststr)); - *info = sizeof(teststr); + memcpy(buffer, teststr, length); + *info = length; return STATUS_SUCCESS; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index eb58878cec..76bcf0d0ce 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -190,8 +190,8 @@ static void main_test(void) static void test_basic_ioctl(void) { + char inbuf[64], buf[32]; DWORD written; - char buf[32]; BOOL res; res = DeviceIoControl(device, IOCTL_WINETEST_BASIC_IOCTL, NULL, 0, buf, @@ -199,6 +199,13 @@ static void test_basic_ioctl(void) ok(res, "DeviceIoControl failed: %u\n", GetLastError()); ok(written == sizeof(teststr), "got size %d\n", written); ok(!strcmp(buf, teststr), "got '%s'\n", buf); + + memset(buf, 0, sizeof(buf)); + res = DeviceIoControl(device, IOCTL_WINETEST_BASIC_IOCTL, inbuf, + sizeof(inbuf), buf, 10, &written, NULL); + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + ok(written == 10, "got size %d\n", written); + ok(!strcmp(buf, "Wine is no"), "got '%s'\n", buf); } static void test_overlapped(void) -- 2.23.0

2 4

[PATCH 1/2] propsys/tests: Merge test files.
by Nikolay Sivov 02 Nov '19

02 Nov '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/propsys/tests/Makefile.in | 1 - dlls/propsys/tests/propstore.c | 374 --------------------------------- dlls/propsys/tests/propsys.c | 342 ++++++++++++++++++++++++++++++ 3 files changed, 342 insertions(+), 375 deletions(-) delete mode 100644 dlls/propsys/tests/propstore.c diff --git a/dlls/propsys/tests/Makefile.in b/dlls/propsys/tests/Makefile.in index d07d675514..19e30afde7 100644 --- a/dlls/propsys/tests/Makefile.in +++ b/dlls/propsys/tests/Makefile.in @@ -2,5 +2,4 @@ TESTDLL = propsys.dll IMPORTS = propsys ole32 oleaut32 C_SRCS = \ - propstore.c \ propsys.c diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c deleted file mode 100644 index 5aeb562cf2..0000000000 --- a/dlls/propsys/tests/propstore.c +++ /dev/null @@ -1,374 +0,0 @@ -/* - * Unit tests for IPropertyStore and related interfaces - * - * Copyright 2012 Vincent Povirk - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#define COBJMACROS - -#include <stdarg.h> -#include <stdio.h> - -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "propsys.h" -#include "wine/test.h" - -#include "initguid.h" - -DEFINE_GUID(PKEY_WineTest, 0x7b317433, 0xdfa3, 0x4c44, 0xad, 0x3e, 0x2f, 0x80, 0x4b, 0x90, 0xdb, 0xf4); -DEFINE_GUID(DUMMY_GUID1, 0x12345678, 0x1234,0x1234, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19); - -#define EXPECT_REF(obj,ref) _expect_ref((IUnknown *)obj, ref, __LINE__) -static void _expect_ref(IUnknown *obj, ULONG ref, int line) -{ - ULONG rc; - IUnknown_AddRef(obj); - rc = IUnknown_Release(obj); - ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); -} - -static void test_inmemorystore(void) -{ - IPropertyStoreCache *propcache; - HRESULT hr; - PROPERTYKEY pkey; - PROPVARIANT propvar; - DWORD count; - PSC_STATE state; - - hr = CoCreateInstance(&CLSID_InMemoryPropertyStore, NULL, CLSCTX_INPROC_SERVER, - &IID_IPropertyStoreCache, (void**)&propcache); - ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); - - if (FAILED(hr)) - { - skip("CLSID_InMemoryPropertyStore not supported\n"); - return; - } - - hr = IPropertyStoreCache_GetCount(propcache, NULL); - ok(hr == E_POINTER, "GetCount failed, hr=%x\n", hr); - - hr = IPropertyStoreCache_GetCount(propcache, &count); - ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); - ok(count == 0, "GetCount returned %i, expected 0\n", count); - - hr = IPropertyStoreCache_Commit(propcache); - ok(hr == S_OK, "Commit failed, hr=%x\n", hr); - - hr = IPropertyStoreCache_Commit(propcache); - ok(hr == S_OK, "Commit failed, hr=%x\n", hr); - - hr = IPropertyStoreCache_GetAt(propcache, 0, &pkey); - ok(hr == E_INVALIDARG, "GetAt failed, hr=%x\n", hr); - - pkey.fmtid = PKEY_WineTest; - pkey.pid = 4; - - memset(&propvar, 0, sizeof(propvar)); - propvar.vt = VT_I4; - propvar.u.lVal = 12345; - - if (0) - { - /* Crashes on Windows 7 */ - hr = IPropertyStoreCache_SetValue(propcache, NULL, &propvar); - ok(hr == E_POINTER, "SetValue failed, hr=%x\n", hr); - - hr = IPropertyStoreCache_SetValue(propcache, &pkey, NULL); - ok(hr == E_POINTER, "SetValue failed, hr=%x\n", hr); - } - - hr = IPropertyStoreCache_SetValue(propcache, &pkey, &propvar); - ok(hr == S_OK, "SetValue failed, hr=%x\n", hr); - - hr = IPropertyStoreCache_GetCount(propcache, &count); - ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); - ok(count == 1, "GetCount returned %i, expected 0\n", count); - - memset(&pkey, 0, sizeof(pkey)); - - hr = IPropertyStoreCache_GetAt(propcache, 0, &pkey); - ok(hr == S_OK, "GetAt failed, hr=%x\n", hr); - ok(IsEqualGUID(&pkey.fmtid, &PKEY_WineTest), "got wrong pkey\n"); - ok(pkey.pid == 4, "got pid of %i, expected 4\n", pkey.pid); - - pkey.fmtid = PKEY_WineTest; - pkey.pid = 4; - - memset(&propvar, 0, sizeof(propvar)); - - if (0) - { - /* Crashes on Windows 7 */ - hr = IPropertyStoreCache_GetValue(propcache, NULL, &propvar); - ok(hr == E_POINTER, "GetValue failed, hr=%x\n", hr); - } - - hr = IPropertyStoreCache_GetValue(propcache, &pkey, NULL); - ok(hr == E_POINTER, "GetValue failed, hr=%x\n", hr); - - hr = IPropertyStoreCache_GetValue(propcache, &pkey, &propvar); - ok(hr == S_OK, "GetValue failed, hr=%x\n", hr); - ok(propvar.vt == VT_I4, "expected VT_I4, got %d\n", propvar.vt); - ok(propvar.u.lVal == 12345, "expected 12345, got %d\n", propvar.u.lVal); - - pkey.fmtid = PKEY_WineTest; - pkey.pid = 10; - - /* Get information for field that isn't set yet */ - propvar.vt = VT_I2; - hr = IPropertyStoreCache_GetValue(propcache, &pkey, &propvar); - ok(hr == S_OK, "GetValue failed, hr=%x\n", hr); - ok(propvar.vt == VT_EMPTY, "expected VT_EMPTY, got %d\n", propvar.vt); - - state = 0xdeadbeef; - hr = IPropertyStoreCache_GetState(propcache, &pkey, &state); - ok(hr == TYPE_E_ELEMENTNOTFOUND, "GetState failed, hr=%x\n", hr); - ok(state == PSC_NORMAL, "expected PSC_NORMAL, got %d\n", state); - - propvar.vt = VT_I2; - state = 0xdeadbeef; - hr = IPropertyStoreCache_GetValueAndState(propcache, &pkey, &propvar, &state); - ok(hr == TYPE_E_ELEMENTNOTFOUND, "GetValueAndState failed, hr=%x\n", hr); - ok(propvar.vt == VT_EMPTY, "expected VT_EMPTY, got %d\n", propvar.vt); - ok(state == PSC_NORMAL, "expected PSC_NORMAL, got %d\n", state); - - /* Set state on an unset field */ - hr = IPropertyStoreCache_SetState(propcache, &pkey, PSC_NORMAL); - ok(hr == TYPE_E_ELEMENTNOTFOUND, "SetState failed, hr=%x\n", hr); - - /* Manipulate state on already set field */ - pkey.fmtid = PKEY_WineTest; - pkey.pid = 4; - - state = 0xdeadbeef; - hr = IPropertyStoreCache_GetState(propcache, &pkey, &state); - ok(hr == S_OK, "GetState failed, hr=%x\n", hr); - ok(state == PSC_NORMAL, "expected PSC_NORMAL, got %d\n", state); - - hr = IPropertyStoreCache_SetState(propcache, &pkey, 10); - ok(hr == S_OK, "SetState failed, hr=%x\n", hr); - - state = 0xdeadbeef; - hr = IPropertyStoreCache_GetState(propcache, &pkey, &state); - ok(hr == S_OK, "GetState failed, hr=%x\n", hr); - ok(state == 10, "expected 10, got %d\n", state); - - propvar.vt = VT_I4; - propvar.u.lVal = 12346; - hr = IPropertyStoreCache_SetValueAndState(propcache, &pkey, &propvar, 5); - ok(hr == S_OK, "SetValueAndState failed, hr=%x\n", hr); - - memset(&propvar, 0, sizeof(propvar)); - state = 0xdeadbeef; - hr = IPropertyStoreCache_GetValueAndState(propcache, &pkey, &propvar, &state); - ok(hr == S_OK, "GetValueAndState failed, hr=%x\n", hr); - ok(propvar.vt == VT_I4, "expected VT_I4, got %d\n", propvar.vt); - ok(propvar.u.lVal == 12346, "expected 12346, got %d\n", propvar.vt); - ok(state == 5, "expected 5, got %d\n", state); - - /* Set new field with state */ - pkey.fmtid = PKEY_WineTest; - pkey.pid = 8; - - propvar.vt = VT_I4; - propvar.u.lVal = 12347; - hr = IPropertyStoreCache_SetValueAndState(propcache, &pkey, &propvar, PSC_DIRTY); - ok(hr == S_OK, "SetValueAndState failed, hr=%x\n", hr); - - memset(&propvar, 0, sizeof(propvar)); - state = 0xdeadbeef; - hr = IPropertyStoreCache_GetValueAndState(propcache, &pkey, &propvar, &state); - ok(hr == S_OK, "GetValueAndState failed, hr=%x\n", hr); - ok(propvar.vt == VT_I4, "expected VT_I4, got %d\n", propvar.vt); - ok(propvar.u.lVal == 12347, "expected 12347, got %d\n", propvar.vt); - ok(state == PSC_DIRTY, "expected PSC_DIRTY, got %d\n", state); - - IPropertyStoreCache_Release(propcache); -} - -static void test_persistserialized(void) -{ - IPropertyStore *propstore; - IPersistSerializedPropStorage *serialized; - HRESULT hr; - SERIALIZEDPROPSTORAGE *result; - DWORD result_size; - - hr = CoCreateInstance(&CLSID_InMemoryPropertyStore, NULL, CLSCTX_INPROC_SERVER, - &IID_IPropertyStore, (void**)&propstore); - ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); - - hr = IPropertyStore_QueryInterface(propstore, &IID_IPersistSerializedPropStorage, - (void**)&serialized); - todo_wine ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); - - if (FAILED(hr)) - { - IPropertyStore_Release(propstore); - skip("IPersistSerializedPropStorage not supported\n"); - return; - } - - hr = IPersistSerializedPropStorage_GetPropertyStorage(serialized, NULL, &result_size); - ok(hr == E_POINTER, "GetPropertyStorage failed, hr=%x\n", hr); - - hr = IPersistSerializedPropStorage_GetPropertyStorage(serialized, &result, NULL); - ok(hr == E_POINTER, "GetPropertyStorage failed, hr=%x\n", hr); - - hr = IPersistSerializedPropStorage_GetPropertyStorage(serialized, &result, &result_size); - ok(hr == S_OK, "GetPropertyStorage failed, hr=%x\n", hr); - - if (SUCCEEDED(hr)) - { - ok(result_size == 0, "expected 0 bytes, got %i\n", result_size); - - CoTaskMemFree(result); - } - - hr = IPersistSerializedPropStorage_SetPropertyStorage(serialized, NULL, 4); - ok(hr == E_POINTER, "SetPropertyStorage failed, hr=%x\n", hr); - - hr = IPersistSerializedPropStorage_SetPropertyStorage(serialized, NULL, 0); - ok(hr == S_OK, "SetPropertyStorage failed, hr=%x\n", hr); - - hr = IPropertyStore_GetCount(propstore, &result_size); - ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); - ok(result_size == 0, "expecting 0, got %d\n", result_size); - - IPropertyStore_Release(propstore); - IPersistSerializedPropStorage_Release(serialized); -} - -static void test_PSCreateMemoryPropertyStore(void) -{ - IPropertyStore *propstore, *propstore1; - IPersistSerializedPropStorage *serialized; - IPropertyStoreCache *propstorecache; - HRESULT hr; - - /* PSCreateMemoryPropertyStore(&IID_IPropertyStore, NULL); crashes */ - - hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore); - ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); - ok(propstore != NULL, "got %p.\n", propstore); - EXPECT_REF(propstore, 1); - - hr = PSCreateMemoryPropertyStore(&IID_IPersistSerializedPropStorage, (void **)&serialized); - todo_wine ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); - todo_wine ok(serialized != NULL, "got %p.\n", serialized); - EXPECT_REF(propstore, 1); - if(serialized) - { - EXPECT_REF(serialized, 1); - IPersistSerializedPropStorage_Release(serialized); - } - - hr = PSCreateMemoryPropertyStore(&IID_IPropertyStoreCache, (void **)&propstorecache); - ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); - ok(propstorecache != NULL, "got %p.\n", propstore); - ok(propstorecache != (IPropertyStoreCache *)propstore, "pointer are equal: %p, %p.\n", propstorecache, propstore); - EXPECT_REF(propstore, 1); - EXPECT_REF(propstorecache, 1); - - hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore1); - ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); - ok(propstore1 != NULL, "got %p.\n", propstore); - ok(propstore1 != propstore, "pointer are equal: %p, %p.\n", propstore1, propstore); - EXPECT_REF(propstore, 1); - EXPECT_REF(propstore1, 1); - EXPECT_REF(propstorecache, 1); - - IPropertyStore_Release(propstore1); - IPropertyStore_Release(propstore); - IPropertyStoreCache_Release(propstorecache); -} - -static void test_propertystore(void) -{ - IPropertyStore *propstore; - HRESULT hr; - PROPVARIANT propvar, ret_propvar; - PROPERTYKEY propkey; - DWORD count = 0; - - hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore); - ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); - ok(propstore != NULL, "got %p.\n", propstore); - - hr = IPropertyStore_GetCount(propstore, &count); - ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); - ok(!count, "got wrong property count: %d, expected 0.\n", count); - - PropVariantInit(&propvar); - propvar.vt = VT_I4; - U(propvar).lVal = 123; - propkey.fmtid = DUMMY_GUID1; - propkey.pid = PID_FIRST_USABLE; - hr = IPropertyStore_SetValue(propstore, &propkey, &propvar); - ok(hr == S_OK, "IPropertyStore_SetValue failed: 0x%08x.\n", hr); - hr = IPropertyStore_Commit(propstore); - ok(hr == S_OK, "IPropertyStore_Commit failed: 0x%08x.\n", hr); - hr = IPropertyStore_GetCount(propstore, &count); - ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); - ok(count == 1, "got wrong property count: %d, expected 1.\n", count); - PropVariantInit(&ret_propvar); - ret_propvar.vt = VT_I4; - hr = IPropertyStore_GetValue(propstore, &propkey, &ret_propvar); - ok(hr == S_OK, "IPropertyStore_GetValue failed: 0x%08x.\n", hr); - ok(ret_propvar.vt == VT_I4, "got wrong property type: %x.\n", ret_propvar.vt); - ok(U(ret_propvar).lVal == 123, "got wrong value: %d, expected 123.\n", U(ret_propvar).lVal); - PropVariantClear(&propvar); - PropVariantClear(&ret_propvar); - - PropVariantInit(&propvar); - propkey.fmtid = DUMMY_GUID1; - propkey.pid = PID_FIRST_USABLE; - hr = IPropertyStore_SetValue(propstore, &propkey, &propvar); - ok(hr == S_OK, "IPropertyStore_SetValue failed: 0x%08x.\n", hr); - hr = IPropertyStore_Commit(propstore); - ok(hr == S_OK, "IPropertyStore_Commit failed: 0x%08x.\n", hr); - hr = IPropertyStore_GetCount(propstore, &count); - ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); - ok(count == 1, "got wrong property count: %d, expected 1.\n", count); - PropVariantInit(&ret_propvar); - hr = IPropertyStore_GetValue(propstore, &propkey, &ret_propvar); - ok(hr == S_OK, "IPropertyStore_GetValue failed: 0x%08x.\n", hr); - ok(ret_propvar.vt == VT_EMPTY, "got wrong property type: %x.\n", ret_propvar.vt); - ok(!U(ret_propvar).lVal, "got wrong value: %d, expected 0.\n", U(ret_propvar).lVal); - PropVariantClear(&propvar); - PropVariantClear(&ret_propvar); - - IPropertyStore_Release(propstore); -} - -START_TEST(propstore) -{ - CoInitialize(NULL); - - test_inmemorystore(); - test_persistserialized(); - test_PSCreateMemoryPropertyStore(); - test_propertystore(); - - CoUninitialize(); -} diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 77ffe05f6d..419a0a080b 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -3,6 +3,7 @@ * * Copyright 2006 Paul Vriens * Copyright 2010 Andrew Nguyen + * Copyright 2012 Vincent Povirk * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -38,6 +39,8 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(dummy_guid, 0xdeadbeef, 0xdead, 0xbeef, 0xde, 0xad, 0xbe, 0xef, 0xca, 0xfe, 0xba, 0xbe); DEFINE_GUID(expect_guid, 0x12345678, 0x1234, 0x1234, 0x12, 0x34, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12); +DEFINE_GUID(PKEY_WineTest, 0x7b317433, 0xdfa3, 0x4c44, 0xad, 0x3e, 0x2f, 0x80, 0x4b, 0x90, 0xdb, 0xf4); +DEFINE_GUID(DUMMY_GUID1, 0x12345678, 0x1234,0x1234, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19); #define GUID_MEMBERS(g) {(g).Data1, (g).Data2, (g).Data3, {(g).Data4[0], (g).Data4[1], (g).Data4[2], (g).Data4[3], (g).Data4[4], (g).Data4[5], (g).Data4[6], (g).Data4[7]}} @@ -45,6 +48,15 @@ static const char topic[] = "wine topic"; static const WCHAR topicW[] = {'w','i','n','e',' ','t','o','p','i','c',0}; static const WCHAR emptyW[] = {0}; +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown *)obj, ref, __LINE__) +static void _expect_ref(IUnknown *obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + static int strcmp_wa(LPCWSTR strw, const char *stra) { CHAR buf[512]; @@ -1581,6 +1593,332 @@ static void test_PropVariantToBuffer(void) PropVariantClear(&propvar); } +static void test_inmemorystore(void) +{ + IPropertyStoreCache *propcache; + HRESULT hr; + PROPERTYKEY pkey; + PROPVARIANT propvar; + DWORD count; + PSC_STATE state; + + CoInitialize(NULL); + + hr = CoCreateInstance(&CLSID_InMemoryPropertyStore, NULL, CLSCTX_INPROC_SERVER, + &IID_IPropertyStoreCache, (void**)&propcache); + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + + if (FAILED(hr)) + { + win_skip("CLSID_InMemoryPropertyStore not supported\n"); + CoUninitialize(); + return; + } + + hr = IPropertyStoreCache_GetCount(propcache, NULL); + ok(hr == E_POINTER, "GetCount failed, hr=%x\n", hr); + + hr = IPropertyStoreCache_GetCount(propcache, &count); + ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); + ok(count == 0, "GetCount returned %i, expected 0\n", count); + + hr = IPropertyStoreCache_Commit(propcache); + ok(hr == S_OK, "Commit failed, hr=%x\n", hr); + + hr = IPropertyStoreCache_Commit(propcache); + ok(hr == S_OK, "Commit failed, hr=%x\n", hr); + + hr = IPropertyStoreCache_GetAt(propcache, 0, &pkey); + ok(hr == E_INVALIDARG, "GetAt failed, hr=%x\n", hr); + + pkey.fmtid = PKEY_WineTest; + pkey.pid = 4; + + memset(&propvar, 0, sizeof(propvar)); + propvar.vt = VT_I4; + propvar.u.lVal = 12345; + + if (0) + { + /* Crashes on Windows 7 */ + hr = IPropertyStoreCache_SetValue(propcache, NULL, &propvar); + ok(hr == E_POINTER, "SetValue failed, hr=%x\n", hr); + + hr = IPropertyStoreCache_SetValue(propcache, &pkey, NULL); + ok(hr == E_POINTER, "SetValue failed, hr=%x\n", hr); + } + + hr = IPropertyStoreCache_SetValue(propcache, &pkey, &propvar); + ok(hr == S_OK, "SetValue failed, hr=%x\n", hr); + + hr = IPropertyStoreCache_GetCount(propcache, &count); + ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); + ok(count == 1, "GetCount returned %i, expected 0\n", count); + + memset(&pkey, 0, sizeof(pkey)); + + hr = IPropertyStoreCache_GetAt(propcache, 0, &pkey); + ok(hr == S_OK, "GetAt failed, hr=%x\n", hr); + ok(IsEqualGUID(&pkey.fmtid, &PKEY_WineTest), "got wrong pkey\n"); + ok(pkey.pid == 4, "got pid of %i, expected 4\n", pkey.pid); + + pkey.fmtid = PKEY_WineTest; + pkey.pid = 4; + + memset(&propvar, 0, sizeof(propvar)); + + if (0) + { + /* Crashes on Windows 7 */ + hr = IPropertyStoreCache_GetValue(propcache, NULL, &propvar); + ok(hr == E_POINTER, "GetValue failed, hr=%x\n", hr); + } + + hr = IPropertyStoreCache_GetValue(propcache, &pkey, NULL); + ok(hr == E_POINTER, "GetValue failed, hr=%x\n", hr); + + hr = IPropertyStoreCache_GetValue(propcache, &pkey, &propvar); + ok(hr == S_OK, "GetValue failed, hr=%x\n", hr); + ok(propvar.vt == VT_I4, "expected VT_I4, got %d\n", propvar.vt); + ok(propvar.u.lVal == 12345, "expected 12345, got %d\n", propvar.u.lVal); + + pkey.fmtid = PKEY_WineTest; + pkey.pid = 10; + + /* Get information for field that isn't set yet */ + propvar.vt = VT_I2; + hr = IPropertyStoreCache_GetValue(propcache, &pkey, &propvar); + ok(hr == S_OK, "GetValue failed, hr=%x\n", hr); + ok(propvar.vt == VT_EMPTY, "expected VT_EMPTY, got %d\n", propvar.vt); + + state = 0xdeadbeef; + hr = IPropertyStoreCache_GetState(propcache, &pkey, &state); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "GetState failed, hr=%x\n", hr); + ok(state == PSC_NORMAL, "expected PSC_NORMAL, got %d\n", state); + + propvar.vt = VT_I2; + state = 0xdeadbeef; + hr = IPropertyStoreCache_GetValueAndState(propcache, &pkey, &propvar, &state); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "GetValueAndState failed, hr=%x\n", hr); + ok(propvar.vt == VT_EMPTY, "expected VT_EMPTY, got %d\n", propvar.vt); + ok(state == PSC_NORMAL, "expected PSC_NORMAL, got %d\n", state); + + /* Set state on an unset field */ + hr = IPropertyStoreCache_SetState(propcache, &pkey, PSC_NORMAL); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "SetState failed, hr=%x\n", hr); + + /* Manipulate state on already set field */ + pkey.fmtid = PKEY_WineTest; + pkey.pid = 4; + + state = 0xdeadbeef; + hr = IPropertyStoreCache_GetState(propcache, &pkey, &state); + ok(hr == S_OK, "GetState failed, hr=%x\n", hr); + ok(state == PSC_NORMAL, "expected PSC_NORMAL, got %d\n", state); + + hr = IPropertyStoreCache_SetState(propcache, &pkey, 10); + ok(hr == S_OK, "SetState failed, hr=%x\n", hr); + + state = 0xdeadbeef; + hr = IPropertyStoreCache_GetState(propcache, &pkey, &state); + ok(hr == S_OK, "GetState failed, hr=%x\n", hr); + ok(state == 10, "expected 10, got %d\n", state); + + propvar.vt = VT_I4; + propvar.u.lVal = 12346; + hr = IPropertyStoreCache_SetValueAndState(propcache, &pkey, &propvar, 5); + ok(hr == S_OK, "SetValueAndState failed, hr=%x\n", hr); + + memset(&propvar, 0, sizeof(propvar)); + state = 0xdeadbeef; + hr = IPropertyStoreCache_GetValueAndState(propcache, &pkey, &propvar, &state); + ok(hr == S_OK, "GetValueAndState failed, hr=%x\n", hr); + ok(propvar.vt == VT_I4, "expected VT_I4, got %d\n", propvar.vt); + ok(propvar.u.lVal == 12346, "expected 12346, got %d\n", propvar.vt); + ok(state == 5, "expected 5, got %d\n", state); + + /* Set new field with state */ + pkey.fmtid = PKEY_WineTest; + pkey.pid = 8; + + propvar.vt = VT_I4; + propvar.u.lVal = 12347; + hr = IPropertyStoreCache_SetValueAndState(propcache, &pkey, &propvar, PSC_DIRTY); + ok(hr == S_OK, "SetValueAndState failed, hr=%x\n", hr); + + memset(&propvar, 0, sizeof(propvar)); + state = 0xdeadbeef; + hr = IPropertyStoreCache_GetValueAndState(propcache, &pkey, &propvar, &state); + ok(hr == S_OK, "GetValueAndState failed, hr=%x\n", hr); + ok(propvar.vt == VT_I4, "expected VT_I4, got %d\n", propvar.vt); + ok(propvar.u.lVal == 12347, "expected 12347, got %d\n", propvar.vt); + ok(state == PSC_DIRTY, "expected PSC_DIRTY, got %d\n", state); + + IPropertyStoreCache_Release(propcache); + + CoUninitialize(); +} + +static void test_persistserialized(void) +{ + IPropertyStore *propstore; + IPersistSerializedPropStorage *serialized; + HRESULT hr; + SERIALIZEDPROPSTORAGE *result; + DWORD result_size; + + CoInitialize(NULL); + + hr = CoCreateInstance(&CLSID_InMemoryPropertyStore, NULL, CLSCTX_INPROC_SERVER, + &IID_IPropertyStore, (void**)&propstore); + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + + hr = IPropertyStore_QueryInterface(propstore, &IID_IPersistSerializedPropStorage, + (void**)&serialized); + todo_wine ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); + + if (FAILED(hr)) + { + IPropertyStore_Release(propstore); + skip("IPersistSerializedPropStorage not supported\n"); + CoUninitialize(); + return; + } + + hr = IPersistSerializedPropStorage_GetPropertyStorage(serialized, NULL, &result_size); + ok(hr == E_POINTER, "GetPropertyStorage failed, hr=%x\n", hr); + + hr = IPersistSerializedPropStorage_GetPropertyStorage(serialized, &result, NULL); + ok(hr == E_POINTER, "GetPropertyStorage failed, hr=%x\n", hr); + + hr = IPersistSerializedPropStorage_GetPropertyStorage(serialized, &result, &result_size); + ok(hr == S_OK, "GetPropertyStorage failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + { + ok(result_size == 0, "expected 0 bytes, got %i\n", result_size); + + CoTaskMemFree(result); + } + + hr = IPersistSerializedPropStorage_SetPropertyStorage(serialized, NULL, 4); + ok(hr == E_POINTER, "SetPropertyStorage failed, hr=%x\n", hr); + + hr = IPersistSerializedPropStorage_SetPropertyStorage(serialized, NULL, 0); + ok(hr == S_OK, "SetPropertyStorage failed, hr=%x\n", hr); + + hr = IPropertyStore_GetCount(propstore, &result_size); + ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); + ok(result_size == 0, "expecting 0, got %d\n", result_size); + + IPropertyStore_Release(propstore); + IPersistSerializedPropStorage_Release(serialized); + + CoUninitialize(); +} + +static void test_PSCreateMemoryPropertyStore(void) +{ + IPropertyStore *propstore, *propstore1; + IPersistSerializedPropStorage *serialized; + IPropertyStoreCache *propstorecache; + HRESULT hr; + + /* PSCreateMemoryPropertyStore(&IID_IPropertyStore, NULL); crashes */ + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstore != NULL, "got %p.\n", propstore); + EXPECT_REF(propstore, 1); + + hr = PSCreateMemoryPropertyStore(&IID_IPersistSerializedPropStorage, (void **)&serialized); + todo_wine ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + todo_wine ok(serialized != NULL, "got %p.\n", serialized); + EXPECT_REF(propstore, 1); + if(serialized) + { + EXPECT_REF(serialized, 1); + IPersistSerializedPropStorage_Release(serialized); + } + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStoreCache, (void **)&propstorecache); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstorecache != NULL, "got %p.\n", propstore); + ok(propstorecache != (IPropertyStoreCache *)propstore, "pointer are equal: %p, %p.\n", propstorecache, propstore); + EXPECT_REF(propstore, 1); + EXPECT_REF(propstorecache, 1); + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore1); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstore1 != NULL, "got %p.\n", propstore); + ok(propstore1 != propstore, "pointer are equal: %p, %p.\n", propstore1, propstore); + EXPECT_REF(propstore, 1); + EXPECT_REF(propstore1, 1); + EXPECT_REF(propstorecache, 1); + + IPropertyStore_Release(propstore1); + IPropertyStore_Release(propstore); + IPropertyStoreCache_Release(propstorecache); +} + +static void test_propertystore(void) +{ + IPropertyStore *propstore; + HRESULT hr; + PROPVARIANT propvar, ret_propvar; + PROPERTYKEY propkey; + DWORD count = 0; + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstore != NULL, "got %p.\n", propstore); + + hr = IPropertyStore_GetCount(propstore, &count); + ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); + ok(!count, "got wrong property count: %d, expected 0.\n", count); + + PropVariantInit(&propvar); + propvar.vt = VT_I4; + U(propvar).lVal = 123; + propkey.fmtid = DUMMY_GUID1; + propkey.pid = PID_FIRST_USABLE; + hr = IPropertyStore_SetValue(propstore, &propkey, &propvar); + ok(hr == S_OK, "IPropertyStore_SetValue failed: 0x%08x.\n", hr); + hr = IPropertyStore_Commit(propstore); + ok(hr == S_OK, "IPropertyStore_Commit failed: 0x%08x.\n", hr); + hr = IPropertyStore_GetCount(propstore, &count); + ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); + ok(count == 1, "got wrong property count: %d, expected 1.\n", count); + PropVariantInit(&ret_propvar); + ret_propvar.vt = VT_I4; + hr = IPropertyStore_GetValue(propstore, &propkey, &ret_propvar); + ok(hr == S_OK, "IPropertyStore_GetValue failed: 0x%08x.\n", hr); + ok(ret_propvar.vt == VT_I4, "got wrong property type: %x.\n", ret_propvar.vt); + ok(U(ret_propvar).lVal == 123, "got wrong value: %d, expected 123.\n", U(ret_propvar).lVal); + PropVariantClear(&propvar); + PropVariantClear(&ret_propvar); + + PropVariantInit(&propvar); + propkey.fmtid = DUMMY_GUID1; + propkey.pid = PID_FIRST_USABLE; + hr = IPropertyStore_SetValue(propstore, &propkey, &propvar); + ok(hr == S_OK, "IPropertyStore_SetValue failed: 0x%08x.\n", hr); + hr = IPropertyStore_Commit(propstore); + ok(hr == S_OK, "IPropertyStore_Commit failed: 0x%08x.\n", hr); + hr = IPropertyStore_GetCount(propstore, &count); + ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); + ok(count == 1, "got wrong property count: %d, expected 1.\n", count); + PropVariantInit(&ret_propvar); + hr = IPropertyStore_GetValue(propstore, &propkey, &ret_propvar); + ok(hr == S_OK, "IPropertyStore_GetValue failed: 0x%08x.\n", hr); + ok(ret_propvar.vt == VT_EMPTY, "got wrong property type: %x.\n", ret_propvar.vt); + ok(!U(ret_propvar).lVal, "got wrong value: %d, expected 0.\n", U(ret_propvar).lVal); + PropVariantClear(&propvar); + PropVariantClear(&ret_propvar); + + IPropertyStore_Release(propstore); +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); @@ -1599,4 +1937,8 @@ START_TEST(propsys) test_PropVariantToDouble(); test_PropVariantToString(); test_PropVariantToBuffer(); + test_inmemorystore(); + test_persistserialized(); + test_PSCreateMemoryPropertyStore(); + test_propertystore(); } -- 2.24.0.rc1

1 1

[PATCH 1/4] ntoskrnl.exe: Pass the correct output size to IoBuildDeviceIoControlRequest().
by Zebediah Figura 02 Nov '19

02 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 3 --- dlls/ntoskrnl.exe/tests/driver.c | 9 +++------ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 9 ++++++++- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 8e6b60e2c4..f7a3f8aced 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -721,10 +721,7 @@ static NTSTATUS dispatch_ioctl( struct dispatch_context *context ) context->in_buff = out_buff; } else - { out_buff = context->in_buff; - out_size = context->in_size; - } } irp = IoBuildDeviceIoControlRequest( context->params.ioctl.code, device, context->in_buff, diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 0506011ce5..67f22a4b2b 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1777,17 +1777,14 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st static NTSTATUS test_basic_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { - ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; + ULONG length = min(stack->Parameters.DeviceIoControl.OutputBufferLength, sizeof(teststr)); char *buffer = irp->AssociatedIrp.SystemBuffer; if (!buffer) return STATUS_ACCESS_VIOLATION; - if (length < sizeof(teststr)) - return STATUS_BUFFER_TOO_SMALL; - - memcpy(buffer, teststr, sizeof(teststr)); - *info = sizeof(teststr); + memcpy(buffer, teststr, length); + *info = length; return STATUS_SUCCESS; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index eb58878cec..76bcf0d0ce 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -190,8 +190,8 @@ static void main_test(void) static void test_basic_ioctl(void) { + char inbuf[64], buf[32]; DWORD written; - char buf[32]; BOOL res; res = DeviceIoControl(device, IOCTL_WINETEST_BASIC_IOCTL, NULL, 0, buf, @@ -199,6 +199,13 @@ static void test_basic_ioctl(void) ok(res, "DeviceIoControl failed: %u\n", GetLastError()); ok(written == sizeof(teststr), "got size %d\n", written); ok(!strcmp(buf, teststr), "got '%s'\n", buf); + + memset(buf, 0, sizeof(buf)); + res = DeviceIoControl(device, IOCTL_WINETEST_BASIC_IOCTL, inbuf, + sizeof(inbuf), buf, 10, &written, NULL); + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + ok(written == 10, "got size %d\n", written); + ok(!strcmp(buf, "Wine is no"), "got '%s'\n", buf); } static void test_overlapped(void) -- 2.23.0

2 4

[PATCH] include/netfw: add INetFwRule2 and INetFwRule3 interfaces
by Biswapriyo Nath 02 Nov '19

02 Nov '19

1 0

[PATCH 2/2] msvcrt: Enable printf %z, %t and %j formats.
by Piotr Caban 02 Nov '19

02 Nov '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/printf.h | 10 ++++++---- dlls/msvcrt/tests/printf.c | 11 ++++++----- 2 files changed, 12 insertions(+), 9 deletions(-)

1 0

[PATCH 1/2] msvcrt: Improve printf %I format support.
by Piotr Caban 02 Nov '19

02 Nov '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/printf.h | 6 +++--- dlls/msvcrt/tests/printf.c | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

[PATCH] shell32: Fix a memory leak (Valgrind).
by Sven Baars 02 Nov '19

02 Nov '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/shell32/shlview.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index c0c027fbd3..bcb9466315 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -655,6 +655,8 @@ static HRESULT ShellView_FillList(IShellViewImpl *This) { if (IncludeObject(This, pidl) == S_OK) shellview_add_item(This, pidl); + else + ILFree(pidl); } SendMessageW(This->hWndList, LVM_SORTITEMS, (WPARAM)This->pSFParent, (LPARAM)ShellView_CompareItems); -- 2.17.1

1 0

[PATCH v3] ucrtbase: Implement t and j printf length modifiers.
by Piotr Caban 02 Nov '19

02 Nov '19

From: Ambrož Bizjak <abizjak.pro(a)gmail.com> Signed-off-by: Ambroz Bizjak <abizjak.pro(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v3: - remove unneeded casts - remove LONGLONG constants from touched code dlls/msvcrt/printf.h | 6 +++++- dlls/ucrtbase/tests/printf.c | 42 +++++++++++++++++++++++------------- 2 files changed, 32 insertions(+), 16 deletions(-)

2 1

Re: [PATCH] ucrtbase: Implement t and j printf length modifiers.
by Ambrož Bizjak 02 Nov '19

02 Nov '19

Updated patch: - Using if (sizeof(type) == 8) instead of #ifdef _WIN64. - Using the MIN_/MAX_ constants for the exact type being tested to prevent a warning. - Added Signed-off-by line. On Fri, Nov 1, 2019 at 6:02 PM Piotr Caban <piotr.caban(a)gmail.com> wrote: > > Hi, > > Can't PTRDIFF_MIN or PTRDIFF_MAX be used to avoid the warning? > > Thanks, > Piotr > > On 11/1/19 5:28 PM, Ambrož Bizjak wrote: > > Hi, > > The reason for the define is that I was getting warnings about integer > > overflow from the branch that is not taken (too large value converted to > > 32 bits). > > > > Let me know if that's ok, then I will resend with signed-off. > > > > On Friday, November 1, 2019, Piotr Caban <piotr.caban(a)gmail.com > > <mailto:piotr.caban@gmail.com>> wrote: > > > > Hi Ambrož, > > > > The patch looks mostly good to me but it's required that you add > > signed-off-by line > > (https://wiki.winehq.org/Submitting_Patches#The_commit_message > > <https://wiki.winehq.org/Submitting_Patches#The_commit_message>). > > > > What's the reason for changing: > > if (sizeof(void*) == 8) > > to > > #ifdef _WIN64 > > ? > > I think it's better to keep it as is so the code is always compiled. > > > > Thanks, > > Piotr > > >

3 3

[PATCH 5/6] vbscript/tests: Add redim statement tests.
by Jacek Caban 02 Nov '19

02 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/tests/lang.vbs | 31 ++++++++++++++++++++++++++++++- dlls/vbscript/tests/run.c | 2 ++ 2 files changed, 32 insertions(+), 1 deletion(-)

2 1

[PATCH 2/6] vbscript: Allow 'with' as an identifier.
by Jacek Caban 02 Nov '19

02 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/parser.y | 1 + dlls/vbscript/tests/lang.vbs | 1 + dlls/vbscript/tests/run.c | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-)

2 1

Wine staging 4.19 release
by Alistair Leslie-Hughes 01 Nov '19

01 Nov '19

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 4.19 (840 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * quartz: Implement MediaSeeking_GetStopPosition on top of MediaSeeking_GetPositions. * quartz: Remove unused cache of MediaSeeking stop position. * quartz: Include the stream position in addition to the reference clock offset in the time returned by MediaSeeking_GetPositions. * crypt32: Add MS root CA 2010. * include: Add restrictederrorinfo.idl. * uianimation: Add stub dll. * uianimation: Implement IUIAnimationManager CreateStoryboard. * uianimation: Implement IUIAnimationManager CreateAnimationVariable. Added: * [47974] X Rebirth: NtVirtualAlloc() does not find available memory with nonzero bitmask. Updated: * ntdll-User_Shared_Data Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 2/2] tapi32: Add lineGetTranslateCapsW function
by Vijay Kiran Kamuju 01 Nov '19

01 Nov '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38585 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/tapi32/line.c | 6 ++++++ dlls/tapi32/tapi32.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index a44ac1a1a726..e0f85cbc9449 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -1135,6 +1135,12 @@ DWORD WINAPI lineGetTranslateCapsA(HLINEAPP hLineApp, DWORD dwAPIVersion, return 0; /* success */ } +DWORD WINAPI lineGetTranslateCapsW(HLINEAPP hLineApp, DWORD dwAPIVersion, + LPLINETRANSLATECAPS lpTranslateCaps) +{ + return lineGetTranslateCapsA(hLineApp, dwAPIVersion, lpTranslateCaps); +} + /*********************************************************************** * lineHandoff (TAPI32.@) */ diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index 62631efe236f..39ab7c1bf2f6 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -67,6 +67,7 @@ @ stdcall lineGetStatusMessages(long ptr ptr) @ stdcall lineGetTranslateCaps(long long ptr) lineGetTranslateCapsA @ stdcall lineGetTranslateCapsA(long long ptr) +@ stdcall lineGetTranslateCapsW(long long ptr) @ stdcall lineHandoff(long str long) lineHandoffA @ stdcall lineHandoffA(long str long) @ stdcall lineHold(long) -- 2.21.0

2 1

[PATCH v2] vkd3d: Allocate huge descriptor pools when root signature demands it.
by Hans-Kristian Arntzen 01 Nov '19

01 Nov '19

Currently, descriptor pools are allocated with the intention of being used as a suballocator, but for a bindless style, root signatures can contain many thousand descriptors. Fall back to single allocations for these cases and do not attempt to recycle these descriptor sets. This path is triggered by Control DX12 which creates a RS with > ~200k SRVs in register space 1. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> --- libs/vkd3d/command.c | 79 ++++++++++++++++++++++++++++---------- libs/vkd3d/state.c | 19 +-------- libs/vkd3d/vkd3d_private.h | 23 +++++++++++ 3 files changed, 84 insertions(+), 37 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3f78d17..34d2505 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1264,13 +1264,24 @@ static bool d3d12_command_allocator_add_framebuffer(struct d3d12_command_allocat } static bool d3d12_command_allocator_add_descriptor_pool(struct d3d12_command_allocator *allocator, - VkDescriptorPool pool) + VkDescriptorPool pool, bool recycle) { - if (!vkd3d_array_reserve((void **)&allocator->descriptor_pools, &allocator->descriptor_pools_size, + if (recycle) + { + if (!vkd3d_array_reserve((void **)&allocator->descriptor_pools, &allocator->descriptor_pools_size, allocator->descriptor_pool_count + 1, sizeof(*allocator->descriptor_pools))) - return false; + return false; - allocator->descriptor_pools[allocator->descriptor_pool_count++] = pool; + allocator->descriptor_pools[allocator->descriptor_pool_count++] = pool; + } + else + { + if (!vkd3d_array_reserve((void **)&allocator->descriptor_pools_huge, &allocator->descriptor_pools_huge_size, + allocator->descriptor_pool_huge_count + 1, sizeof(*allocator->descriptor_pools_huge))) + return false; + + allocator->descriptor_pools_huge[allocator->descriptor_pool_huge_count++] = pool; + } return true; } @@ -1313,9 +1324,17 @@ static bool d3d12_command_allocator_add_transfer_buffer(struct d3d12_command_all } static VkDescriptorPool d3d12_command_allocator_allocate_descriptor_pool( - struct d3d12_command_allocator *allocator) + struct d3d12_command_allocator *allocator, const struct d3d12_root_signature_info *root_signature) { - static const VkDescriptorPoolSize pool_sizes[] = + bool huge_root_signature = false; + struct d3d12_device *device = allocator->device; + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + struct VkDescriptorPoolCreateInfo pool_desc; + VkDevice vk_device = device->vk_device; + VkDescriptorPool vk_pool; + VkResult vr; + + VkDescriptorPoolSize pool_sizes[] = { {VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1024}, {VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, 1024}, @@ -1324,14 +1343,23 @@ static VkDescriptorPool d3d12_command_allocator_allocate_descriptor_pool( {VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, 1024}, {VK_DESCRIPTOR_TYPE_SAMPLER, 1024}, }; - struct d3d12_device *device = allocator->device; - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - struct VkDescriptorPoolCreateInfo pool_desc; - VkDevice vk_device = device->vk_device; - VkDescriptorPool vk_pool; - VkResult vr; - if (allocator->free_descriptor_pool_count > 0) + if (root_signature && ( + root_signature->cbv_count > 1024 || + root_signature->srv_count > 1024 || + root_signature->uav_count + root_signature->buffer_uav_count > 1024 || + root_signature->sampler_count > 1024)) + { + huge_root_signature = true; + pool_sizes[0].descriptorCount = root_signature->cbv_count; + pool_sizes[1].descriptorCount = root_signature->srv_count; + pool_sizes[2].descriptorCount = root_signature->srv_count; + pool_sizes[3].descriptorCount = root_signature->uav_count + root_signature->buffer_uav_count; + pool_sizes[4].descriptorCount = root_signature->uav_count; + pool_sizes[5].descriptorCount = root_signature->sampler_count; + } + + if (!huge_root_signature && allocator->free_descriptor_pool_count > 0) { vk_pool = allocator->free_descriptor_pools[allocator->free_descriptor_pool_count - 1]; allocator->free_descriptor_pools[allocator->free_descriptor_pool_count - 1] = VK_NULL_HANDLE; @@ -1342,7 +1370,7 @@ static VkDescriptorPool d3d12_command_allocator_allocate_descriptor_pool( pool_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO; pool_desc.pNext = NULL; pool_desc.flags = device->vk_info.EXT_descriptor_indexing ? VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT : 0; - pool_desc.maxSets = 512; + pool_desc.maxSets = huge_root_signature ? 1 : 512; pool_desc.poolSizeCount = ARRAY_SIZE(pool_sizes); pool_desc.pPoolSizes = pool_sizes; if ((vr = VK_CALL(vkCreateDescriptorPool(vk_device, &pool_desc, NULL, &vk_pool))) < 0) @@ -1352,7 +1380,7 @@ static VkDescriptorPool d3d12_command_allocator_allocate_descriptor_pool( } } - if (!(d3d12_command_allocator_add_descriptor_pool(allocator, vk_pool))) + if (!(d3d12_command_allocator_add_descriptor_pool(allocator, vk_pool, !huge_root_signature))) { ERR("Failed to add descriptor pool.\n"); VK_CALL(vkDestroyDescriptorPool(vk_device, vk_pool, NULL)); @@ -1363,7 +1391,8 @@ static VkDescriptorPool d3d12_command_allocator_allocate_descriptor_pool( } static VkDescriptorSet d3d12_command_allocator_allocate_descriptor_set( - struct d3d12_command_allocator *allocator, VkDescriptorSetLayout vk_set_layout) + struct d3d12_command_allocator *allocator, VkDescriptorSetLayout vk_set_layout, + const struct d3d12_root_signature_info *root_signature) { struct d3d12_device *device = allocator->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; @@ -1373,7 +1402,7 @@ static VkDescriptorSet d3d12_command_allocator_allocate_descriptor_set( VkResult vr; if (!allocator->vk_descriptor_pool) - allocator->vk_descriptor_pool = d3d12_command_allocator_allocate_descriptor_pool(allocator); + allocator->vk_descriptor_pool = d3d12_command_allocator_allocate_descriptor_pool(allocator, root_signature); if (!allocator->vk_descriptor_pool) return VK_NULL_HANDLE; @@ -1387,7 +1416,7 @@ static VkDescriptorSet d3d12_command_allocator_allocate_descriptor_set( allocator->vk_descriptor_pool = VK_NULL_HANDLE; if (vr == VK_ERROR_FRAGMENTED_POOL || vr == VK_ERROR_OUT_OF_POOL_MEMORY_KHR) - allocator->vk_descriptor_pool = d3d12_command_allocator_allocate_descriptor_pool(allocator); + allocator->vk_descriptor_pool = d3d12_command_allocator_allocate_descriptor_pool(allocator, root_signature); if (!allocator->vk_descriptor_pool) { ERR("Failed to allocate descriptor set, vr %d.\n", vr); @@ -1478,6 +1507,12 @@ static void d3d12_command_allocator_free_resources(struct d3d12_command_allocato } allocator->descriptor_pool_count = 0; + for (i = 0; i < allocator->descriptor_pool_huge_count; ++i) + { + VK_CALL(vkDestroyDescriptorPool(device->vk_device, allocator->descriptor_pools_huge[i], NULL)); + } + allocator->descriptor_pool_huge_count = 0; + for (i = 0; i < allocator->framebuffer_count; ++i) { VK_CALL(vkDestroyFramebuffer(device->vk_device, allocator->framebuffers[i], NULL)); @@ -1755,6 +1790,10 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo allocator->descriptor_pools_size = 0; allocator->descriptor_pool_count = 0; + allocator->descriptor_pools_huge = NULL; + allocator->descriptor_pools_huge_size = 0; + allocator->descriptor_pool_huge_count = 0; + allocator->views = NULL; allocator->views_size = 0; allocator->view_count = 0; @@ -2547,7 +2586,7 @@ static void d3d12_command_list_prepare_descriptors(struct d3d12_command_list *li * we need at the very least a new descriptor set. */ bindings->descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator, - root_signature->vk_set_layout); + root_signature->vk_set_layout, &root_signature->info); bindings->in_use = false; @@ -2582,7 +2621,7 @@ static void d3d12_command_list_prepare_uav_counter_descriptors(struct d3d12_comm if (list->state->uav_counter_mask) { bindings->uav_counter_descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator, - list->state->vk_set_layout); + list->state->vk_set_layout, NULL); } else bindings->uav_counter_descriptor_set = VK_NULL_HANDLE; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index ed20de7..eb87350 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -314,23 +314,6 @@ static bool vk_binding_from_d3d12_descriptor_range(struct VkDescriptorSetLayoutB return true; } -struct d3d12_root_signature_info -{ - size_t cbv_count; - size_t buffer_uav_count; - size_t uav_count; - size_t buffer_srv_count; - size_t srv_count; - size_t sampler_count; - - size_t descriptor_count; - - size_t root_constant_count; - size_t root_descriptor_count; - - size_t cost; -}; - static HRESULT d3d12_root_signature_info_count_descriptors(struct d3d12_root_signature_info *info, const D3D12_DESCRIPTOR_RANGE *range) { @@ -919,6 +902,8 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa if (FAILED(hr = vkd3d_private_store_init(&root_signature->private_store))) goto fail; + root_signature->info = info; + d3d12_device_add_ref(root_signature->device = device); return S_OK; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index bd54c67..3a263ef 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -666,6 +666,23 @@ struct d3d12_root_parameter }; /* ID3D12RootSignature */ +struct d3d12_root_signature_info +{ + size_t cbv_count; + size_t buffer_uav_count; + size_t uav_count; + size_t buffer_srv_count; + size_t srv_count; + size_t sampler_count; + + size_t descriptor_count; + + size_t root_constant_count; + size_t root_descriptor_count; + + size_t cost; +}; + struct d3d12_root_signature { ID3D12RootSignature ID3D12RootSignature_iface; @@ -699,6 +716,8 @@ struct d3d12_root_signature unsigned int static_sampler_count; VkSampler *static_samplers; + struct d3d12_root_signature_info info; + struct d3d12_device *device; struct vkd3d_private_store private_store; @@ -846,6 +865,10 @@ struct d3d12_command_allocator size_t descriptor_pools_size; size_t descriptor_pool_count; + VkDescriptorPool *descriptor_pools_huge; + size_t descriptor_pools_huge_size; + size_t descriptor_pool_huge_count; + struct vkd3d_view **views; size_t views_size; size_t view_count; -- 2.23.0

1 0

[RESEND 1/4] comctl32/combo: Add tests for WM_CTLCOLOR*
by Fabian Maurer 01 Nov '19

01 Nov '19

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/tests/combo.c | 74 +++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 923d826b30..b4130139dd 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -46,6 +46,8 @@ static HWND hComboExParentWnd, hMainWnd; static HINSTANCE hMainHinst; static const char ComboExTestClass[] = "ComboExTestClass"; +static HBRUSH brush_red; + static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); #define MAX_CHARS 100 @@ -507,6 +509,8 @@ static BOOL init(void) wc.lpfnWndProc = ComboExTestWndProc; RegisterClassA(&wc); + brush_red = CreateSolidBrush(RGB(255, 0, 0)); + hMainWnd = CreateWindowA(WC_STATICA, "Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); ShowWindow(hMainWnd, SW_SHOW); @@ -533,6 +537,7 @@ static void cleanup(void) UnregisterClassA(ComboExTestClass, GetModuleHandleA(NULL)); DestroyWindow(hMainWnd); + DeleteObject(brush_red); } static void test_comboex_subclass(void) @@ -717,6 +722,7 @@ static LRESULT (CALLBACK *old_parent_proc)(HWND hwnd, UINT msg, WPARAM wparam, L static LPCSTR expected_edit_text; static LPCSTR expected_list_text; static BOOL selchange_fired; +static HWND lparam_for_WM_CTLCOLOR = 0; static LRESULT CALLBACK parent_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { @@ -748,6 +754,19 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPAR break; } break; + case WM_CTLCOLOR: + case WM_CTLCOLORMSGBOX: + case WM_CTLCOLOREDIT: + case WM_CTLCOLORLISTBOX: + case WM_CTLCOLORBTN: + case WM_CTLCOLORDLG: + case WM_CTLCOLORSCROLLBAR: + case WM_CTLCOLORSTATIC: + if (lparam_for_WM_CTLCOLOR) + { + ok(lparam_for_WM_CTLCOLOR == (HWND)lparam, "Expected %p, got %p\n", lparam_for_WM_CTLCOLOR, (HWND)lparam); + } + return (LRESULT) brush_red; } return CallWindowProcA(old_parent_proc, hwnd, msg, wparam, lparam); @@ -1254,6 +1273,60 @@ static void test_combo_dropdown_size(DWORD style) } } +static void test_color_messages(void) +{ + HBRUSH brush; + int result; + COMBOBOXINFO info; + HWND handle_combo = create_combobox(CBS_DROPDOWN); + + old_parent_proc = (void *)SetWindowLongPtrA(hMainWnd, GWLP_WNDPROC, (ULONG_PTR)parent_wnd_proc); + + info.cbSize = sizeof(COMBOBOXINFO); + SetLastError(0xdeadbeef); + result = GetComboBoxInfo(handle_combo, &info); + ok(result, "Failed to get combobox info structure.\n"); + + lparam_for_WM_CTLCOLOR = info.hwndItem; + + brush = (HBRUSH)SendMessageA(handle_combo, WM_CTLCOLOR, 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "Expected %p, got %p\n", brush_red, brush); + + brush = (HBRUSH)SendMessageA(handle_combo, WM_CTLCOLORMSGBOX, 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "Expected %p, got %p\n", brush_red, brush); + + brush = (HBRUSH)SendMessageA(handle_combo, WM_CTLCOLOREDIT, 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "Expected %p, got %p\n", brush_red, brush); + + brush = (HBRUSH)SendMessageA(handle_combo, WM_CTLCOLORLISTBOX, 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "Expected %p, got %p\n", brush_red, brush); + + brush = (HBRUSH)SendMessageA(handle_combo, WM_CTLCOLORBTN, 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "Expected %p, got %p\n", brush_red, brush); + + brush = (HBRUSH)SendMessageA(handle_combo, WM_CTLCOLORDLG, 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "Expected %p, got %p\n", brush_red, brush); + + brush = (HBRUSH)SendMessageA(handle_combo, WM_CTLCOLORSCROLLBAR, 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "Expected %p, got %p\n", brush_red, brush); + + brush = (HBRUSH)SendMessageA(handle_combo, WM_CTLCOLORSTATIC, 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "Expected %p, got %p\n", brush_red, brush); + + lparam_for_WM_CTLCOLOR = 0; + + DestroyWindow(handle_combo); + SetWindowLongPtrA(hMainWnd, GWLP_WNDPROC, (ULONG_PTR)old_parent_proc); +} + START_TEST(combo) { ULONG_PTR ctx_cookie; @@ -1281,6 +1354,7 @@ START_TEST(combo) } /* ComboBox control tests. */ + test_color_messages(); test_combo_WS_VSCROLL(); test_combo_setfont(CBS_DROPDOWN); test_combo_setfont(CBS_DROPDOWNLIST); -- 2.23.0

2 4

[PATCH] shell32: Improve the stub for SHGetPropertyStoreForWindow.
by Hans Leidekker 01 Nov '19

01 Nov '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/shell32/shell32_main.c | 112 +++++++++++++++++++++++++++++++++++- dlls/shell32/tests/appbar.c | 32 +++++++++++ 2 files changed, 143 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 99ee110b3d..034805f6fb 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -691,13 +691,123 @@ VOID WINAPI Printers_UnregisterWindow(HANDLE hClassPidl, HWND hwnd) FIXME("(%p, %p) stub!\n", hClassPidl, hwnd); } +struct window_prop_store +{ + IPropertyStore IPropertyStore_iface; + LONG ref; +}; + +static inline struct window_prop_store *impl_from_IPropertyStore(IPropertyStore *iface) +{ + return CONTAINING_RECORD(iface, struct window_prop_store, IPropertyStore_iface); +} + +static ULONG WINAPI window_prop_store_AddRef(IPropertyStore *iface) +{ + struct window_prop_store *store = impl_from_IPropertyStore(iface); + LONG ref = InterlockedIncrement(&store->ref); + TRACE("returning %d\n", ref); + return ref; +} + +static ULONG WINAPI window_prop_store_Release(IPropertyStore *iface) +{ + struct window_prop_store *store = impl_from_IPropertyStore(iface); + LONG ref = InterlockedDecrement(&store->ref); + if (!ref) heap_free(store); + TRACE("returning %d\n", ref); + return ref; +} + +static HRESULT WINAPI window_prop_store_QueryInterface(IPropertyStore *iface, REFIID iid, void **obj) +{ + struct window_prop_store *store = impl_from_IPropertyStore(iface); + TRACE("%p, %s, %p\n", iface, debugstr_guid(iid), obj); + + if (!obj) return E_POINTER; + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IPropertyStore)) + { + *obj = &store->IPropertyStore_iface; + } + else + { + FIXME("no interface for %s\n", debugstr_guid(iid)); + *obj = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*obj); + return S_OK; +} + +static HRESULT WINAPI window_prop_store_GetCount(IPropertyStore *iface, DWORD *count) +{ + FIXME("%p, %p\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI window_prop_store_GetAt(IPropertyStore *iface, DWORD prop, PROPERTYKEY *key) +{ + FIXME("%p, %u,%p\n", iface, prop, key); + return E_NOTIMPL; +} + +static HRESULT WINAPI window_prop_store_GetValue(IPropertyStore *iface, const PROPERTYKEY *key, PROPVARIANT *var) +{ + FIXME("%p, {%s,%u}, %p\n", iface, debugstr_guid(&key->fmtid), key->pid, var); + return E_NOTIMPL; +} + +static HRESULT WINAPI window_prop_store_SetValue(IPropertyStore *iface, const PROPERTYKEY *key, const PROPVARIANT *var) +{ + FIXME("%p, {%s,%u}, %p\n", iface, debugstr_guid(&key->fmtid), key->pid, var); + return S_OK; +} + +static HRESULT WINAPI window_prop_store_Commit(IPropertyStore *iface) +{ + FIXME("%p\n", iface); + return S_OK; +} + +static const IPropertyStoreVtbl window_prop_store_vtbl = +{ + window_prop_store_QueryInterface, + window_prop_store_AddRef, + window_prop_store_Release, + window_prop_store_GetCount, + window_prop_store_GetAt, + window_prop_store_GetValue, + window_prop_store_SetValue, + window_prop_store_Commit +}; + +static HRESULT create_window_prop_store(IPropertyStore **obj) +{ + struct window_prop_store *store; + + if (!(store = heap_alloc(sizeof(*store)))) return E_OUTOFMEMORY; + store->IPropertyStore_iface.lpVtbl = &window_prop_store_vtbl; + store->ref = 1; + + *obj = &store->IPropertyStore_iface; + return S_OK; +} + /************************************************************************* * SHGetPropertyStoreForWindow [SHELL32.@] */ HRESULT WINAPI SHGetPropertyStoreForWindow(HWND hwnd, REFIID riid, void **ppv) { + IPropertyStore *store; + HRESULT hr; + FIXME("(%p %p %p) stub!\n", hwnd, riid, ppv); - return E_NOTIMPL; + + if ((hr = create_window_prop_store( &store )) != S_OK) return hr; + hr = IPropertyStore_QueryInterface( store, riid, ppv ); + IPropertyStore_Release( store ); + return hr; } /*************************************************************************/ diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index 1505a40aeb..229d616c6f 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -21,6 +21,8 @@ #include <windows.h> #include "shellapi.h" +#define COBJMACROS +#include "propsys.h" #include "wine/test.h" @@ -30,6 +32,7 @@ static const CHAR testwindow_class[] = "testwindow"; static HMONITOR (WINAPI *pMonitorFromWindow)(HWND, DWORD); static HRESULT (WINAPI *pGetCurrentProcessExplicitAppUserModelID)(PWSTR*); +static HRESULT (WINAPI *pSHGetPropertyStoreForWindow)(HWND, REFIID, void **); typedef BOOL (*boolean_function)(void); @@ -433,6 +436,33 @@ todo_wine ok(appid == NULL, "got %p\n", appid); } +static void test_SHGetPropertyStoreForWindow(void) +{ + HRESULT hr; + IUnknown *unk; + IPropertyStore *store = NULL; + + if (!pSHGetPropertyStoreForWindow) + { + win_skip("SHGetPropertyStoreForWindow() is not supported.\n"); + return; + } + + unk = (IUnknown *)0xdeadbeef; + hr = pSHGetPropertyStoreForWindow(GetDesktopWindow(), &IID_IDispatch, (void **)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + ok(unk == NULL, "got %p\n", unk); + + hr = pSHGetPropertyStoreForWindow(GetDesktopWindow(), &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(unk, &IID_IPropertyStore, (void **)&store); + ok(hr == S_OK, "got 0x%08x\n", hr); + + if (store) IPropertyStore_Release(store); + if (unk) IUnknown_Release(unk); +} + START_TEST(appbar) { HMODULE huser32, hshell32; @@ -441,10 +471,12 @@ START_TEST(appbar) hshell32 = GetModuleHandleA("shell32.dll"); pMonitorFromWindow = (void*)GetProcAddress(huser32, "MonitorFromWindow"); pGetCurrentProcessExplicitAppUserModelID = (void*)GetProcAddress(hshell32, "GetCurrentProcessExplicitAppUserModelID"); + pSHGetPropertyStoreForWindow = (void*)GetProcAddress(hshell32, "SHGetPropertyStoreForWindow"); register_testwindow_class(); test_setpos(); test_appbarget(); test_GetCurrentProcessExplicitAppUserModelID(); + test_SHGetPropertyStoreForWindow(); } -- 2.20.1

2 1

[PATCH V2] ucrtbase/tests: add tests for strftime formats %r and %V
by Vijay Kiran Kamuju 01 Nov '19

01 Nov '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/ucrtbase/tests/misc.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 8a6fb7b8e11b..391cff79f81b 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -904,6 +904,7 @@ static void test_strftime(void) { const struct tm epoch = { 0, 0, 0, 1, 0, 70, 4, 0, 0 }; const struct tm tm1 = { 0, 0, 0, 1, 0, 117, 0, 0, 0 }; + const struct tm tm2 = { 0, 0, 14, 1, 0, 121, 6, 0, 0 }; char bufA[256]; size_t retA; int i; @@ -964,6 +965,14 @@ static void test_strftime(void) ok(retA == 1, "expected 1, got %d\n", (int)retA); ok(!strcmp(bufA, "\n"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%r", &epoch); + todo_wine ok(retA == 11, "expected 11, got %d\n", (int)retA); + todo_wine ok(!strcmp(bufA, "12:00:00 AM"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%r", &tm2); + todo_wine ok(retA == 11, "expected 11, got %d\n", (int)retA); + todo_wine ok(!strcmp(bufA, "02:00:00 PM"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%t", &epoch); ok(retA == 1, "expected 1, got %d\n", (int)retA); ok(!strcmp(bufA, "\t"), "got %s\n", bufA); @@ -984,6 +993,18 @@ static void test_strftime(void) ok(retA == 4, "expected 4, got %d\n", (int)retA); ok(!strcmp(bufA, "2016"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%V", &epoch); + todo_wine ok(retA == 2, "expected 2, got %d\n", (int)retA); + todo_wine ok(!strcmp(bufA, "01"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%V", &tm1); + todo_wine ok(retA == 2, "expected 2, got %d\n", (int)retA); + todo_wine ok(!strcmp(bufA, "52"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%V", &tm2); + todo_wine ok(retA == 2, "expected 2, got %d\n", (int)retA); + todo_wine ok(!strcmp(bufA, "53"), "got %s\n", bufA); + for(i=0; i<14; i++) { __time32_t t = (365*2 + i - 7) * 24 * 60 * 60; -- 2.21.0

2 1

[PATCH 1/5] msvcrt: Simplify printf tests table.
by Piotr Caban 01 Nov '19

01 Nov '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/printf.c | 253 ++++++++++++++++++------------------- 1 file changed, 126 insertions(+), 127 deletions(-)

2 1

[PATCH 6/6] vbscript: Support using function return value in expressions.
by Jacek Caban 01 Nov '19

01 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/interp.c | 5 ++--- dlls/vbscript/tests/lang.vbs | 9 +++++++++ 2 files changed, 11 insertions(+), 3 deletions(-)

1 0

[PATCH 4/6] vbscript: Add interpreter support for redim statement.
by Jacek Caban 01 Nov '19

01 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 20 +++++++++++++ dlls/vbscript/interp.c | 65 ++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 3 files changed, 86 insertions(+)

1 0

[PATCH 3/6] vbscript: Add parser support for redim statement.
by Jacek Caban 01 Nov '19

01 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/lex.c | 2 ++ dlls/vbscript/parse.h | 8 ++++++++ dlls/vbscript/parser.y | 28 ++++++++++++++++++++++++++-- 3 files changed, 36 insertions(+), 2 deletions(-)

1 0

[PATCH 1/6] vbscript: Add support for parametrized set statements.
by Jacek Caban 01 Nov '19

01 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/interp.c | 15 +++++---------- dlls/vbscript/tests/run.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 10 deletions(-)

1 0

[PATCH v4 7/7] ddraw/tests: Port TnLHal device test to ddraw7.c
by David Adam 01 Nov '19

01 Nov '19

2 1

[PATCH] faulrep/tests: Fix some memory leaks (Valgrind).
by Gijs Vermeulen 01 Nov '19

01 Nov '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36404 Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> --- dlls/faultrep/tests/faultrep.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/faultrep/tests/faultrep.c b/dlls/faultrep/tests/faultrep.c index d45c606f1e..d0b30f70cf 100644 --- a/dlls/faultrep/tests/faultrep.c +++ b/dlls/faultrep/tests/faultrep.c @@ -64,6 +64,7 @@ static BOOL is_process_limited(void) trace("Could not check if the current user is an administrator\n"); return FALSE; } + FreeSid(Group); if (!IsInGroup) { if (!AllocateAndInitializeSid(&NtAuthority, 2, @@ -75,6 +76,7 @@ static BOOL is_process_limited(void) trace("Could not check if the current user is a power user\n"); return FALSE; } + FreeSid(Group); if (!IsInGroup) { /* Only administrators and power users can be powerful */ -- 2.23.0

1 0

[PATCH v5 6/7] ddraw/tests: Port the test that RGB device is enumerated
by David Adam 01 Nov '19

01 Nov '19

2 1

[PATCH] ucrtbase: Implement t and j printf length modifiers.
by Ambrož Bizjak 01 Nov '19

01 Nov '19

Hi, This adds support for t (ptrdiff_t) and j (intmax_t/uintmax_t) length modifiers. This fixes an issue in Planet Coaster where many in-game values would otherwise show as "jd". I've confirmed the fix works within Steam Play with a local Proton build. These length modifiers have appeared in VS2015 together with z, so putting the code under "_MSVCR_VER >= 140" seems correct. Tests are included and they passed for me on 32-bit and 64-bit. Regards, Ambroz Bizjak

2 1

[PATCH] ole32/tests: Fix some test failures on Windows XP.
by Sven Baars 01 Nov '19

01 Nov '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- These tests started failing since 1e6b130b85d33d38231fc15b5b5e9bf41a24e0b6 dlls/ole32/tests/compobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 69a38d48b2..8412ee45a0 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -757,7 +757,7 @@ static void test_CoGetClassObject(void) IUnknown_Release(pUnk); hr = CoGetClassObject(&IID_Testiface7, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); - ok(hr == 0x80001235, "Unexpected hr %#x.\n", hr); + ok(hr == 0x80001235 || broken(hr == HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND)) /* winxp */, "Unexpected hr %#x.\n", hr); hr = CoGetClassObject(&IID_Testiface8, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); ok(hr == REGDB_E_CLASSNOTREG, "Unexpected hr %#x.\n", hr); @@ -1573,7 +1573,7 @@ static void test_CoRegisterClassObject(void) if ((handle = activate_context(actctx_manifest, &ctxcookie))) { hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)&pcf); - ok(hr == 0x80001234, "Unexpected hr %#x.\n", hr); + ok(hr == 0x80001234 || broken(hr == HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND)) /* winxp */, "Unexpected hr %#x.\n", hr); deactivate_context(handle, ctxcookie); } -- 2.17.1

1 0

[PATCH] find: Prevent hang by properly checking for EOF
by Fabian Maurer 01 Nov '19

01 Nov '19

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- programs/find/find.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/find/find.c b/programs/find/find.c index 3794a8190f..34ca2801eb 100644 --- a/programs/find/find.c +++ b/programs/find/find.c @@ -36,7 +36,7 @@ static BOOL read_char_from_handle(HANDLE handle, char *char_out) if (buffer_pos >= buffer_max) { BOOL success = ReadFile(handle, buffer, 4096, &buffer_max, NULL); - if (!success) + if (!success || !buffer_max) return FALSE; buffer_pos = 0; } -- 2.23.0

1 0

[PATCH] find: First implementation
by Fabian Maurer 01 Nov '19

01 Nov '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44975 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- programs/find/Makefile.in | 4 +- programs/find/find.c | 170 ++++++++++++++++++++++++++++++++++++- programs/find/find.rc | 25 ++++++ programs/find/resources.h | 27 ++++++ programs/find/tests/find.c | 6 +- 5 files changed, 225 insertions(+), 7 deletions(-) create mode 100644 programs/find/find.rc create mode 100644 programs/find/resources.h diff --git a/programs/find/Makefile.in b/programs/find/Makefile.in index 0c6b334f29..f572a371b4 100644 --- a/programs/find/Makefile.in +++ b/programs/find/Makefile.in @@ -1,5 +1,7 @@ MODULE = find.exe - +IMPORTS = user32 EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = find.c + +RC_SRCS = find.rc diff --git a/programs/find/find.c b/programs/find/find.c index 0c8ba1fcd7..3794a8190f 100644 --- a/programs/find/find.c +++ b/programs/find/find.c @@ -16,18 +16,180 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windows.h> +#include <stdlib.h> +#include <shlwapi.h> + +#include "wine/heap.h" #include "wine/debug.h" +#include "resources.h" WINE_DEFAULT_DEBUG_CHANNEL(find); +static BOOL read_char_from_handle(HANDLE handle, char *char_out) +{ + static char buffer[4096]; + static UINT buffer_max = 0; + static UINT buffer_pos = 0; + + /* Read next content into buffer */ + if (buffer_pos >= buffer_max) + { + BOOL success = ReadFile(handle, buffer, 4096, &buffer_max, NULL); + if (!success) + return FALSE; + buffer_pos = 0; + } + + *char_out = buffer[buffer_pos++]; + return TRUE; +} + +/* Read a line from a handle, returns NULL if the end is reached */ +static WCHAR* read_line_from_handle(HANDLE handle) +{ + int line_max = 4096; + int length = 0; + WCHAR *line_converted; + int line_converted_length; + BOOL success; + char *line = heap_alloc(line_max); + + for (;;) + { + char c; + success = read_char_from_handle(handle, &c); + + /* Check for EOF */ + if (!success) + { + if (length == 0) + return NULL; + else + break; + } + + if (c == '\n') + break; + + /* Make sure buffer is large enough */ + if (length + 1 >= line_max) + { + line_max *= 2; + line = heap_realloc(line, line_max); + } + + line[length++] = c; + } + + line[length] = 0; + if (length - 1 >= 0 && line[length - 1] == '\r') /* Strip \r of windows line endings */ + line[length - 1] = 0; + + line_converted_length = MultiByteToWideChar(CP_ACP, 0, line, -1, 0, 0); + line_converted = heap_alloc(line_converted_length * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, line, -1, line_converted, line_converted_length); + + heap_free(line); + + return line_converted; +} + +static void write_to_stdout(const WCHAR *str) +{ + char *str_converted; + UINT str_converted_length; + DWORD bytes_written; + UINT str_length = lstrlenW(str); + int codepage = CP_ACP; + + str_converted_length = WideCharToMultiByte(codepage, 0, str, str_length, NULL, 0, NULL, NULL); + str_converted = heap_alloc(str_converted_length); + WideCharToMultiByte(codepage, 0, str, str_length, str_converted, str_converted_length, NULL, NULL); + + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), str_converted, str_converted_length, &bytes_written, NULL); + if (bytes_written < str_converted_length) + ERR("Failed to write output\n"); + + heap_free(str_converted); +} + +static BOOL run_find_for_line(const WCHAR *line, const WCHAR *tofind) +{ + void *found; + WCHAR lineending[] = {'\r', '\n', 0}; + + if (lstrlenW(line) == 0 || lstrlenW(tofind) == 0) + return FALSE; + + found = wcsstr(line, tofind); + + if (found) + { + write_to_stdout(line); + write_to_stdout(lineending); + return TRUE; + } + + return FALSE; +} + +static void output_resource_message(int id) +{ + WCHAR buffer[64]; + LoadStringW(GetModuleHandleW(NULL), id, buffer, ARRAY_SIZE(buffer)); + write_to_stdout(buffer); +} + int __cdecl wmain(int argc, WCHAR *argv[]) { + WCHAR *line; + WCHAR *tofind = NULL; int i; + int exitcode; + HANDLE input; - WINE_FIXME("stub:"); + TRACE("running find:"); for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); + { + TRACE(" %s", wine_dbgstr_w(argv[i])); + } + TRACE("\n"); + + input = GetStdHandle(STD_INPUT_HANDLE); + + for (i = 1; i < argc; i++) + { + if (argv[i][0] == '/') + { + output_resource_message(IDS_INVALID_SWITCH); + return 2; + } + else if(tofind == NULL) + { + tofind = argv[i]; + } + else + { + FIXME("Searching files not supported yet\n"); + return 1000; + } + } + + if (tofind == NULL) + { + output_resource_message(IDS_INVALID_PARAMETER); + return 2; + } + + exitcode = 1; + while ((line = read_line_from_handle(input)) != NULL) + { + if (run_find_for_line(line, tofind)) + exitcode = 0; + + heap_free(line); + } - return 0; + return exitcode; } diff --git a/programs/find/find.rc b/programs/find/find.rc new file mode 100644 index 0000000000..8c358c8677 --- /dev/null +++ b/programs/find/find.rc @@ -0,0 +1,25 @@ +/* + * Copyright 2019 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resources.h" + +STRINGTABLE +{ + IDS_INVALID_PARAMETER "FIND: Parameter format not correct\r\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\r\n" +} diff --git a/programs/find/resources.h b/programs/find/resources.h new file mode 100644 index 0000000000..2ebe197b7d --- /dev/null +++ b/programs/find/resources.h @@ -0,0 +1,27 @@ +/* + * Resource IDs + * + * Copyright 2019 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_FIND_RESOURCES_H +#define __WINE_FIND_RESOURCES_H + +#define IDS_INVALID_PARAMETER 1000 +#define IDS_INVALID_SWITCH 1001 + +#endif /* __WINE_FIND_RESOURCES_H */ diff --git a/programs/find/tests/find.c b/programs/find/tests/find.c index 8af21a53fa..147b59c8ce 100644 --- a/programs/find/tests/find.c +++ b/programs/find/tests/find.c @@ -90,7 +90,6 @@ static void check_find_output(const BYTE *child_output, int child_output_len, co } - todo_wine_if(out_expected_len != 0) ok_(file, line)(strings_are_equal, "\n#################### Expected:\n" "%s\n" "#################### But got:\n" @@ -176,7 +175,6 @@ static void run_find_stdin_(const WCHAR *commandline, const BYTE *input, int inp check_find_output(child_output, child_output_len, out_expected, out_expected_len, file, line); - todo_wine_if(exitcode_expected != 0) ok_(file, line)(exitcode == exitcode_expected, "Expected exitcode %d, got %d\n", exitcode_expected, exitcode); heap_free(child_output); @@ -227,7 +225,9 @@ static void run_find_stdin_unicode_(const BYTE *input, int input_len, const BYTE static void test_errors(void) { run_find_stdin_str("", "", "FIND: Parameter format not correct\r\n", 2); + todo_wine /* Quotes are not properly passed into wine yet */ run_find_stdin_str("test", "", "FIND: Parameter format not correct\r\n", 2); + todo_wine /* Quotes are not properly passed into wine yet */ run_find_stdin_str("\"test", "", "FIND: Parameter format not correct\r\n", 2); run_find_stdin_str("\"test\" /XYZ", "", "FIND: Invalid switch\r\n", 2); } @@ -238,6 +238,7 @@ static void test_singleline_without_switches(void) run_find_stdin_str("\"test\"", "", "", 1); run_find_stdin_str("\"test\"", "test", "test\r\n", 0); run_find_stdin_str("\"test\"", "test2", "test2\r\n", 0); + run_find_stdin_str("\"test\"", "test\r2", "test\r2\r\n", 0); run_find_stdin_str("\"test2\"", "test", "", 1); } @@ -297,6 +298,7 @@ static void test_unicode_support(void) run_find_stdin_unicode(str_jap_utf16be_nobom, str_empty, 1); /* Test utf16le */ + todo_wine run_find_stdin_unicode(str_jap_utf16le_bom, str_jap_utf16le_bom, 0); } -- 2.23.0

2 3

[PATCH v5 5/7] ddraw/tests: Test available devices in Enumdevices
by David Adam 01 Nov '19

01 Nov '19

Enumeration of devices was checked in real boxes and device was enumerated once at least: windows 10, windows 8, windows XP and windows98. The last one is worth of checking I think, since old interfaces were used in this old windows only. And some games work only in this box.

2 1

[PATCH 1/2] d3d11/tests: Require D3D_FEATURE_LEVEL_11_0 for using DSV flags.
by Paul Gofman 01 Nov '19

01 Nov '19

Fixes test failures on older Testbot Windows versions in test_sample_attached_rtv(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/d3d11/tests/d3d11.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 47a974e9fc..675a9ee49c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -29392,6 +29392,7 @@ static void test_sample_attached_rtv(void) struct d3d11_test_context test_context; ID3D11RenderTargetView *rtv, *rtvs[2]; D3D11_TEXTURE2D_DESC texture_desc; + D3D_FEATURE_LEVEL feature_level; D3D11_SAMPLER_DESC sampler_desc; ID3D11DepthStencilView *dsview; ID3D11BlendState *blend_state; @@ -29475,6 +29476,8 @@ static void test_sample_attached_rtv(void) device = test_context.device; context = test_context.immediate_context; + feature_level = ID3D11Device_GetFeatureLevel(device); + texture_desc.SampleDesc.Count = 1; texture_desc.SampleDesc.Quality = 0; texture_desc.Usage = D3D11_USAGE_DEFAULT; @@ -29644,6 +29647,16 @@ static void test_sample_attached_rtv(void) for (i = 0; i < ARRAY_SIZE(ds_tests); ++i) { + if (ds_tests[i].dsv_flags && feature_level < D3D_FEATURE_LEVEL_11_0) + { + static unsigned int skip_once; + + if (!skip_once++) + skip("Read only depths or stencils are not supported.\n"); + + continue; + } + texture_desc.Format = ds_tests[i].texture_format; hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &dstexture); ok(hr == S_OK, "Test %u, got unexpected hr %#x.\n", i, hr); -- 2.23.0

3 4

[PATCH v5 4/7] ddraw/tests: Port life time tests in Enumdevices to ddraw*.c files
by David Adam 01 Nov '19

01 Nov '19

2 1

[PATCH] vkd3d: Store a copy of Vulkan view object handles in descriptors.
by Conor McCarthy 01 Nov '19

01 Nov '19

In vk_write_descriptor_set_from_d3d12_desc() this avoids memory reads from the view object on the heap which often cause cache misses. It is a relatively simple (but hacky) change for a 0.5% frame rate increase in SotTR. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/command.c | 10 ++++------ libs/vkd3d/resource.c | 38 ++++++++++++++++++++++++-------------- libs/vkd3d/vkd3d_private.h | 7 ++++++- 3 files changed, 34 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 0532ec0..69d1baa 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2548,8 +2548,6 @@ static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_des uint32_t descriptor_range_magic, VkDescriptorSet vk_descriptor_set, uint32_t vk_binding, unsigned int index) { - const struct vkd3d_view *view = descriptor->u.view; - if (descriptor->magic != descriptor_range_magic) return false; @@ -2582,12 +2580,12 @@ static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_des if (descriptor->vk_descriptor_type == VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER || descriptor->vk_descriptor_type == VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER) { - vk_descriptor_write->pTexelBufferView = &view->u.vk_buffer_view; + vk_descriptor_write->pTexelBufferView = (const VkBufferView *)&descriptor->u.v.vk_view; } else { vk_image_info->sampler = VK_NULL_HANDLE; - vk_image_info->imageView = view->u.vk_image_view; + vk_image_info->imageView = descriptor->u.v.vk_view; vk_image_info->imageLayout = descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_SRV ? VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL : VK_IMAGE_LAYOUT_GENERAL; @@ -2596,7 +2594,7 @@ static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_des break; case VKD3D_DESCRIPTOR_MAGIC_SAMPLER: - vk_image_info->sampler = view->u.vk_sampler; + vk_image_info->sampler = descriptor->u.v.vk_view; vk_image_info->imageView = VK_NULL_HANDLE; vk_image_info->imageLayout = VK_IMAGE_LAYOUT_UNDEFINED; @@ -2649,7 +2647,7 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list && register_idx < ARRAY_SIZE(bindings->vk_uav_counter_views)) { VkBufferView vk_counter_view = descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV - ? descriptor->u.view->vk_counter_view : VK_NULL_HANDLE; + ? descriptor->u.v.vk_counter_view : VK_NULL_HANDLE; if (bindings->vk_uav_counter_views[register_idx] != vk_counter_view) bindings->uav_counter_dirty_mask |= 1u << register_idx; bindings->vk_uav_counter_views[register_idx] = vk_counter_view; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index d6e999e..5627aef 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2044,7 +2044,7 @@ void d3d12_desc_write_atomic(struct d3d12_desc *dst, const struct d3d12_desc *sr struct d3d12_desc destroy_desc; pthread_mutex_t *mutex; - destroy_desc.u.view = NULL; + destroy_desc.u.v.view = NULL; mutex = d3d12_device_get_descriptor_mutex(device, dst); pthread_mutex_lock(mutex); @@ -2053,7 +2053,7 @@ void d3d12_desc_write_atomic(struct d3d12_desc *dst, const struct d3d12_desc *sr if ((dst->magic == VKD3D_DESCRIPTOR_MAGIC_SRV || dst->magic == VKD3D_DESCRIPTOR_MAGIC_UAV || dst->magic == VKD3D_DESCRIPTOR_MAGIC_SAMPLER) - && !InterlockedDecrement(&dst->u.view->refcount)) + && !InterlockedDecrement(&dst->u.v.view->refcount)) destroy_desc = *dst; *dst = *src; @@ -2061,8 +2061,8 @@ void d3d12_desc_write_atomic(struct d3d12_desc *dst, const struct d3d12_desc *sr pthread_mutex_unlock(mutex); /* Destroy the view after unlocking to reduce wait time. */ - if (destroy_desc.u.view) - vkd3d_view_destroy_descriptor(destroy_desc.u.view, &destroy_desc, device); + if (destroy_desc.u.v.view) + vkd3d_view_destroy_descriptor(destroy_desc.u.v.view, &destroy_desc, device); } static void d3d12_desc_destroy(struct d3d12_desc *descriptor, struct d3d12_device *device) @@ -2089,7 +2089,7 @@ void d3d12_desc_copy(struct d3d12_desc *dst, const struct d3d12_desc *src, || src->magic == VKD3D_DESCRIPTOR_MAGIC_UAV || src->magic == VKD3D_DESCRIPTOR_MAGIC_SAMPLER) { - vkd3d_view_incref(src->u.view); + vkd3d_view_incref(src->u.v.view); } tmp = *src; @@ -2527,7 +2527,8 @@ static void vkd3d_create_null_srv(struct d3d12_desc *descriptor, { descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; - descriptor->u.view = view; + descriptor->u.v.view = view; + descriptor->u.v.vk_view = view->u.vk_buffer_view; } return; @@ -2563,7 +2564,8 @@ static void vkd3d_create_null_srv(struct d3d12_desc *descriptor, descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; - descriptor->u.view = view; + descriptor->u.v.view = view; + descriptor->u.v.vk_view = view->u.vk_image_view; } static void vkd3d_create_buffer_srv(struct d3d12_desc *descriptor, @@ -2593,7 +2595,8 @@ static void vkd3d_create_buffer_srv(struct d3d12_desc *descriptor, descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; - descriptor->u.view = view; + descriptor->u.v.view = view; + descriptor->u.v.vk_view = view->u.vk_buffer_view; } void d3d12_desc_create_srv(struct d3d12_desc *descriptor, @@ -2697,7 +2700,8 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; - descriptor->u.view = view; + descriptor->u.v.view = view; + descriptor->u.v.vk_view = view->u.vk_image_view; } static unsigned int vkd3d_view_flags_from_d3d12_buffer_uav_flags(D3D12_BUFFER_UAV_FLAGS flags) @@ -2734,7 +2738,8 @@ static void vkd3d_create_null_uav(struct d3d12_desc *descriptor, { descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; - descriptor->u.view = view; + descriptor->u.v.view = view; + descriptor->u.v.vk_view = view->u.vk_buffer_view; } return; @@ -2770,7 +2775,8 @@ static void vkd3d_create_null_uav(struct d3d12_desc *descriptor, descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; - descriptor->u.view = view; + descriptor->u.v.view = view; + descriptor->u.v.vk_view = view->u.vk_image_view; } static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_device *device, @@ -2803,7 +2809,8 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; - descriptor->u.view = view; + descriptor->u.v.view = view; + descriptor->u.v.vk_view = view->u.vk_buffer_view; if (counter_resource) { @@ -2820,6 +2827,7 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ view->vk_counter_view = VK_NULL_HANDLE; d3d12_desc_destroy(descriptor, device); } + descriptor->u.v.vk_counter_view = view->vk_counter_view; } /* FIXME: Clears are implemented only for R32_UINT buffer UAVs. */ @@ -2883,7 +2891,8 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; - descriptor->u.view = view; + descriptor->u.v.view = view; + descriptor->u.v.vk_view = view->u.vk_image_view; descriptor->uav.texture.vk_aspect_mask = vkd3d_desc.format->vk_aspect_mask; descriptor->uav.texture.miplevel_idx = vkd3d_desc.miplevel_idx; @@ -3046,7 +3055,8 @@ void d3d12_desc_create_sampler(struct d3d12_desc *sampler, sampler->magic = VKD3D_DESCRIPTOR_MAGIC_SAMPLER; sampler->vk_descriptor_type = VK_DESCRIPTOR_TYPE_SAMPLER; - sampler->u.view = view; + sampler->u.v.view = view; + sampler->u.v.vk_view = view->u.vk_sampler; } HRESULT vkd3d_create_static_sampler(struct d3d12_device *device, diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 2d62fda..0f2d916 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -480,7 +480,12 @@ struct d3d12_desc union { VkDescriptorBufferInfo vk_cbv_info; - struct vkd3d_view *view; + struct + { + struct vkd3d_view *view; + void *vk_view; + VkBufferView vk_counter_view; + } v; } u; union -- 2.23.0

2 1

[PATCH v2 3/4] winex11.drv: Retrieve virtual and primary monitor rectangles from SetupAPI.
by Zhiyi Zhang 01 Nov '19

01 Nov '19

So that a process can still get the correct virtual and primary monitor rectangles if display devices are reinitialized in another process. Note that we can't use EnumDisplayMonitor() and GetMonitorInfo() here because they are not loaded when loading winex11.drv. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 162 +++++++++++++++++++++++++------------ 1 file changed, 109 insertions(+), 53 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 6c4097a790..5b0b062ff6 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -104,33 +104,134 @@ static const WCHAR monitor_hardware_idW[] = { 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; static struct x11drv_display_device_handler handler; + +/* Cached screen information, protected by screen_section */ static RECT virtual_screen_rect; static RECT primary_monitor_rect; +static FILETIME last_query_screen_time; +static CRITICAL_SECTION screen_section; +static CRITICAL_SECTION_DEBUG screen_critsect_debug = +{ + 0, 0, &screen_section, + {&screen_critsect_debug.ProcessLocksList, &screen_critsect_debug.ProcessLocksList}, + 0, 0, {(DWORD_PTR)(__FILE__ ": screen_section")} +}; +static CRITICAL_SECTION screen_section = {&screen_critsect_debug, -1, 0, 0, 0, 0}; + +static HANDLE get_display_device_init_mutex(void) +{ + static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; + HANDLE mutex = CreateMutexW(NULL, FALSE, init_mutexW); + + WaitForSingleObject(mutex, INFINITE); + return mutex; +} + +static void release_display_device_init_mutex(HANDLE mutex) +{ + ReleaseMutex(mutex); + CloseHandle(mutex); +} + +/* Update screen rect cache from SetupAPI if it's outdated, return FALSE on failure and TRUE on success */ +static BOOL update_screen_cache(void) +{ + RECT virtual_rect = {0}, primary_rect = {0}, monitor_rect; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo = INVALID_HANDLE_VALUE; + FILETIME filetime; + HKEY video_key; + HANDLE mutex; + DWORD i = 0; + INT result; + DWORD type; + LSTATUS lr; + BOOL ret = FALSE; + + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, video_keyW, &video_key)) + return FALSE; + lr = RegQueryInfoKeyW(video_key, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, &filetime); + RegCloseKey(video_key); + if (lr) + return FALSE; + + EnterCriticalSection(&screen_section); + result = CompareFileTime(&filetime, &last_query_screen_time); + LeaveCriticalSection(&screen_section); + if (result < 1) + return TRUE; + + mutex = get_display_device_init_mutex(); + + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, DIGCF_PRESENT); + if (devinfo == INVALID_HANDLE_VALUE) + goto fail; + + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, + (BYTE *)&monitor_rect, sizeof(monitor_rect), NULL, 0)) + goto fail; + + UnionRect(&virtual_rect, &virtual_rect, &monitor_rect); + if (i == 1) + primary_rect = monitor_rect; + } + + EnterCriticalSection(&screen_section); + virtual_screen_rect = virtual_rect; + primary_monitor_rect = primary_rect; + last_query_screen_time = filetime; + LeaveCriticalSection(&screen_section); + ret = TRUE; +fail: + SetupDiDestroyDeviceInfoList(devinfo); + release_display_device_init_mutex(mutex); + if (!ret) + ERR("Update screen cache failed!\n"); + return ret; +} POINT virtual_screen_to_root(INT x, INT y) { + RECT virtual = get_virtual_screen_rect(); POINT pt; - pt.x = x - virtual_screen_rect.left; - pt.y = y - virtual_screen_rect.top; + + pt.x = x - virtual.left; + pt.y = y - virtual.top; return pt; } POINT root_to_virtual_screen(INT x, INT y) { + RECT virtual = get_virtual_screen_rect(); POINT pt; - pt.x = x + virtual_screen_rect.left; - pt.y = y + virtual_screen_rect.top; + + pt.x = x + virtual.left; + pt.y = y + virtual.top; return pt; } RECT get_virtual_screen_rect(void) { - return virtual_screen_rect; + RECT virtual; + + update_screen_cache(); + EnterCriticalSection(&screen_section); + virtual = virtual_screen_rect; + LeaveCriticalSection(&screen_section); + return virtual; } RECT get_primary_monitor_rect(void) { - return primary_monitor_rect; + RECT primary; + + update_screen_cache(); + EnterCriticalSection(&screen_section); + primary = primary_monitor_rect; + LeaveCriticalSection(&screen_section); + return primary; } void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *new_handler) @@ -321,9 +422,6 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) goto done; - UnionRect(&virtual_screen_rect, &virtual_screen_rect, &monitor->rc_monitor); - if (video_index == 0) - primary_monitor_rect = monitor->rc_monitor; /* RcWork */ if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_work, sizeof(monitor->rc_work), 0)) @@ -348,9 +446,6 @@ static void prepare_devices(HKEY video_hkey) HDEVINFO devinfo; DWORD i = 0; - SetRectEmpty(&virtual_screen_rect); - SetRectEmpty(&primary_monitor_rect); - /* Remove all monitors */ devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) @@ -399,39 +494,8 @@ static void cleanup_devices(void) SetupDiDestroyDeviceInfoList(devinfo); } -/* Initialize virtual screen rect and primary monitor rect for current process */ -static void init_screen_rects(void) -{ - SP_DEVINFO_DATA device_data = {sizeof(device_data)}; - HDEVINFO devinfo; - DWORD type; - DWORD i = 0; - RECT rect; - - /* Already initialized */ - if (!IsRectEmpty(&virtual_screen_rect)) - return; - - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, 0); - while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) - { - if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, (BYTE *)&rect, - sizeof(rect), NULL, 0)) - ERR("Failed to get monitor size property\n"); - - UnionRect(&virtual_screen_rect, &virtual_screen_rect, &rect); - if (i == 1) - primary_monitor_rect = rect; - } - SetupDiDestroyDeviceInfoList(devinfo); - - TRACE("virtual screen rect:%s primary monitor rect:%s\n", wine_dbgstr_rect(&virtual_screen_rect), - wine_dbgstr_rect(&primary_monitor_rect)); -} - void X11DRV_DisplayDevices_Init(BOOL force) { - static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; HANDLE mutex; struct x11drv_gpu *gpus = NULL; struct x11drv_adapter *adapters = NULL; @@ -445,8 +509,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) WCHAR guidW[40]; WCHAR driverW[1024]; - mutex = CreateMutexW(NULL, FALSE, init_mutexW); - WaitForSingleObject(mutex, INFINITE); + mutex = get_display_device_init_mutex(); if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &video_hkey, &disposition)) @@ -457,10 +520,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) /* Avoid unnecessary reinit */ if (!force && disposition != REG_CREATED_NEW_KEY) - { - init_screen_rects(); goto done; - } TRACE("via %s\n", wine_dbgstr_a(handler.name)); @@ -511,16 +571,12 @@ void X11DRV_DisplayDevices_Init(BOOL force) adapters = NULL; } - TRACE("virtual screen rect:%s primary monitor rect:%s\n", wine_dbgstr_rect(&virtual_screen_rect), - wine_dbgstr_rect(&primary_monitor_rect)); - done: cleanup_devices(); SetupDiDestroyDeviceInfoList(monitor_devinfo); SetupDiDestroyDeviceInfoList(gpu_devinfo); RegCloseKey(video_hkey); - ReleaseMutex(mutex); - CloseHandle(mutex); + release_display_device_init_mutex(mutex); if (gpus) handler.free_gpus(gpus); if (adapters) -- 2.23.0

2 2

[PATCH v3 2/2] winex11.drv: Handle display device events in the desktop thread.
by Zhiyi Zhang 01 Nov '19

01 Nov '19

This fixes a regression from 22795243b2d21e1a667215f54c3a15634735749c, which calls thread_init_display() and eventually XOpenIM() before X11DRV_InitXIM() is called. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47821 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 6 ++++++ dlls/winex11.drv/window.c | 1 + dlls/winex11.drv/x11drv.h | 5 +++++ dlls/winex11.drv/xinerama.c | 1 + dlls/winex11.drv/xrandr.c | 35 +++++++++++++++++++++++------------ 5 files changed, 36 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index a323b795b8..ee867343ae 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -241,6 +241,12 @@ void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler } } +void X11DRV_DisplayDevices_RegisterEventHandlers(void) +{ + if (handler.register_event_handlers) + handler.register_event_handlers(); +} + /* Initialize a GPU instance and return its GUID string in guid_string and driver value in driver parameter */ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index, WCHAR *guid_string, WCHAR *driver) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4e01eb201c..f3c6a1b3cb 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1833,6 +1833,7 @@ BOOL CDECL X11DRV_CreateWindow( HWND hwnd ) XFlush( data->display ); SetPropA( hwnd, clip_window_prop, (HANDLE)data->clip_window ); X11DRV_InitClipboard(); + X11DRV_DisplayDevices_RegisterEventHandlers(); } return TRUE; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a06cf3ffd8..35e27334db 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -743,10 +743,15 @@ struct x11drv_display_device_handler /* free_monitors will be called to free a monitor list from get_monitors */ void (*free_monitors)(struct x11drv_monitor *monitors); + + /* register_event_handlers will be called to register event handlers. + * This function pointer is optional and can be NULL when driver doesn't support it */ + void (*register_event_handlers)(void); }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; extern void X11DRV_DisplayDevices_Init(BOOL force) DECLSPEC_HIDDEN; +extern void X11DRV_DisplayDevices_RegisterEventHandlers(void) DECLSPEC_HIDDEN; /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index b5620d3403..57c77d6273 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -344,5 +344,6 @@ void xinerama_init( unsigned int width, unsigned int height ) handler.free_gpus = xinerama_free_gpus; handler.free_adapters = xinerama_free_adapters; handler.free_monitors = xinerama_free_monitors; + handler.register_event_handlers = NULL; X11DRV_DisplayDevices_SetHandler( &handler ); } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 412400e3f6..0a64613fac 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1063,10 +1063,29 @@ static void xrandr14_free_monitors( struct x11drv_monitor *monitors ) heap_free( monitors ); } -static BOOL xrandr14_device_change_event( HWND hwnd, XEvent *event ) +static BOOL xrandr14_device_change_handler( HWND hwnd, XEvent *event ) { - X11DRV_DisplayDevices_Init( TRUE ); - return TRUE; + if (hwnd == GetDesktopWindow() && GetWindowThreadProcessId( hwnd, NULL ) == GetCurrentThreadId()) + X11DRV_DisplayDevices_Init( TRUE ); + return FALSE; +} + +static void xrandr14_register_event_handlers(void) +{ + Display *display = thread_init_display(); + int event_base, error_base; + + if (!pXRRQueryExtension( display, &event_base, &error_base )) + return; + + pXRRSelectInput( display, root_window, + RRCrtcChangeNotifyMask | RROutputChangeNotifyMask | RRProviderChangeNotifyMask ); + X11DRV_register_event_handler( event_base + RRNotify_CrtcChange, xrandr14_device_change_handler, + "XRandR CrtcChange" ); + X11DRV_register_event_handler( event_base + RRNotify_OutputChange, xrandr14_device_change_handler, + "XRandR OutputChange" ); + X11DRV_register_event_handler( event_base + RRNotify_ProviderChange, xrandr14_device_change_handler, + "XRandR ProviderChange" ); } #endif @@ -1115,16 +1134,8 @@ void X11DRV_XRandR_Init(void) handler.free_gpus = xrandr14_free_gpus; handler.free_adapters = xrandr14_free_adapters; handler.free_monitors = xrandr14_free_monitors; + handler.register_event_handlers = xrandr14_register_event_handlers; X11DRV_DisplayDevices_SetHandler( &handler ); - - pXRRSelectInput( thread_init_display(), root_window, - RRCrtcChangeNotifyMask | RROutputChangeNotifyMask | RRProviderChangeNotifyMask); - X11DRV_register_event_handler( event_base + RRNotify_CrtcChange, xrandr14_device_change_event, - "XRandR CrtcChange" ); - X11DRV_register_event_handler( event_base + RRNotify_OutputChange, xrandr14_device_change_event, - "XRandR OutputChange" ); - X11DRV_register_event_handler( event_base + RRNotify_ProviderChange, xrandr14_device_change_event, - "XRandR ProviderChange" ); } #endif } -- 2.23.0

1 0

[PATCH v3 1/2] winex11.drv: Retrieve virtual and primary monitor rectangles from SetupAPI.
by Zhiyi Zhang 01 Nov '19

01 Nov '19

So that a process can still get the correct virtual and primary monitor rectangles if display devices are reinitialized in another process. Note that we can't use EnumDisplayMonitor() and GetMonitorInfo() here because they are not loaded when loading winex11.drv. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v3: Supersede 172073~172074. Reduce wineserver calls when querying cache. dlls/winex11.drv/display.c | 160 +++++++++++++++++++++++++------------ 1 file changed, 107 insertions(+), 53 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 6c4097a790..a323b795b8 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -104,33 +104,132 @@ static const WCHAR monitor_hardware_idW[] = { 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; static struct x11drv_display_device_handler handler; + +/* Cached screen information, protected by screen_section */ +static HKEY video_key; static RECT virtual_screen_rect; static RECT primary_monitor_rect; +static FILETIME last_query_screen_time; +static CRITICAL_SECTION screen_section; +static CRITICAL_SECTION_DEBUG screen_critsect_debug = +{ + 0, 0, &screen_section, + {&screen_critsect_debug.ProcessLocksList, &screen_critsect_debug.ProcessLocksList}, + 0, 0, {(DWORD_PTR)(__FILE__ ": screen_section")} +}; +static CRITICAL_SECTION screen_section = {&screen_critsect_debug, -1, 0, 0, 0, 0}; + +static HANDLE get_display_device_init_mutex(void) +{ + static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; + HANDLE mutex = CreateMutexW(NULL, FALSE, init_mutexW); + + WaitForSingleObject(mutex, INFINITE); + return mutex; +} + +static void release_display_device_init_mutex(HANDLE mutex) +{ + ReleaseMutex(mutex); + CloseHandle(mutex); +} + +/* Update screen rectangle cache from SetupAPI if it's outdated, return FALSE on failure and TRUE on success */ +static BOOL update_screen_cache(void) +{ + RECT virtual_rect = {0}, primary_rect = {0}, monitor_rect; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo = INVALID_HANDLE_VALUE; + FILETIME filetime = {0}; + HANDLE mutex = NULL; + DWORD i = 0; + INT result; + DWORD type; + BOOL ret = FALSE; + + EnterCriticalSection(&screen_section); + if ((!video_key && RegOpenKeyW(HKEY_LOCAL_MACHINE, video_keyW, &video_key)) + || RegQueryInfoKeyW(video_key, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, &filetime)) + { + LeaveCriticalSection(&screen_section); + return FALSE; + } + result = CompareFileTime(&filetime, &last_query_screen_time); + LeaveCriticalSection(&screen_section); + if (result < 1) + return TRUE; + + mutex = get_display_device_init_mutex(); + + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, DIGCF_PRESENT); + if (devinfo == INVALID_HANDLE_VALUE) + goto fail; + + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, + (BYTE *)&monitor_rect, sizeof(monitor_rect), NULL, 0)) + goto fail; + + UnionRect(&virtual_rect, &virtual_rect, &monitor_rect); + if (i == 1) + primary_rect = monitor_rect; + } + + EnterCriticalSection(&screen_section); + virtual_screen_rect = virtual_rect; + primary_monitor_rect = primary_rect; + last_query_screen_time = filetime; + LeaveCriticalSection(&screen_section); + ret = TRUE; +fail: + SetupDiDestroyDeviceInfoList(devinfo); + release_display_device_init_mutex(mutex); + if (!ret) + WARN("Update screen cache failed!\n"); + return ret; +} POINT virtual_screen_to_root(INT x, INT y) { + RECT virtual = get_virtual_screen_rect(); POINT pt; - pt.x = x - virtual_screen_rect.left; - pt.y = y - virtual_screen_rect.top; + + pt.x = x - virtual.left; + pt.y = y - virtual.top; return pt; } POINT root_to_virtual_screen(INT x, INT y) { + RECT virtual = get_virtual_screen_rect(); POINT pt; - pt.x = x + virtual_screen_rect.left; - pt.y = y + virtual_screen_rect.top; + + pt.x = x + virtual.left; + pt.y = y + virtual.top; return pt; } RECT get_virtual_screen_rect(void) { - return virtual_screen_rect; + RECT virtual; + + update_screen_cache(); + EnterCriticalSection(&screen_section); + virtual = virtual_screen_rect; + LeaveCriticalSection(&screen_section); + return virtual; } RECT get_primary_monitor_rect(void) { - return primary_monitor_rect; + RECT primary; + + update_screen_cache(); + EnterCriticalSection(&screen_section); + primary = primary_monitor_rect; + LeaveCriticalSection(&screen_section); + return primary; } void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *new_handler) @@ -321,9 +420,6 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) goto done; - UnionRect(&virtual_screen_rect, &virtual_screen_rect, &monitor->rc_monitor); - if (video_index == 0) - primary_monitor_rect = monitor->rc_monitor; /* RcWork */ if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_work, sizeof(monitor->rc_work), 0)) @@ -348,9 +444,6 @@ static void prepare_devices(HKEY video_hkey) HDEVINFO devinfo; DWORD i = 0; - SetRectEmpty(&virtual_screen_rect); - SetRectEmpty(&primary_monitor_rect); - /* Remove all monitors */ devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) @@ -399,39 +492,8 @@ static void cleanup_devices(void) SetupDiDestroyDeviceInfoList(devinfo); } -/* Initialize virtual screen rect and primary monitor rect for current process */ -static void init_screen_rects(void) -{ - SP_DEVINFO_DATA device_data = {sizeof(device_data)}; - HDEVINFO devinfo; - DWORD type; - DWORD i = 0; - RECT rect; - - /* Already initialized */ - if (!IsRectEmpty(&virtual_screen_rect)) - return; - - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, 0); - while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) - { - if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, (BYTE *)&rect, - sizeof(rect), NULL, 0)) - ERR("Failed to get monitor size property\n"); - - UnionRect(&virtual_screen_rect, &virtual_screen_rect, &rect); - if (i == 1) - primary_monitor_rect = rect; - } - SetupDiDestroyDeviceInfoList(devinfo); - - TRACE("virtual screen rect:%s primary monitor rect:%s\n", wine_dbgstr_rect(&virtual_screen_rect), - wine_dbgstr_rect(&primary_monitor_rect)); -} - void X11DRV_DisplayDevices_Init(BOOL force) { - static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; HANDLE mutex; struct x11drv_gpu *gpus = NULL; struct x11drv_adapter *adapters = NULL; @@ -445,8 +507,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) WCHAR guidW[40]; WCHAR driverW[1024]; - mutex = CreateMutexW(NULL, FALSE, init_mutexW); - WaitForSingleObject(mutex, INFINITE); + mutex = get_display_device_init_mutex(); if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &video_hkey, &disposition)) @@ -457,10 +518,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) /* Avoid unnecessary reinit */ if (!force && disposition != REG_CREATED_NEW_KEY) - { - init_screen_rects(); goto done; - } TRACE("via %s\n", wine_dbgstr_a(handler.name)); @@ -511,16 +569,12 @@ void X11DRV_DisplayDevices_Init(BOOL force) adapters = NULL; } - TRACE("virtual screen rect:%s primary monitor rect:%s\n", wine_dbgstr_rect(&virtual_screen_rect), - wine_dbgstr_rect(&primary_monitor_rect)); - done: cleanup_devices(); SetupDiDestroyDeviceInfoList(monitor_devinfo); SetupDiDestroyDeviceInfoList(gpu_devinfo); RegCloseKey(video_hkey); - ReleaseMutex(mutex); - CloseHandle(mutex); + release_display_device_init_mutex(mutex); if (gpus) handler.free_gpus(gpus); if (adapters) -- 2.23.0

1 0

[PATCH v5 3/7] ddraw/tests: Port tests for the cancellation of enumeration in Enumdevices in ddraw*.c files
by David Adam 01 Nov '19

01 Nov '19

2 1

[PATCH 5/5] msvcrt: Add printf meaningless digits tests.
by Piotr Caban 01 Nov '19

01 Nov '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/printf.c | 2 ++ 1 file changed, 2 insertions(+)

1 0

[PATCH 4/5] msvcrt: Add printf rounding tests.
by Piotr Caban 01 Nov '19

01 Nov '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/printf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)

1 0

[PATCH 3/5] msvcrt: Move more printf tests to table.
by Piotr Caban 01 Nov '19

01 Nov '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/printf.c | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-)

1 0

[PATCH 2/5] msvcrt: Fix test failures on Windows 10.
by Piotr Caban 01 Nov '19

01 Nov '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/printf.c | 286 +++++++++++++++++++------------------ 1 file changed, 150 insertions(+), 136 deletions(-)

1 0

[PATCH v5 2/7] ddraw/tests: Test the name of devices in Enumdevices
by David Adam 01 Nov '19

01 Nov '19

2 1

[PATCH] propsys: add stub for PSCreatePropertyStoreFromObject
by Louis Lenders 01 Nov '19

01 Nov '19

1 0

[PATCH v5 1/7] ddraw: Give exact name for devices in Enumdevices
by David Adam 01 Nov '19

01 Nov '19

This patch allows the game Donald Duck couak attack to start. Bug was spotted by Andrew D'Addesio in bug 19153

2 1

[PATCH] urlmon/tests: Fix a test failure on Windows XP.
by Sven Baars 01 Nov '19

01 Nov '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/urlmon/tests/url.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 1aef981b83..287eb2702e 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -3911,7 +3911,8 @@ static BOOL can_do_https(void) ok(req != NULL, "HttpOpenRequest failed\n"); ret = HttpSendRequestA(req, NULL, 0, NULL, 0); - ok(ret || broken(GetLastError() == ERROR_INTERNET_CANNOT_CONNECT), + ok(ret || broken(GetLastError() == ERROR_INTERNET_CANNOT_CONNECT) + || broken(GetLastError() == ERROR_INTERNET_SECURITY_CHANNEL_ERROR) /* WinXP */, "request failed: %u\n", GetLastError()); InternetCloseHandle(req); -- 2.17.1

3 2

[PATCH] ucrtbase/tests: add tests for strftime formats %r and %V
by Vijay Kiran Kamuju 01 Nov '19

01 Nov '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/ucrtbase/tests/misc.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 8a6fb7b8e11b..391cff79f81b 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -904,6 +904,7 @@ static void test_strftime(void) { const struct tm epoch = { 0, 0, 0, 1, 0, 70, 4, 0, 0 }; const struct tm tm1 = { 0, 0, 0, 1, 0, 117, 0, 0, 0 }; + const struct tm tm2 = { 0, 0, 14, 1, 0, 122, 6, 0, 0 }; char bufA[256]; size_t retA; int i; @@ -964,6 +965,14 @@ static void test_strftime(void) ok(retA == 1, "expected 1, got %d\n", (int)retA); ok(!strcmp(bufA, "\n"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%r", &epoch); + todo_wine ok(retA == 11, "expected 11, got %d\n", (int)retA); + todo_wine ok(!strcmp(bufA, "12:00:00 AM"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%r", &tm2); + todo_wine ok(retA == 11, "expected 11, got %d\n", (int)retA); + todo_wine ok(!strcmp(bufA, "02:00:00 PM"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%t", &epoch); ok(retA == 1, "expected 1, got %d\n", (int)retA); ok(!strcmp(bufA, "\t"), "got %s\n", bufA); @@ -984,6 +993,18 @@ static void test_strftime(void) ok(retA == 4, "expected 4, got %d\n", (int)retA); ok(!strcmp(bufA, "2016"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%V", &epoch); + todo_wine ok(retA == 2, "expected 2, got %d\n", (int)retA); + todo_wine ok(!strcmp(bufA, "01"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%V", &tm1); + todo_wine ok(retA == 2, "expected 2, got %d\n", (int)retA); + todo_wine ok(!strcmp(bufA, "53"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%V", &tm2); + todo_wine ok(retA == 2, "expected 2, got %d\n", (int)retA); + todo_wine ok(!strcmp(bufA, "52"), "got %s\n", bufA); + for(i=0; i<14; i++) { __time32_t t = (365*2 + i - 7) * 24 * 60 * 60; -- 2.21.0

2 1

[PATCH] po: Update Korean tranlation.
by Byeongsik Jeon 01 Nov '19

01 Nov '19

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- po/ko.po | 688 +++++++++++++++++++------------------------------------ 1 file changed, 239 insertions(+), 449 deletions(-) diff --git a/po/ko.po b/po/ko.po index 2e222d8400..2217f02a6e 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-12-17 22:50+0900\n" +"PO-Revision-Date: 2019-11-01 16:21+0900\n" "Last-Translator: Byeongsik Jeon <bsjeon(a)hanmail.net>\n" "Language-Team: Korean\n" "Language: ko\n" @@ -344,7 +344,7 @@ msgstr "마법사" #: comctl32.rc:84 msgid "< &Back" -msgstr "< 이전(&B)" +msgstr "< 뒤로(&B)" #: comctl32.rc:85 msgid "&Next >" @@ -1260,11 +1260,11 @@ msgstr "Caps Lock 켜짐" #: crypt32.rc:30 msgid "Authority Key Identifier" -msgstr "접근 키 식별자" +msgstr "권한 키 식별자" #: crypt32.rc:31 msgid "Key Attributes" -msgstr "키 속성" +msgstr "키 특성" #: crypt32.rc:32 msgid "Key Usage Restriction" @@ -1276,19 +1276,19 @@ msgstr "주제 대체 이름" #: crypt32.rc:34 msgid "Issuer Alternative Name" -msgstr "발행자 대체 이름" +msgstr "발급자 대체 이름" #: crypt32.rc:35 msgid "Basic Constraints" -msgstr "기본 제약" +msgstr "기본 제한" #: crypt32.rc:36 msgid "Key Usage" -msgstr "키 사용법" +msgstr "키 사용" #: crypt32.rc:37 msgid "Certificate Policies" -msgstr "인증 방침" +msgstr "인증서 정책" #: crypt32.rc:38 msgid "Subject Key Identifier" @@ -1296,15 +1296,15 @@ msgstr "주제 키 식별자" #: crypt32.rc:39 msgid "CRL Reason Code" -msgstr "CRL 분별 코드" +msgstr "CRL 원인 코드" #: crypt32.rc:40 msgid "CRL Distribution Points" -msgstr "CRL 배포 지점" +msgstr "CRL 배포 지점" #: crypt32.rc:41 msgid "Enhanced Key Usage" -msgstr "확장된 키 사용법" +msgstr "확장된 키 사용" #: crypt32.rc:42 msgid "Authority Information Access" @@ -1320,7 +1320,7 @@ msgstr "다음 업데이트 위치" #: crypt32.rc:45 msgid "Yes or No Trust" -msgstr "신뢰(예(Y) 나 아니요(N))" +msgstr "신뢰하거나 신뢰하지 않음" #: crypt32.rc:46 msgid "Email Address" @@ -1328,15 +1328,15 @@ msgstr "전자메일 주소" #: crypt32.rc:47 msgid "Unstructured Name" -msgstr "비구조화 이름" +msgstr "구조화되지 않은 이름" #: crypt32.rc:48 msgid "Content Type" -msgstr "내용 형식" +msgstr "콘텐츠 형식" #: crypt32.rc:49 msgid "Message Digest" -msgstr "내용 요약" +msgstr "메시지 요약" #: crypt32.rc:50 msgid "Signing Time" @@ -1344,23 +1344,23 @@ msgstr "서명 시간" #: crypt32.rc:51 msgid "Counter Sign" -msgstr "다시 서명" +msgstr "연대 서명" #: crypt32.rc:52 msgid "Challenge Password" -msgstr "암호 바꾸기" +msgstr "챌린지 암호" #: crypt32.rc:53 msgid "Unstructured Address" -msgstr "비구조화 주소" +msgstr "구조화되지 않은 주소" #: crypt32.rc:54 msgid "S/MIME Capabilities" -msgstr "S/MIME 능력" +msgstr "S/MIME 기능" #: crypt32.rc:55 msgid "Prefer Signed Data" -msgstr "선호하는 사인된 데이터" +msgstr "서명한 데이터 선호" #: crypt32.rc:56 cryptdlg.rc:34 msgctxt "Certification Practice Statement" @@ -1369,23 +1369,23 @@ msgstr "CPS" #: crypt32.rc:57 cryptdlg.rc:35 msgid "User Notice" -msgstr "사용자 통지" +msgstr "사용자 알림" #: crypt32.rc:58 msgid "On-line Certificate Status Protocol" -msgstr "온라인 인증 상태 프로토콜" +msgstr "온라인 인증서 상태 프로토콜" #: crypt32.rc:59 msgid "Certification Authority Issuer" -msgstr "인증서 접근 발행자" +msgstr "인증 기관 발급자" #: crypt32.rc:60 msgid "Certification Template Name" -msgstr "인증 형판 이름" +msgstr "인증 서식 이름" #: crypt32.rc:61 msgid "Certificate Type" -msgstr "인증서 형태" +msgstr "인증서 종류" #: crypt32.rc:62 msgid "Certificate Manifold" @@ -1393,27 +1393,27 @@ msgstr "인증서 사본" #: crypt32.rc:63 msgid "Netscape Cert Type" -msgstr "넷스케이프 인증 형태" +msgstr "넷스케이프 인증서 형식" #: crypt32.rc:64 msgid "Netscape Base URL" -msgstr "넷스케이프 기본 웹주소" +msgstr "넷스케이프 기준 URL" #: crypt32.rc:65 msgid "Netscape Revocation URL" -msgstr "넷스케이프 취소 웹주소" +msgstr "넷스케이프 해지 URL" #: crypt32.rc:66 msgid "Netscape CA Revocation URL" -msgstr "넷스케이프 CA 취소 웹주소" +msgstr "넷스케이프 CA 해지 URL" #: crypt32.rc:67 msgid "Netscape Cert Renewal URL" -msgstr "넷스케이프 인증서 재개 웹주소" +msgstr "넷스케이프 인증서 갱신 URL" #: crypt32.rc:68 msgid "Netscape CA Policy URL" -msgstr "넷스케이프 CA 방침 URL" +msgstr "넷스케이프 CA 정책 URL" #: crypt32.rc:69 msgid "Netscape SSL ServerName" @@ -1421,31 +1421,31 @@ msgstr "넷스케이프 SSL 서버이름" #: crypt32.rc:70 msgid "Netscape Comment" -msgstr "넷스케이프 설명" +msgstr "넷스케이프 주석" #: crypt32.rc:71 msgid "Country/Region" -msgstr "나라/지역" +msgstr "국가/지역" #: crypt32.rc:72 msgid "Organization" -msgstr "단체" +msgstr "조직" #: crypt32.rc:73 msgid "Organizational Unit" -msgstr "단체 단위" +msgstr "조직 단위" #: crypt32.rc:74 msgid "Common Name" -msgstr "완전한 이름" +msgstr "일반 이름" #: crypt32.rc:75 msgid "Locality" -msgstr "소재지" +msgstr "구/군/시" #: crypt32.rc:76 msgid "State or Province" -msgstr "주나 지방" +msgstr "시/도" #: crypt32.rc:77 msgid "Title" @@ -1457,7 +1457,7 @@ msgstr "이름" #: crypt32.rc:79 msgid "Initials" -msgstr "머릿글자" +msgstr "이니셜" #: crypt32.rc:80 msgid "Surname" @@ -1465,7 +1465,7 @@ msgstr "성" #: crypt32.rc:81 msgid "Domain Component" -msgstr "주소 구성요소" +msgstr "주소 구성 요소" #: crypt32.rc:82 msgid "Street Address" @@ -1473,7 +1473,7 @@ msgstr "거리 주소" #: crypt32.rc:83 msgid "Serial Number" -msgstr "시리얼 번호" +msgstr "일련 번호" #: crypt32.rc:84 msgid "CA Version" @@ -1481,15 +1481,15 @@ msgstr "CA 버전" #: crypt32.rc:85 msgid "Cross CA Version" -msgstr "교차 CA 버전" +msgstr "상호 CA 버전" #: crypt32.rc:86 msgid "Serialized Signature Serial Number" -msgstr "직렬화된 서명 일련 번호" +msgstr "순차적인 서명 일련 번호" #: crypt32.rc:87 msgid "Principal Name" -msgstr "주요한 이름" +msgstr "주체 이름" #: crypt32.rc:88 msgid "Windows Product Update" @@ -1505,7 +1505,7 @@ msgstr "OS 버전" #: crypt32.rc:91 msgid "Enrollment CSP" -msgstr "CSP 등록" +msgstr "등록 CSP" #: crypt32.rc:92 msgid "CRL Number" @@ -1517,7 +1517,7 @@ msgstr "델타 CRL 표시기" #: crypt32.rc:94 msgid "Issuing Distribution Point" -msgstr "발행자 배포 위치" +msgstr "배포 지점 발급 중" #: crypt32.rc:95 msgid "Freshest CRL" @@ -1525,31 +1525,31 @@ msgstr "최신 CRL" #: crypt32.rc:96 msgid "Name Constraints" -msgstr "이름 제약" +msgstr "이름 제약 조건" #: crypt32.rc:97 msgid "Policy Mappings" -msgstr "정책 대응" +msgstr "정책 매핑" #: crypt32.rc:98 msgid "Policy Constraints" -msgstr "정책 제약" +msgstr "정책 제약 조건" #: crypt32.rc:99 msgid "Cross-Certificate Distribution Points" -msgstr "상호 인증 분배 위치" +msgstr "상호 인증서 배포 지점" #: crypt32.rc:100 msgid "Application Policies" -msgstr "프로그램 방침" +msgstr "프로그램 정책" #: crypt32.rc:101 msgid "Application Policy Mappings" -msgstr "프로그램 정책 대응" +msgstr "프로그램 정책 매핑" #: crypt32.rc:102 msgid "Application Policy Constraints" -msgstr "프로그램 정책 제약" +msgstr "프로그램 정책 제약 조건" #: crypt32.rc:103 msgid "CMC Data" @@ -1561,7 +1561,7 @@ msgstr "CMC 응답" #: crypt32.rc:105 msgid "Unsigned CMC Request" -msgstr "서명되지 않은CMC 요청" +msgstr "서명되지 않은 CMC 요청" #: crypt32.rc:106 msgid "CMC Status Info" @@ -1573,7 +1573,7 @@ msgstr "CMC 확장" #: crypt32.rc:108 msgid "CMC Attributes" -msgstr "CMC 속성" +msgstr "CMC 특성" #: crypt32.rc:109 msgid "PKCS 7 Data" @@ -1581,27 +1581,27 @@ msgstr "PKCS 7 데이터" #: crypt32.rc:110 msgid "PKCS 7 Signed" -msgstr "PKCS 7 서명" +msgstr "서명된 PKCS 7" #: crypt32.rc:111 msgid "PKCS 7 Enveloped" -msgstr "PKCS 7 싸개" +msgstr "포장된 PKCS 7" #: crypt32.rc:112 msgid "PKCS 7 Signed Enveloped" -msgstr "PKCS 7 서명된 싸개" +msgstr "서명 포장된 PKCS 7" #: crypt32.rc:113 msgid "PKCS 7 Digested" -msgstr "PKCS 7 요약" +msgstr "요약된 PKCS 7" #: crypt32.rc:114 msgid "PKCS 7 Encrypted" -msgstr "PKCS 7 암호화" +msgstr "암호화 된 PKCS 7" #: crypt32.rc:115 msgid "Previous CA Certificate Hash" -msgstr "이전의 CA 인증 해쉬" +msgstr "이전 CA 인증서 해시" #: crypt32.rc:116 msgid "Virtual Base CRL Number" @@ -1609,27 +1609,27 @@ msgstr "가상 기반 CRL 숫자" #: crypt32.rc:117 msgid "Next CRL Publish" -msgstr "다음 CRL 발행" +msgstr "다음 CRL 게시" #: crypt32.rc:118 msgid "CA Encryption Certificate" -msgstr "CA 암호 인증" +msgstr "CA 암호화 인증서" #: crypt32.rc:119 cryptui.rc:148 msgid "Key Recovery Agent" -msgstr "키 복구 관리자" +msgstr "키 복구 에이전트" #: crypt32.rc:120 msgid "Certificate Template Information" -msgstr "인증 주형 정보" +msgstr "인증서 서식 정보" #: crypt32.rc:121 msgid "Enterprise Root OID" -msgstr "기업 루트 OID" +msgstr "엔터프라이즈 루트 OID" #: crypt32.rc:122 msgid "Dummy Signer" -msgstr "더미 사인자" +msgstr "더미 서명자" #: crypt32.rc:123 msgid "Encrypted Private Key" @@ -1637,23 +1637,23 @@ msgstr "암호화된 개인 키" #: crypt32.rc:124 msgid "Published CRL Locations" -msgstr "발행된 CRL 위치" +msgstr "게시된 CRL 위치" #: crypt32.rc:125 msgid "Enforce Certificate Chain Policy" -msgstr "강제 인증 체인 정책" +msgstr "인증서 체인 정책 시행" #: crypt32.rc:126 msgid "Transaction Id" -msgstr "처리 아이디" +msgstr "트랜잭션 ID" #: crypt32.rc:127 msgid "Sender Nonce" -msgstr "임시 발송인" +msgstr "임시 보낸 사람" #: crypt32.rc:128 msgid "Recipient Nonce" -msgstr "임시 수령인" +msgstr "임시 받는 사람" #: crypt32.rc:129 msgid "Reg Info" @@ -1661,19 +1661,19 @@ msgstr "등록 정보" #: crypt32.rc:130 msgid "Get Certificate" -msgstr "인증서 얻기" +msgstr "인증서 가져오기" #: crypt32.rc:131 msgid "Get CRL" -msgstr "CRL 얻기" +msgstr "CRL 가져오기" #: crypt32.rc:132 msgid "Revoke Request" -msgstr "취소 요청" +msgstr "요청 해지" #: crypt32.rc:133 msgid "Query Pending" -msgstr "질문하는 중" +msgstr "대기 중인 쿼리" #: crypt32.rc:134 cryptui.rc:95 msgid "Certificate Trust List" @@ -1681,7 +1681,7 @@ msgstr "인증서 신뢰 목록" #: crypt32.rc:135 msgid "Archived Key Certificate Hash" -msgstr "압축된 키 인증 해쉬" +msgstr "저장된 키 인증서 해시" #: crypt32.rc:136 msgid "Private Key Usage Period" @@ -1709,23 +1709,23 @@ msgstr "보안 전자메일" #: crypt32.rc:142 msgid "Time Stamping" -msgstr "시간 날인" +msgstr "타임스탬프" #: crypt32.rc:143 msgid "Microsoft Trust List Signing" -msgstr "마이크로소프트 신뢰 목록 사인" +msgstr "Microsoft 신뢰 목록 서명" #: crypt32.rc:144 msgid "Microsoft Time Stamping" -msgstr "마이크로소프트 시간 날인" +msgstr "Microsoft 타임스탬프" #: crypt32.rc:145 msgid "IP security end system" -msgstr "IP 보안 종단 시스템" +msgstr "IP 보안 최종 시스템" #: crypt32.rc:146 msgid "IP security tunnel termination" -msgstr "IP 보안 터널 종료" +msgstr "IP 보안 터널 종료" #: crypt32.rc:147 msgid "IP security user" @@ -1733,7 +1733,7 @@ msgstr "IP 보안 사용자" #: crypt32.rc:148 msgid "Encrypting File System" -msgstr "암호화된 파일 시스템" +msgstr "파일 시스템 암호화" #: crypt32.rc:149 cryptui.rc:133 msgid "Windows Hardware Driver Verification" @@ -1741,15 +1741,15 @@ msgstr "Windows 하드웨어 드라이버 검증" #: crypt32.rc:150 cryptui.rc:134 msgid "Windows System Component Verification" -msgstr "Windows 시스템 구성요소 검증" +msgstr "Windows 시스템 구성 요소 검증" #: crypt32.rc:151 cryptui.rc:135 msgid "OEM Windows System Component Verification" -msgstr "OEM Windows 시스템 구성요소 검증" +msgstr "OEM Windows 시스템 구성 요소 검증" #: crypt32.rc:152 cryptui.rc:136 msgid "Embedded Windows System Component Verification" -msgstr "내장 Windows 시스템 구성 요소 확인" +msgstr "임베디드 Windows 시스템 구성 요소 검증" #: crypt32.rc:153 cryptui.rc:143 msgid "Key Pack Licenses" @@ -1757,19 +1757,19 @@ msgstr "키 팩 라이선스" #: crypt32.rc:154 cryptui.rc:144 msgid "License Server Verification" -msgstr "라이선스 서버 확인" +msgstr "라이선스 서버 검증" #: crypt32.rc:155 cryptui.rc:146 msgid "Smart Card Logon" -msgstr "스마트 카드 로그인" +msgstr "스마트 카드 로그온" #: crypt32.rc:156 cryptui.rc:142 msgid "Digital Rights" -msgstr "디지털 저작권" +msgstr "디지털 권한" #: crypt32.rc:157 cryptui.rc:138 msgid "Qualified Subordination" -msgstr "자격있는 종속" +msgstr "정규 종속" #: crypt32.rc:158 cryptui.rc:139 msgid "Key Recovery" @@ -1781,7 +1781,7 @@ msgstr "문서 서명" #: crypt32.rc:160 msgid "IP security IKE intermediate" -msgstr "IP 보안 IKE 수단" +msgstr "IP 보안 IKE 중개" #: crypt32.rc:161 cryptui.rc:132 msgid "File Recovery" @@ -1793,23 +1793,23 @@ msgstr "루트 목록 서명자" #: crypt32.rc:163 msgid "All application policies" -msgstr "모든 프로그램의 방침" +msgstr "전체 프로그램 정책" #: crypt32.rc:164 cryptui.rc:149 msgid "Directory Service Email Replication" -msgstr "디렉터리 서비스 전자메일 응답" +msgstr "디렉터리 서비스 전자메일 복제" #: crypt32.rc:165 cryptui.rc:145 msgid "Certificate Request Agent" -msgstr "인증 요구 관리자" +msgstr "인증서 요청 에이전트" #: crypt32.rc:166 cryptui.rc:141 msgid "Lifetime Signing" -msgstr "유효기간" +msgstr "영구 서명" #: crypt32.rc:167 msgid "All issuance policies" -msgstr "모든 배포 방침" +msgstr "전체 발급 정책" #: crypt32.rc:172 msgid "Trusted Root Certification Authorities" @@ -1829,7 +1829,7 @@ msgstr "다른 사람" #: crypt32.rc:176 msgid "Trusted Publishers" -msgstr "신뢰할 수 있는 발행자" +msgstr "신뢰할 수 있는 게시자" #: crypt32.rc:177 msgid "Untrusted Certificates" @@ -1837,15 +1837,15 @@ msgstr "신뢰할 수 없는 인증서" #: crypt32.rc:182 msgid "KeyID=" -msgstr "키 아이디=" +msgstr "키ID=" #: crypt32.rc:183 msgid "Certificate Issuer" -msgstr "인증서 발행자" +msgstr "인증서 발급자" #: crypt32.rc:184 msgid "Certificate Serial Number=" -msgstr "인증서 시리얼 번호=" +msgstr "인증서 일련 번호=" #: crypt32.rc:185 msgid "Other Name=" @@ -1861,7 +1861,7 @@ msgstr "DNS 이름=" #: crypt32.rc:188 msgid "Directory Address" -msgstr "디렉터리 주소" +msgstr "디렉터리 주소" #: crypt32.rc:189 msgid "URL=" @@ -1885,29 +1885,29 @@ msgstr "알 수 없는 키 사용" #: crypt32.rc:194 msgid "Subject Type=" -msgstr "제목 형식=" +msgstr "주제 종류=" #: crypt32.rc:195 msgctxt "Certificate Authority" msgid "CA" -msgstr "CA" +msgstr "CA(인증기관)" #: crypt32.rc:196 msgid "End Entity" -msgstr "엔티티 끝" +msgstr "엔티티 종료" #: crypt32.rc:197 msgid "Path Length Constraint=" -msgstr "제한된 경로 길이 =" +msgstr "경로 길이 제한=" #: crypt32.rc:198 msgctxt "path length" msgid "None" -msgstr "None" +msgstr "없음" #: crypt32.rc:199 msgid "Information Not Available" -msgstr "정보가 없음" +msgstr "사용 가능한 정보 없음" #: crypt32.rc:200 msgid "Authority Info Access" @@ -1920,11 +1920,11 @@ msgstr "접근 방법=" #: crypt32.rc:202 msgctxt "Online Certificate Status Protocol" msgid "OCSP" -msgstr "OCSP" +msgstr "OCSP(온라인 인증서 상태 프로토콜)" #: crypt32.rc:203 msgid "CA Issuers" -msgstr "CA 발행자" +msgstr "CA 발급자" #: crypt32.rc:204 msgid "Unknown Access Method" @@ -1936,11 +1936,11 @@ msgstr "대체 이름" #: crypt32.rc:206 msgid "CRL Distribution Point" -msgstr "CRL 분배 포인트" +msgstr "CRL 배포 지점" #: crypt32.rc:207 msgid "Distribution Point Name" -msgstr "분배 포인트 이름" +msgstr "배포 지점 이름" #: crypt32.rc:208 msgid "Full Name" @@ -1956,47 +1956,47 @@ msgstr "CRL 원인=" #: crypt32.rc:211 msgid "CRL Issuer" -msgstr "CRL 발행자" +msgstr "CRL 발급자" #: crypt32.rc:212 msgid "Key Compromise" -msgstr "키 협정" +msgstr "키 손상" #: crypt32.rc:213 msgid "CA Compromise" -msgstr "CA 협정" +msgstr "CA 손상" #: crypt32.rc:214 msgid "Affiliation Changed" -msgstr "소속 바꾸기" +msgstr "소속이 바뀜" #: crypt32.rc:215 msgid "Superseded" -msgstr "대체" +msgstr "교체됨" #: crypt32.rc:216 msgid "Operation Ceased" -msgstr "작업 중지" +msgstr "작업 중지됨" #: crypt32.rc:217 msgid "Certificate Hold" -msgstr "인증서 유지" +msgstr "인증서 대기" #: crypt32.rc:218 msgid "Financial Information=" -msgstr "재무 정보=" +msgstr "재정 정보=" #: crypt32.rc:219 taskmgr.rc:397 msgid "Available" -msgstr "가능함" +msgstr "사용 가능함" #: crypt32.rc:220 msgid "Not Available" -msgstr "불가능함" +msgstr "사용 가능하지 않음" #: crypt32.rc:221 msgid "Meets Criteria=" -msgstr "맞는 기준 =" +msgstr "기준에 부합=" #: crypt32.rc:222 cryptui.rc:166 oleaut32.rc:32 wininet.rc:83 ipconfig.rc:47 msgid "Yes" @@ -2008,7 +2008,7 @@ msgstr "아니요" #: crypt32.rc:224 msgid "Digital Signature" -msgstr "전자 서명" +msgstr "디지털 서명" #: crypt32.rc:225 msgid "Non-Repudiation" @@ -2024,15 +2024,15 @@ msgstr "데이터 암호화" #: crypt32.rc:228 msgid "Key Agreement" -msgstr "키 보증서" +msgstr "키 계약" #: crypt32.rc:229 msgid "Certificate Signing" -msgstr "증명서 서명" +msgstr "인증서 서명" #: crypt32.rc:230 msgid "Off-line CRL Signing" -msgstr "오프라인 CRL 사인" +msgstr "오프라인 CRL 서명" #: crypt32.rc:231 msgid "CRL Signing" @@ -2040,11 +2040,11 @@ msgstr "CRL 서명" #: crypt32.rc:232 msgid "Encipher Only" -msgstr "오직 암호화만 함" +msgstr "암호화만" #: crypt32.rc:233 msgid "Decipher Only" -msgstr "오직 복호화만" +msgstr "암호 해독만" #: crypt32.rc:234 msgid "SSL Client Authentication" @@ -2056,7 +2056,7 @@ msgstr "SSL 서버 인증" #: crypt32.rc:236 msgid "S/MIME" -msgstr "S/MIME" +msgstr "보안메일" #: crypt32.rc:237 msgid "Signature" @@ -2064,19 +2064,19 @@ msgstr "서명" #: crypt32.rc:238 msgid "SSL CA" -msgstr "SSL CA" +msgstr "SSL 인증기관" #: crypt32.rc:239 msgid "S/MIME CA" -msgstr "S/MIME CA" +msgstr "보안메일 인증기관" #: crypt32.rc:240 msgid "Signature CA" -msgstr "CA 서명" +msgstr "서명 인증기관" #: cryptdlg.rc:30 msgid "Certificate Policy" -msgstr "인증 방침" +msgstr "인증서 정책" #: cryptdlg.rc:31 msgid "Policy Identifier: " @@ -4225,7 +4225,7 @@ msgstr "루트 디렉터리의 하위 디렉터리가 아닙니다.\n" #: winerror.mc:593 msgid "Directory is not empty.\n" -msgstr "디렉터리가 비워 있지 않습니다.\n" +msgstr "디렉터리가 비어 있지 않습니다.\n" #: winerror.mc:598 msgid "Path is in use as a SUBST.\n" @@ -6793,541 +6793,387 @@ msgstr "메일 보내기" #: mferror.mc:249 mferror.mc:256 msgid "Begin request has already been made.\n" -msgstr "" +msgstr "시작 요청이 이미 이루어졌습니다.\n" #: mferror.mc:599 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Sink has not been finalized.\n" -msgstr "UUID 객체를 찾을 수 없습니다.\n" +msgstr "싱크가 완료되지 않았습니다.\n" #: mferror.mc:32 -#, fuzzy -#| msgid "Installation platform not supported.\n" msgid "Media Foundation platform is not initialized.\n" -msgstr "설치 플랫폼을 지원하지 않음.\n" +msgstr "미디어 기초 플랫폼이 최기화되지 않았습니다.\n" #: mferror.mc:39 -#, fuzzy -#| msgid "Byte count too small.\n" msgid "Buffer is too small.\n" -msgstr "바이트 카운트가 너무 작습니다.\n" +msgstr "버퍼가 너무 작습니다.\n" #: mferror.mc:46 -#, fuzzy -#| msgid "Invalid query syntax.\n" msgid "Invalid request.\n" -msgstr "잘못된 쿼리 구문.\n" +msgstr "잘못된 요청입니다.\n" #: mferror.mc:53 -#, fuzzy -#| msgid "Invalid segment number.\n" msgid "Invalid stream number.\n" -msgstr "올바르지 않은 세그멘트 번호.\n" +msgstr "스트림 번호가 잘못되었습니다.\n" #: mferror.mc:60 -#, fuzzy -#| msgid "Invalid data type.\n" msgid "Invalid media type.\n" -msgstr "올바르지 않은 데이터 형식.\n" +msgstr "미디어 형식이 잘못되었습니다.\n" #: mferror.mc:67 -#, fuzzy -#| msgid "No more entries.\n" msgid "No more input is accepted.\n" -msgstr "더 이상 엔트리가 없습니다.\n" +msgstr "더 이상 입력이 허용되지 않습니다.\n" #: mferror.mc:74 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Object is not initialized.\n" -msgstr "UUID 객체를 찾을 수 없습니다.\n" +msgstr "객체가 초기화되지 않았습니다.\n" #: mferror.mc:81 -#, fuzzy -#| msgid "Operation not supported.\n" msgid "Representation is not supported.\n" -msgstr "이 작업은 지원하지 않습니다.\n" +msgstr "표현이 지원되지 않습니다.\n" #: mferror.mc:88 msgid "No more types in the list of suggested media types.\n" -msgstr "" +msgstr "제안된 미디어 형식 목록에 더 이상 형식이 없습니다.\n" #: mferror.mc:95 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported service.\n" -msgstr "지원하지 않는 형식.\n" +msgstr "지원되지 않는 서비스입니다.\n" #: mferror.mc:102 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Unexpected error.\n" -msgstr "예기치 않은 네트워크 오류.\n" +msgstr "예상치 못한 오류입니다.\n" #: mferror.mc:116 -#, fuzzy -#| msgid "Invalid time.\n" msgid "Invalid type.\n" -msgstr "올바르지 않은 시간.\n" +msgstr "올바르지 않은 형식입니다.\n" #: mferror.mc:123 -#, fuzzy -#| msgid "Invalid pixel format.\n" msgid "Invalid file format.\n" -msgstr "올바르지 않은 픽셀 형식.\n" +msgstr "올바르지 않은 파일 형식입니다.\n" #: mferror.mc:137 -#, fuzzy -#| msgid "Invalid time.\n" msgid "Invalid timestamp.\n" -msgstr "올바르지 않은 시간.\n" +msgstr "올바르지 않은 타임스탬프입니다.\n" #: mferror.mc:144 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported scheme.\n" -msgstr "지원하지 않는 형식.\n" +msgstr "지원되지 않는 스키마입니다.\n" #: mferror.mc:151 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported bytestream type.\n" -msgstr "지원하지 않는 형식.\n" +msgstr "지원되지 않는 바이트스트림 형식입니다.\n" #: mferror.mc:158 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported time format.\n" -msgstr "지원하지 않는 형식.\n" +msgstr "지원되지 않는 시간 형식입니다.\n" #: mferror.mc:165 msgid "Timestamp is not set for the sample.\n" -msgstr "" +msgstr "이 샘플에 대한 타임스탬프가 설정되지 않았습니다.\n" #: mferror.mc:172 msgid "No duration set for the sample.\n" -msgstr "" +msgstr "이 샘플에 대한 기간(duration) 설정이 없습니다.\n" #: mferror.mc:179 -#, fuzzy -#| msgid "Invalid data.\n" msgid "Invalid stream data.\n" -msgstr "올바르지 않은 데이터.\n" +msgstr "올바르지 않은 스트림 데이터입니다.\n" #: mferror.mc:186 -#, fuzzy -#| msgid "Help not available." msgid "Realtime support is not available.\n" -msgstr "도움말은 가능하지않습니다." +msgstr "실시간 지원은 가능하지 않습니다.\n" #: mferror.mc:193 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported rate.\n" -msgstr "지원하지 않는 형식.\n" +msgstr "지원하지 않는 비율(rate).\n" #: mferror.mc:200 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported thinning.\n" -msgstr "지원하지 않는 형식.\n" +msgstr "지원하지 않는 세선화(thinning).\n" #: mferror.mc:207 -#, fuzzy -#| msgid "Request not supported.\n" msgid "Reversing is not supported.\n" -msgstr "지원되지 않는 요청.\n" +msgstr "리버싱(reversing)은 지원되지 않습니다.\n" #: mferror.mc:214 -#, fuzzy -#| msgid "Unsupported authorization level.\n" msgid "Unsupported rate transition.\n" -msgstr "지원하지 않는 인증 레벨.\n" +msgstr "지원하지 않는 비율(rate) 변환.\n" #: mferror.mc:221 msgid "Rate change was preempted.\n" -msgstr "" +msgstr "비율(rate) 변경이 선점되었습니다.\n" #: mferror.mc:228 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Object or value wasn't found.\n" -msgstr "UUID 객체를 찾을 수 없습니다.\n" +msgstr "객체 또는 값을 찾을 수 없습니다.\n" #: mferror.mc:235 -#, fuzzy -#| msgid "Help not available." msgid "Value is not available.\n" -msgstr "도움말은 가능하지않습니다." +msgstr "값을 사용할 수 없습니다.\n" #: mferror.mc:242 -#, fuzzy -#| msgid "Help not available." msgid "Clock is not available.\n" -msgstr "도움말은 가능하지않습니다." +msgstr "시계를 사용할 수 없습니다.\n" #: mferror.mc:263 -#, fuzzy -#| msgid "Extended attributes not supported.\n" msgid "Multiple subscribers are not supported.\n" -msgstr "지원되지 않는 확장 속성.\n" +msgstr "다중 가입자는 지원되지 않습니다.\n" #: mferror.mc:270 -#, fuzzy -#| msgid "The driver was not enabled." msgid "The timer was orphaned.\n" -msgstr "드라이버를 사용할 수 없습니다." +msgstr "타이머가 고립되었습니다.\n" #: mferror.mc:277 -#, fuzzy -#| msgid "Character translation table open failed.\n" msgid "State transition is pending.\n" -msgstr "문자변환테이블 열기 실패.\n" +msgstr "상태 전환이 보류 중입니다.\n" #: mferror.mc:284 -#, fuzzy -#| msgid "Unsupported authorization level.\n" msgid "Unsupported state transition.\n" -msgstr "지원하지 않는 인증 레벨.\n" +msgstr "지원되지 않는 상태 전환.\n" #: mferror.mc:291 -#, fuzzy -#| msgid "An internal error has occurred.\n" msgid "Unrecoverable error occurred.\n" -msgstr "내부 오류 발생.\n" +msgstr "복구할 수 없는 오류가 발생했습니다.\n" #: mferror.mc:298 msgid "Sample has too many buffers.\n" -msgstr "" +msgstr "샘플에 버퍼가 너무 많습니다.\n" #: mferror.mc:305 -#, fuzzy -#| msgid "Temporary directory not writable.\n" msgid "Sample is not writable.\n" -msgstr "임시 디렉터리에 기록할 수 없음.\n" +msgstr "샘플에 쓰기가 가능하지 않습니다.\n" #: mferror.mc:312 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "Key is invalid.\n" -msgstr "올바르지 않은 경로.\n" +msgstr "올바르지 않은 키.\n" #: mferror.mc:319 -#, fuzzy -#| msgid "Wrong stub version.\n" msgid "Bad startup version.\n" -msgstr "잘못된 스텁 버전.\n" +msgstr "잘못된 시작 버전.\n" #: mferror.mc:326 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported caption.\n" -msgstr "지원하지 않는 형식.\n" +msgstr "지원하지 않는 자막.\n" #: mferror.mc:333 -#, fuzzy -#| msgid "Invalid workstation.\n" msgid "Invalid position.\n" -msgstr "올바르지 않은 워크스테이션.\n" +msgstr "올바르지 않은 위치.\n" #: mferror.mc:340 -#, fuzzy -#| msgid "File not found.\n" msgid "Attribute is not found.\n" -msgstr "파일을 찾을 수 없습니다.\n" +msgstr "특성을 찾을 수 없습니다.\n" #: mferror.mc:347 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Property type is not allowed.\n" -msgstr "허용되지 않은 훅 형식.\n" +msgstr "속성 형식이 허용되지 않습니다.\n" #: mferror.mc:354 -#, fuzzy -#| msgid "Operation not supported.\n" msgid "Property type is not supported.\n" -msgstr "이 작업은 지원하지 않습니다.\n" +msgstr "속성 형식이 지원되지 않습니다.\n" #: mferror.mc:361 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is empty.\n" -msgstr "디렉터리가 비워 있지 않습니다.\n" +msgstr "속성이 비어 있습니다.\n" #: mferror.mc:368 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is not empty.\n" -msgstr "디렉터리가 비워 있지 않습니다.\n" +msgstr "속성이 비어 있지 않습니다.\n" #: mferror.mc:375 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Vector property is not allowed.\n" -msgstr "허용되지 않은 훅 형식.\n" +msgstr "벡터 속성이 허용되지 않습니다.\n" #: mferror.mc:382 msgid "Vector property is required.\n" -msgstr "" +msgstr "벡터 속성이 필요합니다.\n" #: mferror.mc:389 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "Operation was cancelled.\n" -msgstr "작업이 사용자에 위해 취소됨.\n" +msgstr "작업이 취소되었습니다.\n" #: mferror.mc:396 -#, fuzzy -#| msgid "Server not disabled.\n" msgid "Bytestream is not seekable.\n" -msgstr "서버가 가능하지 않지가 않음.\n" +msgstr "바이트 스트림은 검색할 수 없습니다.\n" #: mferror.mc:403 msgid "Platform is disabled in safe mode.\n" -msgstr "" +msgstr "안전 모드에서 플랫폼을 사용할 수 없습니다.\n" #: mferror.mc:410 -#, fuzzy -#| msgid "Cannot create service thread.\n" msgid "Cannot parse bytestream.\n" -msgstr "서비스 스레드 만들기 실패.\n" +msgstr "바이트 스트림을 구문 분석할 수 없습니다.\n" #: mferror.mc:417 msgid "Mutually exclusive flags passed to source resolver.\n" -msgstr "" +msgstr "상호 배타적이 플래그가 소스 확인자로 전달되었습니다.\n" #: mferror.mc:424 -#, fuzzy -#| msgid "Unknown interface.\n" msgid "Unknown bytestream length.\n" -msgstr "알 수 없는 인터페이스.\n" +msgstr "알 수 없는 바이트 스트림 길이입니다.\n" #: mferror.mc:431 -#, fuzzy -#| msgid "Invalid index.\n" msgid "Invalid work queue index.\n" -msgstr "올바르지 않은 인덱스.\n" +msgstr "올바르지 않은 작업 큐 인덱스.\n" #: mferror.mc:438 -#, fuzzy -#| msgid "No logon servers available.\n" msgid "No events available.\n" -msgstr "로그온 서버를 이용할 수 없습니다.\n" +msgstr "사용할 수 있는 이벤트가 없습니다.\n" #: mferror.mc:445 -#, fuzzy -#| msgid "Unsupported authorization level.\n" msgid "Invalid media source state transition.\n" -msgstr "지원하지 않는 인증 레벨.\n" +msgstr "올바르지 않은 미디어 소스 상태 전환.\n" #: mferror.mc:452 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "End of media stream has been reached.\n" -msgstr "레지스트리는 복구되었습니다.\n" +msgstr "미디어 스트림의 끝에 도달했습니다.\n" #: mferror.mc:459 msgid "Shutdown() was called.\n" -msgstr "" +msgstr "Shutdown()이 호출되었습니다.\n" #: mferror.mc:466 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media stream has no duration set.\n" -msgstr "레지스트리는 복구되었습니다.\n" +msgstr "미디어 스트림에 기간 설정이 없습니다.\n" #: mferror.mc:473 msgid "Media format was recognized but is invalid.\n" -msgstr "" +msgstr "미디어 형식이 인식되었지만 올바르지 않습니다.\n" #: mferror.mc:480 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Property wasn't found.\n" -msgstr "속성 집합을 찾을 수 없습니다.\n" +msgstr "속성을 찾을 수 없습니다.\n" #: mferror.mc:487 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is read-only.\n" -msgstr "디렉터리가 비워 있지 않습니다.\n" +msgstr "속성이 읽기 전용입니다.\n" #: mferror.mc:494 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Property is not allowed.\n" -msgstr "허용되지 않은 훅 형식.\n" +msgstr "속성이 허용되지 않습니다.\n" #: mferror.mc:501 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is not started.\n" -msgstr "리소스 사용 중.\n" +msgstr "미디어 소스가 시작되지 않았습니다.\n" #: mferror.mc:508 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported media format.\n" -msgstr "지원하지 않는 형식.\n" +msgstr "지원하지 않는 미디어 형식.\n" #: mferror.mc:515 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is in wrong state.\n" -msgstr "리소스 사용 중.\n" +msgstr "미디어 소스가 잘못된 상태에 있습니다.\n" #: mferror.mc:522 -#, fuzzy -#| msgid "No data detected.\n" msgid "No media streams were selected.\n" -msgstr "감지된 데이터가 없습니다.\n" +msgstr "미디어 스트림이 선택되지 않았습니다.\n" #: mferror.mc:529 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported media source characteristics.\n" -msgstr "지원하지 않는 형식.\n" +msgstr "지원되지 않는 미디어 소스 특성입니다.\n" #: mferror.mc:536 msgid "Stream sink was removed.\n" -msgstr "" +msgstr "스트림 싱크가 제거되었습니다.\n" #: mferror.mc:543 msgid "Stream sinks are out of sync.\n" -msgstr "" +msgstr "스트림 싱크가 동기화되지 않습니다.\n" #: mferror.mc:550 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media sink stream sinks set is fixed.\n" -msgstr "레지스트리는 복구되었습니다.\n" +msgstr "미디어 싱크 스트림 싱크 세트가 고정되어 있습니다.\n" #: mferror.mc:557 -#, fuzzy -#| msgid "Domain already exists.\n" msgid "Stream sink already exists.\n" -msgstr "도메인은 이미 존재합니다.\n" +msgstr "스트림 싱크가 이미 존재합니다.\n" #: mferror.mc:564 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "Sample allocation was canceled.\n" -msgstr "작업이 사용자에 위해 취소됨.\n" +msgstr "샘플 할당이 취소되었습니다.\n" #: mferror.mc:571 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Sample allocator is empty.\n" -msgstr "디렉터리가 비워 있지 않습니다.\n" +msgstr "샘플 할당자가 비어 있습니다.\n" #: mferror.mc:578 -#, fuzzy -#| msgid "Class already exists.\n" msgid "Sink was already stopped.\n" -msgstr "클래스는 이미 존재합니다.\n" +msgstr "싱크가 이미 중지되었습니다.\n" #: mferror.mc:585 msgid "Bitrate was unknown for ASF file sink.\n" -msgstr "" +msgstr "ASF 파일 싱크에 대한 비트레이트를 알 수 없습니다.\n" #: mferror.mc:592 -#, fuzzy -#| msgid "No data detected.\n" msgid "No streams were selected for the sink.\n" -msgstr "감지된 데이터가 없습니다.\n" +msgstr "싱크에 대한 스트림이 선택되지 않았습니다.\n" #: mferror.mc:606 -#, fuzzy -#| msgid "File name is too long.\n" msgid "Metadata was too long.\n" -msgstr "너무 긴 파일 이름.\n" +msgstr "메타데이터가 너무 깁니다.\n" #: mferror.mc:613 msgid "No samples were processed by the sink.\n" -msgstr "" +msgstr "싱크가 샘플을 처리하지 않았습니다.\n" #: mferror.mc:620 msgid "Sink was not provided with required headers.\n" -msgstr "" +msgstr "싱크가 필요한 헤더를 제공하지 않았습니다.\n" #: mferror.mc:627 -#, fuzzy -#| msgid "Connection invalid.\n" msgid "Optional node is invalid.\n" -msgstr "올바르지 않은 연결.\n" +msgstr "선택적 노드가 올바르지 않습니다.\n" #: mferror.mc:634 -#, fuzzy -#| msgid "Cannot find the printer." msgid "Cannot find decryptor.\n" -msgstr "프린터를 찾을 수 없습니다." +msgstr "암호 해독기를 찾을 수 없습니다.\n" #: mferror.mc:641 -#, fuzzy -#| msgid "Module not found.\n" msgid "Codec was not found.\n" -msgstr "모듈을 찾을 수 없습니다.\n" +msgstr "코덱을 찾을 수 없습니다.\n" #: mferror.mc:648 -#, fuzzy -#| msgid "Cannot get call handle.\n" msgid "Cannot connect topology nodes.\n" -msgstr "호출 핸들을 얻을 수 없습니다.\n" +msgstr "토폴로지 노드를 연결할 수 없습니다.\n" #: mferror.mc:655 -#, fuzzy -#| msgid "Request not supported.\n" msgid "Topology request is not supported.\n" -msgstr "지원되지 않는 요청.\n" +msgstr "토폴로지 요청이 지원되지 않습니다.\n" #: mferror.mc:662 -#, fuzzy -#| msgid "Invalid group attributes.\n" msgid "Invalid topology time attributes.\n" -msgstr "올바르지 않은 그룹 속성.\n" +msgstr "올바르지 않은 토폴로지 시간 특성.\n" #: mferror.mc:669 msgid "Found loops in topology.\n" -msgstr "" +msgstr "토폴로지에 루프가 있습니다.\n" #: mferror.mc:676 -#, fuzzy -#| msgid "Installation source is missing.\n" msgid "Presentation descriptor is missing.\n" -msgstr "설치 원본이 없음.\n" +msgstr "프리젠테이션 설명자가 없습니다.\n" #: mferror.mc:683 -#, fuzzy -#| msgid "Index is missing.\n" msgid "Stream descriptor is missing.\n" -msgstr "인덱스가 빠짐.\n" +msgstr "스트림 설명자가 없습니다.\n" #: mferror.mc:690 -#, fuzzy -#| msgid "The device is not connected.\n" msgid "Stream descriptor is not selected.\n" -msgstr "장치가 연결되지 않았습니다.\n" +msgstr "스트림 설명자가 선택되지 않았습니다.\n" #: mferror.mc:697 -#, fuzzy -#| msgid "Index is missing.\n" msgid "Source is missing.\n" -msgstr "인덱스가 빠짐.\n" +msgstr "소스가 없습니다.\n" #: mferror.mc:704 msgid "Topology loader does not support sink activates.\n" -msgstr "" +msgstr "토폴로지 로더가 싱크 활성화를 지원하지 않습니다.\n" #: mferror.mc:711 msgid "Clock has no time source set.\n" -msgstr "" +msgstr "시계가 시간 소스 설정을 가지고 있지 않습니다.\n" #: mferror.mc:718 -#, fuzzy -#| msgid "Class already exists.\n" msgid "Clock state was already set.\n" -msgstr "클래스는 이미 존재합니다.\n" +msgstr "시계 상태가 이미 설정되었습니다.\n" #: mpr.rc:35 wininet.rc:37 msgid "Enter Network Password" @@ -11104,16 +10950,12 @@ msgstr "" "다." #: winmm.rc:128 -#, fuzzy -#| msgid "" -#| "The specified MIDI port is already in use. Wait until it is free; then " -#| "try again." msgid "" "The specified MIDI port is already in use. Wait until it is free, and then " "try again." msgstr "" -"저정한 MIDI 포트는 이미 사용 중입니다. 사용할 수 있을 때까지 기다른 다음 다" -"시 시도하십시오." +"저정한 MIDI 포트는 이미 사용 중입니다. 사용할 수 있을 때까지 기다렸다가 다시 " +"시도하십시오." #: winmm.rc:131 msgid "" @@ -11128,16 +10970,12 @@ msgid "An error occurred with the specified port." msgstr "지정한 포트에 오류가 발생했습니다." #: winmm.rc:133 -#, fuzzy -#| msgid "" -#| "All multimedia timers are being used by other applications. Quit one of " -#| "these applications; then, try again." msgid "" "All multimedia timers are being used by other applications. Quit one of " "these applications, and then try again." msgstr "" -"모든 멀티미디어 타이머는 다른 프로그램에서 사용되고 있습니다. 이들 프로그램 " -"중 하나를 종료한 다음 다시 시도하십시오." +"모든 멀티미디어 타이머는 다른 프로그램에서 사용되고 있습니다. 이 중 하나를 종" +"료한 다음 다시 시도하십시오." #: winmm.rc:132 msgid "The system doesn't have a current MIDI port specified." @@ -13650,7 +13488,7 @@ msgstr "reg: 인식되지 않는 이스케이프 시퀀스 [\\%1!c!]\n" #: reg.rc:70 msgid "REG EXPORT key_name file.reg [/y]\n" -msgstr "REG EXPORT 키_이름 파일.reg [/y]\n" +msgstr "REG EXPORT key_name 파일.reg [/y]\n" #: reg.rc:71 msgid "reg: Invalid system key [%1]\n" @@ -15262,7 +15100,7 @@ msgstr "정규 메타파일 보기" #: view.rc:50 msgid "Metafiles (*.wmf, *.emf)" -msgstr "" +msgstr "메타파일 (*.wmf, *.emf)" #: wineboot.rc:31 msgid "Waiting for Program" @@ -15286,7 +15124,7 @@ msgstr "" #: wineboot.rc:46 msgid "The Wine configuration in %s is being updated, please wait..." -msgstr "%s 안의 Wine 설정을 업데이트하고 있습니다. 잠시만 기다려주십시오..." +msgstr "Wine 설정(%s)을 업데이트하고 있습니다. 잠시만 기다려주십시오..." # 라이선스 문구는 번역하지 않습니다. #: winecfg.rc:141 @@ -15433,10 +15271,6 @@ msgid "Drive configuration" msgstr "드라이브 구성" #: winecfg.rc:233 -#, fuzzy -#| msgid "" -#| "Failed to connect to the mount manager, the drive configuration cannot be " -#| "edited." msgid "" "Failed to connect to the mount manager; the drive configuration cannot be " "edited." @@ -15727,12 +15561,6 @@ msgid "System drive" msgstr "시스템 드라이브" #: winecfg.rc:76 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete drive C?\n" -#| "\n" -#| "Most Windows applications expect drive C to exist, and will die messily " -#| "if it doesn't. If you proceed remember to recreate it!" msgid "" "Are you sure you want to delete drive C?\n" "\n" @@ -15742,8 +15570,8 @@ msgstr "" "드라이브 C 항목을 제거하시겠습니까?\n" "\n" "대부분의 Windows 프로그램은 C 드라이브가 있다고 예상합니다. C 드라이브가 없다" -"면 비정상적인 방법으로 종료합니다. 계속 진행한다면 반드시 C 드라이브를 다시 " -"만드십시오!" +"면 비정상적인 방법으로 종료합니다. 계속 진행려면, C 드라이브를 다시 만드십시" +"오!" #: winecfg.rc:77 msgctxt "Drive letter" @@ -16812,8 +16640,6 @@ msgid "Text documents (*.txt)" msgstr "텍스트 파일 (*.txt)" #: wordpad.rc:149 -#, fuzzy -#| msgid "Unicode text document (*.txt)" msgid "Unicode text documents (*.txt)" msgstr "유니코드 텍스트 문서 (*.txt)" @@ -17019,42 +16845,6 @@ msgid "D" msgstr "D" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/K] Copy file attributes, without this attributes are not preserved.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" -- 2.23.0

1 0

[PATCH] ntdll: File compile error on macos
by Alistair Leslie-Hughes 01 Nov '19

01 Nov '19

nt.c:3199:58: error: parameter name omitted static NTSTATUS fill_battery_state(SYSTEM_BATTERY_STATE *) Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/nt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 81bac70b0f..b6daa226b3 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -3196,7 +3196,7 @@ static NTSTATUS fill_battery_state(SYSTEM_BATTERY_STATE *bs) #else -static NTSTATUS fill_battery_state(SYSTEM_BATTERY_STATE *) +static NTSTATUS fill_battery_state(SYSTEM_BATTERY_STATE *bs) { FIXME("SystemBatteryState not implemented on this platform\n"); return STATUS_NOT_IMPLEMENTED; -- 2.24.0.rc1

1 0

[PATCH v5 7/7] ddraw/tests: Port TnLHal device test to ddraw7.c
by David Adam 01 Nov '19

01 Nov '19

1 0

[PATCH] qedit/mediadet: Check for failure from IEnumPins::Next().
by Zebediah Figura 01 Nov '19

01 Nov '19

Fixes a test crash when gstreamer is not present. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Thanks to Roberto Pungartnik for finding the crash. dlls/qedit/mediadet.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index b7a5abb80c..1d70a86a5a 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -456,7 +456,12 @@ static HRESULT GetSplitter(MediaDetImpl *This) IPin_Release(source_pin); goto retry; } - IEnumPins_Next(pins, 1, &splitter_pin, NULL); + if (IEnumPins_Next(pins, 1, &splitter_pin, NULL) != S_OK) + { + IEnumPins_Release(pins); + IPin_Release(source_pin); + goto retry; + } IEnumPins_Release(pins); hr = IPin_Connect(source_pin, splitter_pin, NULL); -- 2.23.0

1 0

[PATCH v2] shcore: Add GetScaleFactorForMonitor stub
by Esdras Tarsis 01 Nov '19

01 Nov '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48016 Signed-off-by: Esdras Tarsis <esdrastarsis(a)gmail.com> --- v2: Fix fixme concatenation for monitor and return of GetScaleFactorForMonitor function. --- dlls/shcore/main.c | 9 +++++++++ dlls/shcore/shcore.spec | 2 +- include/shellscalingapi.h | 22 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 6a6247930f..d8d6d4f8e2 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -1517,6 +1517,15 @@ void WINAPI SetProcessReference(IUnknown *obj) process_ref = obj; } +/************************************************************************* + * GetScaleFactorForMonitor [SHCORE.@] + */ +HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR monitor, DEVICE_SCALE_FACTOR *scale) +{ + FIXME("(%p, %p) - stub!\n", monitor, scale); + return SCALE_100_PERCENT; +} + struct thread_data { LPTHREAD_START_ROUTINE thread_proc; diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 6a634bdee5..d5b7a342e3 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -12,7 +12,7 @@ @ stdcall GetProcessDpiAwareness(long ptr) @ stdcall GetProcessReference(ptr) @ stub GetScaleFactorForDevice -@ stub GetScaleFactorForMonitor +@ stdcall GetScaleFactorForMonitor(long ptr) @ stub IStream_Copy @ stdcall IStream_Read(ptr ptr long) _IStream_Read @ stub IStream_ReadStr diff --git a/include/shellscalingapi.h b/include/shellscalingapi.h index 1df85d5982..80dab0178f 100644 --- a/include/shellscalingapi.h +++ b/include/shellscalingapi.h @@ -34,8 +34,30 @@ typedef enum PROCESS_DPI_AWARENESS PROCESS_PER_MONITOR_DPI_AWARE } PROCESS_DPI_AWARENESS; +typedef enum DEVICE_SCALE_FACTOR +{ + DEVICE_SCALE_FACTOR_INVALID, + SCALE_100_PERCENT, + SCALE_120_PERCENT, + SCALE_125_PERCENT, + SCALE_140_PERCENT, + SCALE_150_PERCENT, + SCALE_160_PERCENT, + SCALE_175_PERCENT, + SCALE_180_PERCENT, + SCALE_200_PERCENT, + SCALE_225_PERCENT, + SCALE_250_PERCENT, + SCALE_300_PERCENT, + SCALE_350_PERCENT, + SCALE_400_PERCENT, + SCALE_450_PERCENT, + SCALE_500_PERCENT +} DEVICE_SCALE_FACTOR; + HRESULT WINAPI GetDpiForMonitor(HMONITOR,MONITOR_DPI_TYPE,UINT*,UINT*); HRESULT WINAPI GetProcessDpiAwareness(HANDLE,PROCESS_DPI_AWARENESS*); HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS); +HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR,DEVICE_SCALE_FACTOR*); #endif /* __WINE_SHELLSCALINGAPI_H */ -- 2.23.0

2 1

[PATCH] wine.inf: Add Dynamic DST for US time zones.
by Daniel Lehman 01 Nov '19

01 Nov '19

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- was changed in 2006: https://github.com/eggert/tz/commit/7206869a52e4372115a8f3203efe4335c202140d --- loader/wine.inf.in | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 0ae057dc4c..df74f28e66 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2808,6 +2808,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"MUI_Std",,"@tzres.dll,-50192" HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"Std",,"Alaskan Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"TZI",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2006",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2007",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" HKLM,%CurrentVersionNT%\Time Zones\Arab Standard Time,"Display",,"Asia/Riyadh" HKLM,%CurrentVersionNT%\Time Zones\Arab Standard Time,"Dlt",,"Arab Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Arab Standard Time,"MUI_Dlt",,"@tzres.dll,-41969" @@ -2953,6 +2957,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time,"MUI_Std",,"@tzres.dll,-17456" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time,"Std",,"Central Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time,"TZI",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"2006",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"2007",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"Display",,"America/Mexico_City" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"Dlt",,"Central Daylight Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"MUI_Dlt",,"@tzres.dll,-32801" @@ -3004,6 +3012,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"MUI_Std",,"@tzres.dll,-30800" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"Std",,"Eastern Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"TZI",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2006",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2007",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"Display",,"Africa/Cairo" HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"Dlt",,"Egypt Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"MUI_Dlt",,"@tzres.dll,-59425" @@ -3299,6 +3311,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"MUI_Dlt",,"@tzres.dll HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"MUI_Std",,"@tzres.dll,-34352" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"Std",,"Mountain Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"TZI",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"2006",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"2007",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico),"Display",,"America/Chihuahua" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico),"Dlt",,"Mountain Daylight Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico),"MUI_Dlt",,"@tzres.dll,-7249" @@ -3368,6 +3384,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"MUI_Std",,"@tzres.dll,-11232" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Std",,"Pacific Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"TZI",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"2006",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"2007",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Display",,"America/Tijuana" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Dlt",,"Pacific Daylight Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"MUI_Dlt",,"@tzres.dll,-15585" -- 2.17.1

1 0

[PATCH] msvcrt: Cleanup sprintf tests.
by Piotr Caban 01 Nov '19

01 Nov '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/printf.c | 806 +++++++++---------------------------- 1 file changed, 193 insertions(+), 613 deletions(-)

4 3

[PATCH 1/1] qedit: Correct MediaDet_Release() crash.
by Roberto Pungartnik 31 Oct '19

31 Oct '19

2 1

[PATCH 1/1] secur32: reset phCredential->dwUpper at AcquireCredentialsHandleA
by Roberto Pungartnik 31 Oct '19

31 Oct '19

2 1

[PATCH v6 01/12] d3dcompiler: Fix declaration issues if used outside of d3dcompiler
by Connor McAdams 31 Oct '19

31 Oct '19

If used outside of other d3dcompiler_xx versions, GUID's do not need to be initialized, and when used for the reflection functions only, certain functions in utils.c don't need to be defined. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> --- dlls/d3dcompiler_43/reflection.c | 3 +++ dlls/d3dcompiler_43/utils.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index b163fca9e7..8f71bd9ce8 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -18,7 +18,10 @@ * */ +#ifdef D3D_COMPILER_VERSION #include "initguid.h" +#endif + #include "d3dcompiler_private.h" #include "winternl.h" diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 079bd1c6bc..27c0ba8c91 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -758,6 +758,7 @@ void compilation_message(struct compilation_messages *msg, const char *fmt, __ms } } +#ifdef D3D_COMPILER_VERSION BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) { struct hlsl_ir_var *var; @@ -2327,3 +2328,4 @@ void add_function_decl(struct wine_rb_tree *funcs, char *name, struct hlsl_ir_fu func->intrinsic = intrinsic; wine_rb_put(funcs, func->name, &func->entry); } +#endif -- 2.20.1

1 11

[PATCH v5 01/14] d3d10: move parse_dxbc + helpers into effects.c
by Connor McAdams 31 Oct '19

31 Oct '19

parse_dxbc is only used in effects.c, so having it in utils.c isn't necessary. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> --- dlls/d3d10/d3d10_private.h | 6 --- dlls/d3d10/effect.c | 101 +++++++++++++++++++++++++++++++++++++ dlls/d3d10/utils.c | 101 ------------------------------------- 3 files changed, 101 insertions(+), 107 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index f3fce9c569..2fe6183e15 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -278,9 +278,6 @@ HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte #define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') #define TAG_SHDR MAKE_TAG('S', 'H', 'D', 'R') -HRESULT parse_dxbc(const char *data, SIZE_T data_size, - HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) DECLSPEC_HIDDEN; - static inline void read_dword(const char **ptr, DWORD *d) { memcpy(d, *ptr, sizeof(*d)); @@ -298,7 +295,4 @@ static inline BOOL require_space(size_t offset, size_t count, size_t size, size_ return !count || (data_size - offset) / count >= size; } -void skip_dword_unknown(const char *location, const char **ptr, unsigned int count) DECLSPEC_HIDDEN; -void write_dword_unknown(char **ptr, DWORD d) DECLSPEC_HIDDEN; - #endif /* __WINE_D3D10_PRIVATE_H */ diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 439833485d..ba5b033b0c 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -241,6 +241,107 @@ static const struct d3d10_effect_state_storage_info d3d10_effect_state_storage_i {D3D10_SVT_SAMPLER, sizeof(default_sampler_desc), &default_sampler_desc }, }; +static void skip_dword_unknown(const char *location, const char **ptr, unsigned int count) +{ + unsigned int i; + DWORD d; + + FIXME("Skipping %u unknown DWORDs (%s):\n", count, location); + for (i = 0; i < count; ++i) + { + read_dword(ptr, &d); + FIXME("\t0x%08x\n", d); + } +} + +static void write_dword_unknown(char **ptr, DWORD d) +{ + FIXME("Writing unknown DWORD 0x%08x\n", d); + write_dword(ptr, d); +} + +static HRESULT parse_dxbc(const char *data, SIZE_T data_size, + HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) +{ + const char *ptr = data; + HRESULT hr = S_OK; + DWORD chunk_count; + DWORD total_size; + unsigned int i; + DWORD version; + DWORD tag; + + if (!data) + { + WARN("No data supplied.\n"); + return E_FAIL; + } + + read_dword(&ptr, &tag); + TRACE("tag: %s.\n", debugstr_an((const char *)&tag, 4)); + + if (tag != TAG_DXBC) + { + WARN("Wrong tag.\n"); + return E_FAIL; + } + + /* checksum? */ + skip_dword_unknown("DXBC header", &ptr, 4); + + read_dword(&ptr, &version); + TRACE("version: %#x.\n", version); + if (version != 0x00000001) + { + WARN("Got unexpected DXBC version %#x.\n", version); + return E_FAIL; + } + + read_dword(&ptr, &total_size); + TRACE("total size: %#x\n", total_size); + + if (data_size != total_size) + { + WARN("Wrong size supplied.\n"); + return E_FAIL; + } + + read_dword(&ptr, &chunk_count); + TRACE("chunk count: %#x\n", chunk_count); + + for (i = 0; i < chunk_count; ++i) + { + DWORD chunk_tag, chunk_size; + const char *chunk_ptr; + DWORD chunk_offset; + + read_dword(&ptr, &chunk_offset); + TRACE("chunk %u at offset %#x\n", i, chunk_offset); + + if (chunk_offset >= data_size || !require_space(chunk_offset, 2, sizeof(DWORD), data_size)) + { + WARN("Invalid chunk offset %#x (data size %#lx).\n", chunk_offset, data_size); + return E_FAIL; + } + + chunk_ptr = data + chunk_offset; + + read_dword(&chunk_ptr, &chunk_tag); + read_dword(&chunk_ptr, &chunk_size); + + if (!require_space(chunk_ptr - data, 1, chunk_size, data_size)) + { + WARN("Invalid chunk size %#x (data size %#lx, chunk offset %#x).\n", chunk_size, data_size, chunk_offset); + return E_FAIL; + } + + hr = chunk_handler(chunk_ptr, chunk_size, chunk_tag, ctx); + if (FAILED(hr)) break; + } + + return hr; +} + static BOOL fx10_get_string(const char *data, size_t data_size, DWORD offset, const char **s, size_t *l) { size_t len, max_len; diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c index 3b51868488..9c76e1f375 100644 --- a/dlls/d3d10/utils.c +++ b/dlls/d3d10/utils.c @@ -128,104 +128,3 @@ const char *debug_d3d10_device_state_types(D3D10_DEVICE_STATE_TYPES t) } #undef WINE_D3D10_TO_STR - -void skip_dword_unknown(const char *location, const char **ptr, unsigned int count) -{ - unsigned int i; - DWORD d; - - FIXME("Skipping %u unknown DWORDs (%s):\n", count, location); - for (i = 0; i < count; ++i) - { - read_dword(ptr, &d); - FIXME("\t0x%08x\n", d); - } -} - -void write_dword_unknown(char **ptr, DWORD d) -{ - FIXME("Writing unknown DWORD 0x%08x\n", d); - write_dword(ptr, d); -} - -HRESULT parse_dxbc(const char *data, SIZE_T data_size, - HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) -{ - const char *ptr = data; - HRESULT hr = S_OK; - DWORD chunk_count; - DWORD total_size; - unsigned int i; - DWORD version; - DWORD tag; - - if (!data) - { - WARN("No data supplied.\n"); - return E_FAIL; - } - - read_dword(&ptr, &tag); - TRACE("tag: %s.\n", debugstr_an((const char *)&tag, 4)); - - if (tag != TAG_DXBC) - { - WARN("Wrong tag.\n"); - return E_FAIL; - } - - /* checksum? */ - skip_dword_unknown("DXBC header", &ptr, 4); - - read_dword(&ptr, &version); - TRACE("version: %#x.\n", version); - if (version != 0x00000001) - { - WARN("Got unexpected DXBC version %#x.\n", version); - return E_FAIL; - } - - read_dword(&ptr, &total_size); - TRACE("total size: %#x\n", total_size); - - if (data_size != total_size) - { - WARN("Wrong size supplied.\n"); - return E_FAIL; - } - - read_dword(&ptr, &chunk_count); - TRACE("chunk count: %#x\n", chunk_count); - - for (i = 0; i < chunk_count; ++i) - { - DWORD chunk_tag, chunk_size; - const char *chunk_ptr; - DWORD chunk_offset; - - read_dword(&ptr, &chunk_offset); - TRACE("chunk %u at offset %#x\n", i, chunk_offset); - - if (chunk_offset >= data_size || !require_space(chunk_offset, 2, sizeof(DWORD), data_size)) - { - WARN("Invalid chunk offset %#x (data size %#lx).\n", chunk_offset, data_size); - return E_FAIL; - } - - chunk_ptr = data + chunk_offset; - - read_dword(&chunk_ptr, &chunk_tag); - read_dword(&chunk_ptr, &chunk_size); - - if (!require_space(chunk_ptr - data, 1, chunk_size, data_size)) - { - WARN("Invalid chunk size %#x (data size %#lx, chunk offset %#x).\n", chunk_size, data_size, chunk_offset); - return E_FAIL; - } - - hr = chunk_handler(chunk_ptr, chunk_size, chunk_tag, ctx); - if (FAILED(hr)) break; - } - - return hr; -} -- 2.20.1

2 27

[PATCH 4/4] vbscript: Support DISP_E_EXCEPTION Invoke[Ex] return value.
by Jacek Caban 31 Oct '19

31 Oct '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/tests/error.vbs | 16 ++++++++++++++++ dlls/vbscript/tests/run.c | 11 ++++++++++- dlls/vbscript/vbdisp.c | 19 +++++++++++++++---- 3 files changed, 41 insertions(+), 5 deletions(-)

1 0

[PATCH 3/4] vbscript/tests: Introduce get_dispid helper.
by Jacek Caban 31 Oct '19

31 Oct '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/tests/run.c | 320 ++++++++++++++------------------------ 1 file changed, 113 insertions(+), 207 deletions(-)

1 0

[PATCH 2/4] vbscript: Silence BuiltinDisp::QueryInterface(IID_IDispatchEx) warning.
by Jacek Caban 31 Oct '19

31 Oct '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/global.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH 1/4] vbscript: Support VT_EMPTY in stack_pop_bool.
by Jacek Caban 31 Oct '19

31 Oct '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/interp.c | 1 + dlls/vbscript/tests/lang.vbs | 8 ++++++++ 2 files changed, 9 insertions(+)

1 0

[PATCH] jscript: Use _ltow_s instead of int_to_string.
by Jacek Caban 31 Oct '19

31 Oct '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jsutils.c | 34 +++------------------------------- 1 file changed, 3 insertions(+), 31 deletions(-)

1 0

[PATCH 2/2] ntdll: Add missing spec file entry for EtwEventWriteString
by Andrew Eikum 31 Oct '19

31 Oct '19

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/advapi32/tests/eventlog.c | 9 +++++++++ dlls/ntdll/ntdll.spec | 1 + include/evntprov.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index f12a6a157bd..6722ea7d622 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -37,6 +37,7 @@ static BOOL (WINAPI *pCreateWellKnownSid)(WELL_KNOWN_SID_TYPE,PSID,PSID,DWORD*); static BOOL (WINAPI *pGetEventLogInformation)(HANDLE,DWORD,LPVOID,DWORD,LPDWORD); static ULONG (WINAPI *pEventRegister)(const GUID *,PENABLECALLBACK,void *,REGHANDLE *); static ULONG (WINAPI *pEventUnregister)(REGHANDLE); +static ULONG (WINAPI *pEventWriteString)(REGHANDLE,UCHAR,ULONGLONG,const WCHAR *); static BOOL (WINAPI *pGetComputerNameExA)(COMPUTER_NAME_FORMAT,LPSTR,LPDWORD); static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(PVOID *); @@ -49,6 +50,7 @@ static void init_function_pointers(void) pCreateWellKnownSid = (void*)GetProcAddress(hadvapi32, "CreateWellKnownSid"); pGetEventLogInformation = (void*)GetProcAddress(hadvapi32, "GetEventLogInformation"); + pEventWriteString = (void*)GetProcAddress(hadvapi32, "EventWriteString"); pEventRegister = (void*)GetProcAddress(hadvapi32, "EventRegister"); pEventUnregister = (void*)GetProcAddress(hadvapi32, "EventUnregister"); @@ -1153,6 +1155,7 @@ static void cleanup_eventlog(void) static void test_trace_event_params(void) { + static const WCHAR emptyW[] = {0}; static const GUID test_guid = {0x57696E65, 0x0000, 0x0000, {0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x01}}; REGHANDLE reg_handle; @@ -1173,6 +1176,12 @@ static void test_trace_event_params(void) uret = pEventRegister(&test_guid, NULL, NULL, &reg_handle); ok(uret == ERROR_SUCCESS, "EventRegister gave wrong error: %#x\n", uret); + uret = pEventWriteString(0, 0, 0, emptyW); + todo_wine ok(uret == ERROR_INVALID_HANDLE, "EventWriteString gave wrong error: %#x\n", uret); + + uret = pEventWriteString(reg_handle, 0, 0, NULL); + todo_wine ok(uret == ERROR_INVALID_PARAMETER, "EventWriteString gave wrong error: %#x\n", uret); + uret = pEventUnregister(0); todo_wine ok(uret == ERROR_INVALID_HANDLE, "EventUnregister gave wrong error: %#x\n", uret); diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 06811edf018..a42b4fc2482 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -52,6 +52,7 @@ @ stdcall EtwEventSetInformation(int64 long ptr long) @ stdcall EtwEventUnregister(int64) @ stdcall EtwEventWrite(int64 ptr long ptr) +@ stdcall EtwEventWriteString(int64 long int64 ptr) @ stdcall EtwEventWriteTransfer(int64 ptr ptr ptr long ptr) @ stdcall EtwGetTraceEnableFlags(int64) @ stdcall EtwGetTraceEnableLevel(int64) diff --git a/include/evntprov.h b/include/evntprov.h index a49fa79d9ad..a89c65fd4b0 100644 --- a/include/evntprov.h +++ b/include/evntprov.h @@ -73,6 +73,7 @@ ULONG WINAPI EventRegister(LPCGUID,PENABLECALLBACK,PVOID,PREGHANDLE); ULONG WINAPI EventSetInformation(REGHANDLE, EVENT_INFO_CLASS, PVOID, ULONG); ULONG WINAPI EventUnregister(REGHANDLE); ULONG WINAPI EventWrite(REGHANDLE,PCEVENT_DESCRIPTOR,ULONG,PEVENT_DATA_DESCRIPTOR); +ULONG WINAPI EventWriteString(REGHANDLE,UCHAR,ULONGLONG,const WCHAR *); ULONG WINAPI EventWriteTransfer(REGHANDLE,PCEVENT_DESCRIPTOR,LPCGUID,LPCGUID,ULONG,PEVENT_DATA_DESCRIPTOR); #ifdef __cplusplus -- 2.23.0

2 1

[PATCH 1/2] d3d11: Mind DSV flags when checking for conflicting SRV.
by Paul Gofman 31 Oct '19

31 Oct '19

Fixes a regression introduced by commit 3f698b950f52bf731d397c04ad68d240d28d7e2b. Might be related to https://bugs.winehq.org/show_bug.cgi?id=48009, but it could not yet be tested with the game, the fix is based on unit testing. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/d3d11/view.c | 5 +++++ dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 11 ++++++----- dlls/wined3d/utils.c | 15 ++++++++++++--- dlls/wined3d/view.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 13 +++++++++++-- include/wine/wined3d.h | 2 ++ 7 files changed, 41 insertions(+), 13 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index a6eddf59ce..40037989eb 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -1216,6 +1216,11 @@ static void wined3d_depth_stencil_view_desc_from_d3d11(struct wined3d_view_desc FIXME("Unhandled depth stencil view flags %#x.\n", desc->Flags); wined3d_desc->flags = 0; + if (desc->Flags & D3D11_DSV_READ_ONLY_DEPTH) + wined3d_desc->flags |= WINED3D_VIEW_READ_ONLY_DEPTH; + if (desc->Flags & D3D11_DSV_READ_ONLY_STENCIL) + wined3d_desc->flags |= WINED3D_VIEW_READ_ONLY_STENCIL; + wined3d_desc->u.texture.level_count = 1; switch (desc->ViewDimension) { diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e9750c41c5..f4c0d46f8e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3696,7 +3696,7 @@ static void context_preload_texture(struct wined3d_context *context, if (!(texture = state->textures[idx])) return; - if (wined3d_resource_check_fbo_attached(state, &texture->resource)) + if (wined3d_resource_check_fbo_attached(state, &texture->resource, NULL)) context->uses_fbo_attached_resources = 1; wined3d_texture_load(texture, context, is_srgb_enabled(state->sampler_states[idx])); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5ccf96a98b..fbdf93f1a1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2239,7 +2239,7 @@ static void wined3d_device_set_shader_resource_view(struct wined3d_device *devic if (view == prev) return; - if (view && wined3d_resource_check_fbo_attached(&device->state, view->resource)) + if (view && wined3d_resource_check_fbo_attached(&device->state, view->resource, view->format)) { WARN("Application is trying to bind resource which is attached as render target.\n"); view = NULL; @@ -5023,7 +5023,7 @@ struct wined3d_rendertarget_view * CDECL wined3d_device_get_depth_stencil_view(c } static void wined3d_unbind_srv_for_rtv(struct wined3d_device *device, - const struct wined3d_rendertarget_view *view) + const struct wined3d_rendertarget_view *view, BOOL dsv) { if (view && view->resource->srv_bind_count_device) { @@ -5035,7 +5035,8 @@ static void wined3d_unbind_srv_for_rtv(struct wined3d_device *device, for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) for (j = 0; j < MAX_SHADER_RESOURCE_VIEWS; ++j) - if ((srv = device->state.shader_resource_view[i][j]) && srv->resource == resource) + if ((srv = device->state.shader_resource_view[i][j]) && srv->resource == resource + && (!dsv || wined3d_dsv_srv_conflict(view, srv->format))) wined3d_device_set_shader_resource_view(device, i, j, NULL); } } @@ -5098,7 +5099,7 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device if (prev) wined3d_rendertarget_view_decref(prev); - wined3d_unbind_srv_for_rtv(device, view); + wined3d_unbind_srv_for_rtv(device, view, FALSE); return WINED3D_OK; } @@ -5130,7 +5131,7 @@ HRESULT CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *devic if (prev) wined3d_rendertarget_view_decref(prev); - wined3d_unbind_srv_for_rtv(device, view); + wined3d_unbind_srv_for_rtv(device, view, TRUE); return WINED3D_OK; } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7150ca4697..e0bb17d22a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3785,18 +3785,27 @@ static BOOL init_typeless_formats(const struct wined3d_adapter *adapter) typeless_format->flags[j] &= ~(WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); } - if ((format_id = typeless_depth_stencil_formats[i].depth_view_id) - && typeless_depth_stencil_formats[i].separate_depth_view_format) + if ((format_id = typeless_depth_stencil_formats[i].depth_view_id)) { if (!(depth_view_format = get_format_internal(adapter, format_id))) return FALSE; - copy_format(adapter, depth_view_format, ds_format); + if (typeless_depth_stencil_formats[i].separate_depth_view_format) + { + copy_format(adapter, depth_view_format, ds_format); + depth_view_format->stencil_size = 0; + } + else + { + depth_view_format->depth_size = ds_format->depth_size; + } } if ((format_id = typeless_depth_stencil_formats[i].stencil_view_id)) { if (!(stencil_view_format = get_format_internal(adapter, format_id))) return FALSE; copy_format(adapter, stencil_view_format, ds_format); + if (typeless_depth_stencil_formats[i].separate_depth_view_format) + stencil_view_format->depth_size = 0; } } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 6710abb270..eeca7c868b 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -65,11 +65,13 @@ static GLenum get_texture_view_target(const struct wined3d_gl_info *gl_info, {GL_TEXTURE_1D_ARRAY, 0, GL_TEXTURE_1D}, {GL_TEXTURE_1D_ARRAY, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_1D_ARRAY}, }; + unsigned int flags = desc->flags & (WINED3D_VIEW_BUFFER_RAW | WINED3D_VIEW_BUFFER_APPEND + | WINED3D_VIEW_BUFFER_COUNTER | WINED3D_VIEW_TEXTURE_CUBE | WINED3D_VIEW_TEXTURE_ARRAY); unsigned int i; for (i = 0; i < ARRAY_SIZE(view_types); ++i) { - if (view_types[i].texture_target != texture_gl->target || view_types[i].view_flags != desc->flags) + if (view_types[i].texture_target != texture_gl->target || view_types[i].view_flags != flags) continue; if (gl_info->supported[view_types[i].extension]) return view_types[i].view_target; @@ -77,7 +79,7 @@ static GLenum get_texture_view_target(const struct wined3d_gl_info *gl_info, FIXME("Extension %#x not supported.\n", view_types[i].extension); } - FIXME("Unhandled view flags %#x for texture target %#x.\n", desc->flags, texture_gl->target); + FIXME("Unhandled view flags %#x for texture target %#x.\n", flags, texture_gl->target); return texture_gl->target; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3c18c14136..2974227d0c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5313,14 +5313,23 @@ static inline void wined3d_context_copy_bo_address(struct wined3d_context *conte dst, dst_bind_flags, src, src_bind_flags, size); } +static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_view *dsv, + const struct wined3d_format *srv_format) +{ + return srv_format && ((srv_format->depth_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_DEPTH)) + || (srv_format->stencil_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_STENCIL))); +} + static inline BOOL wined3d_resource_check_fbo_attached(const struct wined3d_state *state, - const struct wined3d_resource *resource) + const struct wined3d_resource *resource, const struct wined3d_format *srv_format) { struct wined3d_rendertarget_view * const *rts = &state->fb->render_targets[0]; + const struct wined3d_rendertarget_view *dsv; unsigned int i; if ((resource->bind_flags & WINED3D_BIND_DEPTH_STENCIL) - && state->fb->depth_stencil && state->fb->depth_stencil->resource == resource) + && (dsv = state->fb->depth_stencil) && dsv->resource == resource + && wined3d_dsv_srv_conflict(dsv, srv_format)) return TRUE; if (!(resource->bind_flags & WINED3D_BIND_RENDER_TARGET)) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 925443d112..35cef05848 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1580,6 +1580,8 @@ enum wined3d_shader_type #define WINED3D_VIEW_BUFFER_COUNTER 0x00000004 #define WINED3D_VIEW_TEXTURE_CUBE 0x00000008 #define WINED3D_VIEW_TEXTURE_ARRAY 0x00000010 +#define WINED3D_VIEW_READ_ONLY_DEPTH 0x00000020 +#define WINED3D_VIEW_READ_ONLY_STENCIL 0x00000040 #define WINED3D_MAX_VIEWPORTS 16 -- 2.23.0

4 6

[PATCH] httpapi: add stub for HttpReceiveRequestEntityBody
by Louis Lenders 31 Oct '19

31 Oct '19

1 0

(no subject)
by Louis Lenders 31 Oct '19

31 Oct '19

2 2

[PATCH v3 7/7] ddraw/tests: Port TnLHal device test to ddraw7.c
by David Adam 31 Oct '19

31 Oct '19

2 1

[PATCH v4 6/7] ddraw/tests: Port the test that RGB device is enumerated
by David Adam 31 Oct '19

31 Oct '19

2 1

[PATCH 1/3] testbot/testagentd: Don't close the GetStdHandle()s in case of error.
by Francois Gouget 31 Oct '19

31 Oct '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/testagentd/platform_windows.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index acd0138d4..b3db635e1 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -112,7 +112,7 @@ uint64_t platform_run(char** argv, uint32_t flags, char** redirects) free(cmdline); while (i > 0) { - if (fhs[i] != INVALID_HANDLE_VALUE) + if (redirects[i][0] && fhs[i] != INVALID_HANDLE_VALUE) CloseHandle(fhs[i]); i--; } -- 2.20.1

1 2

[PATCH] testbot/WineRunTask: Use a trampoline script to capture cmd errors.
by Francois Gouget 31 Oct '19

31 Oct '19

This side-steps the console / redirection bug in the currently deployed versions of TestAgentd. This also side-steps cmd's command line parsing bug. When given ["cmd". "/c", "script.bat >Task.log"] TestAgent would build a command line of the form '"cmd" "/c" "script.bat >Task.log"' which would lead cmd to try to run '"script.bat >Task.log'. This would fail because of the extraneous double quote. Note that cmd fails in the same way for 'cmd "/c" "script.bat >Task.log"'. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunTask.pl | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index be0b0f673..ea3ad4eb1 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -502,14 +502,19 @@ if (!$TA->SendFileFromString($Script, "script.bat", $TestAgent::SENDFILE_EXE)) FatalTAError($TA, "Could not send the task script to the VM"); } +my $Logger = "script.bat >Task.log 2>&1\r\n"; +if (!$TA->SendFileFromString($Logger, "cmdlogger.bat", $TestAgent::SENDFILE_EXE)) +{ + FatalTAError($TA, "Could not send the logging script to the VM"); +} + # # Run the test # Debug(Elapsed($Start), " Starting the script\n"); -my $TaskLog = $TA->HasMinVersion(1, 7) ? "Task.log" : undef; -my $Pid = $TA->Run(["./script.bat"], 0, undef, $TaskLog, $TaskLog); +my $Pid = $TA->Run(["./cmdlogger.bat"], 0); if (!$Pid) { FatalTAError($TA, "Failed to start the test"); @@ -540,13 +545,10 @@ if (!defined $TA->Wait($Pid, $Timeout, $Keepalive)) } } -if (defined $TaskLog) +Debug(Elapsed($Start), " Retrieving 'Task.log'\n"); +if (!$TA->GetFile("Task.log", "$TaskDir/log") and !defined $TAError) { - Debug(Elapsed($Start), " Retrieving 'Task.log'\n"); - if (!$TA->GetFile($TaskLog, "$TaskDir/log") and !defined $TAError) - { - $TAError = "An error occurred while retrieving the task log: ". $TA->GetLastError(); - } + $TAError = "An error occurred while retrieving the task log: ". $TA->GetLastError(); } Debug(Elapsed($Start), " Retrieving the report file to '$RptFileName'\n"); -- 2.20.1

1 0

[PATCH v4 5/7] ddraw/tests: Test available devices in Enumdevices
by David Adam 31 Oct '19

31 Oct '19

2 1

[PATCH v4 4/7] ddraw/tests: Port life time tests in Enumdevices to ddraw*.c files
by David Adam 31 Oct '19

31 Oct '19

2 1

[PATCH v4 3/7] ddraw/tests: Port tests for the cancellation of enumeration in Enumdevices in ddraw*.c files
by David Adam 31 Oct '19

31 Oct '19

2 1

[PATCH v4 2/7] ddraw/tests: Test the name of devices in Enumdevices
by David Adam 31 Oct '19

31 Oct '19

2 1

[PATCH v4 7/7] kernel32/tests: Test GetUserGeoID(), GetUserDefaultGeoName().
by João Diogo Ferreira 31 Oct '19

31 Oct '19

Tests for SetUserGeoID() and SetUserGeoName() are not included, since normal programs shouldn't call those anyway. Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- Supersedes: 172361 V4: Fix compiler warning (removed ARRAY_SIZE() from trace call). --- dlls/kernel32/tests/locale.c | 109 +++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 81e74531ea..b40df611ca 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -98,6 +98,8 @@ static INT (WINAPI *pCompareStringEx)(LPCWSTR, DWORD, LPCWSTR, INT, LPCWSTR, INT static INT (WINAPI *pGetGeoInfoA)(GEOID, GEOTYPE, LPSTR, INT, LANGID); static INT (WINAPI *pGetGeoInfoW)(GEOID, GEOTYPE, LPWSTR, INT, LANGID); static BOOL (WINAPI *pEnumSystemGeoID)(GEOCLASS, GEOID, GEO_ENUMPROC); +static GEOID (WINAPI *pGetUserGeoID)(GEOCLASS); +static int (WINAPI *pGetUserDefaultGeoName)(WCHAR*, int); static BOOL (WINAPI *pGetSystemPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); static BOOL (WINAPI *pGetThreadPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); static BOOL (WINAPI *pGetUserPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); @@ -136,6 +138,8 @@ static void InitFunctionPointers(void) X(GetGeoInfoA); X(GetGeoInfoW); X(EnumSystemGeoID); + X(GetUserGeoID); + X(GetUserDefaultGeoName); X(GetSystemPreferredUILanguages); X(GetThreadPreferredUILanguages); X(GetUserPreferredUILanguages); @@ -4893,6 +4897,109 @@ static void test_EnumSystemGeoID(void) } } +static void test_GetUserGeoID(void) +{ + GEOID id; + + if (pGetUserDefaultGeoName) + { + ok(GEOID_NOT_AVAILABLE != GetUserGeoID(GEOCLASS_NATION), + "GEOCLASS_NATION: should never return GEOID_NOT_AVAILABLE in this platform.\n"); + ok(GEOID_NOT_AVAILABLE != GetUserGeoID(GEOCLASS_REGION), + "GEOCLASS_REGION: should never return GEOID_NOT_AVAILABLE in this platform.\n"); + } + else + win_skip("This platform allows returning GEOID_NOT_AVAILABLE on success.\n"); + + id = GetUserGeoID(GEOCLASS_ALL); + ok(id == GEOID_NOT_AVAILABLE, + "GEOCLASS_ALL: expected GEOID_NOT_AVAILABLE, got %d.\n", id); + + id = GetUserGeoID(0xdeadbeef); + ok(id == GEOID_NOT_AVAILABLE, + "Gibberish argument: expected GEOID_NOT_AVAILABLE, got %d.\n", id); +} + +static void test_GetUserDefaultGeoName(void) +{ + WCHAR name[10] = {0}; + int result, count; + + if (!pGetUserDefaultGeoName) + { + win_skip("GetUserDefaultGeoName: not implemented on this platform.\n"); + return; + } + + SetLastError(ERROR_SUCCESS); + count = result = pGetUserDefaultGeoName(NULL, 0); + ok(result > 0, + "(NULL, 0): Expected ret > 0, got %d; last error was %d.\n", + result, GetLastError()); + + SetLastError(ERROR_SUCCESS); + result = pGetUserDefaultGeoName(name, 0); + ok(result == count, + "(buffer, 0): Expected ret to match previous result (%d), got %d; last error was %d.\n", + result, count, GetLastError()); + + SetLastError(ERROR_SUCCESS); + result = pGetUserDefaultGeoName(NULL, 10); + ok(result == 0 && (GetLastError() == ERROR_INVALID_PARAMETER), + "(NULL, 10): Expected ret=0, got %d; and expected last error = 87, got %d\n", + result, GetLastError()); + + SetLastError(ERROR_SUCCESS); + result = pGetUserDefaultGeoName(NULL, -1); + ok(result == 0 && (GetLastError() == ERROR_INVALID_PARAMETER), + "(NULL, -1): Expected ret=0, got %d; and expected last error = 87, got %d.\n", + result, GetLastError()); + + SetLastError(ERROR_SUCCESS); + result = pGetUserDefaultGeoName(name, 1); + ok(result == 0 && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "(buffer, 1): Expected ret == 0, got %d; and expected last error = 122, got %d.\n", + result, GetLastError()); + + SetLastError(ERROR_SUCCESS); + result = pGetUserDefaultGeoName(name, -1); + ok(result == 0 && (GetLastError() == ERROR_INVALID_PARAMETER), + "(buffer, -1): Expected ret=0, got %d; and expected last error = 87, got %d.\n", + result, GetLastError()); + + if (count <= ARRAY_SIZE(name)) + { + SetLastError(ERROR_SUCCESS); + result = pGetUserDefaultGeoName(name, count); + ok(result, + "(buffer, reported length): Expected non-zero ret, got otherwise with error = %d.\n", + GetLastError()); + ok(result == count, + "(buffer, reported length): Expected charcount == %d, got %d; last error was %d.\n", + count, result, GetLastError()); + ok(result == strlenW(name) + 1, + "(buffer, reported length): Expected string length to match ret (%d), got %d.\n", + result, strlenW(name) + 1); + + if (count < ARRAY_SIZE(name)) + { + SetLastError(ERROR_SUCCESS); + result = pGetUserDefaultGeoName(name, ARRAY_SIZE(name)); + ok(result, + "(buffer, larger length): Expected non-zero ret, got otherwise with error = %d.\n", + GetLastError()); + ok(result == count, + "(buffer, larger length): Expected charcount == %d, got %d; last error was %d.\n", + count, result, GetLastError()); + ok(result == strlenW(name) + 1, + "(buffer, larger length): Expected string length to match ret (%d), got %d.\n", + result, strlenW(name) + 1); + } + } + else + skip("GetUserDefaultGeoName: string length (%d) too large to test.\n", count); +} + struct invariant_entry { const char *name; int id; @@ -6048,6 +6155,8 @@ START_TEST(locale) test_IsValidLocaleName(); test_CompareStringOrdinal(); test_GetGeoInfo(); + test_GetUserGeoID(); + test_GetUserDefaultGeoName(); test_EnumSystemGeoID(); test_invariant(); test_GetSystemPreferredUILanguages(); -- 2.23.0

2 1

[PATCH 1/4] wined3d: Introduce wined3d_stateblock_set_material().
by Zebediah Figura 31 Oct '19

31 Oct '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/stateblock.c | 9 +++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 98986c735b..24fd551adc 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1537,6 +1537,15 @@ HRESULT CDECL wined3d_stateblock_set_clip_plane(struct wined3d_stateblock *state return S_OK; } +void CDECL wined3d_stateblock_set_material(struct wined3d_stateblock *stateblock, + const struct wined3d_material *material) +{ + TRACE("stateblock %p, material %p.\n", stateblock, material); + + stateblock->stateblock_state.material = *material; + stateblock->changed.material = TRUE; +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 43b6112714..4f3cdf9b7b 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -265,6 +265,7 @@ @ cdecl wined3d_stateblock_reset(ptr) @ cdecl wined3d_stateblock_set_blend_factor(ptr ptr) @ cdecl wined3d_stateblock_set_clip_plane(ptr long ptr) +@ cdecl wined3d_stateblock_set_material(ptr ptr) @ cdecl wined3d_stateblock_set_pixel_shader(ptr ptr) @ cdecl wined3d_stateblock_set_ps_consts_b(ptr long long ptr) @ cdecl wined3d_stateblock_set_ps_consts_f(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index fabcdcb0d7..27a0e58a28 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2670,6 +2670,7 @@ void __cdecl wined3d_stateblock_set_blend_factor(struct wined3d_stateblock *stat const struct wined3d_color *blend_factor); HRESULT __cdecl wined3d_stateblock_set_clip_plane(struct wined3d_stateblock *stateblock, UINT plane_idx, const struct wined3d_vec4 *plane); +void __cdecl wined3d_stateblock_set_material(struct wined3d_stateblock *stateblock, const struct wined3d_material *material); void __cdecl wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); HRESULT __cdecl wined3d_stateblock_set_ps_consts_b(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const BOOL *constants); -- 2.23.0

3 8

[PATCH 1/2] wined3d: Introduce a separate use_legacy_fragment_output() helper.
by Matteo Bruni 31 Oct '19

31 Oct '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0e0977e1d48..b1930d9a882 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2030,9 +2030,17 @@ static void shader_glsl_declare_shader_outputs(const struct wined3d_gl_info *gl_ } } +static BOOL use_legacy_fragment_output(const struct wined3d_gl_info *gl_info) +{ + /* Technically 1.30 does support user-defined fragment shader outputs but + * we might not have glBindFragDataLocation() available (i.e. GL version + * might be < 3.0). */ + return gl_info->glsl_version <= MAKEDWORD_VERSION(1, 30); +} + static const char *get_fragment_output(const struct wined3d_gl_info *gl_info) { - return needs_legacy_glsl_syntax(gl_info) ? "gl_FragData" : "ps_out"; + return use_legacy_fragment_output(gl_info) ? "gl_FragData" : "ps_out"; } static const char *glsl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) @@ -7545,7 +7553,7 @@ static void shader_glsl_generate_ps_epilogue(const struct wined3d_gl_info *gl_in if (reg_maps->sample_mask) shader_addline(buffer, "gl_SampleMask[0] = floatBitsToInt(sample_mask);\n"); - if (!needs_legacy_glsl_syntax(gl_info)) + if (!use_legacy_fragment_output(gl_info)) shader_glsl_generate_color_output(buffer, gl_info, shader, args, string_buffers); } @@ -7650,7 +7658,7 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ shader_addline(buffer, " float scale;\n"); shader_addline(buffer, "} ffp_fog;\n"); - if (needs_legacy_glsl_syntax(gl_info)) + if (legacy_syntax) { if (glsl_is_color_reg_read(shader, 0)) shader_addline(buffer, "vec4 ffp_varying_diffuse;\n"); @@ -7731,7 +7739,7 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ if (args->alpha_test_func + 1 != WINED3D_CMP_ALWAYS) shader_addline(buffer, "uniform float alpha_test_ref;\n"); - if (!needs_legacy_glsl_syntax(gl_info)) + if (!use_legacy_fragment_output(gl_info)) { const struct wined3d_shader_signature *output_signature = &shader->output_signature; @@ -9482,7 +9490,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) shader_addline(buffer, "#extension GL_ARB_texture_rectangle : enable\n"); - if (!needs_legacy_glsl_syntax(gl_info)) + if (!use_legacy_fragment_output(gl_info)) { shader_addline(buffer, "vec4 ps_out[1];\n"); if (shader_glsl_use_explicit_attrib_location(gl_info)) @@ -9793,7 +9801,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * shader_glsl_generate_fog_code(buffer, gl_info, settings->fog); shader_glsl_generate_alpha_test(buffer, gl_info, alpha_test_func); - if (!needs_legacy_glsl_syntax(gl_info)) + if (!use_legacy_fragment_output(gl_info)) shader_addline(buffer, "color_out0 = ps_out[0];\n"); shader_addline(buffer, "}\n"); @@ -10338,7 +10346,7 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, } checkGLcall("glBindAttribLocation"); - if (!needs_legacy_glsl_syntax(gl_info)) + if (!use_legacy_fragment_output(gl_info)) { for (i = 0; i < MAX_RENDER_TARGET_VIEWS; ++i) { @@ -12763,7 +12771,7 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter declare_in_varying(gl_info, buffer, FALSE, "vec3 out_texcoord;\n"); /* TODO: Declare the out variable with the correct type (and put it in the * blitter args). */ - if (!needs_legacy_glsl_syntax(gl_info)) + if (!use_legacy_fragment_output(gl_info)) shader_addline(buffer, "out vec4 ps_out[1];\n"); output = string_buffer_get(&blitter->string_buffers); @@ -12795,7 +12803,7 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter GL_EXTCALL(glBindAttribLocation(program, 0, "pos")); GL_EXTCALL(glBindAttribLocation(program, 1, "texcoord")); - if (!needs_legacy_glsl_syntax(gl_info)) + if (!use_legacy_fragment_output(gl_info)) GL_EXTCALL(glBindFragDataLocation(program, 0, "ps_out")); GL_EXTCALL(glCompileShader(vshader_id)); -- 2.21.0

2 3

[PATCH 1/2] advapi32: Add EventRegister and EventUnregister tests
by Andrew Eikum 31 Oct '19

31 Oct '19

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/advapi32/tests/eventlog.c | 35 ++++++++++++++++++++++++++++++++++ dlls/ntdll/misc.c | 2 ++ 2 files changed, 37 insertions(+) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index d613c95315e..f12a6a157bd 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -28,12 +28,15 @@ #include "winreg.h" #include "sddl.h" #include "wmistr.h" +#include "evntprov.h" #include "evntrace.h" #include "wine/test.h" static BOOL (WINAPI *pCreateWellKnownSid)(WELL_KNOWN_SID_TYPE,PSID,PSID,DWORD*); static BOOL (WINAPI *pGetEventLogInformation)(HANDLE,DWORD,LPVOID,DWORD,LPDWORD); +static ULONG (WINAPI *pEventRegister)(const GUID *,PENABLECALLBACK,void *,REGHANDLE *); +static ULONG (WINAPI *pEventUnregister)(REGHANDLE); static BOOL (WINAPI *pGetComputerNameExA)(COMPUTER_NAME_FORMAT,LPSTR,LPDWORD); static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(PVOID *); @@ -46,6 +49,8 @@ static void init_function_pointers(void) pCreateWellKnownSid = (void*)GetProcAddress(hadvapi32, "CreateWellKnownSid"); pGetEventLogInformation = (void*)GetProcAddress(hadvapi32, "GetEventLogInformation"); + pEventRegister = (void*)GetProcAddress(hadvapi32, "EventRegister"); + pEventUnregister = (void*)GetProcAddress(hadvapi32, "EventUnregister"); pGetComputerNameExA = (void*)GetProcAddress(hkernel32, "GetComputerNameExA"); pWow64DisableWow64FsRedirection = (void*)GetProcAddress(hkernel32, "Wow64DisableWow64FsRedirection"); @@ -1146,6 +1151,35 @@ static void cleanup_eventlog(void) ok(bret, "Expected MoveFileEx to succeed: %d\n", GetLastError()); } +static void test_trace_event_params(void) +{ + static const GUID test_guid = {0x57696E65, 0x0000, 0x0000, {0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x01}}; + + REGHANDLE reg_handle; + ULONG uret; + + if (!pEventRegister) + { + win_skip("advapi32.EventRegister is missing, skipping trace event tests\n"); + return; + } + + uret = pEventRegister(NULL, NULL, NULL, &reg_handle); + todo_wine ok(uret == ERROR_INVALID_PARAMETER, "EventRegister gave wrong error: %#x\n", uret); + + uret = pEventRegister(&test_guid, NULL, NULL, NULL); + ok(uret == ERROR_INVALID_PARAMETER, "EventRegister gave wrong error: %#x\n", uret); + + uret = pEventRegister(&test_guid, NULL, NULL, &reg_handle); + ok(uret == ERROR_SUCCESS, "EventRegister gave wrong error: %#x\n", uret); + + uret = pEventUnregister(0); + todo_wine ok(uret == ERROR_INVALID_HANDLE, "EventUnregister gave wrong error: %#x\n", uret); + + uret = pEventUnregister(reg_handle); + ok(uret == ERROR_SUCCESS, "EventUnregister gave wrong error: %#x\n", uret); +} + static void test_start_trace(void) { const char sessionname[] = "wine"; @@ -1259,6 +1293,7 @@ START_TEST(eventlog) test_openbackup(); test_read(); test_clear(); + test_trace_event_params(); /* Functional tests */ if (create_new_eventlog()) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 2a135518e75..c29a1c26c26 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -403,6 +403,8 @@ ULONG WINAPI EtwEventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID { FIXME("(%s, %p, %p, %p) stub.\n", debugstr_guid(provider), callback, context, handle); + if (!handle) return ERROR_INVALID_PARAMETER; + *handle = 0xdeadbeef; return ERROR_SUCCESS; } -- 2.23.0

1 0

[PATCH v4 6/7] kernel32: Autoinitialize geographic values when launching any program.
by João Diogo Ferreira 31 Oct '19

31 Oct '19

We ask Wine for the country code of the current locale and then set it with SetUserGeoName(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46196 Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- Supersedes: 172358 V4: Removed opt-out mechanism. --- dlls/kernel32/kernel_main.c | 3 +++ dlls/kernel32/kernel_private.h | 1 + dlls/kernel32/locale.c | 16 ++++++++++++++++ 3 files changed, 20 insertions(+) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index dfa66f0295..206972c210 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -88,6 +88,9 @@ static BOOL process_attach( HMODULE module ) /* Setup registry locale information */ LOCALE_InitRegistry(); + /* Setup registry geographic information */ + LOCALE_InitGeo(); + /* Setup registry timezone information */ TIMEZONE_InitRegistry(); diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index af85bee84d..6b93add056 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -76,6 +76,7 @@ extern void COMPUTERNAME_Init(void) DECLSPEC_HIDDEN; /* locale.c */ extern void LOCALE_Init(void) DECLSPEC_HIDDEN; extern void LOCALE_InitRegistry(void) DECLSPEC_HIDDEN; +extern void LOCALE_InitGeo(void) DECLSPEC_HIDDEN; /* time.c */ extern void TIMEZONE_InitRegistry(void) DECLSPEC_HIDDEN; diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 7d481a2a48..4d5a0880ad 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -846,6 +846,22 @@ void LOCALE_InitRegistry(void) NtClose( hkey ); } +/* Initialize the geographic information in the registry. */ +void LOCALE_InitGeo(void) +{ + WCHAR name[4]; + static WCHAR fallback[] = {'0','0','1',0}; /* World */ + int result; + + TRACE("Initializing geographic data...\n"); + if ((result = GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_SISO3166CTRYNAME, + name, ARRAY_SIZE(name)))) + result = SetUserGeoName(name); + + if (!result) + SetUserGeoName(fallback); + TRACE("Finished initializing geographic data.\n"); +} #ifdef __APPLE__ /*********************************************************************** -- 2.23.0

2 1

[PATCH vkd3d 2/2] vkd3d: Do not report a root signature version higher than requested.
by Henri Verbeet 31 Oct '19

31 Oct '19

From: Rémi Bernon <rbernon(a)codeweavers.com> This fixes Shadow of the Tomb Raider crashing because of NULL root signatures being passed since c002aee119b638d30eeb7cdc91099449ccafeafc. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/device.c | 3 ++- tests/d3d12.c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 4d6f7c9..13ebc70 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2665,7 +2665,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return E_INVALIDARG; } - data->HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_1; + TRACE("Root signature requested %#x.\n", data->HighestVersion); + data->HighestVersion = min(data->HighestVersion, D3D_ROOT_SIGNATURE_VERSION_1_1); TRACE("Root signature version %#x.\n", data->HighestVersion); return S_OK; diff --git a/tests/d3d12.c b/tests/d3d12.c index 046dfdd..e428bf0 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1039,6 +1039,7 @@ static void test_check_feature_support(void) { D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT gpu_virtual_address; D3D12_FEATURE_DATA_FEATURE_LEVELS feature_levels; + D3D12_FEATURE_DATA_ROOT_SIGNATURE root_signature; D3D_FEATURE_LEVEL max_supported_feature_level; D3D12_FEATURE_DATA_ARCHITECTURE architecture; D3D12_FEATURE_DATA_FORMAT_INFO format_info; @@ -1229,6 +1230,21 @@ static void test_check_feature_support(void) trace("GPU virtual address bits per process: %u.\n", gpu_virtual_address.MaxGPUVirtualAddressBitsPerProcess); + root_signature.HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_0; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_ROOT_SIGNATURE, + &root_signature, sizeof(root_signature)); + ok(hr == S_OK, "Failed to get root signature feature support, hr %#x.\n", hr); + ok(root_signature.HighestVersion == D3D_ROOT_SIGNATURE_VERSION_1_0, + "Got unexpected root signature feature version %#x.\n", root_signature.HighestVersion); + + root_signature.HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_1; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_ROOT_SIGNATURE, + &root_signature, sizeof(root_signature)); + ok(hr == S_OK, "Failed to get root signature feature support, hr %#x.\n", hr); + ok(root_signature.HighestVersion == D3D_ROOT_SIGNATURE_VERSION_1_0 + || root_signature.HighestVersion == D3D_ROOT_SIGNATURE_VERSION_1_1, + "Got unexpected root signature feature version %#x.\n", root_signature.HighestVersion); + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } -- 2.11.0

1 0

[PATCH vkd3d 1/2] tests: Test ClearUnorderedAccessView() with placed resources.
by Henri Verbeet 31 Oct '19

31 Oct '19

From: Hans-Kristian Arntzen <post(a)arntzen-software.no> Catches certain implementation issues which committed resources do not. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- tests/d3d12.c | 14 +++++++++++++- tests/d3d12_test_utils.h | 27 +++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 2ec74a1..046dfdd 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4688,11 +4688,14 @@ static void test_clear_unordered_access_view(void) struct test_context context; struct resource_readback rb; ID3D12CommandQueue *queue; + D3D12_HEAP_DESC heap_desc; ID3D12Resource *buffer; ID3D12Device *device; UINT clear_value[4]; unsigned int i, j; + ID3D12Heap *heap; D3D12_BOX box; + HRESULT hr; #define BUFFER_SIZE (1024 * 1024) static const struct @@ -4749,11 +4752,19 @@ static void test_clear_unordered_access_view(void) cpu_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 2); gpu_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 2); + heap_desc.SizeInBytes = 2 * BUFFER_SIZE; + memset(&heap_desc.Properties, 0, sizeof(heap_desc.Properties)); + heap_desc.Properties.Type = D3D12_HEAP_TYPE_DEFAULT; + heap_desc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + heap_desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS; + hr = ID3D12Device_CreateHeap(device, &heap_desc, &IID_ID3D12Heap, (void **)&heap); + ok(hr == S_OK, "Failed to create heap, hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(tests); ++i) { vkd3d_test_set_context("Test %u", i); - buffer = create_default_buffer(device, BUFFER_SIZE, + buffer = create_placed_buffer(device, heap, BUFFER_SIZE, BUFFER_SIZE, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); for (j = 0; j < ARRAY_SIZE(clear_value); ++j) @@ -4810,6 +4821,7 @@ static void test_clear_unordered_access_view(void) ID3D12DescriptorHeap_Release(cpu_heap); ID3D12DescriptorHeap_Release(gpu_heap); + ID3D12Heap_Release(heap); destroy_test_context(&context); #undef BUFFER_SIZE } diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index ec6f839..024cf87 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -111,6 +111,33 @@ static inline void queue_wait_(unsigned int line, ID3D12CommandQueue *queue, ID3 ok_(line)(hr == S_OK, "Failed to submit wait operation to queue, hr %#x.\n", hr); } +#define create_placed_buffer(a, b, c, d, e, f) create_placed_buffer_(__LINE__, a, b, c, d, e, f) +static inline ID3D12Resource *create_placed_buffer_(unsigned int line, ID3D12Device *device, + ID3D12Heap *heap, size_t offset, size_t size, D3D12_RESOURCE_FLAGS resource_flags, + D3D12_RESOURCE_STATES initial_resource_state) +{ + D3D12_RESOURCE_DESC resource_desc; + ID3D12Resource *buffer; + HRESULT hr; + + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; + resource_desc.Alignment = 0; + resource_desc.Width = size; + resource_desc.Height = 1; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_UNKNOWN; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; + resource_desc.Flags = resource_flags; + + hr = ID3D12Device_CreatePlacedResource(device, heap, offset, &resource_desc, + initial_resource_state, NULL, &IID_ID3D12Resource, (void **)&buffer); + assert_that_(line)(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + return buffer; +} + #define create_buffer(a, b, c, d, e) create_buffer_(__LINE__, a, b, c, d, e) static ID3D12Resource *create_buffer_(unsigned int line, ID3D12Device *device, D3D12_HEAP_TYPE heap_type, size_t size, D3D12_RESOURCE_FLAGS resource_flags, -- 2.11.0

1 0

[PATCH vkd3d 1/2] vkd3d: Keep active bindings after changing root signature.
by Philip Rebohle 31 Oct '19

31 Oct '19

Shadow of the Tomb Raider does not re-bind all descriptor tables after setting a new root signature if tessellation is enabled, which causes some descriptors to be left undefined. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> --- In order to run with tessellation enabled, SotTR currently requires a root signature version fix (patch 172080) as well as the vicp patch from my tessellation series (patch 171410), both of which don't seem to have been reviewed yet. libs/vkd3d/command.c | 10 ++++------ libs/vkd3d/state.c | 8 ++++++++ libs/vkd3d/vkd3d_private.h | 3 +++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index c401349..0532ec0 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2539,8 +2539,8 @@ static void d3d12_command_list_prepare_descriptors(struct d3d12_command_list *li root_signature->vk_set_layout); bindings->in_use = false; - bindings->descriptor_table_dirty_mask |= bindings->descriptor_table_active_mask; - bindings->push_descriptor_dirty_mask |= bindings->push_descriptor_active_mask; + bindings->descriptor_table_dirty_mask |= bindings->descriptor_table_active_mask & root_signature->descriptor_table_mask; + bindings->push_descriptor_dirty_mask |= bindings->push_descriptor_active_mask & root_signature->push_descriptor_mask; } static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_descriptor_write, @@ -4030,10 +4030,8 @@ static void d3d12_command_list_set_root_signature(struct d3d12_command_list *lis bindings->root_signature = root_signature; bindings->descriptor_set = VK_NULL_HANDLE; - bindings->descriptor_table_dirty_mask = 0; - bindings->descriptor_table_active_mask = 0; - bindings->push_descriptor_dirty_mask = 0; - bindings->push_descriptor_active_mask = 0; + bindings->descriptor_table_dirty_mask = bindings->descriptor_table_active_mask & root_signature->descriptor_table_mask; + bindings->push_descriptor_dirty_mask = bindings->push_descriptor_active_mask & root_signature->push_descriptor_mask; } static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootSignature(ID3D12GraphicsCommandList1 *iface, diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 9dc5cff..a321fa4 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -600,12 +600,16 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo unsigned int i, j, k, range_count; uint32_t vk_binding; + root_signature->descriptor_table_mask = 0; + for (i = 0; i < desc->NumParameters; ++i) { const D3D12_ROOT_PARAMETER *p = &desc->pParameters[i]; if (p->ParameterType != D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) continue; + root_signature->descriptor_table_mask |= 1ull << i; + table = &root_signature->parameters[i].u.descriptor_table; range_count = p->u.DescriptorTable.NumDescriptorRanges; @@ -666,6 +670,8 @@ static HRESULT d3d12_root_signature_init_root_descriptors(struct d3d12_root_sign VkDescriptorSetLayoutBinding *cur_binding = context->current_binding; unsigned int i; + root_signature->push_descriptor_mask = 0; + for (i = 0; i < desc->NumParameters; ++i) { const D3D12_ROOT_PARAMETER *p = &desc->pParameters[i]; @@ -674,6 +680,8 @@ static HRESULT d3d12_root_signature_init_root_descriptors(struct d3d12_root_sign && p->ParameterType != D3D12_ROOT_PARAMETER_TYPE_UAV) continue; + root_signature->push_descriptor_mask |= 1u << i; + if (p->u.Descriptor.RegisterSpace) { FIXME("Unhandled register space %u for parameter %u.\n", p->u.Descriptor.RegisterSpace, i); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 1cb40f2..2d62fda 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -678,6 +678,9 @@ struct d3d12_root_signature unsigned int parameter_count; uint32_t main_set; + uint64_t descriptor_table_mask; + uint32_t push_descriptor_mask; + D3D12_ROOT_SIGNATURE_FLAGS flags; unsigned int descriptor_count; -- 2.23.0

2 3

[PATCH vkd3d 00/11] vkd3d-shader: Fix patch constant handling in hull shaders.
by Philip Rebohle 31 Oct '19

31 Oct '19

This series mainly changes the way patch constant outputs are generated in hull shaders to always use a private array variable. This is done to fix several issues in the current imlementation, and to avoid excessive complexity in dealing with patch constants which stem from DXBC's design: 1) Tessellation factors and regular patch constants share the same register space in DXBC and can both be dynamically or statically indexed. The current implementation only works correctly in case tessellation factors do not share registers with regular outputs, and does not support all indexing patterns, leading to invalid code being generated in some cases. 2) Join phases can read patch constants written by a fork phase, also with dynamic indexing. However, the index ranges used by the join phase are not known at the time the fork phase is compiled. With these changes, tessellation shaders work correctly in Shadow of the Tomb Raider, which previously contained invalid SPIR-V and would crash the game if enabled. Note that enabling the tessellation option in the game triggers a separate issue related to descriptor updates, which will have to be addressed separately.

4 22

[PATCH v3 5/7] kernel32: Make GetUserGeoID() pretend we set a GeoID even if we didn't.
by João Diogo Ferreira 31 Oct '19

31 Oct '19

In Windows 10, with the changes introduced in v1709, this function now always returns a good GeoID if the provided geoclass is valid. If that class didn't have a GeoID set, this will return 39070, which is the ID for the very neutral "World" region. This behaviour also helps prevent bugs with at least one app. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46196 (partial fix: game no longer crashes.) Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- V3: Actually do what's advertised. Supersedes: 171984 --- dlls/kernel32/locale.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index abb3ecd773..f061b893e1 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4090,10 +4090,23 @@ static inline const struct geoinfo_t *get_geoinfoptr_by_name(const WCHAR *name) /****************************************************************************** * GetUserGeoID (KERNEL32.@) + * + * Retrieves the ID of the user's geographic nation or region. + * + * PARAMS + * GeoClass [I] One of GEOCLASS_NATION or GEOCLASS_REGION (SYSGEOCLASS enum from "winnls.h"). + * + * RETURNS + * SUCCESS: The ID of the specified geographic class. + * FAILURE: GEOID_NOT_AVAILABLE. + * + * NOTES + * This function only fails if the geoclass specified is invalid; + * otherwise, a valid GeoID is always returned. */ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) { - GEOID ret = GEOID_NOT_AVAILABLE; + GEOID ret = 39070; /* World */ static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; WCHAR bufferW[40], *end; @@ -4116,7 +4129,7 @@ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) else { WARN("Unknown geoclass %d\n", geoclass); - return ret; + return GEOID_NOT_AVAILABLE; } if (!(hkey = create_geo_regkey())) return ret; -- 2.23.0

2 2

[PATCH v4 4/7] kernel32: Implement GetUserDefaultGeoName().
by João Diogo Ferreira 31 Oct '19

31 Oct '19

Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- Supersedes: 172360 V4: Use NLS_RegOpenKey() instead of other helper; fix unicode issue. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 132 ++++++++++++++++++++++++++++++++++++ include/winnls.h | 1 + 3 files changed, 134 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 9898bdec6e..c2dd727135 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -869,6 +869,7 @@ # @ stub GetUILanguageInfo @ stdcall -arch=x86_64 GetUmsCompletionListEvent(ptr ptr) # @ stub -arch=x86_64 GetUmsSystemThreadInformation +@ stdcall GetUserDefaultGeoName(ptr long) @ stdcall -import GetUserDefaultLCID() @ stdcall -import GetUserDefaultLangID() @ stdcall -import GetUserDefaultLocaleName(ptr long) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 63d9e03d8b..4dcad37c72 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4141,6 +4141,138 @@ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) return ret; } +/****************************************************************************** + * GetUserDefaultGeoName (KERNEL32.@) + * + * Retrieves the name of the user's geographic location. + * + * This name is a two-letter ISO 3166 country code + * or a three-digit UN M.49 code for anything other than countries (e.g. continents). + * + * If geoname_len is 0, this function will return the minimum length + * required for a buffer to hold the name. + * + * PARAMS + * buffer [O] Pointer to a buffer to hold the name. + * buffer_len [I] Length of the buffer, including null terminator, measured in WCHARs. + * + * RETURNS + * SUCCESS: Number of WCHARs written to the buffer -OR- minimum length required for the buffer. + * FAILURE: Zero. Call GetLastError() to determine the cause. + * + * NOTES + * On failure, GetLastError() will return one of the following values: + * - ERROR_INVALID_PARAMETER: one of the parameters was invalid. + * - ERROR_INSUFFICIENT_BUFFER: the specified buffer was too small to hold the name. + * - ERROR_BADDB: an internal error occured and Wine couldn't retrieve the name. + * - ERROR_NOT_ENOUGH_MEMORY: (Wine implementation) could not allocate more memory. + */ +int WINAPI GetUserDefaultGeoName(WCHAR *buffer, int buffer_len) +{ + int ret = 0, name_len; + WCHAR fallback[] = {'0','0','1',0}; /* World */ + int fallback_len = ARRAY_SIZE(fallback); + int use_fallback = 0; + + static const WCHAR geokeyname[] = {'G','e','o',0}; + HANDLE hkey = create_registry_key(), hsubkey; + KEY_VALUE_PARTIAL_INFORMATION kvi = {0}; + WCHAR valuename[] = {'N','a','m','e',0}; + UNICODE_STRING uvaluename; + DWORD reg_len; + + TRACE("(%p, %d)\n", buffer, buffer_len); + + if (buffer_len < 0 || (buffer_len && !buffer)) + { + SetLastError(ERROR_INVALID_PARAMETER); + if (hkey) NtClose(hkey); + return 0; + } + + if (!hkey) + { + ERR("Couldn't open the International regkey; please report.\n"); + SetLastError(ERROR_BADDB); + return 0; + } + + hsubkey = NLS_RegOpenKey(hkey, geokeyname); + + RtlInitUnicodeString(&uvaluename, valuename); + + /* If we don't get an overflow, it's the wrong value. */ + if (hsubkey && + NtQueryValueKey(hsubkey, &uvaluename, KeyValuePartialInformation, + &kvi, sizeof(kvi), &reg_len) == STATUS_BUFFER_OVERFLOW) + name_len = kvi.DataLength / sizeof(WCHAR); + else + { + TRACE("We've fallen back to our hardcoded value.\n"); + use_fallback = 1; + } + + if (!use_fallback) + { + if (!buffer_len) + ret = name_len; + else if (buffer_len < name_len) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = 0; + } + else if (buffer_len >= name_len) + { + KEY_VALUE_PARTIAL_INFORMATION *kvi; + DWORD kvi_size = sizeof(*kvi) + (name_len * sizeof(WCHAR)); + + if ((kvi = HeapAlloc(GetProcessHeap(), 0, kvi_size))) + { + NTSTATUS status = NtQueryValueKey(hsubkey, &uvaluename, KeyValuePartialInformation, + kvi, kvi_size, &reg_len); + if (status == STATUS_SUCCESS) + { + memcpy(buffer, kvi->Data, name_len * sizeof(WCHAR)); + ret = name_len; + } + else + { + ERR("Failure: status=0x%x, kvi_size=%d, reg_len=%d, DataLength=%u\n", + status, kvi_size, reg_len, kvi->DataLength); + SetLastError(ERROR_BADDB); + ret = 0; + } + HeapFree(GetProcessHeap(), 0, kvi); + } + else + { + ERR("We couldn't allocate memory somehow.\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ret = 0; + } + } + } + else + { + if (!buffer_len) + ret = fallback_len; + else if (buffer_len < fallback_len) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = 0; + } + else if (buffer_len >= fallback_len) + { + strcpyW(buffer, fallback); + ret = fallback_len; + } + } + + if (hsubkey) NtClose(hsubkey); + if (hkey) NtClose(hkey); + return ret; +} + /****************************************************************************** * set_geo_reg * diff --git a/include/winnls.h b/include/winnls.h index 4f84c64f81..6e60ceaa1d 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -935,6 +935,7 @@ WINBASEAPI INT WINAPI GetTimeFormatA(LCID,DWORD,const SYSTEMTIME*,LPCSTR WINBASEAPI INT WINAPI GetTimeFormatEx(LPCWSTR,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT); WINBASEAPI INT WINAPI GetTimeFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT); #define GetTimeFormat WINELIB_NAME_AW(GetTimeFormat) +WINBASEAPI int WINAPI GetUserDefaultGeoName(WCHAR*,int); WINBASEAPI LANGID WINAPI GetUserDefaultLangID(void); WINBASEAPI LCID WINAPI GetUserDefaultLCID(void); WINBASEAPI INT WINAPI GetUserDefaultLocaleName(LPWSTR,int); -- 2.23.0

2 3

[PATCH v4 3/7] kernel32: Implement SetUserGeoName().
by João Diogo Ferreira 31 Oct '19

31 Oct '19

SetUserGeoName() and SetUserGeoID() are now implemented by the same internal function, since they behave the same (they only differ in the arguments they take). The new UN codes (required for SetUserGeoName()) were tested and confirmed to match with Windows 10 v1909. Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- Supersedes: 172369 V4: Remove camelCase; fix divergence from Win32; fix null ptr access; no longer clean up locale.c; change var names. V3: Fix build error from patch #2. V2: Squash UN codes and clean-up into this commit. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 272 +++++++++++++++++++++++++++++------- include/winnls.h | 1 + 3 files changed, 226 insertions(+), 48 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 23c25b7acd..9898bdec6e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1469,6 +1469,7 @@ @ stdcall -arch=x86_64 SetUmsThreadInformation(ptr long ptr long) @ stdcall -import SetUnhandledExceptionFilter(ptr) @ stdcall SetUserGeoID(long) +@ stdcall SetUserGeoName(wstr) @ stub SetVDMCurrentDirectories @ stdcall SetVolumeLabelA(str str) @ stdcall SetVolumeLabelW(wstr wstr) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index cee501278a..63d9e03d8b 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3889,7 +3889,7 @@ static const struct geoinfo_t geoinfodata[] = { { 305, {'X','X',0}, {'X','X',0}, 161832256 }, /* Baker Island */ { 306, {'B','V',0}, {'B','V','T',0}, 39070, 74 }, /* Bouvet Island */ { 307, {'K','Y',0}, {'C','Y','M',0}, 10039880, 136 }, /* Cayman Islands */ - { 308, {'X','X',0}, {'X','X',0}, 10210824, 0, LOCATION_BOTH }, /* Channel Islands */ + { 308, {'X','X',0}, {'X','X',0}, 10210824, 830, LOCATION_BOTH }, /* Channel Islands */ { 309, {'C','X',0}, {'C','X','R',0}, 12, 162 }, /* Christmas Island */ { 310, {'X','X',0}, {'X','X',0}, 27114 }, /* Clipperton Island */ { 311, {'C','C',0}, {'C','C','K',0}, 10210825, 166 }, /* Cocos (Keeling) Islands */ @@ -3929,47 +3929,54 @@ static const struct geoinfo_t geoinfodata[] = { { 349, {'T','C',0}, {'T','C','A',0}, 10039880, 796 }, /* Turks and Caicos Islands */ { 351, {'V','G',0}, {'V','G','B',0}, 10039880, 92 }, /* Virgin Islands, British */ { 352, {'W','F',0}, {'W','L','F',0}, 26286, 876 }, /* Wallis and Futuna */ - { 742, {'X','X',0}, {'X','X',0}, 39070, 0, LOCATION_REGION }, /* Africa */ - { 2129, {'X','X',0}, {'X','X',0}, 39070, 0, LOCATION_REGION }, /* Asia */ - { 10541, {'X','X',0}, {'X','X',0}, 39070, 0, LOCATION_REGION }, /* Europe */ + { 742, {'X','X',0}, {'X','X',0}, 39070, 2, LOCATION_REGION }, /* Africa */ + { 2129, {'X','X',0}, {'X','X',0}, 39070, 142, LOCATION_REGION }, /* Asia */ + { 10541, {'X','X',0}, {'X','X',0}, 39070, 150, LOCATION_REGION }, /* Europe */ { 15126, {'I','M',0}, {'I','M','N',0}, 10039882, 833 }, /* Man, Isle of */ { 19618, {'M','K',0}, {'M','K','D',0}, 47610, 807 }, /* Macedonia, Former Yugoslav Republic of */ - { 20900, {'X','X',0}, {'X','X',0}, 27114, 0, LOCATION_REGION }, /* Melanesia */ - { 21206, {'X','X',0}, {'X','X',0}, 27114, 0, LOCATION_REGION }, /* Micronesia */ + { 20900, {'X','X',0}, {'X','X',0}, 27114, 54, LOCATION_REGION }, /* Melanesia */ + { 21206, {'X','X',0}, {'X','X',0}, 27114, 57, LOCATION_REGION }, /* Micronesia */ { 21242, {'X','X',0}, {'X','X',0}, 161832256 }, /* Midway Islands */ - { 23581, {'X','X',0}, {'X','X',0}, 10026358, 0, LOCATION_REGION }, /* Northern America */ - { 26286, {'X','X',0}, {'X','X',0}, 27114, 0, LOCATION_REGION }, /* Polynesia */ - { 27082, {'X','X',0}, {'X','X',0}, 161832257, 0, LOCATION_REGION }, /* Central America */ - { 27114, {'X','X',0}, {'X','X',0}, 39070, 0, LOCATION_REGION }, /* Oceania */ + { 23581, {'X','X',0}, {'X','X',0}, 10026358, 21, LOCATION_REGION }, /* Northern America */ + { 26286, {'X','X',0}, {'X','X',0}, 27114, 61, LOCATION_REGION }, /* Polynesia */ + { 27082, {'X','X',0}, {'X','X',0}, 161832257, 13, LOCATION_REGION }, /* Central America */ + { 27114, {'X','X',0}, {'X','X',0}, 39070, 9, LOCATION_REGION }, /* Oceania */ { 30967, {'S','X',0}, {'S','X','M',0}, 10039880, 534 }, /* Sint Maarten (Dutch part) */ - { 31396, {'X','X',0}, {'X','X',0}, 161832257, 0, LOCATION_REGION }, /* South America */ + { 31396, {'X','X',0}, {'X','X',0}, 161832257, 5, LOCATION_REGION }, /* South America */ { 31706, {'M','F',0}, {'M','A','F',0}, 10039880, 663 }, /* Saint Martin (French part) */ - { 39070, {'X','X',0}, {'X','X',0}, 39070, 0, LOCATION_REGION }, /* World */ - { 42483, {'X','X',0}, {'X','X',0}, 742, 0, LOCATION_REGION }, /* Western Africa */ - { 42484, {'X','X',0}, {'X','X',0}, 742, 0, LOCATION_REGION }, /* Middle Africa */ - { 42487, {'X','X',0}, {'X','X',0}, 742, 0, LOCATION_REGION }, /* Northern Africa */ - { 47590, {'X','X',0}, {'X','X',0}, 2129, 0, LOCATION_REGION }, /* Central Asia */ - { 47599, {'X','X',0}, {'X','X',0}, 2129, 0, LOCATION_REGION }, /* South-Eastern Asia */ - { 47600, {'X','X',0}, {'X','X',0}, 2129, 0, LOCATION_REGION }, /* Eastern Asia */ - { 47603, {'X','X',0}, {'X','X',0}, 742, 0, LOCATION_REGION }, /* Eastern Africa */ - { 47609, {'X','X',0}, {'X','X',0}, 10541, 0, LOCATION_REGION }, /* Eastern Europe */ - { 47610, {'X','X',0}, {'X','X',0}, 10541, 0, LOCATION_REGION }, /* Southern Europe */ - { 47611, {'X','X',0}, {'X','X',0}, 2129, 0, LOCATION_REGION }, /* Middle East */ - { 47614, {'X','X',0}, {'X','X',0}, 2129, 0, LOCATION_REGION }, /* Southern Asia */ + { 39070, {'X','X',0}, {'X','X',0}, 39070, 1, LOCATION_REGION }, /* World */ + { 42483, {'X','X',0}, {'X','X',0}, 742, 11, LOCATION_REGION }, /* Western Africa */ + { 42484, {'X','X',0}, {'X','X',0}, 742, 17, LOCATION_REGION }, /* Middle Africa */ + { 42487, {'X','X',0}, {'X','X',0}, 742, 15, LOCATION_REGION }, /* Northern Africa */ + { 47590, {'X','X',0}, {'X','X',0}, 2129, 143, LOCATION_REGION }, /* Central Asia */ + { 47599, {'X','X',0}, {'X','X',0}, 2129, 35, LOCATION_REGION }, /* South-Eastern Asia */ + { 47600, {'X','X',0}, {'X','X',0}, 2129, 30, LOCATION_REGION }, /* Eastern Asia */ + { 47603, {'X','X',0}, {'X','X',0}, 742, 14, LOCATION_REGION }, /* Eastern Africa */ + { 47609, {'X','X',0}, {'X','X',0}, 10541, 151, LOCATION_REGION }, /* Eastern Europe */ + { 47610, {'X','X',0}, {'X','X',0}, 10541, 39, LOCATION_REGION }, /* Southern Europe */ + { 47611, {'X','X',0}, {'X','X',0}, 2129, 145, LOCATION_REGION }, /* Middle East */ + { 47614, {'X','X',0}, {'X','X',0}, 2129, 34, LOCATION_REGION }, /* Southern Asia */ { 7299303, {'T','L',0}, {'T','L','S',0}, 47599, 626 }, /* Democratic Republic of Timor-Leste */ - { 10026358, {'X','X',0}, {'X','X',0}, 39070, 0, LOCATION_REGION }, /* Americas */ + { 10026358, {'X','X',0}, {'X','X',0}, 39070, 19, LOCATION_REGION }, /* Americas */ { 10028789, {'A','X',0}, {'A','L','A',0}, 10039882, 248 }, /* Åland Islands */ - { 10039880, {'X','X',0}, {'X','X',0}, 161832257, 0, LOCATION_REGION }, /* Caribbean */ - { 10039882, {'X','X',0}, {'X','X',0}, 10541, 0, LOCATION_REGION }, /* Northern Europe */ - { 10039883, {'X','X',0}, {'X','X',0}, 742, 0, LOCATION_REGION }, /* Southern Africa */ - { 10210824, {'X','X',0}, {'X','X',0}, 10541, 0, LOCATION_REGION }, /* Western Europe */ - { 10210825, {'X','X',0}, {'X','X',0}, 27114, 0, LOCATION_REGION }, /* Australia and New Zealand */ + { 10039880, {'X','X',0}, {'X','X',0}, 161832257, 29, LOCATION_REGION }, /* Caribbean */ + { 10039882, {'X','X',0}, {'X','X',0}, 10541, 154, LOCATION_REGION }, /* Northern Europe */ + { 10039883, {'X','X',0}, {'X','X',0}, 742, 18, LOCATION_REGION }, /* Southern Africa */ + { 10210824, {'X','X',0}, {'X','X',0}, 10541, 155, LOCATION_REGION }, /* Western Europe */ + { 10210825, {'X','X',0}, {'X','X',0}, 27114, 53, LOCATION_REGION }, /* Australia and New Zealand */ { 161832015, {'B','L',0}, {'B','L','M',0}, 10039880, 652 }, /* Saint Barthélemy */ { 161832256, {'U','M',0}, {'U','M','I',0}, 27114, 581 }, /* U.S. Minor Outlying Islands */ - { 161832257, {'X','X',0}, {'X','X',0}, 10026358, 0, LOCATION_REGION }, /* Latin America and the Caribbean */ + { 161832257, {'X','X',0}, {'X','X',0}, 10026358, 419, LOCATION_REGION }, /* Latin America and the Caribbean */ }; -static const struct geoinfo_t *get_geoinfo_dataptr(GEOID geoid) +static const WCHAR geoname_uncode_fmtW[] = {'%','0','3','i',0}; + +/****************************************************************************** + * get_geoinfoptr_by_id + * + * Returns a pointer to a geoinfo struct by finding its GeoID. + */ +static const struct geoinfo_t *get_geoinfoptr_by_id(GEOID geoid) { int min, max; @@ -3994,6 +4001,91 @@ static const struct geoinfo_t *get_geoinfo_dataptr(GEOID geoid) return NULL; } +/****************************************************************************** + * get_geoinfoptr_by_str + * + * Returns a pointer to a geoinfo struct by + * matching a string to the specified geotype. + */ + +static const struct geoinfo_t *get_geoinfoptr_by_str(const WCHAR *str, GEOTYPE geotype) +{ + int num; + + if (!str) + return NULL; + + switch (geotype) + { + case GEO_ISO2: + for (int i = 0; i < ARRAY_SIZE(geoinfodata); i++) + if (!(strcmpW(geoinfodata[i].iso2W, str))) return &geoinfodata[i]; + break; + case GEO_ISO_UN_NUMBER: + if (!(num = atoiW(str))) return NULL; + for (int i = 0; i < ARRAY_SIZE(geoinfodata); i++) + if (num == geoinfodata[i].uncode) + return geoinfodata[i].kind == LOCATION_REGION ? &geoinfodata[i] : NULL; + break; + } + return NULL; +} + +/****************************************************************************** + * get_geoinfoptr_by_name + * + * Parse and fix a geoname and return a pointer + * to the matching geoinfo struct. + */ + +static inline const struct geoinfo_t *get_geoinfoptr_by_name(const WCHAR *name) +{ + WCHAR buffer[3]; + int good = 0, len = 0; + + if (!name) + return NULL; + + /* Check if str is a two-letter country code (and make it uppercase) */ + for (int i = 0; i <= 2; i++) + if ((name[i] <= 127 && isalphaW(name[i]))) + { + buffer[i] = toupperW(name[i]); + good++; + } + else + { + if (!name[i]) + { + buffer[i] = 0; + len = i; + } + break; + } + + if (good == 2 && len == 2) + return get_geoinfoptr_by_str(buffer, GEO_ISO2); + + /* Now check if it's a three-digit code. */ + good = 0; + len = 0; + + for (int i = 0; i <= 3; i++) + if (isdigitW(name[i])) + good++; + else + { + if (!name[i]) + len = i; + break; + } + + if (good == 3 && len == 3) + return get_geoinfoptr_by_str(name, GEO_ISO_UN_NUMBER); + + return NULL; +} + /****************************************************************************** * GetUserGeoID (KERNEL32.@) * @@ -4050,19 +4142,25 @@ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) } /****************************************************************************** - * SetUserGeoID (KERNEL32.@) - */ -BOOL WINAPI SetUserGeoID(GEOID geoid) +* set_geo_reg +* +* Does the heavy lifting for SetUserGeoName() and SetUserGeoID(). +* +* The return value and last error set here can (and probably should) +* be returned to the callers of those two functions. +*/ +static int set_geo_reg(const struct geoinfo_t *geoinfo) { - const struct geoinfo_t *geoinfo = get_geoinfo_dataptr(geoid); static const WCHAR geoW[] = {'G','e','o',0}; static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; - static const WCHAR formatW[] = {'%','i',0}; - UNICODE_STRING nameW, keyW; - WCHAR bufferW[10]; + static const WCHAR nameW[] = {'N','a','m','e',0}; + static const WCHAR id_formatW[] = {'%','i',0}; + UNICODE_STRING geokeyW, idkeyW, namekeyW; + WCHAR id_buffer[10], name_buffer[4]; OBJECT_ATTRIBUTES attr; HANDLE hkey; + RtlInitUnicodeString(&geokeyW, geoW); if (!geoinfo) { @@ -4077,16 +4175,11 @@ BOOL WINAPI SetUserGeoID(GEOID geoid) attr.Length = sizeof(attr); attr.RootDirectory = hkey; - attr.ObjectName = &nameW; + attr.ObjectName = &geokeyW; attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString(&nameW, geoW); - - if (geoinfo->kind == LOCATION_NATION) - RtlInitUnicodeString(&keyW, nationW); - else - RtlInitUnicodeString(&keyW, regionW); + RtlInitUnicodeString(&geokeyW, geoW); if (NtCreateKey(&hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL) != STATUS_SUCCESS) { @@ -4095,13 +4188,96 @@ BOOL WINAPI SetUserGeoID(GEOID geoid) return FALSE; } - sprintfW(bufferW, formatW, geoinfo->id); - NtSetValueKey(hkey, &keyW, 0, REG_SZ, bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR)); + /* Prepare GeoID */ + if (geoinfo->kind == LOCATION_NATION) + RtlInitUnicodeString(&idkeyW, nationW); + else + RtlInitUnicodeString(&idkeyW, regionW); + + sprintfW(id_buffer, id_formatW, geoinfo->id); + + /* Now prepare geoname */ + RtlInitUnicodeString(&namekeyW, nameW); + + if (geoinfo->kind == LOCATION_REGION) + sprintfW(name_buffer, geoname_uncode_fmtW, geoinfo->uncode); + else + strcpyW(name_buffer, geoinfo->iso2W); + + NtSetValueKey(hkey, &idkeyW, 0, REG_SZ, id_buffer, + (strlenW(id_buffer) + 1) * sizeof(WCHAR)); + NtSetValueKey(hkey, &namekeyW, 0, REG_SZ, name_buffer, + (strlenW(name_buffer) + 1) * sizeof(WCHAR)); + + TRACE("Set %s to ID %d; set Name to %s.\n", + wine_dbgstr_w(idkeyW.Buffer), geoinfo->id, wine_dbgstr_w(name_buffer)); + NtClose(attr.RootDirectory); NtClose(hkey); return TRUE; } +/****************************************************************************** + * SetUserGeoID (KERNEL32.@) + * + * Sets the ID of the user's geographic location. + * + * PARAMS + * geoid [I] The geographic ID to be set. + * + * RETURNS + * SUCCESS: TRUE. + * FAILURE: FALSE. Call GetLastError() to determine the cause. + * + * NOTES + * On success, the geographic name will be set to the location of the specified ID. + * + * On failure, GetLastError() will return one of the following values: + * - ERROR_INVALID_PARAMETER: the specified GeoID was invalid. + * - ERROR_INTERNAL_ERROR: an internal error prevented Wine from setting the ID. + */ +BOOL WINAPI SetUserGeoID(GEOID geoid) +{ + TRACE("(%d)\n", geoid); + return set_geo_reg(get_geoinfoptr_by_id(geoid)); +} + +/****************************************************************************** + * SetUserGeoName (KERNEL32.@) + * + * Sets the name of the user's geographic location. + * + * This name is a two-letter ISO 3166 country code + * or a three-digit UN M.49 code for anything other than countries (e.g. continents). + * + * PARAMS + * geoname [I] The name to be set. + * + * RETURNS + * SUCCESS: TRUE. + * FAILURE: FALSE. Call GetLastError() to determine the cause. + * + * NOTES + * On success, the geographic ID for the relevant class will be set to + * the location of the specified name. + * + * On failure, GetLastError() will return one of the following values: + * - ERROR_INVALID_PARAMETER: the specified GeoID was invalid. + * - ERROR_INTERNAL_ERROR: an internal error prevented Wine from setting the name. + */ +BOOL WINAPI SetUserGeoName(WCHAR *geoname) +{ + if (!geoname || !*geoname) + { + TRACE("(%p = (null))\n", geoname); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + TRACE("(%p = %s)\n", geoname, wine_dbgstr_w(geoname)); + return set_geo_reg(get_geoinfoptr_by_name(geoname)); +} + /****************************************************************************** * GetGeoInfoW (KERNEL32.@) */ @@ -4115,7 +4291,7 @@ INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, TRACE("%d %d %p %d %d\n", geoid, geotype, data, data_len, lang); - if (!(ptr = get_geoinfo_dataptr(geoid))) { + if (!(ptr = get_geoinfoptr_by_id(geoid))) { SetLastError(ERROR_INVALID_PARAMETER); return 0; } diff --git a/include/winnls.h b/include/winnls.h index e810c44af7..4f84c64f81 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -968,6 +968,7 @@ WINBASEAPI BOOL WINAPI SetLocaleInfoW(LCID,LCTYPE,LPCWSTR); WINBASEAPI BOOL WINAPI SetThreadLocale(LCID); WINBASEAPI LANGID WINAPI SetThreadUILanguage(LANGID); WINBASEAPI BOOL WINAPI SetUserGeoID(GEOID); +WINBASEAPI BOOL WINAPI SetUserGeoName(WCHAR*); WINBASEAPI INT WINAPI WideCharToMultiByte(UINT,DWORD,LPCWSTR,INT,LPSTR,INT,LPCSTR,LPBOOL); WINBASEAPI INT WINAPI FindNLSStringEx(const WCHAR *,DWORD,const WCHAR *,INT,const WCHAR *,INT,INT *,NLSVERSIONINFO *,void *,LPARAM); -- 2.23.0

2 1

[PATCH] regedit: Fix double free error in GetValueName.
by Piotr Caban 31 Oct '19

31 Oct '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- programs/regedit/listview.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)

1 0

[PATCH v2] d3dx11: Add D3DX11SaveTextureToFileA/W stub
by Andrey Gusev 31 Oct '19

31 Oct '19

You also missed to add prototype in header.

1 0

[PATCH] shcore: Add GetScaleFactorForMonitor stub
by Esdras Tarsis 31 Oct '19

31 Oct '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48016 Signed-off-by: Esdras Tarsis <esdrastarsis(a)gmail.com> --- dlls/shcore/main.c | 9 +++++++++ dlls/shcore/shcore.spec | 2 +- include/shellscalingapi.h | 22 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 6a6247930f..af107647c6 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -1517,6 +1517,15 @@ void WINAPI SetProcessReference(IUnknown *obj) process_ref = obj; } +/************************************************************************* + * GetScaleFactorForMonitor [SHCORE.@] + */ +HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR monitor, DEVICE_SCALE_FACTOR *scale) +{ + FIXME("(%d, %p) - stub!\n", monitor, scale); + return S_OK; +} + struct thread_data { LPTHREAD_START_ROUTINE thread_proc; diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 6a634bdee5..d5b7a342e3 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -12,7 +12,7 @@ @ stdcall GetProcessDpiAwareness(long ptr) @ stdcall GetProcessReference(ptr) @ stub GetScaleFactorForDevice -@ stub GetScaleFactorForMonitor +@ stdcall GetScaleFactorForMonitor(long ptr) @ stub IStream_Copy @ stdcall IStream_Read(ptr ptr long) _IStream_Read @ stub IStream_ReadStr diff --git a/include/shellscalingapi.h b/include/shellscalingapi.h index 1df85d5982..80dab0178f 100644 --- a/include/shellscalingapi.h +++ b/include/shellscalingapi.h @@ -34,8 +34,30 @@ typedef enum PROCESS_DPI_AWARENESS PROCESS_PER_MONITOR_DPI_AWARE } PROCESS_DPI_AWARENESS; +typedef enum DEVICE_SCALE_FACTOR +{ + DEVICE_SCALE_FACTOR_INVALID, + SCALE_100_PERCENT, + SCALE_120_PERCENT, + SCALE_125_PERCENT, + SCALE_140_PERCENT, + SCALE_150_PERCENT, + SCALE_160_PERCENT, + SCALE_175_PERCENT, + SCALE_180_PERCENT, + SCALE_200_PERCENT, + SCALE_225_PERCENT, + SCALE_250_PERCENT, + SCALE_300_PERCENT, + SCALE_350_PERCENT, + SCALE_400_PERCENT, + SCALE_450_PERCENT, + SCALE_500_PERCENT +} DEVICE_SCALE_FACTOR; + HRESULT WINAPI GetDpiForMonitor(HMONITOR,MONITOR_DPI_TYPE,UINT*,UINT*); HRESULT WINAPI GetProcessDpiAwareness(HANDLE,PROCESS_DPI_AWARENESS*); HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS); +HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR,DEVICE_SCALE_FACTOR*); #endif /* __WINE_SHELLSCALINGAPI_H */ -- 2.23.0

2 1

[PATCH] shell32: Symlink the Downloads and Templates folders too
by Alex Henrie 31 Oct '19

31 Oct '19

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- I recently wanted to try out the Windows version of Avidemux on a file I had just downloaded from the web, and Avidemux's Open dialog defaulted to C:\Users\alex, but when I double-clicked Downloads it was empty. --- dlls/shell32/shellpath.c | 52 ++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 8c6e8a89b2..28984a9dc1 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4354,6 +4354,12 @@ static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { case IDS_MYVIDEOS: lstrcpyW(wszSubPath, My_VideosW); break; + case IDS_DOWNLOADS: + lstrcpyW(wszSubPath, DownloadsW); + break; + case IDS_TEMPLATES: + lstrcpyW(wszSubPath, TemplatesW); + break; default: ERR("LoadString(%d) failed!\n", LOWORD(pwszSubPath)); return FALSE; @@ -4380,21 +4386,21 @@ static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { /****************************************************************************** * _SHCreateSymbolicLinks [Internal] * - * Sets up symbol links for various shell folders to point into the users home + * Sets up symbol links for various shell folders to point into the user's home * directory. We do an educated guess about what the user would probably want: * - If there is a 'My Documents' directory in $HOME, the user probably wants - * wine's 'My Documents' to point there. Furthermore, we imply that the user - * is a Windows lover and has no problem with wine creating 'My Pictures', - * 'My Music' and 'My Videos' subfolders under '$HOME/My Documents', if those - * do not already exits. We put appropriate symbolic links in place for those, - * too. + * wine's 'My Documents' to point there. Furthermore, we infer that the user + * is a Windows lover and has no problem with wine creating subfolders for + * 'My Pictures', 'My Music', 'My Videos' etc. under '$HOME/My Documents', if + * those do not already exist. We put appropriate symbolic links in place for + * those, too. * - If there is no 'My Documents' directory in $HOME, we let 'My Documents' * point directly to $HOME. We assume the user to be a unix hacker who does not * want wine to create anything anywhere besides the .wine directory. So, if * there already is a 'My Music' directory in $HOME, we symlink the 'My Music' * shell folder to it. But if not, then we check XDG_MUSIC_DIR - "well known" * directory, and try to link to that. If that fails, then we symlink to - * $HOME directly. The same holds fo 'My Pictures' and 'My Videos'. + * $HOME directly. The same holds for 'My Pictures', 'My Videos' etc. * - The Desktop shell folder is symlinked to XDG_DESKTOP_DIR. If that does not * exist, then we try '$HOME/Desktop'. If that does not exist, then we leave * it alone. @@ -4402,10 +4408,18 @@ static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { */ static void _SHCreateSymbolicLinks(void) { - UINT aidsMyStuff[] = { IDS_MYPICTURES, IDS_MYVIDEOS, IDS_MYMUSIC }, i; - const WCHAR* MyOSXStuffW[] = { PicturesW, MoviesW, MusicW }; - int acsidlMyStuff[] = { CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC }; - static const char * const xdg_dirs[] = { "PICTURES", "VIDEOS", "MUSIC", "DOCUMENTS", "DESKTOP" }; + static const UINT aidsMyStuff[] = { + IDS_MYPICTURES, IDS_MYVIDEOS, IDS_MYMUSIC, IDS_DOWNLOADS, IDS_TEMPLATES + }; + static const WCHAR * const MyOSXStuffW[] = { + PicturesW, MoviesW, MusicW, DownloadsW, TemplatesW + }; + static const int acsidlMyStuff[] = { + CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC, CSIDL_DOWNLOADS, CSIDL_TEMPLATES + }; + static const char * const xdg_dirs[] = { + "PICTURES", "VIDEOS", "MUSIC", "DOWNLOAD", "TEMPLATES", "DOCUMENTS", "DESKTOP" + }; static const unsigned int num = ARRAY_SIZE(xdg_dirs); WCHAR wszTempPath[MAX_PATH]; char szPersonalTarget[FILENAME_MAX], *pszPersonal; @@ -4416,6 +4430,7 @@ static void _SHCreateSymbolicLinks(void) HRESULT hr; char ** xdg_results; char * xdg_desktop_dir; + UINT i; /* Create all necessary profile sub-dirs up to 'My Documents' and get the unix path. */ hr = SHGetFolderPathW(NULL, CSIDL_PERSONAL|CSIDL_FLAG_CREATE, NULL, @@ -4437,9 +4452,9 @@ static void _SHCreateSymbolicLinks(void) if (_SHAppendToUnixPath(szPersonalTarget, MAKEINTRESOURCEW(IDS_PERSONAL)) && !stat(szPersonalTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) { - /* '$HOME/My Documents' exists. Create 'My Pictures', - * 'My Videos' and 'My Music' subfolders or fail silently if - * they already exist. + /* '$HOME/My Documents' exists. Create subfolders for + * 'My Pictures', 'My Videos', 'My Music' etc. or fail silently + * if they already exist. */ for (i = 0; i < ARRAY_SIZE(aidsMyStuff); i++) { @@ -4477,8 +4492,9 @@ static void _SHCreateSymbolicLinks(void) } else { - /* '$HOME' doesn't exist. Create 'My Pictures', 'My Videos' and 'My Music' subdirs - * in '%USERPROFILE%\\My Documents' or fail silently if they already exist. */ + /* '$HOME' doesn't exist. Create subdirs for 'My Pictures', 'My Videos', + * 'My Music' etc. in '%USERPROFILE%\My Documents' or fail silently if + * they already exist. */ pszHome = NULL; strcpy(szPersonalTarget, pszPersonal); for (i = 0; i < ARRAY_SIZE(aidsMyStuff); i++) { @@ -4488,7 +4504,7 @@ static void _SHCreateSymbolicLinks(void) } } - /* Create symbolic links for 'My Pictures', 'My Videos' and 'My Music'. */ + /* Create symbolic links for 'My Pictures', 'My Videos', 'My Music' etc. */ for (i=0; i < ARRAY_SIZE(aidsMyStuff); i++) { /* Create the current 'My Whatever' folder and get its unix path. */ @@ -6124,7 +6140,7 @@ HRESULT SHELL_RegisterShellFolders(void) HRESULT hr; /* Set up '$HOME' targeted symlinks for 'My Documents', 'My Pictures', - * 'My Videos', 'My Music' and 'Desktop' in advance, so that the + * 'My Videos', 'My Music', 'Desktop' etc. in advance, so that the * _SHRegister*ShellFolders() functions will find everything nice and clean * and thus will not attempt to create them in the profile directory. */ _SHCreateSymbolicLinks(); -- 2.23.0

1 0

[PATCH v3 2/7] kernel32: Handle GEOCLASS_REGION in Get/SetUserGeoID.
by João Diogo Ferreira 31 Oct '19

31 Oct '19

Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- Supersedes: 172356 V3: Fix build error. V2: Introduce trace logs. --- dlls/kernel32/locale.c | 57 ++++++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 7c97915199..4bb0b16109 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4002,6 +4002,7 @@ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) GEOID ret = GEOID_NOT_AVAILABLE; static const WCHAR geoW[] = {'G','e','o',0}; static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; + static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; WCHAR bufferW[40], *end; HANDLE hkey, hsubkey = 0; UNICODE_STRING keyW; @@ -4009,20 +4010,29 @@ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) DWORD count = sizeof(bufferW); RtlInitUnicodeString(&keyW, nationW); + if (geoclass == GEOCLASS_NATION) + { + TRACE("(GEOCLASS_NATION)\n"); + RtlInitUnicodeString(&keyW, nationW); + } + else if (geoclass == GEOCLASS_REGION) + { + TRACE("(GEOCLASS_REGION)\n"); + RtlInitUnicodeString(&keyW, regionW); + } + else + { + WARN("Unknown geoclass %d\n", geoclass); + return ret; + } + if (!(hkey = create_registry_key())) return ret; - switch (geoclass) { - case GEOCLASS_NATION: - if ((hsubkey = NLS_RegOpenKey(hkey, geoW))) - { - if ((NtQueryValueKey(hsubkey, &keyW, KeyValuePartialInformation, - bufferW, count, &count) == STATUS_SUCCESS ) && info->DataLength) - ret = strtolW((const WCHAR*)info->Data, &end, 10); - } - break; - case GEOCLASS_REGION: - FIXME("GEOCLASS_REGION not handled yet\n"); - break; + if ((hsubkey = NLS_RegOpenKey(hkey, geoW))) + { + if((NtQueryValueKey(hsubkey, &keyW, KeyValuePartialInformation, + bufferW, count, &count) == STATUS_SUCCESS ) && info->DataLength) + ret = strtolW((const WCHAR*)info->Data, &end, 10); } NtClose(hkey); @@ -4035,15 +4045,26 @@ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) */ BOOL WINAPI SetUserGeoID(GEOID geoid) { + const struct geoinfo_t *geoinfo = get_geoinfo_dataptr(geoid); static const WCHAR geoW[] = {'G','e','o',0}; static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; + static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; static const WCHAR formatW[] = {'%','i',0}; UNICODE_STRING nameW, keyW; WCHAR bufferW[10]; OBJECT_ATTRIBUTES attr; HANDLE hkey; - if(!(hkey = create_registry_key())) return FALSE; + if (!geoinfo) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (!(hkey = create_registry_key())) + { + SetLastError(ERROR_INTERNAL_ERROR); + return FALSE; + } attr.Length = sizeof(attr); attr.RootDirectory = hkey; @@ -4052,16 +4073,20 @@ BOOL WINAPI SetUserGeoID(GEOID geoid) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; RtlInitUnicodeString(&nameW, geoW); - RtlInitUnicodeString(&keyW, nationW); - if (NtCreateKey(&hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL) != STATUS_SUCCESS) + if (geoinfo->kind == LOCATION_NATION) + RtlInitUnicodeString(&keyW, nationW); + else + RtlInitUnicodeString(&keyW, regionW); + if (NtCreateKey(&hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL) != STATUS_SUCCESS) { NtClose(attr.RootDirectory); + SetLastError(ERROR_INTERNAL_ERROR); return FALSE; } - sprintfW(bufferW, formatW, geoid); + sprintfW(bufferW, formatW, geoinfo->id); NtSetValueKey(hkey, &keyW, 0, REG_SZ, bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR)); NtClose(attr.RootDirectory); NtClose(hkey); -- 2.23.0

2 2

[PATCH v3 3/7] kernel32: Implement SetUserGeoName() and clean-up locale.c.
by João Diogo Ferreira 31 Oct '19

31 Oct '19

The new UN codes (required for SetUserGeoName()) were tested and confirmed to match with Windows 10 v1909. Introduced new helpers to keep this file clean. I wrote some documentation. This is my original work and/or work copied from the Wine source itself and does not include any other copyrighted material, nor does it copy any content owned or written by Microsoft. Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- Supersedes: 172357 V3: Fix build error from patch #2. V2: Squash UN codes and clean-up into this commit. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 336 ++++++++++++++++++++++++++---------- include/winnls.h | 1 + 3 files changed, 251 insertions(+), 87 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 23c25b7acd..9898bdec6e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1469,6 +1469,7 @@ @ stdcall -arch=x86_64 SetUmsThreadInformation(ptr long ptr long) @ stdcall -import SetUnhandledExceptionFilter(ptr) @ stdcall SetUserGeoID(long) +@ stdcall SetUserGeoName(wstr) @ stub SetVDMCurrentDirectories @ stdcall SetVolumeLabelA(str str) @ stdcall SetVolumeLabelW(wstr wstr) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 4bb0b16109..5bb314b595 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -645,11 +645,11 @@ static BOOL is_genitive_name_supported( LCTYPE lctype ) } /*********************************************************************** - * create_registry_key + * create_intl_regkey * * Create the Control Panel\\International registry key. */ -static inline HANDLE create_registry_key(void) +static inline HANDLE create_intl_regkey(void) { static const WCHAR cplW[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l',0}; static const WCHAR intlW[] = {'I','n','t','e','r','n','a','t','i','o','n','a','l',0}; @@ -678,6 +678,37 @@ static inline HANDLE create_registry_key(void) return hkey; } +/*********************************************************************** + * create_geo_regkey + * + * Create the Control Panel\\International\\Geo registry key. + */ + +static inline HANDLE create_geo_regkey(void) +{ + static const WCHAR geoW[] = {'G','e','o',0}; + UNICODE_STRING name; + OBJECT_ATTRIBUTES attr; + HANDLE intl_key, hkey; + + if (!(intl_key = create_intl_regkey())) + return 0; + + attr.Length = sizeof(attr); + attr.RootDirectory = intl_key; + attr.ObjectName = &name; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString(&name, geoW); + + if (NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ) != STATUS_SUCCESS) + hkey = 0; + + NtClose(intl_key); + return hkey; +} + /* update the registry settings for a given locale parameter */ /* return TRUE if an update was needed */ @@ -790,7 +821,7 @@ void LOCALE_InitRegistry(void) HANDLE hkey; LCID lcid = GetUserDefaultLCID(); - if (!(hkey = create_registry_key())) + if (!(hkey = create_intl_regkey())) return; /* don't do anything if we can't create the registry key */ locale_update_registry( hkey, localeW, lcid_LC_MESSAGES, lc_messages_values, @@ -1240,7 +1271,7 @@ static INT get_registry_locale_info( struct registry_value *registry_value, LPWS if (!registry_value->cached_value) { - if (!(hkey = create_registry_key())) + if (!(hkey = create_intl_regkey())) { RtlLeaveCriticalSection( &cache_section ); return -1; @@ -1686,7 +1717,7 @@ BOOL WINAPI SetLocaleInfoW( LCID lcid, LCTYPE lctype, LPCWSTR data ) /* FIXME: profile functions should map to registry */ WriteProfileStringW( intlW, value->name, data ); - if (!(hkey = create_registry_key())) return FALSE; + if (!(hkey = create_intl_regkey())) return FALSE; RtlInitUnicodeString( &valueW, value->name ); status = NtSetValueKey( hkey, &valueW, 0, REG_SZ, data, (strlenW(data)+1)*sizeof(WCHAR) ); @@ -3593,21 +3624,6 @@ void LOCALE_Init(void) setlocale(LC_NUMERIC, "C"); /* FIXME: oleaut32 depends on this */ } -static HANDLE NLS_RegOpenKey(HANDLE hRootKey, LPCWSTR szKeyName) -{ - UNICODE_STRING keyName; - OBJECT_ATTRIBUTES attr; - HANDLE hkey; - - RtlInitUnicodeString( &keyName, szKeyName ); - InitializeObjectAttributes(&attr, &keyName, 0, hRootKey, NULL); - - if (NtOpenKey( &hkey, KEY_READ, &attr ) != STATUS_SUCCESS) - hkey = 0; - - return hkey; -} - /****************************************************************************** * EnumSystemLanguageGroupsA (KERNEL32.@) */ @@ -3889,7 +3905,7 @@ static const struct geoinfo_t geoinfodata[] = { { 305, {'X','X',0}, {'X','X',0}, 161832256 }, /* Baker Island */ { 306, {'B','V',0}, {'B','V','T',0}, 39070, 74 }, /* Bouvet Island */ { 307, {'K','Y',0}, {'C','Y','M',0}, 10039880, 136 }, /* Cayman Islands */ - { 308, {'X','X',0}, {'X','X',0}, 10210824, 0, LOCATION_BOTH }, /* Channel Islands */ + { 308, {'X','X',0}, {'X','X',0}, 10210824, 830, LOCATION_BOTH }, /* Channel Islands */ { 309, {'C','X',0}, {'C','X','R',0}, 12, 162 }, /* Christmas Island */ { 310, {'X','X',0}, {'X','X',0}, 27114 }, /* Clipperton Island */ { 311, {'C','C',0}, {'C','C','K',0}, 10210825, 166 }, /* Cocos (Keeling) Islands */ @@ -3929,47 +3945,54 @@ static const struct geoinfo_t geoinfodata[] = { { 349, {'T','C',0}, {'T','C','A',0}, 10039880, 796 }, /* Turks and Caicos Islands */ { 351, {'V','G',0}, {'V','G','B',0}, 10039880, 92 }, /* Virgin Islands, British */ { 352, {'W','F',0}, {'W','L','F',0}, 26286, 876 }, /* Wallis and Futuna */ - { 742, {'X','X',0}, {'X','X',0}, 39070, 0, LOCATION_REGION }, /* Africa */ - { 2129, {'X','X',0}, {'X','X',0}, 39070, 0, LOCATION_REGION }, /* Asia */ - { 10541, {'X','X',0}, {'X','X',0}, 39070, 0, LOCATION_REGION }, /* Europe */ + { 742, {'X','X',0}, {'X','X',0}, 39070, 2, LOCATION_REGION }, /* Africa */ + { 2129, {'X','X',0}, {'X','X',0}, 39070, 142, LOCATION_REGION }, /* Asia */ + { 10541, {'X','X',0}, {'X','X',0}, 39070, 150, LOCATION_REGION }, /* Europe */ { 15126, {'I','M',0}, {'I','M','N',0}, 10039882, 833 }, /* Man, Isle of */ { 19618, {'M','K',0}, {'M','K','D',0}, 47610, 807 }, /* Macedonia, Former Yugoslav Republic of */ - { 20900, {'X','X',0}, {'X','X',0}, 27114, 0, LOCATION_REGION }, /* Melanesia */ - { 21206, {'X','X',0}, {'X','X',0}, 27114, 0, LOCATION_REGION }, /* Micronesia */ + { 20900, {'X','X',0}, {'X','X',0}, 27114, 54, LOCATION_REGION }, /* Melanesia */ + { 21206, {'X','X',0}, {'X','X',0}, 27114, 57, LOCATION_REGION }, /* Micronesia */ { 21242, {'X','X',0}, {'X','X',0}, 161832256 }, /* Midway Islands */ - { 23581, {'X','X',0}, {'X','X',0}, 10026358, 0, LOCATION_REGION }, /* Northern America */ - { 26286, {'X','X',0}, {'X','X',0}, 27114, 0, LOCATION_REGION }, /* Polynesia */ - { 27082, {'X','X',0}, {'X','X',0}, 161832257, 0, LOCATION_REGION }, /* Central America */ - { 27114, {'X','X',0}, {'X','X',0}, 39070, 0, LOCATION_REGION }, /* Oceania */ + { 23581, {'X','X',0}, {'X','X',0}, 10026358, 21, LOCATION_REGION }, /* Northern America */ + { 26286, {'X','X',0}, {'X','X',0}, 27114, 61, LOCATION_REGION }, /* Polynesia */ + { 27082, {'X','X',0}, {'X','X',0}, 161832257, 13, LOCATION_REGION }, /* Central America */ + { 27114, {'X','X',0}, {'X','X',0}, 39070, 9, LOCATION_REGION }, /* Oceania */ { 30967, {'S','X',0}, {'S','X','M',0}, 10039880, 534 }, /* Sint Maarten (Dutch part) */ - { 31396, {'X','X',0}, {'X','X',0}, 161832257, 0, LOCATION_REGION }, /* South America */ + { 31396, {'X','X',0}, {'X','X',0}, 161832257, 5, LOCATION_REGION }, /* South America */ { 31706, {'M','F',0}, {'M','A','F',0}, 10039880, 663 }, /* Saint Martin (French part) */ - { 39070, {'X','X',0}, {'X','X',0}, 39070, 0, LOCATION_REGION }, /* World */ - { 42483, {'X','X',0}, {'X','X',0}, 742, 0, LOCATION_REGION }, /* Western Africa */ - { 42484, {'X','X',0}, {'X','X',0}, 742, 0, LOCATION_REGION }, /* Middle Africa */ - { 42487, {'X','X',0}, {'X','X',0}, 742, 0, LOCATION_REGION }, /* Northern Africa */ - { 47590, {'X','X',0}, {'X','X',0}, 2129, 0, LOCATION_REGION }, /* Central Asia */ - { 47599, {'X','X',0}, {'X','X',0}, 2129, 0, LOCATION_REGION }, /* South-Eastern Asia */ - { 47600, {'X','X',0}, {'X','X',0}, 2129, 0, LOCATION_REGION }, /* Eastern Asia */ - { 47603, {'X','X',0}, {'X','X',0}, 742, 0, LOCATION_REGION }, /* Eastern Africa */ - { 47609, {'X','X',0}, {'X','X',0}, 10541, 0, LOCATION_REGION }, /* Eastern Europe */ - { 47610, {'X','X',0}, {'X','X',0}, 10541, 0, LOCATION_REGION }, /* Southern Europe */ - { 47611, {'X','X',0}, {'X','X',0}, 2129, 0, LOCATION_REGION }, /* Middle East */ - { 47614, {'X','X',0}, {'X','X',0}, 2129, 0, LOCATION_REGION }, /* Southern Asia */ + { 39070, {'X','X',0}, {'X','X',0}, 39070, 1, LOCATION_REGION }, /* World */ + { 42483, {'X','X',0}, {'X','X',0}, 742, 11, LOCATION_REGION }, /* Western Africa */ + { 42484, {'X','X',0}, {'X','X',0}, 742, 17, LOCATION_REGION }, /* Middle Africa */ + { 42487, {'X','X',0}, {'X','X',0}, 742, 15, LOCATION_REGION }, /* Northern Africa */ + { 47590, {'X','X',0}, {'X','X',0}, 2129, 143, LOCATION_REGION }, /* Central Asia */ + { 47599, {'X','X',0}, {'X','X',0}, 2129, 35, LOCATION_REGION }, /* South-Eastern Asia */ + { 47600, {'X','X',0}, {'X','X',0}, 2129, 30, LOCATION_REGION }, /* Eastern Asia */ + { 47603, {'X','X',0}, {'X','X',0}, 742, 14, LOCATION_REGION }, /* Eastern Africa */ + { 47609, {'X','X',0}, {'X','X',0}, 10541, 151, LOCATION_REGION }, /* Eastern Europe */ + { 47610, {'X','X',0}, {'X','X',0}, 10541, 39, LOCATION_REGION }, /* Southern Europe */ + { 47611, {'X','X',0}, {'X','X',0}, 2129, 145, LOCATION_REGION }, /* Middle East */ + { 47614, {'X','X',0}, {'X','X',0}, 2129, 34, LOCATION_REGION }, /* Southern Asia */ { 7299303, {'T','L',0}, {'T','L','S',0}, 47599, 626 }, /* Democratic Republic of Timor-Leste */ - { 10026358, {'X','X',0}, {'X','X',0}, 39070, 0, LOCATION_REGION }, /* Americas */ + { 10026358, {'X','X',0}, {'X','X',0}, 39070, 19, LOCATION_REGION }, /* Americas */ { 10028789, {'A','X',0}, {'A','L','A',0}, 10039882, 248 }, /* Åland Islands */ - { 10039880, {'X','X',0}, {'X','X',0}, 161832257, 0, LOCATION_REGION }, /* Caribbean */ - { 10039882, {'X','X',0}, {'X','X',0}, 10541, 0, LOCATION_REGION }, /* Northern Europe */ - { 10039883, {'X','X',0}, {'X','X',0}, 742, 0, LOCATION_REGION }, /* Southern Africa */ - { 10210824, {'X','X',0}, {'X','X',0}, 10541, 0, LOCATION_REGION }, /* Western Europe */ - { 10210825, {'X','X',0}, {'X','X',0}, 27114, 0, LOCATION_REGION }, /* Australia and New Zealand */ + { 10039880, {'X','X',0}, {'X','X',0}, 161832257, 29, LOCATION_REGION }, /* Caribbean */ + { 10039882, {'X','X',0}, {'X','X',0}, 10541, 154, LOCATION_REGION }, /* Northern Europe */ + { 10039883, {'X','X',0}, {'X','X',0}, 742, 18, LOCATION_REGION }, /* Southern Africa */ + { 10210824, {'X','X',0}, {'X','X',0}, 10541, 155, LOCATION_REGION }, /* Western Europe */ + { 10210825, {'X','X',0}, {'X','X',0}, 27114, 53, LOCATION_REGION }, /* Australia and New Zealand */ { 161832015, {'B','L',0}, {'B','L','M',0}, 10039880, 652 }, /* Saint Barthélemy */ { 161832256, {'U','M',0}, {'U','M','I',0}, 27114, 581 }, /* U.S. Minor Outlying Islands */ - { 161832257, {'X','X',0}, {'X','X',0}, 10026358, 0, LOCATION_REGION }, /* Latin America and the Caribbean */ + { 161832257, {'X','X',0}, {'X','X',0}, 10026358, 419, LOCATION_REGION }, /* Latin America and the Caribbean */ }; -static const struct geoinfo_t *get_geoinfo_dataptr(GEOID geoid) +static const WCHAR geoname_uncode_fmtW[] = {'%','0','3','i',0}; + +/****************************************************************************** + * get_geoinfoptr_by_id + * + * Returns a pointer to a geoinfo struct by finding its GeoID. + */ +static const struct geoinfo_t *get_geoinfoptr_by_id(GEOID geoid) { int min, max; @@ -3994,17 +4017,87 @@ static const struct geoinfo_t *get_geoinfo_dataptr(GEOID geoid) return NULL; } +/****************************************************************************** + * get_geoinfoptr_by_str + * + * Returns a pointer to a geoinfo struct by + * matching a string to the specified geotype. + */ + +static const struct geoinfo_t *get_geoinfoptr_by_str(const WCHAR *str, GEOTYPE geotype) +{ + int num; + + if (!str) + return NULL; + + switch (geotype) + { + case GEO_ISO2: + for (int i = 0; i < ARRAY_SIZE(geoinfodata); i++) + if (!(strcmpW(geoinfodata[i].iso2W, str))) return &geoinfodata[i]; + break; + case GEO_ISO_UN_NUMBER: + if (!(num = atoiW(str))) return NULL; + for (int i = 0; i < ARRAY_SIZE(geoinfodata); i++) + if (num == geoinfodata[i].uncode) return &geoinfodata[i]; + break; + } + return NULL; +} + +/****************************************************************************** + * get_geoinfoptr_by_name + * + * Automatically parse and fix a geoname and + * return a pointer to the matching geoinfo struct. + */ + +static inline const struct geoinfo_t *get_geoinfoptr_by_name(const WCHAR *name) +{ + WCHAR buffer[3]; + int written = 0, len = 0; + + /* Check if str is a 2-letter country code (and make it uppercase) */ + for (int i = 0; i <= 2; i++) + if ((name[i] <= 127 && isalphaW(name[i]))) + { + buffer[i] = toupperW(name[i]); + written++; + } + else + { + if (!name[i]) + { + buffer[i] = 0; + len = i; + } + break; + } + if (written == 2 && len == 2) + return get_geoinfoptr_by_str(buffer, GEO_ISO2); + + /* Now check if it's a numerical code, up to three digits */ + for (int i = 0; i <= 3; i++) + if (isdigitW(name[i])) continue; + else if (!name[i]) + return get_geoinfoptr_by_str(name, GEO_ISO_UN_NUMBER); + else + break; + + return NULL; +} + /****************************************************************************** * GetUserGeoID (KERNEL32.@) */ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) { GEOID ret = GEOID_NOT_AVAILABLE; - static const WCHAR geoW[] = {'G','e','o',0}; static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; WCHAR bufferW[40], *end; - HANDLE hkey, hsubkey = 0; + HANDLE hkey; UNICODE_STRING keyW; const KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)bufferW; DWORD count = sizeof(bufferW); @@ -4026,33 +4119,33 @@ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) return ret; } - if (!(hkey = create_registry_key())) return ret; + if (!(hkey = create_geo_regkey())) return ret; - if ((hsubkey = NLS_RegOpenKey(hkey, geoW))) - { - if((NtQueryValueKey(hsubkey, &keyW, KeyValuePartialInformation, - bufferW, count, &count) == STATUS_SUCCESS ) && info->DataLength) + if((NtQueryValueKey(hkey, &keyW, KeyValuePartialInformation, + bufferW, count, &count) == STATUS_SUCCESS ) && info->DataLength) ret = strtolW((const WCHAR*)info->Data, &end, 10); - } NtClose(hkey); - if (hsubkey) NtClose(hsubkey); return ret; } /****************************************************************************** - * SetUserGeoID (KERNEL32.@) + * set_geo_reg + * + * Does the heavy lifting for SetUserGeoName() and SetUserGeoID(). + * + * The return value and last error set here can (and probably should) + * be returned to the callers of those two functions. */ -BOOL WINAPI SetUserGeoID(GEOID geoid) +static int set_geo_reg(const struct geoinfo_t *geoinfo) { - const struct geoinfo_t *geoinfo = get_geoinfo_dataptr(geoid); - static const WCHAR geoW[] = {'G','e','o',0}; static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; - static const WCHAR formatW[] = {'%','i',0}; - UNICODE_STRING nameW, keyW; - WCHAR bufferW[10]; - OBJECT_ATTRIBUTES attr; + static const WCHAR nameW[] = {'N','a','m','e',0}; + static const WCHAR id_formatW[] = {'%','i',0}; + UNICODE_STRING idkeyW, namekeyW; + WCHAR geoidW[10], geonameW[4]; + int namelen; HANDLE hkey; if (!geoinfo) @@ -4060,39 +4153,108 @@ BOOL WINAPI SetUserGeoID(GEOID geoid) SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if (!(hkey = create_registry_key())) + if (!(hkey = create_geo_regkey())) { SetLastError(ERROR_INTERNAL_ERROR); return FALSE; } - attr.Length = sizeof(attr); - attr.RootDirectory = hkey; - attr.ObjectName = &nameW; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString(&nameW, geoW); - + /* Prepare GeoID */ if (geoinfo->kind == LOCATION_NATION) - RtlInitUnicodeString(&keyW, nationW); + RtlInitUnicodeString(&idkeyW, nationW); else - RtlInitUnicodeString(&keyW, regionW); + RtlInitUnicodeString(&idkeyW, regionW); + + sprintfW(geoidW, id_formatW, geoinfo->id); - if (NtCreateKey(&hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL) != STATUS_SUCCESS) + /* Now prepare GeoName */ + RtlInitUnicodeString( &namekeyW, nameW ); + + if (geoinfo->kind == LOCATION_REGION) { - NtClose(attr.RootDirectory); - SetLastError(ERROR_INTERNAL_ERROR); - return FALSE; + sprintfW(geonameW, geoname_uncode_fmtW, geoinfo->uncode); + namelen = 4; + } + else + { + strcpyW(geonameW, geoinfo->iso2W); + namelen = 3; } - sprintfW(bufferW, formatW, geoinfo->id); - NtSetValueKey(hkey, &keyW, 0, REG_SZ, bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR)); - NtClose(attr.RootDirectory); + NtSetValueKey(hkey, &idkeyW, 0, REG_SZ, geoidW, (strlenW(geoidW) + 1) * sizeof(WCHAR)); + NtSetValueKey(hkey, &namekeyW, 0, REG_SZ, geonameW, namelen * sizeof(WCHAR)); + + TRACE("Set %s to ID %d; set Name to %s\n", + wine_dbgstr_w(idkeyW.Buffer), geoinfo->id, wine_dbgstr_w(geonameW)); + NtClose(hkey); return TRUE; } +/****************************************************************************** + * SetUserGeoID (KERNEL32.@) + * + * Sets the ID of the user's geographic location. + * + * PARAMS + * GeoID [I] The geographic ID to be set. + * + * RETURNS + * SUCCESS: TRUE. + * FAILURE: FALSE. Call GetLastError() to determine the cause. + * + * NOTES + * On success, the geographic name will be set to the location of the specified GeoID. + * + * On failure, GetLastError() will return one of the following values: + * - ERROR_INVALID_PARAMETER: the specified GeoID was invalid. + * - ERROR_INTERNAL_ERROR: an internal error prevented Wine from setting the GeoID. + */ +BOOL WINAPI SetUserGeoID(GEOID GeoID) +{ + TRACE("(%d)\n", GeoID); + return set_geo_reg(get_geoinfoptr_by_id(GeoID)); +} + +/****************************************************************************** + * SetUserGeoName (KERNEL32.@) + * + * Sets the name of the user's geographic location. + * + * This name is a two-letter ISO 3166 country code + * or a three-digit UN M.49 code for anything other than countries (e.g. continents). + * + * PARAMS + * geoName [I] The name to be set. + * + * RETURNS + * SUCCESS: TRUE. + * FAILURE: FALSE. Call GetLastError() to determine the cause. + * + * NOTES + * If you specify the UN code of a valid country, its two-letter ISO code + * will be used instead. + * + * On success, the geographic ID for the relevant class will be set to + * the location of the specified name. + * + * On failure, GetLastError() will return one of the following values: + * - ERROR_INVALID_PARAMETER: the specified GeoID was invalid. + * - ERROR_INTERNAL_ERROR: an internal error prevented Wine from setting the name. + */ +BOOL WINAPI SetUserGeoName(const WCHAR *geoName) +{ + if (!geoName || !*geoName) + { + TRACE("(%p = (null))\n", geoName); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + TRACE("(%p = %s)\n", geoName, wine_dbgstr_w(geoName)); + return set_geo_reg(get_geoinfoptr_by_name(geoName)); +} + /****************************************************************************** * GetGeoInfoW (KERNEL32.@) */ @@ -4106,7 +4268,7 @@ INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, TRACE("%d %d %p %d %d\n", geoid, geotype, data, data_len, lang); - if (!(ptr = get_geoinfo_dataptr(geoid))) { + if (!(ptr = get_geoinfoptr_by_id(geoid))) { SetLastError(ERROR_INVALID_PARAMETER); return 0; } diff --git a/include/winnls.h b/include/winnls.h index e810c44af7..a60dd1f1b0 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -968,6 +968,7 @@ WINBASEAPI BOOL WINAPI SetLocaleInfoW(LCID,LCTYPE,LPCWSTR); WINBASEAPI BOOL WINAPI SetThreadLocale(LCID); WINBASEAPI LANGID WINAPI SetThreadUILanguage(LANGID); WINBASEAPI BOOL WINAPI SetUserGeoID(GEOID); +WINBASEAPI BOOL WINAPI SetUserGeoName(const WCHAR*); WINBASEAPI INT WINAPI WideCharToMultiByte(UINT,DWORD,LPCWSTR,INT,LPSTR,INT,LPCSTR,LPBOOL); WINBASEAPI INT WINAPI FindNLSStringEx(const WCHAR *,DWORD,const WCHAR *,INT,const WCHAR *,INT,INT *,NLSVERSIONINFO *,void *,LPARAM); -- 2.23.0

2 2

[PATCH v4 0/7] Autoset GeoName/GeoID when lauching any program.
by João Diogo Ferreira 31 Oct '19

31 Oct '19

v4! After meticulous editting and careful reviewing, I managed to trim the fat out of some patches, improved readability, fixed bugs and code style, and dealt with compiler warnings, making it easy for YOU to review! (I hope.) It's still a bit long though, with 7 patches. Sorry about that. This is the ultimate version of this patchset and I will NOT be issuing any later revisions (also so I don't look like a spammer.) (What I'm trying to say is: please review my patches?) Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> João Diogo Craveiro Ferreira (7): kernel32: Move Get/SetUserGeoID() to after the geoinfo struct. kernel32: Handle GEOCLASS_REGION in Get/SetUserGeoID. kernel32: Implement SetUserGeoName(). kernel32: Implement GetUserDefaultGeoName(). kernel32: Make GetUserGeoID() pretend we set a GeoID even if we didn't. kernel32: Autoinitialize geographic values when launching any program. kernel32/tests: Test GetUserGeoID(), GetUserDefaultGeoName(). dlls/kernel32/kernel32.spec | 2 + dlls/kernel32/kernel_main.c | 3 + dlls/kernel32/kernel_private.h | 1 + dlls/kernel32/locale.c | 575 +++++++++++++++++++++++++++------ dlls/kernel32/tests/locale.c | 109 +++++++ include/winnls.h | 2 + 6 files changed, 585 insertions(+), 107 deletions(-) -- 2.23.0

2 2

[PATCH v4 5/7] kernel32: Make GetUserGeoID() pretend we set a GeoID even if we didn't.
by João Diogo Ferreira 31 Oct '19

31 Oct '19

In Windows 10, with the changes introduced in v1709, this function now always returns a good GeoID if the provided geoclass is valid. If that class didn't have a GeoID set yet, it now returns 39070, which is the ID for the very neutral "World" region. This behaviour matches Windows 10 v1709-v1909 and also prevents at least one game from crashing. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46196 (partial fix: game no longer crashes.) Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- Supersedes: 172370 V4: Use NLS_RegOpenKey(); slightly change documentation. V3: Actually do what's advertised. --- dlls/kernel32/locale.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 4dcad37c72..7d481a2a48 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4097,10 +4097,14 @@ static inline const struct geoinfo_t *get_geoinfoptr_by_name(const WCHAR *name) * RETURNS * SUCCESS: The ID of the specified geographic class. * FAILURE: GEOID_NOT_AVAILABLE. + * + * NOTES + * This function only fails if the specified geoclass is invalid; + * otherwise, a valid GeoID will always be returned. */ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) { - GEOID ret = GEOID_NOT_AVAILABLE; + GEOID ret = 39070; /* World */ static const WCHAR geoW[] = {'G','e','o',0}; static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; @@ -4124,7 +4128,7 @@ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) else { WARN("Unknown geoclass %d\n", geoclass); - return ret; + return GEOID_NOT_AVAILABLE; } if (!(hkey = create_registry_key())) return ret; -- 2.23.0

1 0

[PATCH] quartz/tests: Relax some more timeouts.
by Zebediah Figura 31 Oct '19

31 Oct '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- In an attempt to address failures like <http://test.winehq.org/data/931408698859360e56cd85d532b142e789a6c274/vista_…> and <http://test.winehq.org/data/717109ce79bbf92b5e3e93e49f96b78ece00a952/win7_f…>. dlls/quartz/tests/filtergraph.c | 2 +- dlls/quartz/tests/systemclock.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 14f2dfaa7a..4b233dbcff 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -512,7 +512,7 @@ static void test_media_event(IFilterGraph2 *graph) while (!got_eos) { - if (WaitForSingleObject(event, 2000) == WAIT_TIMEOUT) + if (WaitForSingleObject(event, 5000) == WAIT_TIMEOUT) break; while ((hr = IMediaEvent_GetEvent(media_event, &code, &lparam1, &lparam2, 0)) == S_OK) diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index 3c493a0f38..fa1ab6856b 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -120,8 +120,8 @@ static void test_advise(void) hr = IReferenceClock_AdviseTime(clock, current, 500 * 10000, (HEVENT)event, &cookie); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(WaitForSingleObject(event, 480) == WAIT_TIMEOUT, "Event should not be signaled.\n"); - ok(!WaitForSingleObject(event, 40), "Event should be signaled.\n"); + ok(WaitForSingleObject(event, 460) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + ok(!WaitForSingleObject(event, 80), "Event should be signaled.\n"); hr = IReferenceClock_Unadvise(clock, cookie); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -133,15 +133,15 @@ static void test_advise(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IReferenceClock_Unadvise(clock, cookie); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(WaitForSingleObject(event, 520) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + ok(WaitForSingleObject(event, 540) == WAIT_TIMEOUT, "Event should not be signaled.\n"); ResetEvent(event); hr = IReferenceClock_GetTime(clock, &current); ok(SUCCEEDED(hr), "Got hr %#x.\n", hr); hr = IReferenceClock_AdviseTime(clock, current + 500 * 10000, 0, (HEVENT)event, &cookie); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(WaitForSingleObject(event, 480) == WAIT_TIMEOUT, "Event should not be signaled.\n"); - ok(!WaitForSingleObject(event, 40), "Event should be signaled.\n"); + ok(WaitForSingleObject(event, 460) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + ok(!WaitForSingleObject(event, 80), "Event should be signaled.\n"); hr = IReferenceClock_GetTime(clock, &current); ok(SUCCEEDED(hr), "Got hr %#x.\n", hr); -- 2.23.0

2 1

[PATCH v2 4/4] ddraw: Handle stateblocks in d3d_device7_SetClipPlane().
by Zebediah Figura 31 Oct '19

31 Oct '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: check hr, thanks Henri. This supersedes patch 172344. dlls/ddraw/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 599e45c24f..525dd98d78 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6528,7 +6528,9 @@ static HRESULT d3d_device7_SetClipPlane(IDirect3DDevice7 *iface, DWORD idx, D3DV wined3d_plane = (struct wined3d_vec4 *)plane; wined3d_mutex_lock(); - hr = wined3d_device_set_clip_plane(device->wined3d_device, idx, wined3d_plane); + hr = wined3d_stateblock_set_clip_plane(device->update_state, idx, wined3d_plane); + if (SUCCEEDED(hr) && !device->recording) + hr = wined3d_device_set_clip_plane(device->wined3d_device, idx, wined3d_plane); if (idx < ARRAY_SIZE(device->user_clip_planes)) { device->user_clip_planes[idx] = *wined3d_plane; -- 2.23.0

3 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel