November 2019 - Wine-devel - list.winehq.org

[PATCH v3 0/4] Set the scan code prefix when necessary.
by Derek Lesho 12 Nov '19

12 Nov '19

v3: Resend of the same patchset since v2 was marked "Bad Sequence". Derek Lesho (4): winex11: Set the scan code prefix when necessary. winemac: Set the scan code prefix when necessary. wineandroid: Set the scan code prefix when necessary. users/tests: Test scan code prefix for MAPVK_VK_TO_VSC_EX. dlls/user32/tests/input.c | 10 ++++++++++ dlls/wineandroid.drv/keyboard.c | 9 ++++++++- dlls/winemac.drv/keyboard.c | 9 ++++++++- dlls/winex11.drv/keyboard.c | 9 ++++++++- 4 files changed, 34 insertions(+), 3 deletions(-) -- 2.23.0

1 4

[PATCH] shlwapi: Fix PathUndecorate[AW] implementation.
by Jacek Caban 12 Nov '19

12 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I meant to fix iswdigit usage, but found more problems with the function and ended up rewriting it. dlls/shlwapi/path.c | 76 ++++++++++++++++----------------------- dlls/shlwapi/tests/path.c | 41 +++++++++++++++++++++ 2 files changed, 71 insertions(+), 46 deletions(-)

1 0

[PATCH] ntoskrnl.exe: Store device state in volatile key.
by Piotr Caban 12 Nov '19

12 Nov '19

Native also creates volatile control key. Thanks to it correct device state is reported after killing wine. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ntoskrnl.exe/pnp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] winex11: Fix off-by-one error in color value scaling
by Alex Henrie 12 Nov '19

12 Nov '19

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- For 0 to map to 0 and 255 to map to 65535, the value must be multiplied by 257, not 256. The incorrect factor would cause the color #FFFFFF to become #FEFEFE. --- dlls/winex11.drv/palette.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index 25bdb5f2bf..6cc6a0fe34 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -293,19 +293,19 @@ static BOOL X11DRV_PALETTE_BuildPrivateMap( const PALETTEENTRY *sys_pal_template { if( i < NB_RESERVED_COLORS/2 ) { - color.red = sys_pal_template[i].peRed * 65535 / 255; - color.green = sys_pal_template[i].peGreen * 65535 / 255; - color.blue = sys_pal_template[i].peBlue * 65535 / 255; - COLOR_sysPal[i] = sys_pal_template[i]; + color.red = sys_pal_template[i].peRed * (65535 / 255); + color.green = sys_pal_template[i].peGreen * (65535 / 255); + color.blue = sys_pal_template[i].peBlue * (65535 / 255); + COLOR_sysPal[i] = sys_pal_template[i]; COLOR_sysPal[i].peFlags |= PC_SYS_USED; } else if( i >= palette_size - NB_RESERVED_COLORS/2 ) { - int j = NB_RESERVED_COLORS + i - palette_size; - color.red = sys_pal_template[j].peRed * 65535 / 255; - color.green = sys_pal_template[j].peGreen * 65535 / 255; - color.blue = sys_pal_template[j].peBlue * 65535 / 255; - COLOR_sysPal[i] = sys_pal_template[j]; + int j = NB_RESERVED_COLORS + i - palette_size; + color.red = sys_pal_template[j].peRed * (65535 / 255); + color.green = sys_pal_template[j].peGreen * (65535 / 255); + color.blue = sys_pal_template[j].peBlue * (65535 / 255); + COLOR_sysPal[i] = sys_pal_template[j]; COLOR_sysPal[i].peFlags |= PC_SYS_USED; } @@ -633,9 +633,9 @@ static void X11DRV_PALETTE_FillDefaultColors( const PALETTEENTRY *sys_pal_templa { XColor color; color.pixel = (X11DRV_PALETTE_PaletteToXPixel)? X11DRV_PALETTE_PaletteToXPixel[idx] : idx; - color.red = COLOR_sysPal[idx].peRed << 8; - color.green = COLOR_sysPal[idx].peGreen << 8; - color.blue = COLOR_sysPal[idx].peBlue << 8; + color.red = COLOR_sysPal[idx].peRed * (65535 / 255); + color.green = COLOR_sysPal[idx].peGreen * (65535 / 255); + color.blue = COLOR_sysPal[idx].peBlue * (65535 / 255); color.flags = DoRed | DoGreen | DoBlue; XStoreColor(gdi_display, default_colormap, &color); } @@ -1156,9 +1156,9 @@ UINT CDECL X11DRV_RealizePalette( PHYSDEV dev, HPALETTE hpal, BOOL primary ) X11DRV_PALETTE_firstFree = X11DRV_PALETTE_freeList[index]; color.pixel = (X11DRV_PALETTE_PaletteToXPixel) ? X11DRV_PALETTE_PaletteToXPixel[index] : index; - color.red = entries[i].peRed << 8; - color.green = entries[i].peGreen << 8; - color.blue = entries[i].peBlue << 8; + color.red = entries[i].peRed * (65535 / 255); + color.green = entries[i].peGreen * (65535 / 255); + color.blue = entries[i].peBlue * (65535 / 255); color.flags = DoRed | DoGreen | DoBlue; XStoreColor(gdi_display, default_colormap, &color); -- 2.24.0

