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

[PATCH 1/3] d3d9: Track the viewport and scissor rect in the primary stateblock.
by Zebediah Figura Nov. 20, 2019

Nov. 20, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This is not particularly pretty, but there seems to me to be too much logic in wined3d regarding these states to be worth duplicating. dlls/d3d9/device.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5ef0c9cdf66..76fddc59f18 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -522,6 +522,17 @@ void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d } } +static void device_reset_viewport_state(struct d3d9_device *device) +{ + struct wined3d_viewport vp; + RECT rect; + + wined3d_device_get_viewports(device->wined3d_device, NULL, &vp); + wined3d_stateblock_set_viewport(device->state, &vp); + wined3d_device_get_scissor_rects(device->wined3d_device, NULL, &rect); + wined3d_stateblock_set_scissor_rect(device->state, &rect); +} + static HRESULT WINAPI d3d9_device_QueryInterface(IDirect3DDevice9Ex *iface, REFIID riid, void **out) { TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); @@ -1011,6 +1022,7 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, !!swapchain_desc.enable_auto_depth_stencil); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); + device_reset_viewport_state(device); } if (FAILED(hr = d3d9_device_get_swapchains(device))) @@ -1902,7 +1914,11 @@ static HRESULT WINAPI d3d9_device_SetRenderTarget(IDirect3DDevice9Ex *iface, DWO hr = wined3d_device_set_rendertarget_view(device->wined3d_device, idx, rtv, TRUE); d3d9_surface_release_rendertarget_view(surface_impl, rtv); if (SUCCEEDED(hr)) + { + if (!idx) + device_reset_viewport_state(device); device->render_targets[idx] = surface_impl; + } wined3d_mutex_unlock(); return hr; @@ -4636,6 +4652,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine !!swapchain_desc->enable_auto_depth_stencil); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc->enable_auto_depth_stencil); + device_reset_viewport_state(device); if (FAILED(hr = d3d9_device_get_swapchains(device))) { -- 2.23.0

4 6

[PATCH] ddraw/tests: Fix a few typos.
by Matteo Bruni Nov. 20, 2019

Nov. 20, 2019

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- Also fix the same comment in ddraw4.c, merge with another similar patch that I had in my queue. Supersedes patch 174018. dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 64c03c87d0c..fa65d0e722e 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5083,7 +5083,7 @@ static void test_surface_attachment(void) hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) - IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface3); + IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface2); hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); hr = IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface3); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 77c8e32e6bd..541362c7488 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6094,7 +6094,7 @@ static void test_surface_attachment(void) hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) - IDirectDrawSurface2_DeleteAttachedSurface(surface1, 0, surface3); + IDirectDrawSurface2_DeleteAttachedSurface(surface1, 0, surface2); hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); hr = IDirectDrawSurface2_DeleteAttachedSurface(surface1, 0, surface3); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index df20ccb09d3..e61d67d723d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7624,7 +7624,7 @@ static void test_surface_attachment(void) hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) - IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface3); + IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface2); hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); hr = IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface3); @@ -16622,7 +16622,7 @@ static void test_surface_format_conversion_alpha(void) {16}, {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000} }, "R5G6B5", 2, 4, 4, 0, TRUE, - /* Looks broken for sysmem texture convertions on Windows (at + /* Looks broken for sysmem texture conversions on Windows (at * least with hardware device), the result is either error from * _Blt() or a copy of the source data without any conversion. */ }, diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 7c46f33cb7a..c1db7b2df6a 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7496,7 +7496,7 @@ static void test_surface_attachment(void) hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) - IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface3); + IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface2); hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); hr = IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface3); @@ -16593,7 +16593,7 @@ static void test_surface_format_conversion_alpha(void) {16}, {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000} }, "R5G6B5", 2, 4, 4, 0, TRUE, - /* Looks broken for sysmem texture convertions on Windows (at + /* Looks broken for sysmem texture conversions on Windows (at * least with hardware device), the result is either error from * _Blt() or a copy of the source data without any conversion. */ }, -- 2.21.0

3 2

[PATCH 1/3] mfreadwrite: Start media source when stream selection changes.
by Nikolay Sivov Nov. 20, 2019

