wine-commits December 2021

wine-commits@winehq.org

2 participants
569 discussions

Alexandre Julliard : wow64: Add mapping for NtQuerySystemInformation(SystemExtendedProcessInformation).
by Alexandre Julliard 08 Dec '21

08 Dec '21

Module: wine Branch: master Commit: 09f2896d95256f07f274769b1a297525b6587c6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=09f2896d95256f07f274769b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 8 13:20:03 2021 +0100 wow64: Add mapping for NtQuerySystemInformation(SystemExtendedProcessInformation). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/struct32.h | 12 +++++ dlls/wow64/system.c | 142 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 97 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=09f2896d95256f07f274…

1 0

Alexandre Julliard : include: Document remaining fields in the SYSTEM_PROCESS_INFORMATION structure.
by Alexandre Julliard 08 Dec '21

08 Dec '21

Module: wine Branch: master Commit: cdafebed15118c4b761c13b89536b455e260db14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdafebed15118c4b761c13b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 8 13:19:48 2021 +0100 include: Document remaining fields in the SYSTEM_PROCESS_INFORMATION structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 9 ++++++--- dlls/wow64/struct32.h | 7 +++++-- include/winternl.h | 7 +++++-- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 6c01ee092d4..b16fa4da22f 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -454,7 +454,10 @@ static void test_query_process( BOOL extended ) typedef struct _SYSTEM_PROCESS_INFORMATION_PRIVATE { ULONG NextEntryOffset; DWORD dwThreadCount; - DWORD dwUnknown1[6]; + LARGE_INTEGER WorkingSetPrivateSize; + ULONG HardFaultCount; + ULONG NumberOfThreadsHighWatermark; + ULONGLONG CycleTime; FILETIME ftCreationTime; FILETIME ftUserTime; FILETIME ftKernelTime; @@ -463,8 +466,8 @@ static void test_query_process( BOOL extended ) HANDLE UniqueProcessId; HANDLE ParentProcessId; ULONG HandleCount; - DWORD dwUnknown3; - DWORD dwUnknown4; + ULONG SessionId; + ULONG_PTR UniqueProcessKey; VM_COUNTERS_EX vmCounters; IO_COUNTERS ioCounters; SYSTEM_THREAD_INFORMATION ti[1]; diff --git a/dlls/wow64/struct32.h b/dlls/wow64/struct32.h index ace5929d64d..93739656050 100644 --- a/dlls/wow64/struct32.h +++ b/dlls/wow64/struct32.h @@ -619,7 +619,10 @@ typedef struct { ULONG NextEntryOffset; DWORD dwThreadCount; - DWORD dwUnknown1[6]; + LARGE_INTEGER WorkingSetPrivateSize; + ULONG HardFaultCount; + ULONG NumberOfThreadsHighWatermark; + ULONGLONG CycleTime; LARGE_INTEGER CreationTime; LARGE_INTEGER UserTime; LARGE_INTEGER KernelTime; @@ -629,7 +632,7 @@ typedef struct ULONG ParentProcessId; ULONG HandleCount; ULONG SessionId; - DWORD dwUnknown4; + ULONG UniqueProcessKey; VM_COUNTERS_EX32 vmCounters; IO_COUNTERS ioCounters; SYSTEM_THREAD_INFORMATION32 ti[1]; diff --git a/include/winternl.h b/include/winternl.h index 24609e136bf..f8cbcdcbf97 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2578,7 +2578,10 @@ typedef struct _SYSTEM_PROCESS_INFORMATION { #ifdef __WINESRC__ /* win32/win64 */ ULONG NextEntryOffset; /* 00/00 */ DWORD dwThreadCount; /* 04/04 */ - DWORD dwUnknown1[6]; /* 08/08 */ + LARGE_INTEGER WorkingSetPrivateSize; /* 08/08 */ + ULONG HardFaultCount; /* 10/10 */ + ULONG NumberOfThreadsHighWatermark;/* 14/14 */ + ULONGLONG CycleTime; /* 18/18 */ LARGE_INTEGER CreationTime; /* 20/20 */ LARGE_INTEGER UserTime; /* 28/28 */ LARGE_INTEGER KernelTime; /* 30/30 */ @@ -2588,7 +2591,7 @@ typedef struct _SYSTEM_PROCESS_INFORMATION { HANDLE ParentProcessId; /* 48/58 */ ULONG HandleCount; /* 4c/60 */ ULONG SessionId; /* 50/64 */ - DWORD dwUnknown4; /* 54/68 */ + ULONG_PTR UniqueProcessKey; /* 54/68 */ VM_COUNTERS_EX vmCounters; /* 58/70 */ IO_COUNTERS ioCounters; /* 88/d0 */ SYSTEM_THREAD_INFORMATION ti[1]; /* b8/100 */

1 0

Zhiyi Zhang : comctl32/propsheet: Fix a typo in a comment.
by Alexandre Julliard 08 Dec '21

08 Dec '21

Module: wine Branch: master Commit: f68ac2e4c1360fe032776504d9be6c78a1c082f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f68ac2e4c1360fe032776504… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Dec 8 15:09:30 2021 +0800 comctl32/propsheet: Fix a typo in a comment. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/propsheet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 9309250f65a..82c0a3cc576 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1289,7 +1289,7 @@ static LRESULT CALLBACK PROPSHEET_ThemedSubclassProc(HWND hwnd, UINT msg, WPARAM /* Using FillRect() to draw background could introduce a tiling effect if the destination * rectangle is larger than the pattern brush size, which is usually 10x600. This bug is * visible on property sheet pages if system DPI is set to 192. However, the same bug also - * exists on XP and explains why vista+ don't use gradient tab body backgound anymore */ + * exists on XP and explains why vista+ don't use gradient tab body background anymore */ hdc = (HDC)wp; GetViewportOrgEx(hdc, &org); SetBrushOrgEx(hdc, org.x, org.y, &old_org);

1 0

Ziqing Hui : user32: Add an is_shared member to cursoricon_object.
by Alexandre Julliard 08 Dec '21

08 Dec '21

Module: wine Branch: master Commit: 9e74b207cfd9d1d866bdfbd61a165456430b70db URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e74b207cfd9d1d866bdfbd6… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Dec 7 18:06:45 2021 +0800 user32: Add an is_shared member to cursoricon_object. It makes sure that shared icon/cursor created by CreateIconFromResourceEx() won't be destroyed by Destroy{Icon,Cursor}(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 13 +++++++++---- dlls/user32/tests/cursoricon.c | 2 -- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index ba5c5d8904c..f107255c8c0 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -76,6 +76,7 @@ struct cursoricon_object HMODULE module; /* module for icons loaded from resources */ LPWSTR resname; /* resource name for icons loaded from resources */ HRSRC rsrc; /* resource for shared icons */ + BOOL is_shared; /* whether this object is shared */ BOOL is_icon; /* whether icon or cursor */ BOOL is_ani; /* whether this object is a static cursor or an animated cursor */ UINT delay; /* delay between this frame and the next (in jiffies) */ @@ -1224,10 +1225,14 @@ done: } else info->resname = MAKEINTRESOURCEW( LOWORD(resname) ); - if (module && (cFlag & LR_SHARED)) + if (cFlag & LR_SHARED) { - info->rsrc = rsrc; - list_add_head( &icon_cache, &info->entry ); + info->is_shared = TRUE; + if (module) + { + info->rsrc = rsrc; + list_add_head( &icon_cache, &info->entry ); + } } release_user_handle_ptr( info ); } @@ -1871,7 +1876,7 @@ BOOL WINAPI DestroyIcon( HICON hIcon ) if (obj) { - BOOL shared = (obj->rsrc != NULL); + BOOL shared = obj->is_shared; release_user_handle_ptr( obj ); ret = (NtUserGetCursor() != hIcon); if (!shared) free_icon_handle( hIcon ); diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index fac330bd7e9..a4bdc4f13cf 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1709,7 +1709,6 @@ static void test_CreateIconFromResource(void) ret = DestroyIcon(handle); ok(ret, "Destroy icon failed, error %u.\n", GetLastError()); ret = GetIconInfo(handle, &icon_info); - todo_wine ok(ret, "Get info failed, error %u.\n", GetLastError()); /* Test creating a shared icon from heap bits that has been created before. */ @@ -1747,7 +1746,6 @@ static void test_CreateIconFromResource(void) ret = DestroyIcon(handle); ok(ret, "Destroy icon failed, error %u.\n", GetLastError()); ret = GetIconInfo(handle, &icon_info); - todo_wine ok(ret, "Get info failed, error %u.\n", GetLastError()); /* Test creating a shared icon from resource bits that has been created before. */

1 0

Ziqing Hui : user32/tests: Test CreateIconFromResourceEx() with resource bits.
by Alexandre Julliard 08 Dec '21

08 Dec '21

Module: wine Branch: master Commit: 1746ed9c7d5c67c0f695bc78ccc2c01c11663a91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1746ed9c7d5c67c0f695bc78… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Dec 7 18:06:44 2021 +0800 user32/tests: Test CreateIconFromResourceEx() with resource bits. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/cursoricon.c | 49 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index b1a8c48b35d..fac330bd7e9 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1539,6 +1539,13 @@ static void test_LoadImage(void) test_LoadImage_working_directory(); } +static BOOL CALLBACK find_res_proc(HMODULE module, LPCSTR type, LPSTR name, LONG_PTR param) +{ + char **res_name = (char **)param; + *res_name = name; + return FALSE; +} + static void test_CreateIconFromResource(void) { HANDLE handle, old_handle; @@ -1547,6 +1554,13 @@ static void test_CreateIconFromResource(void) BITMAPINFOHEADER *icon_header; INT16 *hotspot; ICONINFO icon_info; + HMODULE user32; + char *res_name; + HRSRC rsrc; + HGLOBAL res; + BYTE *bits; + UINT size; + #define ICON_RES_WIDTH 32 #define ICON_RES_HEIGHT 32 @@ -1706,6 +1720,41 @@ static void test_CreateIconFromResource(void) ok(handle != old_handle, "Expect a different handle.\n"); HeapFree(GetProcessHeap(), 0, hotspot); + + /* Get icon resource bits */ + user32 = GetModuleHandleA("user32.dll"); + EnumResourceNamesA(user32, (const char *)RT_GROUP_ICON, find_res_proc, (LONG_PTR)&res_name); + rsrc = FindResourceA(user32, res_name, (const char *)RT_GROUP_ICON); + ok(rsrc != NULL, "Find resource failed, error %u.\n", GetLastError()); + res = LoadResource(user32, rsrc); + ok(res != NULL, "Load resource failed, error %u.\n", GetLastError()); + bits = LockResource(res); + ok(bits != NULL, "Lock resource failed, error %u.\n", GetLastError()); + + res_name = MAKEINTRESOURCEA(LookupIconIdFromDirectory(bits, TRUE)); + rsrc = FindResourceA(user32, res_name, (const char *)RT_ICON); + ok(rsrc != NULL, "Find resource failed, error %u.\n", GetLastError()); + size = SizeofResource(user32, rsrc); + ok(size != 0, "Get resource size failed, error %u.\n", GetLastError()); + res = LoadResource(user32, rsrc); + ok(res != NULL, "Load resource failed, error %u.\n", GetLastError()); + bits = LockResource(res); + ok(bits != NULL, "Lock resource failed, error %u.\n", GetLastError()); + + /* Test creating and destroying a shared icon from resource bits. */ + handle = CreateIconFromResourceEx(bits, size, TRUE, 0x00030000, 0, 0, LR_DEFAULTSIZE | LR_SHARED); + ok(handle != NULL, "Create icon failed, error %u\n", GetLastError()); + ret = DestroyIcon(handle); + ok(ret, "Destroy icon failed, error %u.\n", GetLastError()); + ret = GetIconInfo(handle, &icon_info); + todo_wine + ok(ret, "Get info failed, error %u.\n", GetLastError()); + + /* Test creating a shared icon from resource bits that has been created before. */ + old_handle = handle; + handle = CreateIconFromResourceEx(bits, size, TRUE, 0x00030000, 0, 0, LR_DEFAULTSIZE | LR_SHARED); + ok(handle != NULL, "Create icon failed, error %u.\n", GetLastError()); + ok(handle != old_handle, "Expect a different handle.\n"); } static int check_cursor_data( HDC hdc, HCURSOR hCursor, void *data, int length)

1 0

Ziqing Hui : user32/tests: Test creating shared icon by CreateIconFromResourceEx().
by Alexandre Julliard 08 Dec '21

08 Dec '21

Module: wine Branch: master Commit: 14c28747007d53135d5c47afbd8665d28e03fb31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14c28747007d53135d5c47af… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Dec 7 18:06:43 2021 +0800 user32/tests: Test creating shared icon by CreateIconFromResourceEx(). The tests show that shared icon created by CreateIconFromResourceEx() won't be destroyed by DestroyIcon(). However, a second call to it for the same icon bits will return a different handle. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/cursoricon.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 267aff70fb5..b1a8c48b35d 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1541,7 +1541,7 @@ static void test_LoadImage(void) static void test_CreateIconFromResource(void) { - HANDLE handle; + HANDLE handle, old_handle; BOOL ret; DWORD error; BITMAPINFOHEADER *icon_header; @@ -1646,7 +1646,6 @@ static void test_CreateIconFromResource(void) * handle = CreateIconFromResource(NULL, ICON_RES_SIZE, TRUE, 0x00030000); * ok(handle == NULL, "Invalid pointer accepted (%p)\n", handle); */ - HeapFree(GetProcessHeap(), 0, hotspot); /* Test creating an animated cursor. */ empty_anicursor.frames[0].data.icon_info.idType = 2; /* type: cursor */ @@ -1678,6 +1677,35 @@ static void test_CreateIconFromResource(void) ok(ret, "DestroyCursor() failed.\n"); error = GetLastError(); ok(error == 0xdeadbeef, "Last error: %u\n", error); + + /* Test creating and destroying a non-shared icon. */ + handle = CreateIconFromResourceEx((BYTE *)icon_header, ICON_RES_SIZE, TRUE, 0x00030000, + 0, 0, LR_DEFAULTSIZE); + ok(handle != NULL, "Create icon failed, error %u.\n", GetLastError()); + ret = DestroyIcon(handle); + ok(ret, "Destroy icon failed, error %u.\n", GetLastError()); + ret = GetIconInfo(handle, &icon_info); + ok(!ret, "Get info succeeded.\n"); + ok(GetLastError() == ERROR_INVALID_CURSOR_HANDLE, "Got unexpected error %u.\n", error); + + /* Test creating and destroying a shared icon from heap bits. */ + handle = CreateIconFromResourceEx((BYTE *)icon_header, ICON_RES_SIZE, TRUE, 0x00030000, + 0, 0, LR_DEFAULTSIZE | LR_SHARED); + ok(handle != NULL, "Create icon failed, error %u.\n", GetLastError()); + ret = DestroyIcon(handle); + ok(ret, "Destroy icon failed, error %u.\n", GetLastError()); + ret = GetIconInfo(handle, &icon_info); + todo_wine + ok(ret, "Get info failed, error %u.\n", GetLastError()); + + /* Test creating a shared icon from heap bits that has been created before. */ + old_handle = handle; + handle = CreateIconFromResourceEx((BYTE *)icon_header, ICON_RES_SIZE, TRUE, 0x00030000, + 0, 0, LR_DEFAULTSIZE | LR_SHARED); + ok(handle != NULL, "Create icon failed, error %u.\n", GetLastError()); + ok(handle != old_handle, "Expect a different handle.\n"); + + HeapFree(GetProcessHeap(), 0, hotspot); } static int check_cursor_data( HDC hdc, HCURSOR hCursor, void *data, int length)

1 0

Ziqing Hui : user32/tests: Fix cursor state test failures for win10.
by Alexandre Julliard 08 Dec '21

08 Dec '21

Module: wine Branch: master Commit: f1113270958d2ec39730aa7f5fa2c1cdb973f87c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1113270958d2ec39730aa7f… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Dec 7 18:06:42 2021 +0800 user32/tests: Fix cursor state test failures for win10. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/cursoricon.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 33ca2e3cb63..267aff70fb5 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2505,7 +2505,7 @@ static void test_ShowCursor(void) memset( &info, 0, sizeof(info) ); info.cbSize = sizeof(info); ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); - ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + ok( info.flags & (CURSOR_SHOWING | CURSOR_SUPPRESSED), "Got unexpected cursor state\n" ); } event_start = CreateEventW( NULL, FALSE, FALSE, NULL ); @@ -2529,7 +2529,7 @@ static void test_ShowCursor(void) info.cbSize = sizeof(info); ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); /* global show count is not affected since we don't have a window */ - ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + ok( info.flags & (CURSOR_SHOWING | CURSOR_SUPPRESSED), "Got unexpected cursor state\n" ); } parent_id = 0; @@ -2582,7 +2582,7 @@ static void test_ShowCursor(void) { info.cbSize = sizeof(info); ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); - ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + ok( info.flags & (CURSOR_SHOWING | CURSOR_SUPPRESSED), "Got unexpected cursor state\n" ); } count = ShowCursor( TRUE ); @@ -2594,7 +2594,7 @@ static void test_ShowCursor(void) { info.cbSize = sizeof(info); ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); - ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + ok( info.flags & (CURSOR_SHOWING | CURSOR_SUPPRESSED), "Got unexpected cursor state\n" ); } }

