wine-commits October 2019

wine-commits@winehq.org

2 participants
614 discussions

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_transform().
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: a5efdaca8f8e0554955361b5a8394c0bb06a47a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5efdaca8f8e0554955361b5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 28 18:35:52 2019 -0500 wined3d: Introduce wined3d_stateblock_set_transform(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 13 +++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 16 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index fe49fd6754..41c97b5020 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1508,6 +1508,19 @@ void CDECL wined3d_stateblock_set_texture(struct wined3d_stateblock *stateblock, stateblock->changed.textures |= 1u << stage; } +void CDECL wined3d_stateblock_set_transform(struct wined3d_stateblock *stateblock, + enum wined3d_transform_state d3dts, const struct wined3d_matrix *matrix) +{ + TRACE("stateblock %p, state %s, matrix %p.\n", stateblock, debug_d3dtstype(d3dts), matrix); + TRACE("%.8e %.8e %.8e %.8e\n", matrix->_11, matrix->_12, matrix->_13, matrix->_14); + TRACE("%.8e %.8e %.8e %.8e\n", matrix->_21, matrix->_22, matrix->_23, matrix->_24); + TRACE("%.8e %.8e %.8e %.8e\n", matrix->_31, matrix->_32, matrix->_33, matrix->_34); + TRACE("%.8e %.8e %.8e %.8e\n", matrix->_41, matrix->_42, matrix->_43, matrix->_44); + + stateblock->stateblock_state.transforms[d3dts] = *matrix; + stateblock->changed.transform[d3dts >> 5] |= 1u << (d3dts & 0x1f); +} + 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 d0ba31bf4e..297d3a0410 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -268,6 +268,7 @@ @ cdecl wined3d_stateblock_set_sampler_state(ptr long long long) @ cdecl wined3d_stateblock_set_texture(ptr long ptr) @ cdecl wined3d_stateblock_set_texture_stage_state(ptr long long long) +@ cdecl wined3d_stateblock_set_transform(ptr long ptr) @ cdecl wined3d_stateblock_set_vertex_declaration(ptr ptr) @ cdecl wined3d_stateblock_set_vertex_shader(ptr ptr) @ cdecl wined3d_stateblock_set_vs_consts_b(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a567cfd2f1..298cb3b270 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2677,6 +2677,8 @@ void __cdecl wined3d_stateblock_set_sampler_state(struct wined3d_stateblock *sta void __cdecl wined3d_stateblock_set_texture(struct wined3d_stateblock *stateblock, UINT stage, struct wined3d_texture *texture); void __cdecl wined3d_stateblock_set_texture_stage_state(struct wined3d_stateblock *stateblock, UINT stage, enum wined3d_texture_stage_state state, DWORD value); +void __cdecl wined3d_stateblock_set_transform(struct wined3d_stateblock *stateblock, + enum wined3d_transform_state state, const struct wined3d_matrix *matrix); void __cdecl wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, struct wined3d_vertex_declaration *declaration); void __cdecl wined3d_stateblock_set_vertex_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader);

1 0

Paul Gofman : d3d8: Fix stream data skip count in convert_to_wined3d_declaration().
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: 5e10f1d339aaf798374917ba039363072a867c1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e10f1d339aaf798374917ba… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Oct 29 02:23:12 2019 +0300 d3d8: Fix stream data skip count in convert_to_wined3d_declaration(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40364 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 17 ++++++++++++----- dlls/d3d8/vertexdeclaration.c | 4 ++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index fc7c3cc293..310ffc59e4 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -7813,13 +7813,19 @@ static void test_vshader_input(void) {{ 0.0f, 0.0f, 0.1f}, 0x00ff8040}, {{ 1.0f, -1.0f, 0.1f}, 0x00ff8040}, {{ 1.0f, 0.0f, 0.1f}, 0x00ff8040}, - }, + }; + static const struct + { + struct vec3 position; + struct vec3 dummy; /* testing D3DVSD_SKIP */ + DWORD diffuse; + } quad3_color[] = { - {{-1.0f, 0.0f, 0.1f}, 0x00ff8040}, - {{-1.0f, 1.0f, 0.1f}, 0x00ff8040}, - {{ 0.0f, 0.0f, 0.1f}, 0x00ff8040}, - {{ 0.0f, 1.0f, 0.1f}, 0x00ff8040}, + {{-1.0f, 0.0f, 0.1f}, {0.0f}, 0x00ff8040}, + {{-1.0f, 1.0f, 0.1f}, {0.0f}, 0x00ff8040}, + {{ 0.0f, 0.0f, 0.1f}, {0.0f}, 0x00ff8040}, + {{ 0.0f, 1.0f, 0.1f}, {0.0f}, 0x00ff8040}, }; static const float quad4_color[] = { @@ -7870,6 +7876,7 @@ static void test_vshader_input(void) { D3DVSD_STREAM(0), D3DVSD_REG(0, D3DVSDT_FLOAT3), /* position */ + D3DVSD_SKIP(3), /* not used */ D3DVSD_REG(5, D3DVSDT_D3DCOLOR), /* diffuse */ D3DVSD_END() }; diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index a43fb26f95..525666d680 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -291,8 +291,8 @@ static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3 offset += wined3d_type_sizes[type]; } else if (token_type == D3DVSD_TOKEN_STREAMDATA && (*token & D3DVSD_DATALOADTYPEMASK)) { - TRACE(" 0x%08x SKIP(%u)\n", token_type, ((token_type & D3DVSD_SKIPCOUNTMASK) >> D3DVSD_SKIPCOUNTSHIFT)); - offset += sizeof(DWORD) * ((token_type & D3DVSD_SKIPCOUNTMASK) >> D3DVSD_SKIPCOUNTSHIFT); + TRACE(" 0x%08x SKIP(%u)\n", *token, (*token & D3DVSD_SKIPCOUNTMASK) >> D3DVSD_SKIPCOUNTSHIFT); + offset += sizeof(DWORD) * ((*token & D3DVSD_SKIPCOUNTMASK) >> D3DVSD_SKIPCOUNTSHIFT); } if (element_count >= 127) {

1 0

Alistair Leslie-Hughes : dmband: Simplify DllGetClassObject.
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: 422c4fbf71079ca6e3940bb9b53e5a74f78651c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=422c4fbf71079ca6e3940bb9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 28 22:35:15 2019 +0100 dmband: Simplify DllGetClassObject. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/dmband_main.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/dmband/dmband_main.c b/dlls/dmband/dmband_main.c index f72b41570b..e63678c831 100644 --- a/dlls/dmband/dmband_main.c +++ b/dlls/dmband/dmband_main.c @@ -145,16 +145,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv); - if (IsEqualCLSID (rclsid, &CLSID_DirectMusicBand) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = &Band_CF; - IClassFactory_AddRef((IClassFactory*)*ppv); - return S_OK; - } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicBandTrack) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = &BandTrack_CF; - IClassFactory_AddRef((IClassFactory*)*ppv); - return S_OK; - } - + if (IsEqualCLSID(rclsid, &CLSID_DirectMusicBand)) + return IClassFactory_QueryInterface(&Band_CF.IClassFactory_iface, riid, ppv); + else if (IsEqualCLSID(rclsid, &CLSID_DirectMusicBandTrack)) + return IClassFactory_QueryInterface(&BandTrack_CF.IClassFactory_iface, riid, ppv); + WARN("(%s, %s, %p): no interface found.\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; }

1 0

Alexandre Julliard : kernel32/tests: Enable the ExitProcess() test on ARM64.
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: fea66c28847f51de9c56e228cc08ca150f8ffba2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fea66c28847f51de9c56e228… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 29 17:42:14 2019 +0100 kernel32/tests: Enable the ExitProcess() test on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 912e8600dd..6f143f5efd 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -683,7 +683,9 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG else ok( 0, "%u: got unexpected path %s instead of %s\n", line, wine_dbgstr_w(path), wine_dbgstr_w(load_test_name)); pLdrUnloadDll( ldr_mod ); } - else if (ldr_status == STATUS_DLL_INIT_FAILED || ldr_status == STATUS_ACCESS_VIOLATION) + else if (ldr_status == STATUS_DLL_INIT_FAILED || + ldr_status == STATUS_ACCESS_VIOLATION || + ldr_status == STATUS_ILLEGAL_INSTRUCTION) { /* some dlls with invalid entry point will crash, but this means we loaded the test dll */ ok( !expect_fallback, "%u: got test dll but expected fallback\n", line ); @@ -2953,6 +2955,7 @@ static void child_process(const char *dll_name, DWORD target_offset) static void test_ExitProcess(void) { +#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) #include "pshpack1.h" #ifdef __x86_64__ static struct section_data @@ -2961,13 +2964,20 @@ static void test_ExitProcess(void) void *target; BYTE jmp_rax[2]; } section_data = { { 0x48,0xb8 }, dll_entry_point, { 0xff,0xe0 } }; -#else +#elif defined(__i386__) static struct section_data { BYTE mov_eax; void *target; BYTE jmp_eax[2]; } section_data = { 0xb8, dll_entry_point, { 0xff,0xe0 } }; +#elif defined(__aarch64__) + static struct section_data + { + DWORD ldr; /* ldr x0,target */ + DWORD br; /* br x0 */ + void *target; + } section_data = { 0x58000040, 0xd61f0000, dll_entry_point }; #endif #include "poppack.h" DWORD dummy, file_align; @@ -2986,11 +2996,6 @@ static void test_ExitProcess(void) SIZE_T size; IMAGE_NT_HEADERS nt_header; -#if !defined(__i386__) && !defined(__x86_64__) - skip("x86 specific ExitProcess test\n"); - return; -#endif - if (!pRtlDllShutdownInProgress) { win_skip("RtlDllShutdownInProgress is not available on this platform (XP+)\n"); @@ -3440,6 +3445,9 @@ if (0) ret = DeleteFileA(dll_name); ok(ret, "DeleteFile error %d\n", GetLastError()); +#else + skip("x86 specific ExitProcess test\n"); +#endif } static PVOID WINAPI failuredllhook(ULONG ul, DELAYLOAD_INFO* pd)

1 0

Alexandre Julliard : msvcrt/tests: Fix signed char issues.
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: 43d24ffbe7b668a16e06f9d9a54b92b2473fff40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43d24ffbe7b668a16e06f9d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 29 17:41:41 2019 +0100 msvcrt/tests: Fix signed char issues. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 05d7a4f28b..8d28da1315 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2810,13 +2810,13 @@ static void test_wctob(void) ok(ret == EOF, "ret = %x\n", ret); ret = p_wctob(0x81); - ok(ret == (int)(char)0x81, "ret = %x\n", ret); + ok(ret == (signed char)0x81, "ret = %x\n", ret); ret = p_wctob(0x9f); - ok(ret == (int)(char)0x9f, "ret = %x\n", ret); + ok(ret == (signed char)0x9f, "ret = %x\n", ret); ret = p_wctob(0xe0); - ok(ret == (int)(char)0xe0, "ret = %x\n", ret); + ok(ret == (signed char)0xe0, "ret = %x\n", ret); _setmbcp(cp); }

1 0

Alexandre Julliard : oleaut32: Fix handling of VARIANT parameters in DispCallFunc() on ARM64.
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: 03a590017e901b9473cc40afbc851eca218c96c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03a590017e901b9473cc40af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 29 14:10:45 2019 +0100 oleaut32: Fix handling of VARIANT parameters in DispCallFunc() on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 27 ++++++++++++++++++++++++--- dlls/oleaut32/typelib.c | 33 +++++++++++---------------------- 2 files changed, 35 insertions(+), 25 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index a706481042..47faad7763 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1201,17 +1201,37 @@ static HRESULT WINAPI ret_false_func(void) static const WCHAR testW[] = { 'T','e','s','t',0 }; -static void WINAPI variant_func2(VARIANT *ret, VARIANT v1, VARIANT v2) +static VARIANT WINAPI variant_func2(VARIANT v1, VARIANT v2) { + VARIANT ret; + ok(V_VT(&v1) == VT_I4, "unexpected %d\n", V_VT(&v1)); ok(V_I4(&v1) == 2, "unexpected %d\n", V_I4(&v1)); ok(V_VT(&v2) == VT_BSTR, "unexpected %d\n", V_VT(&v2)); ok(lstrcmpW(V_BSTR(&v2), testW) == 0, "unexpected %s\n", wine_dbgstr_w(V_BSTR(&v2))); - V_VT(ret) = VT_UI4; - V_I4(ret) = 4321; + V_VT(&ret) = VT_UI4; + V_I4(&ret) = 4321; + return ret; } +#ifdef __aarch64__ +static VARIANT WINAPI inst_func2(void *inst, VARIANT v1, VARIANT v2) +{ + VARIANT ret; + + ok( (*(void ***)inst)[3] == inst_func2, "wrong ptr %p\n", inst ); + + ok(V_VT(&v1) == VT_I4, "unexpected %d\n", V_VT(&v1)); + ok(V_I4(&v1) == 2, "unexpected %d\n", V_I4(&v1)); + ok(V_VT(&v2) == VT_BSTR, "unexpected %d\n", V_VT(&v2)); + ok(lstrcmpW(V_BSTR(&v2), testW) == 0, "unexpected %s\n", wine_dbgstr_w(V_BSTR(&v2))); + + V_VT(&ret) = VT_UI4; + V_I4(&ret) = 4321; + return ret; +} +#else static void WINAPI inst_func2(void *inst, VARIANT *ret, VARIANT v1, VARIANT v2) { ok( (*(void ***)inst)[3] == inst_func2, "wrong ptr %p\n", inst ); @@ -1227,6 +1247,7 @@ static void WINAPI inst_func2(void *inst, VARIANT *ret, VARIANT v1, VARIANT v2) V_VT(ret) = VT_UI4; V_I4(ret) = 4321; } +#endif static void *vtable[] = { NULL, NULL, NULL, inst_func }; static void *vtable2[] = { NULL, NULL, NULL, inst_func2 }; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 7ad92837da..d652edc7ee 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6882,23 +6882,8 @@ HRESULT WINAPI DispCallFunc( void *instance, ULONG_PTR offset, CALLCONV cc, VART } else func = (void *)offset; - /* Determine if we need to pass a pointer for the return value as arg 0. If so, do that */ - /* first as it will need to be in the 'x' registers: */ - switch (ret_type) - { - case VT_DECIMAL: - case VT_VARIANT: - regs.x[8] = (DWORD_PTR)result; /* x8 is a pointer to the result */ - break; - case VT_HRESULT: - WARN("invalid return type %u\n", ret_type); - return E_INVALIDARG; - default: - break; - } - - /* maximum size for an argument is sizeof(VARIANT). Also allow for return pointer and stack alignment. */ - args = heap_alloc( sizeof(VARIANT) * count + sizeof(DWORD_PTR) * 4 ); + /* maximum size for an argument is 16 */ + args = heap_alloc( 16 * count ); for (i = 0; i < count; i++) { @@ -6906,8 +6891,6 @@ HRESULT WINAPI DispCallFunc( void *instance, ULONG_PTR offset, CALLCONV cc, VART switch (types[i]) { - case VT_EMPTY: - break; case VT_R4: if (fpcount < 8) regs.fp[fpcount++].f = V_R4(arg); else *(float *)&args[argspos++] = V_R4(arg); @@ -6918,7 +6901,6 @@ HRESULT WINAPI DispCallFunc( void *instance, ULONG_PTR offset, CALLCONV cc, VART else *(double *)&args[argspos++] = V_R8(arg); break; case VT_DECIMAL: - case VT_VARIANT: if (rcount < 7) { memcpy( &regs.x[rcount], arg, sizeof(*arg) ); @@ -6930,6 +6912,10 @@ HRESULT WINAPI DispCallFunc( void *instance, ULONG_PTR offset, CALLCONV cc, VART argspos += 2; } break; + case VT_VARIANT: + if (rcount < 8) regs.x[rcount++] = (DWORD_PTR)arg; + else args[argspos++] = (DWORD_PTR)arg; + break; case VT_BOOL: /* VT_BOOL is 16-bit but BOOL is 32-bit, needs to be extended */ if (rcount < 8) regs.x[rcount++] = V_BOOL(arg); else args[argspos++] = V_BOOL(arg); @@ -6946,9 +6932,12 @@ HRESULT WINAPI DispCallFunc( void *instance, ULONG_PTR offset, CALLCONV cc, VART switch (ret_type) { - case VT_EMPTY: /* EMPTY = no return value */ - case VT_DECIMAL: /* DECIMAL and VARIANT already have a pointer argument passed (see above) */ + case VT_HRESULT: + heap_free( args ); + return E_INVALIDARG; + case VT_DECIMAL: case VT_VARIANT: + regs.x[8] = (DWORD_PTR)result; /* x8 is a pointer to the result */ call_method( func, argspos, args, (DWORD_PTR *)&regs ); break; case VT_R4:

1 0

Alexandre Julliard : winex11: Also catch X errors from XF86VidModeSetGammaRamp().
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: 81f8b6e8c215dc04a19438e4369fcba8f7f4f333 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81f8b6e8c215dc04a19438e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 29 10:49:20 2019 +0100 winex11: Also catch X errors from XF86VidModeSetGammaRamp(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xvidmode.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 9c0c97f1eb..975575fe77 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -416,8 +416,12 @@ static BOOL xf86vm_set_gamma_ramp(struct x11drv_gamma_ramp *ramp) ramp->red, ramp->green, ramp->blue, GAMMA_RAMP_SIZE); } + X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); ret = pXF86VidModeSetGammaRamp(gdi_display, DefaultScreen(gdi_display), xf86vm_gammaramp_size, red, green, blue); + if (ret) XSync( gdi_display, FALSE ); + if (X11DRV_check_error()) ret = FALSE; + if (red != ramp->red) heap_free(red); return ret;