Nov. 20, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/main.c | 59 +++++++++++++++++++++++++++------ dlls/mfreadwrite/tests/mfplat.c | 50 ++++++++++++++++++++-------- 2 files changed, 84 insertions(+), 25 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index f24de690bc..bffe5cc47f 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -99,6 +99,8 @@ struct media_stream CONDITION_VARIABLE sample_event; struct list samples; enum media_stream_state state; + BOOL selected; + BOOL presented; }; struct source_reader @@ -820,6 +822,41 @@ static IMFSample *media_stream_pop_sample(struct media_stream *stream, DWORD *st return ret; } +static HRESULT source_reader_start_source(struct source_reader *reader) +{ + BOOL selection_changed = FALSE; + PROPVARIANT position; + HRESULT hr = S_OK; + DWORD i; + + if (reader->source_state == SOURCE_STATE_STARTED) + { + for (i = 0; i < reader->stream_count; ++i) + { + if (FAILED(hr = source_reader_get_stream_selection(reader, i, &reader->streams[i].selected))) + return hr; + selection_changed = reader->streams[i].selected ^ reader->streams[i].presented; + if (selection_changed) + break; + } + } + + position.u.hVal.QuadPart = 0; + if (reader->source_state != SOURCE_STATE_STARTED || selection_changed) + { + position.vt = reader->source_state == SOURCE_STATE_STARTED ? VT_EMPTY : VT_I8; + + /* Update cached stream selection if descriptor was accepted. */ + if (SUCCEEDED(hr = IMFMediaSource_Start(reader->source, reader->descriptor, &GUID_NULL, &position))) + { + for (i = 0; i < reader->stream_count; ++i) + reader->streams[i].presented = reader->streams[i].selected; + } + } + + return hr; +} + static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD index, DWORD flags, DWORD *actual_index, DWORD *stream_flags, LONGLONG *timestamp, IMFSample **sample) { @@ -867,20 +904,23 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind EnterCriticalSection(&stream->cs); - if (!(flags & MF_SOURCE_READER_CONTROLF_DRAIN)) + if (SUCCEEDED(hr = source_reader_start_source(reader))) { - while (list_empty(&stream->samples) && stream->state != STREAM_STATE_EOS) + if (!(flags & MF_SOURCE_READER_CONTROLF_DRAIN)) { - if (stream->stream) + while (list_empty(&stream->samples) && stream->state != STREAM_STATE_EOS) { - if (FAILED(hr = IMFMediaStream_RequestSample(stream->stream, NULL))) - WARN("Sample request failed, hr %#x.\n", hr); + 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); } - SleepConditionVariableCS(&stream->sample_event, &stream->cs, INFINITE); } - } - *sample = media_stream_pop_sample(stream, stream_flags); + *sample = media_stream_pop_sample(stream, stream_flags); + } LeaveCriticalSection(&stream->cs); @@ -913,9 +953,6 @@ static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, 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) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 16bb92b80e..081d94c7d5 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -351,10 +351,11 @@ static HRESULT WINAPI test_source_Start(IMFMediaSource *iface, IMFPresentationDe 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"); -} + 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; @@ -823,16 +824,6 @@ static void test_source_reader_from_media_source(void) 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); @@ -882,10 +873,41 @@ todo_wine IMFSourceReader_Release(reader); IMFMediaSource_Release(source); + /* Request from stream 0. */ + source = create_test_source(); + ok(!!source, "Failed to create test source.\n"); + + hr = MFCreateSourceReaderFromMediaSource(source, NULL, &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); + + hr = IMFSourceReader_ReadSample(reader, 0, 0, &actual_index, &stream_flags, &timestamp, &sample); + ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); + ok(actual_index == 0, "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); + + IMFSourceReader_Release(reader); + IMFMediaSource_Release(source); + /* Async mode. */ 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, attributes, &reader); ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); -- 2.24.0

1 2

[PATCH] shell32: add stub for SHCreateDataObject
by Louis Lenders Nov. 20, 2019

Nov. 20, 2019

See https://bugs.winehq.org/show_bug.cgi?id=48140

1 0

[PATCH 1/2] gdi32/tests: Fix some test SetDIBitsToDevice RLE8 test failures on Windows 2008+.
by Sven Baars Nov. 20, 2019

