September 2021 - Wine-commits

Paul Gofman : ntdll: Optimize get_vprot_range_size() for big ranges.
by Alexandre Julliard 28 Sep '21

28 Sep '21

Module: wine Branch: master Commit: bcdb28a563d43f2aebe28f457497bb36f59a50ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcdb28a563d43f2aebe28f45… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Sep 23 18:20:06 2021 +0300 ntdll: Optimize get_vprot_range_size() for big ranges. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 50 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 8a55abfd15a..63655f0c928 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -948,17 +948,53 @@ static BYTE get_page_vprot( const void *addr ) * * Return the size of the region with equal masked vprot byte. * Also return the protections for the first page. - * The function assumes that base and size are page aligned and - * base + size does not wrap around. */ + * The function assumes that base and size are page aligned, + * base + size does not wrap around and the range is within view so + * vprot bytes are allocated for the range. */ static SIZE_T get_vprot_range_size( char *base, SIZE_T size, BYTE mask, BYTE *vprot ) { - char *addr; + static const UINT_PTR word_from_byte = (UINT_PTR)0x101010101010101; + static const UINT_PTR index_align_mask = sizeof(UINT_PTR) - 1; + SIZE_T curr_idx, start_idx, end_idx, aligned_start_idx; + UINT_PTR vprot_word, mask_word; + const BYTE *vprot_ptr; - *vprot = get_page_vprot( base ); - for (addr = base + page_size; addr != base + size; addr += page_size) - if ((*vprot ^ get_page_vprot( addr )) & mask) break; + TRACE("base %p, size %p, mask %#x.\n", base, (void *)size, mask); - return addr - base; + curr_idx = start_idx = (size_t)base >> page_shift; + end_idx = start_idx + (size >> page_shift); + + aligned_start_idx = (start_idx + index_align_mask) & ~index_align_mask; + if (aligned_start_idx > end_idx) aligned_start_idx = end_idx; + +#ifdef _WIN64 + vprot_ptr = pages_vprot[curr_idx >> pages_vprot_shift] + (curr_idx & pages_vprot_mask); +#else + vprot_ptr = pages_vprot + curr_idx; +#endif + *vprot = *vprot_ptr; + + /* Page count page table is at least the multiples of sizeof(UINT_PTR) + * so we don't have to worry about crossing the boundary on unaligned idx values. */ + + for (; curr_idx < aligned_start_idx; ++curr_idx, ++vprot_ptr) + if ((*vprot ^ *vprot_ptr) & mask) return (curr_idx - start_idx) << page_shift; + + vprot_word = word_from_byte * *vprot; + mask_word = word_from_byte * mask; + for (; curr_idx < end_idx; curr_idx += sizeof(UINT_PTR), vprot_ptr += sizeof(UINT_PTR)) + { +#ifdef _WIN64 + if (!(curr_idx & pages_vprot_mask)) vprot_ptr = pages_vprot[curr_idx >> pages_vprot_shift]; +#endif + if ((vprot_word ^ *(UINT_PTR *)vprot_ptr) & mask_word) + { + for (; curr_idx < end_idx; ++curr_idx, ++vprot_ptr) + if ((*vprot ^ *vprot_ptr) & mask) break; + return (curr_idx - start_idx) << page_shift; + } + } + return size; } /***********************************************************************

1 0

Rémi Bernon : dinput: Implement HID joystick DIPROP_AUTOCENTER property.
by Alexandre Julliard 28 Sep '21

28 Sep '21

Module: wine Branch: master Commit: 5732347cbeca13c10d31097665a5e681da5b9e3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5732347cbeca13c10d310976… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 28 09:30:14 2021 +0200 dinput: Implement HID joystick DIPROP_AUTOCENTER property. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 15 +++++++++++++++ dlls/dinput8/tests/hid.c | 3 --- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 4ce60e67faf..a8f8077863b 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -628,6 +628,9 @@ static HRESULT WINAPI hid_joystick_GetProperty( IDirectInputDevice8W *iface, con lstrcpynW( value->wszPath, impl->device_path, MAX_PATH ); return DI_OK; } + case (DWORD_PTR)DIPROP_AUTOCENTER: + if (header->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; + return DIERR_UNSUPPORTED; default: return IDirectInputDevice2WImpl_GetProperty( iface, guid, header ); } @@ -684,6 +687,7 @@ static HRESULT WINAPI hid_joystick_SetProperty( IDirectInputDevice8W *iface, con const DIPROPHEADER *header ) { struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + HRESULT hr; TRACE( "iface %p, guid %s, header %p\n", iface, debugstr_guid( guid ), header ); @@ -717,6 +721,17 @@ static HRESULT WINAPI hid_joystick_SetProperty( IDirectInputDevice8W *iface, con enum_objects( impl, header, DIDFT_AXIS, set_property_prop_saturation, (void *)header ); return DI_OK; } + case (DWORD_PTR)DIPROP_AUTOCENTER: + { + DIPROPDWORD *value = (DIPROPDWORD *)header; + if (header->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; + EnterCriticalSection( &impl->base.crit ); + if (impl->base.acquired) hr = DIERR_ACQUIRED; + else if (value->dwData > DIPROPAUTOCENTER_ON) hr = DIERR_INVALIDPARAM; + else hr = DIERR_UNSUPPORTED; + LeaveCriticalSection( &impl->base.crit ); + return hr; + } case (DWORD_PTR)DIPROP_FFLOAD: case (DWORD_PTR)DIPROP_GRANULARITY: case (DWORD_PTR)DIPROP_VIDPID: diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 07505797eb1..848619bd468 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3864,7 +3864,6 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_GetProperty( device, DIPROP_CALIBRATION, &prop_dword.diph ); ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetProperty DIPROP_CALIBRATION returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_AUTOCENTER, &prop_dword.diph ); - todo_wine ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_GetProperty DIPROP_AUTOCENTER returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_DEADZONE, &prop_dword.diph ); ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_GetProperty DIPROP_DEADZONE returned %#x\n", hr ); @@ -4347,7 +4346,6 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_SetProperty( device, DIPROP_BUFFERSIZE, &prop_dword.diph ); ok( hr == DIERR_ACQUIRED, "IDirectInputDevice8_SetProperty DIPROP_BUFFERSIZE returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_AUTOCENTER, &prop_dword.diph ); - todo_wine ok( hr == DIERR_ACQUIRED, "IDirectInputDevice8_SetProperty DIPROP_AUTOCENTER returned %#x\n", hr ); prop_pointer.diph.dwHow = DIPH_BYUSAGE; prop_pointer.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); @@ -4460,7 +4458,6 @@ static void test_simple_joystick(void) ok( hr == DI_OK, "IDirectInputDevice8_SetProperty DIPROP_BUFFERSIZE returned %#x\n", hr ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_SetProperty( device, DIPROP_AUTOCENTER, &prop_dword.diph ); - todo_wine ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetProperty DIPROP_AUTOCENTER returned %#x\n", hr ); prop_dword.dwData = DIPROPAUTOCENTER_ON; hr = IDirectInputDevice8_SetProperty( device, DIPROP_AUTOCENTER, &prop_dword.diph );

1 0

Rémi Bernon : dinput: Remove unusual HID joystick button count FIXMEs.
by Alexandre Julliard 28 Sep '21

28 Sep '21

Module: wine Branch: master Commit: e4766cad6d25451ecc4b1248933329204ad80098 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4766cad6d25451ecc4b1248… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 28 09:30:15 2021 +0200 dinput: Remove unusual HID joystick button count FIXMEs. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index a8f8077863b..29cb8990689 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -359,9 +359,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, TRACE( "Ignoring input button %s, usage page not implemented.\n", debugstr_hid_caps( &caps ) ); else if (caps.button->IsRange) { - if (caps.button->NotRange.Usage >= 128) - FIXME( "Ignoring input button %s, too many buttons.\n", debugstr_hid_caps( &caps ) ); - else for (j = caps.button->Range.UsageMin; j <= caps.button->Range.UsageMax; ++j) + for (j = caps.button->Range.UsageMin; j <= caps.button->Range.UsageMax; ++j) { instance.dwOfs = button_ofs + (j - caps.button->Range.UsageMin); instance.dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( button++ ); @@ -375,8 +373,6 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, if (ret != DIENUM_CONTINUE) return ret; } } - else if (caps.button->NotRange.Usage >= 128) - FIXME( "Ignoring input button %s, too many buttons.\n", debugstr_hid_caps( &caps ) ); else { instance.dwOfs = button_ofs;

1 0

Alexandre Julliard : tools: Add a shared header for common helper functions.
by Alexandre Julliard 28 Sep '21

28 Sep '21

Module: wine Branch: master Commit: 97ca9f8a3ddf7347f589cd928ef3fe1a7ef23fc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97ca9f8a3ddf7347f589cd92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 28 10:08:06 2021 +0200 tools: Add a shared header for common helper functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- tools/make_xftmpl.c | 19 ++--- tools/makedep.c | 151 +--------------------------------- tools/sfnt2fon/sfnt2fon.c | 13 ++- tools/tools.h | 204 ++++++++++++++++++++++++++++++++++++++++++++++ tools/widl/utils.c | 63 -------------- tools/widl/utils.h | 21 ----- tools/widl/widl.h | 1 + tools/winebuild/build.h | 34 +------- tools/winebuild/utils.c | 116 -------------------------- tools/winegcc/utils.c | 114 -------------------------- tools/winegcc/utils.h | 27 +----- tools/wmc/utils.c | 63 -------------- tools/wmc/utils.h | 13 +-- tools/wrc/utils.c | 63 -------------- tools/wrc/utils.h | 12 --- tools/wrc/wpp_private.h | 1 + tools/wrc/wrc.h | 1 + 19 files changed, 226 insertions(+), 694 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=97ca9f8a3ddf7347f589…

1 0

Alexandre Julliard : tools: Add helper functions to spawn a command from an strarray.
by Alexandre Julliard 28 Sep '21

28 Sep '21

Module: wine Branch: master Commit: 2a08d6ce8086baf62f687fa664cc3995ba8cb11b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a08d6ce8086baf62f687fa6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 28 18:18:49 2021 +0200 tools: Add helper functions to spawn a command from an strarray. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/tools.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ tools/winebuild/utils.c | 8 ++------ tools/winegcc/utils.c | 21 ++++----------------- 3 files changed, 54 insertions(+), 23 deletions(-) diff --git a/tools/tools.h b/tools/tools.h index bfbbb60b9e8..7c0f4c20a42 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -25,6 +25,18 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <sys/types.h> +#include <errno.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif + +#if defined(_WIN32) && !defined(__CYGWIN__) +# include <process.h> +#else +# include <sys/wait.h> +# include <unistd.h> +#endif #if !defined(__GNUC__) && !defined(__attribute__) #define __attribute__(x) @@ -200,5 +212,41 @@ static inline const char *strarray_bsearch( const struct strarray *array, const return res ? *res : NULL; } +static inline void strarray_trace( struct strarray args ) +{ + unsigned int i; + + for (i = 0; i < args.count; i++) + { + if (strpbrk( args.str[i], " \t\n\r")) printf( "\"%s\"", args.str[i] ); + else printf( "%s", args.str[i] ); + putchar( i < args.count - 1 ? ' ' : '\n' ); + } +} + +static inline int strarray_spawn( struct strarray args ) +{ +#if defined(_WIN32) && !defined(__CYGWIN__) + strarray_add( &args, NULL ); + return _spawnvp( _P_WAIT, args.str[0], args.str ); +#else + pid_t pid, wret; + int status; + + if (!(pid = fork())) + { + strarray_add( &args, NULL ); + execvp( args.str[0], (char **)args.str ); + _exit(1); + } + if (pid == -1) return -1; + + while (pid != (wret = waitpid( pid, &status, 0 ))) + if (wret == -1 && errno != EINTR) break; + + if (pid == wret && WIFEXITED(status)) return WEXITSTATUS(status); + return 255; /* abnormal exit with an abort or an interrupt */ +#endif +} #endif /* __WINE_TOOLS_H */ diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index f6468312902..de0d26ddba6 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -206,17 +206,13 @@ static const char *find_binary( const char *prefix, const char *name ) void spawn( struct strarray args ) { - unsigned int i; int status; const char *argv0 = find_binary( NULL, args.str[0] ); if (argv0) args.str[0] = argv0; - strarray_add( &args, NULL ); - if (verbose) - for (i = 0; args.str[i]; i++) - fprintf( stderr, "%s%c", args.str[i], args.str[i+1] ? ' ' : '\n' ); + if (verbose) strarray_trace( args ); - if ((status = _spawnvp( _P_WAIT, args.str[0], args.str ))) + if ((status = strarray_spawn( args ))) { if (status > 0) fatal_error( "%s failed with status %u\n", args.str[0], status ); else fatal_perror( "winebuild" ); diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index 95764289391..4fc315db69e 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -197,27 +197,14 @@ const char *find_binary( struct strarray prefix, const char *name ) int spawn(struct strarray prefix, struct strarray args, int ignore_errors) { - unsigned int i; int status; - const char** argv; - - strarray_add( &args, NULL); - argv = args.str; - argv[0] = find_binary( prefix, argv[0] ); - if (verbose) - { - for(i = 0; argv[i]; i++) - { - if (strpbrk(argv[i], " \t\n\r")) printf("\"%s\" ", argv[i]); - else printf("%s ", argv[i]); - } - printf("\n"); - } + args.str[0] = find_binary( prefix, args.str[0] ); + if (verbose) strarray_trace( args ); - if ((status = _spawnvp( _P_WAIT, argv[0], argv)) && !ignore_errors) + if ((status = strarray_spawn( args )) && !ignore_errors) { - if (status > 0) error("%s failed\n", argv[0]); + if (status > 0) error("%s failed\n", args.str[0]); else perror("winegcc"); exit(3); }

1 0

Zebediah Figura : d3d8/tests: Add a stress test for dynamic buffer maps.
by Alexandre Julliard 28 Sep '21

28 Sep '21

Module: wine Branch: master Commit: 53d3d0b25ff9af22fbaa89ed0fa2d2a559fca93b URL: https://source.winehq.org/git/wine.git/?a=commit;h=53d3d0b25ff9af22fbaa89ed… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 27 17:04:51 2021 -0500 d3d8/tests: Add a stress test for dynamic buffer maps. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 136 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index f25549388d0..df4dd0029a6 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -263,6 +263,34 @@ static void check_rect(struct surface_readback *rb, RECT r, const char *message) } } +#define check_rt_color(a, b) check_rt_color_(__LINE__, a, b) +static void check_rt_color_(unsigned int line, IDirect3DSurface8 *rt, D3DCOLOR expected_color) +{ + D3DCOLOR color = 0xdeadbeef; + struct surface_readback rb; + D3DSURFACE_DESC desc; + unsigned int x, y; + HRESULT hr; + + hr = IDirect3DSurface8_GetDesc(rt, &desc); + ok_(__FILE__, line)(hr == S_OK, "Failed to get surface desc, hr %#x.\n", hr); + + get_rt_readback(rt, &rb); + for (y = 0; y < desc.Height; ++y) + { + for (x = 0; x < desc.Width; ++x) + { + color = get_readback_color(&rb, x, y) & 0x00ffffff; + if (color != expected_color) + break; + } + if (color != expected_color) + break; + } + release_surface_readback(&rb); + ok_(__FILE__, line)(color == expected_color, "Got unexpected color 0x%08x.\n", color); +} + static IDirect3DDevice8 *create_device(IDirect3D8 *d3d, HWND device_window, HWND focus_window, BOOL windowed) { D3DPRESENT_PARAMETERS present_parameters = {0}; @@ -11157,6 +11185,113 @@ static void test_sample_mask(void) DestroyWindow(window); } +struct dynamic_vb_vertex +{ + struct vec3 position; + DWORD diffuse; +}; + +static void fill_dynamic_vb_quad(struct dynamic_vb_vertex *quad, unsigned int x, unsigned int y) +{ + unsigned int i; + + memset(quad, 0, 4 * sizeof(*quad)); + + quad[0].position.x = quad[1].position.x = -1.0f + 0.01f * x; + quad[2].position.x = quad[3].position.x = -1.0f + 0.01f * (x + 1); + + quad[0].position.y = quad[2].position.y = -1.0f + 0.01f * y; + quad[1].position.y = quad[3].position.y = -1.0f + 0.01f * (y + 1); + + for (i = 0; i < 4; ++i) + quad[i].diffuse = 0xff00ff00; +} + +static void test_dynamic_map_synchronization(void) +{ + IDirect3DVertexBuffer8 *buffer; + IDirect3DDevice8 *device; + IDirect3DSurface8 *rt; + unsigned int x, y; + IDirect3D8 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + BYTE *data; + + window = create_window(); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateVertexBuffer(device, 200 * 4 * sizeof(struct dynamic_vb_vertex), + D3DUSAGE_DYNAMIC, D3DFVF_XYZ, D3DPOOL_DEFAULT, &buffer); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, buffer, sizeof(struct dynamic_vb_vertex)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (y = 0; y < 200; ++y) + { + hr = IDirect3DVertexBuffer8_Lock(buffer, 0, 0, &data, D3DLOCK_DISCARD); + ok(hr == D3D_OK, "Failed to map buffer, hr %#x.\n", hr); + + fill_dynamic_vb_quad((struct dynamic_vb_vertex *)data, 0, y); + + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(hr == D3D_OK, "Failed to map buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (x = 1; x < 200; ++x) + { + hr = IDirect3DVertexBuffer8_Lock(buffer, 4 * sizeof(struct dynamic_vb_vertex) * x, + 4 * sizeof(struct dynamic_vb_vertex), &data, D3DLOCK_NOOVERWRITE); + ok(hr == D3D_OK, "Failed to map buffer, hr %#x.\n", hr); + + fill_dynamic_vb_quad((struct dynamic_vb_vertex *)data, x, y); + + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(hr == D3D_OK, "Failed to map buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 4 * x, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + } + + hr = IDirect3DDevice8_GetRenderTarget(device, &rt); + ok(hr == S_OK, "Failed to get render target, hr %#x.\n", hr); + check_rt_color(rt, 0x0000ff00); + IDirect3DSurface8_Release(rt); + + hr = IDirect3DDevice8_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3DVertexBuffer8_Release(buffer); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -11235,4 +11370,5 @@ START_TEST(visual) test_alphatest(); test_desktop_window(); test_sample_mask(); + test_dynamic_map_synchronization(); }

1 0

Jan Sikorski : wined3d: Record a state reset on the first command list.
by Alexandre Julliard 28 Sep '21

28 Sep '21

Module: wine Branch: master Commit: 8a7e6cf1665a656b422590ce1d07bcd37b93bb5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a7e6cf1665a656b422590ce… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue Sep 28 12:54:53 2021 +0200 wined3d: Record a state reset on the first command list. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 23 +++++++++++++++++++++++ dlls/wined3d/cs.c | 4 ++++ 2 files changed, 27 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0f8e59573ed..d8c10ab054c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -32888,6 +32888,29 @@ static void test_deferred_context_rendering(void) ID3D11CommandList_Release(list1); ID3D11DeviceContext_Release(deferred); + /* Command lists do not inherit state from the immediate context. */ + + hr = ID3D11Device_CreateDeferredContext(device, 0, &deferred); + ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, black); + + ID3D11DeviceContext_OMSetRenderTargets(deferred, 1, &test_context.backbuffer_rtv, NULL); + set_viewport(deferred, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f); + test_context.immediate_context = deferred; + draw_color_quad(&test_context, &white); + test_context.immediate_context = immediate; + hr = ID3D11DeviceContext_FinishCommandList(deferred, FALSE, &list1); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + ID3D11DeviceContext_OMSetBlendState(immediate, green_blend, NULL, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11DeviceContext_ExecuteCommandList(immediate, list1, FALSE); + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(color == 0xffffffff, "Got unexpected color %#08x.\n", color); + + ID3D11CommandList_Release(list1); + ID3D11DeviceContext_Release(deferred); + /* The clearing of state done by FinishCommandList is captured by a * subsequent call to FinishCommandList... */ diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 1f03833e0ed..2d295d4660e 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3637,6 +3637,10 @@ HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, str object->c.ops = &wined3d_deferred_context_ops; object->c.device = device; + /* Make sure the first command list gets the state reset when executed. + * Resets for subsequent command lists are encoded in wined3d_deferred_context_record_command_list(). */ + wined3d_device_context_emit_reset_state(&object->c, true); + TRACE("Created deferred context %p.\n", object); *context = &object->c;

1 0

Connor McAdams : oleacc/tests: Add tests for default edit accessible object.
by Alexandre Julliard 28 Sep '21

28 Sep '21

Module: wine Branch: master Commit: 7246ccea1dbefb5f772a1946bbcbb265c4712164 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7246ccea1dbefb5f772a1946… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Sep 28 11:37:32 2021 +0200 oleacc/tests: Add tests for default edit accessible object. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 315 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 315 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7246ccea1dbefb5f772a…

1 0

Zebediah Figura : krnl386: Print %bp, %ss, and %sp for register functions in relay_call_from_16().
by Alexandre Julliard 28 Sep '21

28 Sep '21

Module: wine Branch: master Commit: f0328650cd325ade7baae4ae8585246d0d4829ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0328650cd325ade7baae4ae… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Sep 28 11:27:01 2021 -0500 krnl386: Print %bp, %ss, and %sp for register functions in relay_call_from_16(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/relay.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/krnl386.exe16/relay.c b/dlls/krnl386.exe16/relay.c index 6eab9970a90..3559bb460a7 100644 --- a/dlls/krnl386.exe16/relay.c +++ b/dlls/krnl386.exe16/relay.c @@ -538,10 +538,10 @@ int relay_call_from_16( void *entry_point, unsigned char *args16, CONTEXT *conte if (!j) /* register function */ { args32[nb_args++] = (int)context; - TRACE( ") ret=%04x:%04x ax=%04x bx=%04x cx=%04x dx=%04x si=%04x di=%04x ds=%04x es=%04x efl=%08x\n", + TRACE( ") ret=%04x:%04x ax=%04x bx=%04x cx=%04x dx=%04x si=%04x di=%04x bp=%04x ss:sp=%04x:%04x ds=%04x es=%04x efl=%08x\n", frame->cs, frame->ip, (WORD)context->Eax, (WORD)context->Ebx, (WORD)context->Ecx, - (WORD)context->Edx, (WORD)context->Esi, (WORD)context->Edi, (WORD)context->SegDs, - (WORD)context->SegEs, context->EFlags ); + (WORD)context->Edx, (WORD)context->Esi, (WORD)context->Edi, (WORD)context->Ebp, + (WORD)context->SegSs, (WORD)context->Esp, (WORD)context->SegDs, (WORD)context->SegEs, context->EFlags ); } else TRACE( ") ret=%04x:%04x ds=%04x\n", frame->cs, frame->ip, frame->ds );

1 0

Zebediah Figura : ntdll: Also print %ss in dispatch_exception().
by Alexandre Julliard 28 Sep '21

28 Sep '21

Module: wine Branch: master Commit: f5fef036fdd04fc835302e8b64384174b31c290f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5fef036fdd04fc835302e8b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Sep 28 11:27:02 2021 -0500 ntdll: Also print %ss in dispatch_exception(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 479accaf63c..14971032ce6 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -214,8 +214,8 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) TRACE(" eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x\n", context->Eax, context->Ebx, context->Ecx, context->Edx, context->Esi, context->Edi ); - TRACE(" ebp=%08x esp=%08x cs=%04x ds=%04x es=%04x fs=%04x gs=%04x flags=%08x\n", - context->Ebp, context->Esp, context->SegCs, context->SegDs, + TRACE(" ebp=%08x esp=%08x cs=%04x ss=%04x ds=%04x es=%04x fs=%04x gs=%04x flags=%08x\n", + context->Ebp, context->Esp, context->SegCs, context->SegSs, context->SegDs, context->SegEs, context->SegFs, context->SegGs, context->EFlags ); }

1 0