1 0

Jacek Caban : win32u: Use user driver for wine_get_vulkan_driver.
by Alexandre Julliard 08 Dec '21

08 Dec '21

Module: wine Branch: master Commit: 9596e7f2a4e972c35efdca38b01d068bfc055d36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9596e7f2a4e972c35efdca38… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 7 15:30:12 2021 +0100 win32u: Use user driver for wine_get_vulkan_driver. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/d3d12_main.c | 6 +----- dlls/dxgi/swapchain.c | 6 +----- dlls/user32/driver.c | 2 ++ dlls/win32u/dibdrv/dc.c | 2 -- dlls/win32u/driver.c | 18 ++++++++++++------ dlls/win32u/emfdrv.c | 1 - dlls/win32u/font.c | 1 - dlls/win32u/path.c | 1 - dlls/win32u/vulkan.c | 15 +++------------ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 +- dlls/win32u/wrappers.c | 4 ++-- dlls/wined3d/adapter_vk.c | 5 +---- dlls/winemac.drv/gdi.c | 2 +- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/vulkan.c | 11 ++--------- dlls/wineps.drv/init.c | 1 - dlls/winevulkan/loader.c | 5 +---- dlls/winevulkan/make_vulkan | 2 +- dlls/winex11.drv/init.c | 13 +++---------- dlls/winex11.drv/xrender.c | 1 - include/wine/gdi_driver.h | 7 ++++--- include/wine/vulkan_driver.h | 2 +- 23 files changed, 38 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9596e7f2a4e972c35efd…