Nov. 20, 2019

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- This patch and the next one supercede 173282. dlls/gdi32/tests/bitmap.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index d651765006..c1651b5a2b 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -5532,14 +5532,23 @@ static void test_SetDIBitsToDevice_RLE8(void) info->bmiHeader.biWidth = 2; ret = SetDIBitsToDevice( hdc, 0, 0, 8, 8, 0, 0, 0, 8, rle8_data, info, DIB_RGB_COLORS ); ok( ret == 8, "got %d\n", ret ); - for (i = 0; i < 64; i++) ok( dib_bits[i] == bottom_up[i], "%d: got %08x\n", i, dib_bits[i] ); + if (dib_bits[0] == 0xaaaaaaaa) + { + win_skip("SetDIBitsToDevice is broken on Windows 2008.\n"); + goto cleanup; + } + for (i = 0; i < 64; i += 8) + { + ok( dib_bits[i] == bottom_up[i], "%d: got %08x\n", i, dib_bits[i] ); + ok( dib_bits[i+1] == bottom_up[i+1], "%d: got %08x\n", i+1, dib_bits[i+1] ); + } memset( dib_bits, 0xaa, 64 * 4 ); info->bmiHeader.biWidth = 8; info->bmiHeader.biHeight = 2; ret = SetDIBitsToDevice( hdc, 0, 0, 8, 8, 0, 0, 0, 8, rle8_data, info, DIB_RGB_COLORS ); ok( ret == 2, "got %d\n", ret ); - for (i = 0; i < 64; i++) ok( dib_bits[i] == bottom_up[i], "%d: got %08x\n", i, dib_bits[i] ); + for (i = 0; i < 16; i++) ok( dib_bits[i] == bottom_up[i], "%d: got %08x\n", i, dib_bits[i] ); memset( dib_bits, 0xaa, 64 * 4 ); info->bmiHeader.biHeight = 9; @@ -5671,6 +5680,7 @@ static void test_SetDIBitsToDevice_RLE8(void) for (i = 40; i < 64; i++) ok( dib_bits[i] == 0xaaaaaaaa, "%d: got %08x\n", i, dib_bits[i] ); memset( dib_bits, 0xaa, 64 * 4 ); +cleanup: DeleteDC( hdc ); DeleteObject( dib ); HeapFree( GetProcessHeap(), 0, info ); -- 2.17.1

3 4

[PATCH v3 1/2] kernel32/tests: Add test for GetSystemFirmwareTable regression
by John Chadwick Nov. 20, 2019

Nov. 20, 2019

This adds an assertion to ensure that a typical usage of GetSystemFirmwareTable with a preflight call works correctly. Signed-off-by: John Chadwick <john(a)jchw.io> --- This supersedes patch 174123. dlls/kernel32/tests/version.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index c1b7c9c59d..db42fc5a29 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -737,6 +737,10 @@ static void test_GetSystemFirmwareTable(void) pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, expected_len, &expected_len); expected_len -= min_sfti_len; + len = pGetSystemFirmwareTable(RSMB, 0, NULL, 0); +todo_wine + ok(len == expected_len, "Expected length %u, got %u\n", expected_len, len); + smbios_table = HeapAlloc(GetProcessHeap(), 0, expected_len); len = pGetSystemFirmwareTable(RSMB, 0, smbios_table, expected_len); ok(len == expected_len, "Expected length %u, got %u\n", expected_len, len); -- 2.23.0

1 1

[PATCH] server: Automatically create ProfileList key for current user.
by Dmitry Timoshkov Nov. 20, 2019

Nov. 20, 2019

