wine-devel April 2021

wine-devel@winehq.org

70 participants
697 discussions

Implementing AllocateUserPhysicalPages (Idea)
by Keith Cancel 17 Apr '21

17 Apr '21

I hope this email is not too long, but linux does not does not quiet have the functionality of these functions: AllocateUserPhysicalPages() MapUserPhysicalPagesScatter() MapUserPhysicalPages() FreeUserPhysicalPages() I noticed that they were stubs, and thusly unimplemented. However, I have an idea on how to implement these functions. However, I am not entirely familiar with the code wine code base, but nonetheless I will explain my idea. Let's start with AllocateUserPhysicalPages() it needs to do a few things: * Another process needs to be able to reserve pages for an other process (aka the HANDLE hProcess parameter) * Reserve memory without being added to the virtual address space of caller or target process. * Said memory is locked aka mlocked() and won't be swapped. So first thing is any windows process with permission to do so, needs to be able to reserve memory for other proccess including itself. It makes sense have what currently is stub invoke what I will describe next in the Wine Server. This is so when the target process tries mapping the reserved memory it can fetch the info it needs from the Wine server. So the first thing the handler in the Wine server would need to do is: * Check that invoking windows process is allowed to do this. (aka SeLockMemoryPrivilege, and PROCESS_VM_OPERATION on the handle) or just grant all processes this ability. * Check that the target windows process exists. However, now we need to reserve memory that can be mapped and unmapped multiple times in the target process without losing the memory contents. The simplest way to do this would be a file. However, a file resides on disk and when unmapped can be slow when remapped. It also has potential to pollute the file system if cleanup fails. However, luckily linux has the memfd_create() system call. This creates a RAM backed file, and returns a file descriptor that then later can be passed to mmap(). This lets create a persistent bit of memory that does not pollute either the caller or targets address space. I assume there is a per process structure in the Wine server we could store this file descriptor there. We can also just use ftruncate() to set the size to be equal to the number of bytes requested. However, FreeUserPhysicalPages() makes things a tad more complicated, it can for instance be used to free only a single page worth of memory. So we need to track free pages size chunks. Luckily, we are only tracking fixed size memory blocks so it's not as bad as it could be. So in C-ish pseudo code do in the following for AllocateUserPhysicalPage(): remaining_pages = NumberOfPages; // NumberOfPages is a function parameter proc_struct = get_process_struct(win_process_id/handle); // If there is a structure like this get it page_array_index = 0; // Track what index we have written to if(proc_struct.memfd == -1) { proc_struct.memfd = memfd_create("debug name", {FLAGS}); proc_struct.free_list_head = NULL; } // Check the free list since FreeUserPhysicalPages() can free for instance a single page next_ptr = proc_struct.free_list_head; while(next_ptr != NULL) { // PageArray is also an other function parameter PageArray[page_array_index] = {However the IDing is done for pages}; next_ptr = next_ptr->next; proc_struct.free_list_head = next_ptr; page_array_index++; remaining_pages--; } if(remaining_pages > 0) { old_size = proc_struct.memfd_sz; new_size = old_size + (page_sz * remaining_pages); proc_struct.memfd_sz = new_size; ftruncate(proc_struct.memfd, new_size); for(int i = 0; i < remaining_pages; i++) { // calclate ID start from the old_size and increment it up PageArray[page_array_index] = {However, IDing is done for pages}; } } // Assuming no failures we don't need to update the NumberOfPages value. So now obviously one needs to be identify what windows referees to as frame number for these API, that get returned as array for each page in the PageArray parameter. I propose the uppers bits be the process ID and the lower bits be position on in the file descriptor aligned to page boundary size and shifted. So 4096 bytes pages [Process ID | (aligned_index >> 12)]. I know a Linux process ID can only be configured to be up 22 bits on a 64bit system. While the windows process ID is likely different 64 - 22 = leaves 42 bits to identify a given page for a process. Lastly, although I am not sure it's necessary AllocateUserPhysicalPages() implies the pages are locked to RAM. The memfd files from my understanding can be swapped. We could mmap this file descriptor into the wine server memory while setting MAP_SHARED flag, and then call mlock() on this mapping in the Wine server to ensure it's never swapped out. We could also use the unused page boundaries to store the free list. However, this also will eat up address space of the Wine Server. So now let's discuss the MapUserPhysicalPages() function, this in some regards is simpler. It can only be called from the process that is mapping the pages. It needs to do the following: * Get the file descriptor from the Wine Server * Start at the provided virtual address * Check if the our page IDs in the PageArray make sense. (aka ID is not in free list, and process ID matches) * Check that each page is in already mapped region of memory. * Then mmap-inng each page size chunk referenced in the page array sequential starting from virtual address * Each mmap should keep the same permissions as what the page at the address had before. Next MapUserPhysicalPagesScatter() is mostly the same as MapUserPhysicalPages(), but instead we handle an array of VirtualAddresses that gets mapped to each page in the page array. The last function is FreeUserPhysicalPages(). Again this one can be called by any process since it takes a process handle. * Don't do anything to any chunks that are mmap()-ed, this implies we need to keep a reference count or some how check that a process does not have this page size chunk mapped. * If freeing a page would create a whole in the middle of memory backed file add it to the free list * Zero this page size chunk * If the page size chunk is at the end or or all the pages size chunks after it are also free * ftruncate() the file the memory back filed down in size While this mostly was kinda a broad overview, I hope it gives someone a good idea of where to jump start implementing these functions. I did think about it for a little while since linux does not quite have the same functionality. Thanks, Keith Cancel