1 0

Alexandre Julliard : atlthunk: Add support for ARM64.
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: cf1c9d88f441bdf520b0402a1c5f5440a2f77bfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf1c9d88f441bdf520b0402a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 29 13:15:35 2019 +0100 atlthunk: Add support for ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atlthunk/atlthunk.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/atlthunk/atlthunk.c b/dlls/atlthunk/atlthunk.c index cd37b75f04..04e592f113 100644 --- a/dlls/atlthunk/atlthunk.c +++ b/dlls/atlthunk/atlthunk.c @@ -22,7 +22,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(atlthunk); -#if defined(__i386__) || defined(__x86_64__) +#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) struct AtlThunkData_t { struct thunk_pool *pool; @@ -45,6 +45,11 @@ struct thunk_code DWORD mov_eax_esp; /* movl %eax, 4(%esp) */ WORD jmp; DWORD jmp_addr; /* jmp *jmp_addr */ +#elif defined(__aarch64__) + DWORD ldr_x0; /* ldr x0,data_addr */ + DWORD ldr_x16; /* ldr x16,proc_addr */ + DWORD br_x16; /* br x16 */ + DWORD pad; #endif }; #include "poppack.h" @@ -86,6 +91,10 @@ static struct thunk_pool *alloc_thunk_pool(void) thunk->mov_eax_esp = 0x04244489; /* movl %eax, 4(%esp) */ thunk->jmp = 0x25ff; /* jmp *jmp_addr */ thunk->jmp_addr = (DWORD)&thunks->data[i].proc; +#elif defined(__aarch64__) + thunk->ldr_x0 = 0x58000000 | (((DWORD *)&thunks->data[i].arg - &thunk->ldr_x0) << 5); + thunk->ldr_x16 = 0x58000010 | (((DWORD *)&thunks->data[i].proc - &thunk->ldr_x16) << 5); + thunk->br_x16 = 0xd61f0200; #endif } VirtualProtect(thunks->thunks, FIELD_OFFSET(struct thunk_pool, first_free), PAGE_EXECUTE_READ, &old_protect); @@ -161,7 +170,7 @@ void WINAPI AtlThunk_InitData(AtlThunkData_t *thunk, void *proc, SIZE_T arg) thunk->arg = arg; } -#else /* __i386__ || __x86_64__ */ +#else /* __i386__ || __x86_64__ || __aarch64__ */ AtlThunkData_t* WINAPI AtlThunk_AllocateData(void) { @@ -182,4 +191,4 @@ void WINAPI AtlThunk_InitData(AtlThunkData_t *thunk, void *proc, SIZE_T arg) { } -#endif /* __i386__ || __x86_64__ */ +#endif /* __i386__ || __x86_64__ || __aarch64__ */