1 1

[PATCH] oleaut32: Fix checks for digit characters.
by Jacek Caban 12 Nov '19

12 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/oleaut32/tests/vartest.c | 6 ++++++ dlls/oleaut32/variant.c | 11 ++++++++--- dlls/oleaut32/vartype.c | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-)

1 0

[PATCH] mshtml: Fix checks for digit characters.
by Jacek Caban 12 Nov '19

12 Nov '19

1 0

[PATCH v2] d3dcompiler/tests: Add d3dcompiler_47 tests.
by Matteo Bruni 12 Nov '19

12 Nov '19

Share the code with the existing d3dcompiler_43 tests. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Now with 100% more makefiles (thanks Jacek!) Supersedes patch 173440. configure | 1 + configure.ac | 1 + dlls/d3dcompiler_43/tests/reflection.c | 44 ++++++++++++++++++-------- dlls/d3dcompiler_47/tests/Makefile.in | 10 ++++++ 4 files changed, 42 insertions(+), 14 deletions(-) create mode 100644 dlls/d3dcompiler_47/tests/Makefile.in diff --git a/configure b/configure index ad0b149b7d3..e40850201b6 100755 --- a/configure +++ b/configure @@ -20255,6 +20255,7 @@ wine_fn_config_makefile dlls/d3dcompiler_43 enable_d3dcompiler_43 wine_fn_config_makefile dlls/d3dcompiler_43/tests enable_tests wine_fn_config_makefile dlls/d3dcompiler_46 enable_d3dcompiler_46 wine_fn_config_makefile dlls/d3dcompiler_47 enable_d3dcompiler_47 +wine_fn_config_makefile dlls/d3dcompiler_47/tests enable_tests wine_fn_config_makefile dlls/d3dim enable_d3dim wine_fn_config_makefile dlls/d3drm enable_d3drm wine_fn_config_makefile dlls/d3drm/tests enable_tests diff --git a/configure.ac b/configure.ac index 4f651efbd58..c7768db9f9e 100644 --- a/configure.ac +++ b/configure.ac @@ -3131,6 +3131,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_43) WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_43/tests) WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_46) WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_47) +WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_47/tests) WINE_CONFIG_MAKEFILE(dlls/d3dim) WINE_CONFIG_MAKEFILE(dlls/d3drm) WINE_CONFIG_MAKEFILE(dlls/d3drm/tests) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 1b9d2d418d9..8e48d4d4028 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -75,11 +75,11 @@ static DWORD test_reflection_blob[] = { static void test_reflection_references(void) { - HRESULT hr; - ULONG count; ID3D11ShaderReflection *ref11, *ref11_test; - ID3D10ShaderReflection *ref10; ID3D10ShaderReflection1 *ref10_1; + ID3D10ShaderReflection *ref10; + HRESULT hr, expected; + ULONG count; hr = pD3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); ok(hr == S_OK, "D3DReflect failed, got %x, expected %x\n", hr, S_OK); @@ -100,11 +100,16 @@ static void test_reflection_references(void) ok(count == 0, "Release failed %u\n", count); /* check invalid cases */ +#if D3D_COMPILER_VERSION >= 46 + expected = E_INVALIDARG; +#else + expected = E_NOINTERFACE; +#endif hr = pD3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D10ShaderReflection, (void **)&ref10); - ok(hr == E_NOINTERFACE, "D3DReflect failed, got %x, expected %x\n", hr, E_NOINTERFACE); + ok(hr == expected, "D3DReflect failed, got %x, expected %x\n", hr, expected); hr = pD3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D10ShaderReflection1, (void **)&ref10_1); - ok(hr == E_NOINTERFACE, "D3DReflect failed, got %x, expected %x\n", hr, E_NOINTERFACE); + ok(hr == expected, "D3DReflect failed, got %x, expected %x\n", hr, expected); hr = pD3DReflect(NULL, test_reflection_blob[6], &IID_ID3D10ShaderReflection1, (void **)&ref10_1); ok(hr == D3DERR_INVALIDCALL, "D3DReflect failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); @@ -116,20 +121,25 @@ static void test_reflection_references(void) hr = pD3DReflect(test_reflection_blob, 31, &IID_ID3D10ShaderReflection1, (void **)&ref10_1); ok(hr == D3DERR_INVALIDCALL, "D3DReflect failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); +#if D3D_COMPILER_VERSION >= 46 + expected = D3DERR_INVALIDCALL; +#else + expected = E_FAIL; +#endif hr = pD3DReflect(test_reflection_blob, 32, &IID_ID3D10ShaderReflection1, (void **)&ref10_1); - ok(hr == E_FAIL, "D3DReflect failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == expected, "Got %x, expected %x.\n", hr, expected); hr = pD3DReflect(test_reflection_blob, test_reflection_blob[6]-1, &IID_ID3D10ShaderReflection1, (void **)&ref10_1); - ok(hr == E_FAIL, "D3DReflect failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == expected, "Got %x, expected %x.\n", hr, expected); hr = pD3DReflect(test_reflection_blob, 31, &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == D3DERR_INVALIDCALL, "D3DReflect failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "Got %x, expected %x.\n", hr, D3DERR_INVALIDCALL); hr = pD3DReflect(test_reflection_blob, 32, &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == E_FAIL, "D3DReflect failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == expected, "Got %x, expected %x.\n", hr, expected); hr = pD3DReflect(test_reflection_blob, test_reflection_blob[6]-1, &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == E_FAIL, "D3DReflect failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == expected, "Got %x, expected %x.\n", hr, expected); } /* @@ -1509,11 +1519,17 @@ static void test_reflection_constant_buffer(void) ok(count == 0, "Release failed %u\n", count); } -static BOOL load_d3dcompiler(void) +static BOOL load_d3dreflect(void) { +#if D3D_COMPILER_VERSION == 47 + static const char filename[] = "d3dcompiler_47.dll"; +#else + static const char filename[] = "d3dcompiler_43.dll"; +#endif HMODULE module; - if (!(module = LoadLibraryA("d3dcompiler_43.dll"))) return FALSE; + if (!(module = LoadLibraryA(filename))) + return FALSE; pD3DReflect = (void*)GetProcAddress(module, "D3DReflect"); return TRUE; @@ -1521,9 +1537,9 @@ static BOOL load_d3dcompiler(void) START_TEST(reflection) { - if (!load_d3dcompiler()) + if (!load_d3dreflect()) { - win_skip("Could not load d3dcompiler_43.dll\n"); + win_skip("Could not load DLL.\n"); return; } diff --git a/dlls/d3dcompiler_47/tests/Makefile.in b/dlls/d3dcompiler_47/tests/Makefile.in new file mode 100644 index 00000000000..a4e3798bed2 --- /dev/null +++ b/dlls/d3dcompiler_47/tests/Makefile.in @@ -0,0 +1,10 @@ +TESTDLL = d3dcompiler_47.dll +IMPORTS = d3d9 d3dx9 user32 +EXTRADEFS = -DD3D_COMPILER_VERSION=47 +PARENTSRC = ../../d3dcompiler_43/tests + +C_SRCS = \ + asm.c \ + blob.c \ + hlsl.c \ + reflection.c -- 2.21.0

1 0

[PATCH 1/2] ucrtbase: strftime returns 4-digit timezone for %z.
by Jeff Smith 12 Nov '19

12 Nov '19

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/msvcrt/time.c | 26 ++++++++++++++++++++++++++ dlls/ucrtbase/tests/misc.c | 6 ++++++ 2 files changed, 32 insertions(+) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 9787d18e3f..3f378b0d1a 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1033,6 +1033,26 @@ static inline BOOL strftime_time(char *str, MSVCRT_size_t *pos, MSVCRT_size_t ma return TRUE; } +static inline BOOL strftime_tzdiff(char *str, MSVCRT_size_t *pos, MSVCRT_size_t max, int dst) +{ + MSVCRT_size_t len; + MSVCRT_long tz = MSVCRT___timezone + (dst * MSVCRT__dstbias); + + char sign = (tz > 0) ? '-' : '+'; + unsigned int minutes = ((tz < 0) ? -tz : tz) / 60; + unsigned int hours = minutes / 60; + + len = MSVCRT__snprintf(str+*pos, max-*pos, "%c%02u%02u", sign, hours, minutes % 60); + if(*pos + len > max) { + *str = 0; + *MSVCRT__errno() = MSVCRT_ERANGE; + return FALSE; + } + + *pos += len; + return TRUE; +} + static inline BOOL strftime_str(char *str, MSVCRT_size_t *pos, MSVCRT_size_t max, char *src) { MSVCRT_size_t len = strlen(src); @@ -1300,6 +1320,12 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f return 0; break; case 'z': +#if _MSVCR_VER>=140 + MSVCRT__tzset(); + if(!strftime_tzdiff(str, &ret, max, mstm->tm_isdst ? 1 : 0)) + return 0; + break; +#endif case 'Z': MSVCRT__tzset(); if(MSVCRT__get_tzname(&tmp, str+ret, max-ret, mstm->tm_isdst ? 1 : 0)) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 3a1598fee2..014d66d595 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -1005,6 +1005,12 @@ static void test_strftime(void) 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), "%z", &tm2); + ok(retA == 5, "expected 5, got %d\n", (int)retA); + ok((bufA[0] == '+' || bufA[0] == '-') && + isdigit(bufA[1]) && isdigit(bufA[2]) && + isdigit(bufA[3]) && isdigit(bufA[4]), "got %s\n", bufA); + for(i=0; i<14; i++) { __time32_t t = (365*2 + i - 7) * 24 * 60 * 60; -- 2.23.0

1 1

[PATCH] winebus: Fix DEVICE_RELATIONS content on device removal.
by Piotr Caban 12 Nov '19

12 Nov '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/winebus.sys/bus.h | 1 + dlls/winebus.sys/bus_iohid.c | 1 + dlls/winebus.sys/bus_sdl.c | 2 ++ dlls/winebus.sys/bus_udev.c | 2 ++ dlls/winebus.sys/main.c | 14 ++++++++++---- 5 files changed, 16 insertions(+), 4 deletions(-)

1 0

[PATCH 1/8] d3dcompiler: Implement d3d10 reflect In/OutParameterDesc() methods.
by Connor McAdams 12 Nov '19

12 Nov '19

Implement GetInputParameterDesc and GetOutputParameterDesc methods for d3d10 shader reflection interface. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> --- Extra info, the structs being memcpy'd: typedef struct _D3D10_SIGNATURE_PARAMETER_DESC { LPCSTR SemanticName; UINT SemanticIndex; UINT Register; D3D10_NAME SystemValueType; D3D10_REGISTER_COMPONENT_TYPE ComponentType; BYTE Mask; BYTE ReadWriteMask; } D3D10_SIGNATURE_PARAMETER_DESC; typedef struct _D3D11_SIGNATURE_PARAMETER_DESC { LPCSTR SemanticName; UINT SemanticIndex; UINT Register; D3D_NAME SystemValueType; D3D_REGISTER_COMPONENT_TYPE ComponentType; BYTE Mask; BYTE ReadWriteMask; UINT Stream; D3D_MIN_PRECISION MinPrecision; } D3D11_SIGNATURE_PARAMETER_DESC; --- dlls/d3dcompiler_43/reflection.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index d3d083e8d8..9d8ca2e48f 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1926,17 +1926,37 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetResourceBindingDesc( static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetInputParameterDesc(ID3D10ShaderReflection *iface, UINT index, D3D10_SIGNATURE_PARAMETER_DESC *desc) { - FIXME("iface %p, index %u, desc %p stub!\n", iface, index, desc); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D10ShaderReflection(iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); + + if (!desc || !reflection->isgn || index >= reflection->isgn->element_count) + { + WARN("Invalid argument specified.\n"); + return E_INVALIDARG; + } + + memcpy(desc, &reflection->isgn->elements[index], sizeof(*desc)); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetOutputParameterDesc(ID3D10ShaderReflection *iface, UINT index, D3D10_SIGNATURE_PARAMETER_DESC *desc) { - FIXME("iface %p, index %u, desc %p stub!\n", iface, index, desc); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D10ShaderReflection(iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); + + if (!desc || !reflection->osgn || index >= reflection->osgn->element_count) + { + WARN("Invalid argument specified.\n"); + return E_INVALIDARG; + } + + memcpy(desc, &reflection->osgn->elements[index], sizeof(*desc)); + + return S_OK; } static const struct ID3D10ShaderReflectionVtbl d3d10_shader_reflection_vtbl = -- 2.20.1

2 8