2 1

[PATCH 1/2] user32/tests: Add tests for maximizing and restoring windows without WS_CAPTION.
by Ziqing Hui 17 Apr '21

17 Apr '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/user32/tests/win.c | 55 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+)

2 1

[PATCH 2/2] winex11.drv: Correct a full screen conditon.
by Ziqing Hui 17 Apr '21

17 Apr '21

The if condition here came from 47c54c4ae7f235780a55ddf670503db4afc11055, which is to detect full screen window. However, according to tests in 8ce2c739780a924a46eb272df19bc7c65c41586d, there is possibility that a window without setting WS_CAPTION is not full screen, for example, main window of Tencent WeChat. And windows like this can also be maximized or restored. So that we can not treat WS_CAPTION as our full screen condition. This fixes maximizing Tencent WeChat by dragging it to screen edge. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/winex11.drv/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH v2 1/2] wined3d: Only use default SetPixelFormat on private windows.
by Connor McAdams 16 Apr '21

16 Apr '21

Only use the default SetPixelFormat function if the format is unset and the window is private. If the window isn't private, use wglSetPixelFormatWINE, which allows for another application to change the pixel format. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- v2: -Changed the first if statement from current && private to just changing the SetPixelFormat version used depending on if the window is private or not. --- dlls/wined3d/context_gl.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 123214afd5d..5f0bab5b78b 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -1198,12 +1198,24 @@ static BOOL wined3d_context_gl_set_pixel_format(struct wined3d_context_gl *conte if (!current) { - if (!SetPixelFormat(dc, format, NULL)) + if (private) { - /* This may also happen if the dc belongs to a destroyed window. */ - WARN("Failed to set pixel format %d on device context %p, last error %#x.\n", - format, dc, GetLastError()); - return FALSE; + if (!SetPixelFormat(dc, format, NULL)) + { + /* This may also happen if the dc belongs to a destroyed window. */ + WARN("Failed to set pixel format %d on device context %p, last error %#x.\n", + format, dc, GetLastError()); + return FALSE; + } + } + else + { + if (!GL_EXTCALL(wglSetPixelFormatWINE(dc, format))) + { + ERR("wglSetPixelFormatWINE failed to set pixel format %d on device context %p.\n", + format, dc); + return FALSE; + } } context_gl->restore_pf = 0; -- 2.25.1