This patch aims to replace the appropriate patchset from wine-staging, the ProfileList key is populated on first user process creation, and thus this emulates the "system login" phase. If this approach is not acceptable I'd be interested to know a preferred way to add similar functionality. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- server/object.h | 1 + server/process.c | 3 ++ server/registry.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+) diff --git a/server/object.h b/server/object.h index 4a486e0d63..0744fe4a8d 100644 --- a/server/object.h +++ b/server/object.h @@ -214,6 +214,7 @@ extern void debug_exit_thread( struct thread *thread ); extern unsigned int get_prefix_cpu_mask(void); extern void init_registry(void); extern void flush_registry(void); +extern void init_profilelist(void); /* signal functions */ diff --git a/server/process.c b/server/process.c index 16bb5d57e7..5c7bd40c8a 100644 --- a/server/process.c +++ b/server/process.c @@ -1208,6 +1208,9 @@ DECL_HANDLER(new_process) if (!(process = create_process( socket_fd, parent, req->inherit_all, sd ))) goto done; + if (running_processes == 1) + init_profilelist(); + process->startup_info = (struct startup_info *)grab_object( info ); if (req->exe_file && diff --git a/server/registry.c b/server/registry.c index 48a0f28c97..0a3c32640b 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1762,6 +1762,77 @@ static WCHAR *format_user_registry_path( const SID *sid, struct unicode_str *pat return p; } +static WCHAR *format_user_sid_path( const SID *sid, struct unicode_str *path ) +{ + static const WCHAR prefixW[] = {'S',0}; + static const WCHAR formatW[] = {'-','%','u',0}; + WCHAR buffer[1 + 10 + 10 + 10 * SID_MAX_SUB_AUTHORITIES]; + WCHAR *p = buffer; + unsigned int i; + + strcpyW( p, prefixW ); + p += strlenW( prefixW ); + p += sprintfW( p, formatW, sid->Revision ); + p += sprintfW( p, formatW, MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5], + sid->IdentifierAuthority.Value[4] ), + MAKEWORD( sid->IdentifierAuthority.Value[3], + sid->IdentifierAuthority.Value[2] ))); + for (i = 0; i < sid->SubAuthorityCount; i++) + p += sprintfW( p, formatW, sid->SubAuthority[i] ); + + path->len = (p - buffer) * sizeof(WCHAR); + path->str = p = memdup( buffer, path->len ); + return p; +} + +void init_profilelist(void) +{ + static const WCHAR profile_list[] = {'M','a','c','h','i','n','e','\\', + 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'P','r','o','f','i','l','e','L','i','s','t'}; + static const WCHAR image_path[] = {'P','r','o','f','i','l','e','I','m','a','g','e','P','a','t','h'}; + static const struct unicode_str profile_list_name = { profile_list, sizeof(profile_list) }; + static const struct unicode_str image_path_name = { image_path, sizeof(image_path) }; + static const WCHAR users[] = {'C',':','\\','u','s','e','r','s','\\'}; + WCHAR *current_user_path, *profile; + struct unicode_str current_user_str; + struct key *key, *profile_key; + const char *user; + int len; + + if (!(key = create_key_recursive( root_key, &profile_list_name, current_time ))) + fatal_error( "could not create ProfileList key\n" ); + + current_user_path = format_user_sid_path( token_get_user( current->process->token ), &current_user_str ); + if (!current_user_path || + !(profile_key = create_key_recursive( key, &current_user_str, current_time ))) + fatal_error( "could not create ProfileList\\SID registry key\n" ); + + if (debug_level) + { + fprintf( stderr, "profile: " ); + dump_strW( current_user_str.str, current_user_str.len / sizeof(WCHAR), stderr, "\"\"" ); + fprintf( stderr, "\"\n" ); + } + free( current_user_path ); + + user = wine_get_user_name(); + + len = sizeof(users) + (strlen(user) + 1) * sizeof(WCHAR); + profile = mem_alloc( len ); + memcpy( profile, users, sizeof(users) ); + wine_utf8_mbstowcs( 0, user, strlen(user) + 1, profile + sizeof(users) / sizeof(WCHAR), len ); + + set_value( profile_key, &image_path_name, REG_EXPAND_SZ, profile, len ); + free( profile ); + + release_object( profile_key ); + release_object( key ); +} + /* get the cpu architectures that can be supported in the current prefix */ unsigned int get_prefix_cpu_mask(void) { -- 2.20.1

2 1

[PATCH v2 1/2] kernelbase: Fix GetSystemFirmwareTable regression
by John Chadwick Nov. 20, 2019

Nov. 20, 2019