1 0

Michael Müller : crypt32: Add MS root CA 2010.
by Alexandre Julliard 28 Oct '19

28 Oct '19

Module: wine Branch: master Commit: 5b62f89baa82daecd430897de0bb5cab32c5fc5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b62f89baa82daecd430897d… Author: Michael Müller <michael@fds-team> Date: Sun Oct 27 11:16:45 2019 +0100 crypt32: Add MS root CA 2010. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47626 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/rootstore.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 706ec75285..f795181bcf 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -652,6 +652,103 @@ static const BYTE rootcertauthority[] = { 0x7e,0x6c,0x9e,0xdb,0x73,0x13,0x64,0x62,0x69,0xa5,0x2f,0x7d,0xca,0x96,0x6d,0x9f, 0xf8,0x04,0x4d,0x30,0x92,0x3d,0x6e,0x21,0x14,0x21,0xc9,0x3d,0xe0,0xc3,0xfd,0x8a, 0x6b,0x9d,0x4a,0xfd,0xd1,0xa1,0x9d,0x99,0x43,0x77,0x3f,0xb0,0xda }; +static const BYTE rootcertauthority2010[] = { +0x30,0x82,0x05,0xed,0x30,0x82,0x03,0xd5,0xa0,0x03,0x02,0x01,0x02,0x02,0x10,0x28, +0xcc,0x3a,0x25,0xbf,0xba,0x44,0xac,0x44,0x9a,0x9b,0x58,0x6b,0x43,0x39,0xaa,0x30, +0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x0b,0x05,0x00,0x30,0x81, +0x88,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x13, +0x30,0x11,0x06,0x03,0x55,0x04,0x08,0x13,0x0a,0x57,0x61,0x73,0x68,0x69,0x6e,0x67, +0x74,0x6f,0x6e,0x31,0x10,0x30,0x0e,0x06,0x03,0x55,0x04,0x07,0x13,0x07,0x52,0x65, +0x64,0x6d,0x6f,0x6e,0x64,0x31,0x1e,0x30,0x1c,0x06,0x03,0x55,0x04,0x0a,0x13,0x15, +0x4d,0x69,0x63,0x72,0x6f,0x73,0x6f,0x66,0x74,0x20,0x43,0x6f,0x72,0x70,0x6f,0x72, +0x61,0x74,0x69,0x6f,0x6e,0x31,0x32,0x30,0x30,0x06,0x03,0x55,0x04,0x03,0x13,0x29, +0x4d,0x69,0x63,0x72,0x6f,0x73,0x6f,0x66,0x74,0x20,0x52,0x6f,0x6f,0x74,0x20,0x43, +0x65,0x72,0x74,0x69,0x66,0x69,0x63,0x61,0x74,0x65,0x20,0x41,0x75,0x74,0x68,0x6f, +0x72,0x69,0x74,0x79,0x20,0x32,0x30,0x31,0x30,0x30,0x1e,0x17,0x0d,0x31,0x30,0x30, +0x36,0x32,0x33,0x32,0x31,0x35,0x37,0x32,0x34,0x5a,0x17,0x0d,0x33,0x35,0x30,0x36, +0x32,0x33,0x32,0x32,0x30,0x34,0x30,0x31,0x5a,0x30,0x81,0x88,0x31,0x0b,0x30,0x09, +0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x13,0x30,0x11,0x06,0x03,0x55, +0x04,0x08,0x13,0x0a,0x57,0x61,0x73,0x68,0x69,0x6e,0x67,0x74,0x6f,0x6e,0x31,0x10, +0x30,0x0e,0x06,0x03,0x55,0x04,0x07,0x13,0x07,0x52,0x65,0x64,0x6d,0x6f,0x6e,0x64, +0x31,0x1e,0x30,0x1c,0x06,0x03,0x55,0x04,0x0a,0x13,0x15,0x4d,0x69,0x63,0x72,0x6f, +0x73,0x6f,0x66,0x74,0x20,0x43,0x6f,0x72,0x70,0x6f,0x72,0x61,0x74,0x69,0x6f,0x6e, +0x31,0x32,0x30,0x30,0x06,0x03,0x55,0x04,0x03,0x13,0x29,0x4d,0x69,0x63,0x72,0x6f, +0x73,0x6f,0x66,0x74,0x20,0x52,0x6f,0x6f,0x74,0x20,0x43,0x65,0x72,0x74,0x69,0x66, +0x69,0x63,0x61,0x74,0x65,0x20,0x41,0x75,0x74,0x68,0x6f,0x72,0x69,0x74,0x79,0x20, +0x32,0x30,0x31,0x30,0x30,0x82,0x02,0x22,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86, +0xf7,0x0d,0x01,0x01,0x01,0x05,0x00,0x03,0x82,0x02,0x0f,0x00,0x30,0x82,0x02,0x0a, +0x02,0x82,0x02,0x01,0x00,0xb9,0x08,0x9e,0x28,0xe4,0xe4,0xec,0x06,0x4e,0x50,0x68, +0xb3,0x41,0xc5,0x7b,0xeb,0xae,0xb6,0x8e,0xaf,0x81,0xba,0x22,0x44,0x1f,0x65,0x34, +0x69,0x4c,0xbe,0x70,0x40,0x17,0xf2,0x16,0x7b,0xe2,0x79,0xfd,0x86,0xed,0x0d,0x39, +0xf4,0x1b,0xa8,0xad,0x92,0x90,0x1e,0xcb,0x3d,0x76,0x8f,0x5a,0xd9,0xb5,0x91,0x10, +0x2e,0x3c,0x05,0x8d,0x8a,0x6d,0x24,0x54,0xe7,0x1f,0xed,0x56,0xad,0x83,0xb4,0x50, +0x9c,0x15,0xa5,0x17,0x74,0x88,0x59,0x20,0xfc,0x08,0xc5,0x84,0x76,0xd3,0x68,0xd4, +0x6f,0x28,0x78,0xce,0x5c,0xb8,0xf3,0x50,0x90,0x44,0xff,0xe3,0x63,0x5f,0xbe,0xa1, +0x9a,0x2c,0x96,0x15,0x04,0xd6,0x07,0xfe,0x1e,0x84,0x21,0xe0,0x42,0x31,0x11,0xc4, +0x28,0x36,0x94,0xcf,0x50,0xa4,0x62,0x9e,0xc9,0xd6,0xab,0x71,0x00,0xb2,0x5b,0x0c, +0xe6,0x96,0xd4,0x0a,0x24,0x96,0xf5,0xff,0xc6,0xd5,0xb7,0x1b,0xd7,0xcb,0xb7,0x21, +0x62,0xaf,0x12,0xdc,0xa1,0x5d,0x37,0xe3,0x1a,0xfb,0x1a,0x46,0x98,0xc0,0x9b,0xc0, +0xe7,0x63,0x1f,0x2a,0x08,0x93,0x02,0x7e,0x1e,0x6a,0x8e,0xf2,0x9f,0x18,0x89,0xe4, +0x22,0x85,0xa2,0xb1,0x84,0x57,0x40,0xff,0xf5,0x0e,0xd8,0x6f,0x9c,0xed,0xe2,0x45, +0x31,0x01,0xcd,0x17,0xe9,0x7f,0xb0,0x81,0x45,0xe3,0xaa,0x21,0x40,0x26,0xa1,0x72, +0xaa,0xa7,0x4f,0x3c,0x01,0x05,0x7e,0xee,0x83,0x58,0xb1,0x5e,0x06,0x63,0x99,0x62, +0x91,0x78,0x82,0xb7,0x0d,0x93,0x0c,0x24,0x6a,0xb4,0x1b,0xdb,0x27,0xec,0x5f,0x95, +0x04,0x3f,0x93,0x4a,0x30,0xf5,0x97,0x18,0xb3,0xa7,0xf9,0x19,0xa7,0x93,0x33,0x1d, +0x01,0xc8,0xdb,0x22,0x52,0x5c,0xd7,0x25,0xc9,0x46,0xf9,0xa2,0xfb,0x87,0x59,0x43, +0xbe,0x9b,0x62,0xb1,0x8d,0x2d,0x86,0x44,0x1a,0x46,0xac,0x78,0x61,0x7e,0x30,0x09, +0xfa,0xae,0x89,0xc4,0x41,0x2a,0x22,0x66,0x03,0x91,0x39,0x45,0x9c,0xc7,0x8b,0x0c, +0xa8,0xca,0x0d,0x2f,0xfb,0x52,0xea,0x0c,0xf7,0x63,0x33,0x23,0x9d,0xfe,0xb0,0x1f, +0xad,0x67,0xd6,0xa7,0x50,0x03,0xc6,0x04,0x70,0x63,0xb5,0x2c,0xb1,0x86,0x5a,0x43, +0xb7,0xfb,0xae,0xf9,0x6e,0x29,0x6e,0x21,0x21,0x41,0x26,0x06,0x8c,0xc9,0xc3,0xee, +0xb0,0xc2,0x85,0x93,0xa1,0xb9,0x85,0xd9,0xe6,0x32,0x6c,0x4b,0x4c,0x3f,0xd6,0x5d, +0xa3,0xe5,0xb5,0x9d,0x77,0xc3,0x9c,0xc0,0x55,0xb7,0x74,0x00,0xe3,0xb8,0x38,0xab, +0x83,0x97,0x50,0xe1,0x9a,0x42,0x24,0x1d,0xc6,0xc0,0xa3,0x30,0xd1,0x1a,0x5a,0xc8, +0x52,0x34,0xf7,0x73,0xf1,0xc7,0x18,0x1f,0x33,0xad,0x7a,0xec,0xcb,0x41,0x60,0xf3, +0x23,0x94,0x20,0xc2,0x48,0x45,0xac,0x5c,0x51,0xc6,0x2e,0x80,0xc2,0xe2,0x77,0x15, +0xbd,0x85,0x87,0xed,0x36,0x9d,0x96,0x91,0xee,0x00,0xb5,0xa3,0x70,0xec,0x9f,0xe3, +0x8d,0x80,0x68,0x83,0x76,0xba,0xaf,0x5d,0x70,0x52,0x22,0x16,0xe2,0x66,0xfb,0xba, +0xb3,0xc5,0xc2,0xf7,0x3e,0x2f,0x77,0xa6,0xca,0xde,0xc1,0xa6,0xc6,0x48,0x4c,0xc3, +0x37,0x51,0x23,0xd3,0x27,0xd7,0xb8,0x4e,0x70,0x96,0xf0,0xa1,0x44,0x76,0xaf,0x78, +0xcf,0x9a,0xe1,0x66,0x13,0x02,0x03,0x01,0x00,0x01,0xa3,0x51,0x30,0x4f,0x30,0x0b, +0x06,0x03,0x55,0x1d,0x0f,0x04,0x04,0x03,0x02,0x01,0x86,0x30,0x0f,0x06,0x03,0x55, +0x1d,0x13,0x01,0x01,0xff,0x04,0x05,0x30,0x03,0x01,0x01,0xff,0x30,0x1d,0x06,0x03, +0x55,0x1d,0x0e,0x04,0x16,0x04,0x14,0xd5,0xf6,0x56,0xcb,0x8f,0xe8,0xa2,0x5c,0x62, +0x68,0xd1,0x3d,0x94,0x90,0x5b,0xd7,0xce,0x9a,0x18,0xc4,0x30,0x10,0x06,0x09,0x2b, +0x06,0x01,0x04,0x01,0x82,0x37,0x15,0x01,0x04,0x03,0x02,0x01,0x00,0x30,0x0d,0x06, +0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x0b,0x05,0x00,0x03,0x82,0x02,0x01, +0x00,0xac,0xa5,0x96,0x8c,0xbf,0xbb,0xae,0xa6,0xf6,0xd7,0x71,0x87,0x43,0x31,0x56, +0x88,0xfd,0x1c,0x32,0x71,0x5b,0x35,0xb7,0xd4,0xf0,0x91,0xf2,0xaf,0x37,0xe2,0x14, +0xf1,0xf3,0x02,0x26,0x05,0x3e,0x16,0x14,0x7f,0x14,0xba,0xb8,0x4f,0xfb,0x89,0xb2, +0xb2,0xe7,0xd4,0x09,0xcc,0x6d,0xb9,0x5b,0x3b,0x64,0x65,0x70,0x66,0xb7,0xf2,0xb1, +0x5a,0xdf,0x1a,0x02,0xf3,0xf5,0x51,0xb8,0x67,0x6d,0x79,0xf3,0xbf,0x56,0x7b,0xe4, +0x84,0xb9,0x2b,0x1e,0x9b,0x40,0x9c,0x26,0x34,0xf9,0x47,0x18,0x98,0x69,0xd8,0x1c, +0xd7,0xb6,0xd1,0xbf,0x8f,0x61,0xc2,0x67,0xc4,0xb5,0xef,0x60,0x43,0x8e,0x10,0x1b, +0x36,0x49,0xe4,0x20,0xca,0xad,0xa7,0xc1,0xb1,0x27,0x65,0x09,0xf8,0xcd,0xf5,0x5b, +0x2a,0xd0,0x84,0x33,0xf3,0xef,0x1f,0xf2,0xf5,0x9c,0x0b,0x58,0x93,0x37,0xa0,0x75, +0xa0,0xde,0x72,0xde,0x6c,0x75,0x2a,0x66,0x22,0xf5,0x8c,0x06,0x30,0x56,0x9f,0x40, +0xb9,0x30,0xaa,0x40,0x77,0x15,0x82,0xd7,0x8b,0xec,0xc0,0xd3,0xb2,0xbd,0x83,0xc5, +0x77,0x0c,0x1e,0xae,0xaf,0x19,0x53,0xa0,0x4d,0x79,0x71,0x9f,0x0f,0xaf,0x30,0xce, +0x67,0xf9,0xd6,0x2c,0xcc,0x22,0x41,0x7a,0x07,0xf2,0x97,0x42,0x18,0xce,0x59,0x79, +0x10,0x55,0xde,0x6f,0x10,0xe4,0xb8,0xda,0x83,0x66,0x40,0x16,0x09,0x68,0x23,0x5b, +0x97,0x2e,0x26,0x9a,0x02,0xbb,0x57,0x8c,0xc5,0xb8,0xba,0x69,0x62,0x32,0x80,0x89, +0x9e,0xa1,0xfd,0xc0,0x92,0x7c,0x7b,0x2b,0x33,0x19,0x84,0x2a,0x63,0xc5,0x00,0x68, +0x62,0xfa,0x9f,0x47,0x8d,0x99,0x7a,0x45,0x3a,0xa7,0xe9,0xed,0xee,0x69,0x42,0xb5, +0xf3,0x81,0x9b,0x47,0x56,0x10,0x7b,0xfc,0x70,0x36,0x84,0x18,0x73,0xea,0xef,0xf9, +0x97,0x4d,0x9e,0x33,0x23,0xdd,0x26,0x0b,0xba,0x2a,0xb7,0x3f,0x44,0xdc,0x83,0x27, +0xff,0xbd,0x61,0x59,0x2b,0x11,0xb7,0xca,0x4f,0xdb,0xc5,0x8b,0x0c,0x1c,0x31,0xae, +0x32,0xf8,0xf8,0xb9,0x42,0xf7,0x7f,0xdc,0x61,0x9a,0x76,0xb1,0x5a,0x04,0xe1,0x11, +0x3d,0x66,0x45,0xb7,0x18,0x71,0xbe,0xc9,0x24,0x85,0xd6,0xf3,0xd4,0xba,0x41,0x34, +0x5d,0x12,0x2d,0x25,0xb9,0x8d,0xa6,0x13,0x48,0x6d,0x4b,0xb0,0x07,0x7d,0x99,0x93, +0x09,0x61,0x81,0x74,0x57,0x26,0x8a,0xab,0x69,0xe3,0xe4,0xd9,0xc7,0x88,0xcc,0x24, +0xd8,0xec,0x52,0x24,0x5c,0x1e,0xbc,0x91,0x14,0xe2,0x96,0xde,0xeb,0x0a,0xda,0x9e, +0xdd,0x5f,0xb3,0x5b,0xdb,0xd4,0x82,0xec,0xc6,0x20,0x50,0x87,0x25,0x40,0x3a,0xfb, +0xc7,0xee,0xcd,0xfe,0x33,0xe5,0x6e,0xc3,0x84,0x09,0x55,0x03,0x25,0x39,0xc0,0xe9, +0x35,0x5d,0x65,0x31,0xa8,0xf6,0xbf,0xa0,0x09,0xcd,0x29,0xc7,0xb3,0x36,0x32,0x2e, +0xdc,0x95,0xf3,0x83,0xc1,0x5a,0xcf,0x8b,0x8d,0xf6,0xea,0xb3,0x21,0xf8,0xa4,0xed, +0x1e,0x31,0x0e,0xb6,0x4c,0x11,0xab,0x60,0x0b,0xa4,0x12,0x23,0x22,0x17,0xa3,0x36, +0x64,0x82,0x91,0x04,0x12,0xe0,0xab,0x6f,0x1e,0xcb,0x50,0x05,0x61,0xb4,0x40,0xff, +0x59,0x86,0x71,0xd1,0xd5,0x33,0x69,0x7c,0xa9,0x73,0x8a,0x38,0xd7,0x64,0x0c,0xf1, +0x69 }; static const BYTE rootcertauthority2011[] = { 0x30,0x82,0x05,0xed,0x30,0x82,0x03,0xd5,0xa0,0x03,0x02,0x01,0x02,0x02,0x10,0x3f, 0x8b,0xc8,0xb5,0xfc,0x9f,0xb2,0x96,0x43,0xb5,0x69,0xd6,0x6c,0x42,0xe1,0x44,0x30, @@ -757,6 +854,7 @@ static const struct CONST_BLOB { { authenticode, sizeof(authenticode) }, { rootauthority, sizeof(rootauthority) }, { rootcertauthority, sizeof(rootcertauthority) }, + { rootcertauthority2010, sizeof(rootcertauthority2010) }, { rootcertauthority2011, sizeof(rootcertauthority2011) }, };

1 0

Sven Baars : ntdll/tests: Fix some test failures on Windows 10.
by Alexandre Julliard 28 Oct '19

28 Oct '19

Module: wine Branch: master Commit: e8f4251423e9be35ae55174447732b53b6745de3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8f4251423e9be35ae551744… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Oct 26 14:56:39 2019 +0200 ntdll/tests: Fix some test failures on Windows 10. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 64c39f0940..30ed6e5ef9 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1864,8 +1864,10 @@ static void test_readvirtualmemory(void) /* illegal local address */ status = pNtReadVirtualMemory(process, teststring, (void *)0x1234, 12, &readcount); - ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status); - ok( readcount == 0, "Expected to read 0 bytes, got %ld\n",readcount); + ok( status == STATUS_ACCESS_VIOLATION || broken(status == STATUS_PARTIAL_COPY) /* Win10 */, + "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status); + if (status == STATUS_ACCESS_VIOLATION) + ok( readcount == 0, "Expected to read 0 bytes, got %ld\n",readcount); CloseHandle(process); }

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
62
Older →

Jump to page:

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-commits October 2019