1 1

[PATCH 1/2] wined3d: Only use default SetPixelFormat on private windows.
by Connor McAdams 16 Apr '21

16 Apr '21

Only use the default SetPixelFormat function if the format is unset and the window is private. If the window isn't private, use wglSetPixelFormatWINE, which allows for another application to change the pixel format. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- I'm not sure if this is the correct way to do this, so you'll have to let me know if there's a better way. Currently, the application I'm trying to get work sets the pixel format after wined3d's initial format set. So, in this case, I'm assuming it'd make sense to only use the default SetPixelFormat if we know the window is private to wined3d. --- dlls/wined3d/context_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 123214afd5d..bbed7f46875 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -1196,7 +1196,7 @@ static BOOL wined3d_context_gl_set_pixel_format(struct wined3d_context_gl *conte current = gl_info->gl_ops.wgl.p_wglGetPixelFormat(dc); if (current == format) goto success; - if (!current) + if (!current && private) { if (!SetPixelFormat(dc, format, NULL)) { -- 2.25.1

2 3

[PATCH v2] ntdll: Return STATUS_INFO_LENGTH_MISMATCH when len is too small in NtQueryObject(ObjectBasicInformation).
by Gijs Vermeulen 16 Apr '21

16 Apr '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50791 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ntdll/tests/om.c | 15 +++++++++++++++ dlls/ntdll/unix/file.c | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index e93f11e1126..e0988769c9c 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1379,6 +1379,7 @@ static void test_query_object(void) char buffer[1024]; NTSTATUS status; ULONG len, expected_len; + OBJECT_BASIC_INFORMATION info; OBJECT_ATTRIBUTES attr; UNICODE_STRING path, target, *str; char dir[MAX_PATH], tmp_path[MAX_PATH], file1[MAX_PATH + 16]; @@ -1390,6 +1391,20 @@ static void test_query_object(void) handle = CreateEventA( NULL, FALSE, FALSE, "test_event" ); + status = pNtQueryObject( handle, ObjectBasicInformation, NULL, 0, NULL ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); + + status = pNtQueryObject( handle, ObjectBasicInformation, &info, 0, NULL ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); + + status = pNtQueryObject( handle, ObjectBasicInformation, NULL, 0, &len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); + + len = 0; + status = pNtQueryObject( handle, ObjectBasicInformation, &info, sizeof(OBJECT_BASIC_INFORMATION), &len ); + ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); + ok( len >= sizeof(OBJECT_BASIC_INFORMATION), "unexpected len %u\n", len ); + len = 0; status = pNtQueryObject( handle, ObjectNameInformation, buffer, 0, &len ); ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index b4d834b7855..488f7485ad8 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -6734,7 +6734,7 @@ NTSTATUS WINAPI NtQueryObject( HANDLE handle, OBJECT_INFORMATION_CLASS info_clas { OBJECT_BASIC_INFORMATION *p = ptr; - if (len < sizeof(*p)) return STATUS_INVALID_BUFFER_SIZE; + if (len < sizeof(*p)) return STATUS_INFO_LENGTH_MISMATCH; SERVER_START_REQ( get_object_info ) { -- 2.31.1

2 1

[PATCH] ntdll: Return STATUS_INFO_LENGTH_MISMATCH when len is too small in NtQueryObject(ObjectBasicInformation).
by Gijs Vermeulen 16 Apr '21

16 Apr '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50791 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ntdll/tests/om.c | 19 +++++++++++++++++++ dlls/ntdll/unix/file.c | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index e93f11e1126..e6597235aba 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1379,6 +1379,7 @@ static void test_query_object(void) char buffer[1024]; NTSTATUS status; ULONG len, expected_len; + OBJECT_BASIC_INFORMATION info; OBJECT_ATTRIBUTES attr; UNICODE_STRING path, target, *str; char dir[MAX_PATH], tmp_path[MAX_PATH], file1[MAX_PATH + 16]; @@ -1390,6 +1391,24 @@ static void test_query_object(void) handle = CreateEventA( NULL, FALSE, FALSE, "test_event" ); + status = pNtQueryObject( NULL, ObjectBasicInformation, NULL, 0, NULL ); + todo_wine ok( status == STATUS_INVALID_HANDLE, "NtQueryObject failed %x\n", status ); + + status = pNtQueryObject( handle, ObjectBasicInformation, NULL, 0, NULL ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); + + status = pNtQueryObject( handle, ObjectBasicInformation, &info, 0, NULL ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); + + len = 0; + status = pNtQueryObject( handle, ObjectBasicInformation, NULL, 0, &len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); + + len = 0; + status = pNtQueryObject( handle, ObjectBasicInformation, &info, sizeof(OBJECT_BASIC_INFORMATION), &len ); + ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); + ok( len >= sizeof(OBJECT_BASIC_INFORMATION), "unexpected len %u\n", len ); + len = 0; status = pNtQueryObject( handle, ObjectNameInformation, buffer, 0, &len ); ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index b4d834b7855..488f7485ad8 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -6734,7 +6734,7 @@ NTSTATUS WINAPI NtQueryObject( HANDLE handle, OBJECT_INFORMATION_CLASS info_clas { OBJECT_BASIC_INFORMATION *p = ptr; - if (len < sizeof(*p)) return STATUS_INVALID_BUFFER_SIZE; + if (len < sizeof(*p)) return STATUS_INFO_LENGTH_MISMATCH; SERVER_START_REQ( get_object_info ) { -- 2.31.1

1 0

[PATCH v3 1/5] wined3d: Pass a wined3d_device_context to wined3d_device_get_blend_state().
by Zebediah Figura 16 Apr '21

16 Apr '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/device.c | 4 ++-- dlls/wined3d/device.c | 9 +++++---- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d93256e77ad..70d14c7f2c5 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2137,7 +2137,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargetsAndUnord static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetBlendState(ID3D11DeviceContext1 *iface, ID3D11BlendState **blend_state, FLOAT blend_factor[4], UINT *sample_mask) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_blend_state *wined3d_state; struct d3d_blend_state *blend_state_impl; @@ -2145,7 +2145,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetBlendState(ID3D11Devi iface, blend_state, blend_factor, sample_mask); wined3d_mutex_lock(); - if ((wined3d_state = wined3d_device_get_blend_state(device->wined3d_device, + if ((wined3d_state = wined3d_device_context_get_blend_state(context->wined3d_context, (struct wined3d_color *)blend_factor, sample_mask))) { blend_state_impl = wined3d_blend_state_get_parent(wined3d_state); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 974db90037d..39701886450 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1603,12 +1603,12 @@ void CDECL wined3d_device_set_blend_state(struct wined3d_device *device, wined3d_device_context_set_blend_state(&device->cs->c, blend_state, blend_factor, sample_mask); } -struct wined3d_blend_state * CDECL wined3d_device_get_blend_state(const struct wined3d_device *device, +struct wined3d_blend_state * CDECL wined3d_device_context_get_blend_state(const struct wined3d_device_context *context, struct wined3d_color *blend_factor, unsigned int *sample_mask) { - const struct wined3d_state *state = device->cs->c.state; + const struct wined3d_state *state = context->state; - TRACE("device %p, blend_factor %p, sample_mask %p.\n", device, blend_factor, sample_mask); + TRACE("context %p, blend_factor %p, sample_mask %p.\n", context, blend_factor, sample_mask); *blend_factor = state->blend_factor; *sample_mask = state->sample_mask; @@ -3921,6 +3921,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, const struct wined3d_stateblock_state *state = &stateblock->stateblock_state; const struct wined3d_saved_states *changed = &stateblock->changed; const unsigned int word_bit_count = sizeof(DWORD) * CHAR_BIT; + struct wined3d_device_context *context = &device->cs->c; unsigned int i, j, start, idx; struct wined3d_range range; uint32_t map; @@ -4153,7 +4154,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, if (wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_BLENDFACTOR)) wined3d_color_from_d3dcolor(&colour, state->rs[WINED3D_RS_BLENDFACTOR]); else - wined3d_device_get_blend_state(device, &colour, &sample_mask); + wined3d_device_context_get_blend_state(context, &colour, &sample_mask); if ((entry = wine_rb_get(&device->blend_states, &desc))) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 406e511c0f6..35fbc44ee64 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -55,7 +55,6 @@ @ cdecl wined3d_device_end_scene(ptr) @ cdecl wined3d_device_evict_managed_resources(ptr) @ cdecl wined3d_device_get_available_texture_mem(ptr) -@ cdecl wined3d_device_get_blend_state(ptr ptr) @ cdecl wined3d_device_get_clip_status(ptr ptr) @ cdecl wined3d_device_get_compute_shader(ptr) @ cdecl wined3d_device_get_creation_parameters(ptr ptr) @@ -170,6 +169,7 @@ @ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_flush(ptr) @ cdecl wined3d_device_context_generate_mipmaps(ptr ptr) +@ cdecl wined3d_device_context_get_blend_state(ptr ptr ptr) @ cdecl wined3d_device_context_get_constant_buffer(ptr long long) @ cdecl wined3d_device_context_get_shader(ptr long) @ cdecl wined3d_device_context_issue_query(ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1a58c671934..7dcb969966c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2375,8 +2375,6 @@ HRESULT __cdecl wined3d_device_end_scene(struct wined3d_device *device); void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device); void __cdecl wined3d_device_flush(struct wined3d_device *device); UINT __cdecl wined3d_device_get_available_texture_mem(const struct wined3d_device *device); -struct wined3d_blend_state * __cdecl wined3d_device_get_blend_state(const struct wined3d_device *device, - struct wined3d_color *blend_factor, unsigned int *sample_mask); HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, struct wined3d_clip_status *clip_status); struct wined3d_shader * __cdecl wined3d_device_get_compute_shader(const struct wined3d_device *device); @@ -2565,6 +2563,8 @@ void __cdecl wined3d_device_context_draw_indirect(struct wined3d_device_context void __cdecl wined3d_device_context_flush(struct wined3d_device_context *context); void __cdecl wined3d_device_context_generate_mipmaps(struct wined3d_device_context *context, struct wined3d_shader_resource_view *view); +struct wined3d_blend_state * __cdecl wined3d_device_context_get_blend_state( + const struct wined3d_device_context *context, struct wined3d_color *blend_factor, unsigned int *sample_mask); struct wined3d_buffer * __cdecl wined3d_device_context_get_constant_buffer(const struct wined3d_device_context *context, enum wined3d_shader_type shader_type, unsigned int idx); struct wined3d_shader * __cdecl wined3d_device_context_get_shader(const struct wined3d_device_context *context, -- 2.30.2

2 9

[PATCH] wine.inf: Install the protocol database at etc\protocol.
by Zebediah Figura 16 Apr '21

16 Apr '21

Unlike Unix, on Windows the file name is not plural. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 50156644d5f..4c8fa69327b 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -4047,7 +4047,7 @@ srgb color space profile.icm,"@%11%\mscms.dll,-1" [EtcFiles] hosts,"@%11%\ws2_32.dll,-1" networks,"@%11%\ws2_32.dll,-2" -protocols,"@%11%\ws2_32.dll,-3" +protocol,"@%11%\ws2_32.dll,-3" services,"@%11%\ws2_32.dll,-4" [InfFiles] -- 2.30.2

1 0

[PATCH] Install the protocol database at etc\protocol.
by Zebediah Figura 16 Apr '21

16 Apr '21

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
70
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel April 2021