1 0

Damjan Jovanovic : server: FreeBSD 14-CURRENT's sched_setaffinity() needs _WITH_CPU_SET_T defined.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: 316a358b0f718d4c81d331993ebc22543c029bf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=316a358b0f718d4c81d33199… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Dec 6 03:52:13 2021 +0200 server: FreeBSD 14-CURRENT's sched_setaffinity() needs _WITH_CPU_SET_T defined. FreeBSD 14-CURRENT got the non-standard sched_setaffinity() function, but it uses FreeBSD's cpuset_t type instead of Linux's cpu_set_t (also non-standard). This breaks the build. We have to define _WITH_CPU_SET_T before including <sched.h> to get that type named cpu_set_t instead. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/thread.c b/server/thread.c index e9240a05659..296f7a5d265 100644 --- a/server/thread.c +++ b/server/thread.c @@ -33,6 +33,8 @@ #include <time.h> #include <poll.h> #ifdef HAVE_SCHED_H +/* FreeBSD needs this for cpu_set_t intead of its cpuset_t */ +#define _WITH_CPU_SET_T #include <sched.h> #endif

1 0

Damjan Jovanovic : ntdll: Implement fill_battery_state() on FreeBSD.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: 36af18a4f13b5e9ffbf8be71ea0aaad7321cefb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36af18a4f13b5e9ffbf8be71… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Dec 4 13:23:51 2021 +0200 ntdll: Implement fill_battery_state() on FreeBSD. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 941c69190fb..d1a40e47bbf 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -3516,6 +3516,51 @@ static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs ) return STATUS_SUCCESS; } +#elif defined(__FreeBSD__) + +#include <dev/acpica/acpiio.h> + +static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs ) +{ + size_t len; + int state = 0; + int rate_mW = 0; + int time_mins = -1; + int life_percent = 0; + + bs->BatteryPresent = TRUE; + len = sizeof(state); + bs->BatteryPresent &= !sysctlbyname("hw.acpi.battery.state", &state, &len, NULL, 0); + len = sizeof(rate_mW); + bs->BatteryPresent &= !sysctlbyname("hw.acpi.battery.rate", &rate_mW, &len, NULL, 0); + len = sizeof(time_mins); + bs->BatteryPresent &= !sysctlbyname("hw.acpi.battery.time", &time_mins, &len, NULL, 0); + len = sizeof(life_percent); + bs->BatteryPresent &= !sysctlbyname("hw.acpi.battery.life", &life_percent, &len, NULL, 0); + + if (bs->BatteryPresent) + { + bs->AcOnLine = (time_mins == -1); + bs->Charging = state & ACPI_BATT_STAT_CHARGING; + bs->Discharging = state & ACPI_BATT_STAT_DISCHARG; + + bs->Rate = (rate_mW >= 0 ? -rate_mW : 0); + if (time_mins >= 0 && life_percent > 0) + { + bs->EstimatedTime = 60 * time_mins; + bs->RemainingCapacity = bs->EstimatedTime * rate_mW / 3600; + bs->MaxCapacity = bs->RemainingCapacity * 100 / life_percent; + } + else + { + bs->EstimatedTime = ~0u; + bs->RemainingCapacity = life_percent; + bs->MaxCapacity = 100; + } + } + return STATUS_SUCCESS; +} + #else static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs )

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
57
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 December 2021