In 71aba33f, GetSystemFirmwareTable was moved from kernel32 to kernelbase. In the process, its error handling was refactored to use NtQuerySystemInformation, and it began to return zero whenever NtQuerySystemInformation failed. This prevents software from being able to make 'preflight' calls to determine how large their buffer should be. This patch simply restores the old behavior. Signed-off-by: John Chadwick <john(a)jchw.io> --- dlls/kernelbase/memory.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 6be399bc97..c93d490e74 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -1161,13 +1161,10 @@ UINT WINAPI GetSystemFirmwareTable( DWORD provider, DWORD id, void *buffer, DWOR info->Action = SystemFirmwareTable_Get; info->TableID = id; - if (set_ntstatus( NtQuerySystemInformation( SystemFirmwareTableInformation, - info, buffer_size, &buffer_size ))) - { - buffer_size -= offsetof( SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer ); - if (buffer_size <= size) memcpy( buffer, info->TableBuffer, buffer_size ); - } - else buffer_size = 0; + set_ntstatus( NtQuerySystemInformation( SystemFirmwareTableInformation, + info, buffer_size, &buffer_size )); + buffer_size -= offsetof( SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer ); + if (buffer_size <= size) memcpy( buffer, info->TableBuffer, buffer_size ); HeapFree( GetProcessHeap(), 0, info ); return buffer_size; -- 2.23.0

3 3

[PATCH v2] winex11.drv: Handle button events without axes.
by John Chadwick Nov. 20, 2019

Nov. 20, 2019

Not all XInput events contain axes information. In particular, libinput does not seem to provide axes information on button_event. In effect, before this patch, with some configurations, wintab32 clients would see a point at 0, 0 before and after each stroke. Signed-off-by: John Chadwick <john(a)jchw.io> --- dlls/winex11.drv/wintab.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index fe3d4a8ff4..12eb89ac7f 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -929,13 +929,20 @@ static BOOL button_event( HWND hwnd, XEvent *event ) gMsgPacket.pkTime = EVENT_x11_time_to_win32_time(button->time); gMsgPacket.pkSerialNumber = gSerial++; gMsgPacket.pkCursor = curnum; - gMsgPacket.pkX = button->axis_data[0]; - gMsgPacket.pkY = button->axis_data[1]; - gMsgPacket.pkOrientation.orAzimuth = figure_deg(button->axis_data[3],button->axis_data[4]); - gMsgPacket.pkOrientation.orAltitude = ((1000 - 15 * max(abs(button->axis_data[3]), - abs(button->axis_data[4]))) - * (gMsgPacket.pkStatus & TPS_INVERT?-1:1)); - gMsgPacket.pkNormalPressure = button->axis_data[2]; + if (button->axes_count > 0) { + gMsgPacket.pkX = button->axis_data[0]; + gMsgPacket.pkY = button->axis_data[1]; + gMsgPacket.pkOrientation.orAzimuth = figure_deg(button->axis_data[3],button->axis_data[4]); + gMsgPacket.pkOrientation.orAltitude = ((1000 - 15 * max(abs(button->axis_data[3]), + abs(button->axis_data[4]))) + * (gMsgPacket.pkStatus & TPS_INVERT?-1:1)); + gMsgPacket.pkNormalPressure = button->axis_data[2]; + } else { + gMsgPacket.pkX = last_packet.pkX; + gMsgPacket.pkY = last_packet.pkY; + gMsgPacket.pkOrientation = last_packet.pkOrientation; + gMsgPacket.pkNormalPressure = last_packet.pkNormalPressure; + } gMsgPacket.pkButtons = get_button_state(curnum); gMsgPacket.pkChanged = get_changed_state(&gMsgPacket); SendMessageW(hwndTabletDefault,WT_PACKET,gMsgPacket.pkSerialNumber,(LPARAM)hwnd); -- 2.23.0

1 0

[PATCH 1/2] kernelbase: Fix GetSystemFirmwareTable regression
by John Chadwick Nov. 20, 2019

Nov. 20, 2019

In 71aba33f, GetSystemFirmwareTable was moved from kernel32 to kernelbase. In the process, its error handling was refactored to use NtQuerySystemInformation, and it began to return zero whenever NtQuerySystemInformation failed. This prevents software from being able to make 'preflight' calls to determine how large their buffer should be. This patch simply restores the old behavior. Signed-off-by: John Chadwick <john(a)jchw.io> --- dlls/kernelbase/memory.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 6be399bc97..c93d490e74 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -1161,13 +1161,10 @@ UINT WINAPI GetSystemFirmwareTable( DWORD provider, DWORD id, void *buffer, DWOR info->Action = SystemFirmwareTable_Get; info->TableID = id; - if (set_ntstatus( NtQuerySystemInformation( SystemFirmwareTableInformation, - info, buffer_size, &buffer_size ))) - { - buffer_size -= offsetof( SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer ); - if (buffer_size <= size) memcpy( buffer, info->TableBuffer, buffer_size ); - } - else buffer_size = 0; + set_ntstatus( NtQuerySystemInformation( SystemFirmwareTableInformation, + info, buffer_size, &buffer_size )); + buffer_size -= offsetof( SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer ); + if (buffer_size <= size) memcpy( buffer, info->TableBuffer, buffer_size ); HeapFree( GetProcessHeap(), 0, info ); return buffer_size; -- 2.23.0

2 2