May 2022 - Wine-commits - list.winehq.org

Rémi Bernon : ntdll: Store the block size directly in block headers.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 4c3cc858f87aaaf4d3e6f0809ab09a520f8da37d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c3cc858f87aaaf4d3e6f080… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 16:08:44 2022 +0200 ntdll: Store the block size directly in block headers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index ac0f14646c4..1b6337d4ce8 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -253,17 +253,11 @@ static inline UINT block_get_overhead( const struct block *block ) /* return the size of a block, including its header */ static inline UINT block_get_size( const struct block *block ) { - UINT data_size = block->size & ARENA_SIZE_MASK, size = data_size; - if (block_get_flags( block ) & ARENA_FLAG_FREE) size += sizeof(struct entry); - else size += sizeof(*block); - if (size < data_size) return ~0u; - return size; + return block->size & ARENA_SIZE_MASK; } static inline void block_set_size( struct block *block, UINT flags, UINT block_size ) { - if (flags & ARENA_FLAG_FREE) block_size -= sizeof(struct entry); - else block_size -= sizeof(*block); block->size = (block_size & ARENA_SIZE_MASK) | (flags & ~ARENA_SIZE_MASK); }

1 0

Alistair Leslie-Hughes : winex11.drv: Define ControlMask when not available.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: cf4a781e987a98a8d48610362a20a320c4a1016d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf4a781e987a98a8d4861036… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun May 22 17:40:44 2022 +1000 winex11.drv: Define ControlMask when not available. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winex11.drv/bitblt.c | 2 -- dlls/winex11.drv/event.c | 6 ------ dlls/winex11.drv/keyboard.c | 7 ++++--- dlls/winex11.drv/mouse.c | 4 +--- dlls/winex11.drv/window.c | 6 +++--- dlls/winex11.drv/x11drv.h | 3 +++ dlls/winex11.drv/x11drv_main.c | 4 +--- 7 files changed, 12 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index d1e6407d87c..10388a1cc8f 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -46,8 +46,6 @@ # endif #endif -#include "windef.h" -#include "winbase.h" #include "x11drv.h" #include "winternl.h" #include "wine/debug.h" diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index cbab1dcfe13..f81d2338faf 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -39,13 +39,7 @@ #include <stdarg.h> #include <string.h> -#include "windef.h" -#include "winbase.h" - #include "x11drv.h" - -/* avoid conflict with field names in included win32 headers */ -#undef Status #include "shlobj.h" /* DROPFILES */ #include "shellapi.h" diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 6157548474b..7b4ad9acd8d 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -44,14 +44,13 @@ #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" +#include "x11drv.h" + #include "wingdi.h" #include "winuser.h" #include "winreg.h" #include "winnls.h" #include "ime.h" -#include "x11drv.h" #include "wine/server.h" #include "wine/debug.h" @@ -64,6 +63,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(keyboard); WINE_DECLARE_DEBUG_CHANNEL(key); +static const unsigned int ControlMask = 1 << 2; + static int min_keycode, max_keycode, keysyms_per_keycode; static KeySym *key_mapping; static WORD keyc2vkey[256], keyc2scan[256]; diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index d0cdd3d4984..2ce03c3f12f 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -50,11 +50,9 @@ MAKE_FUNCPTR(XcursorLibraryLoadCursor); #define NONAMELESSUNION #define OEMRESOURCE -#include "windef.h" -#include "winbase.h" -#include "winreg.h" #include "x11drv.h" +#include "winreg.h" #include "wine/server.h" #include "wine/debug.h" diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 773fa81f5f3..07fb1515e24 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -43,14 +43,14 @@ /* avoid conflict with field names in included win32 headers */ #undef Status + #include "ntstatus.h" #define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" + +#include "x11drv.h" #include "wingdi.h" #include "winuser.h" -#include "x11drv.h" #include "wine/debug.h" #include "wine/server.h" #include "mwm.h" diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 613dc0e05fe..222d7328387 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -57,6 +57,9 @@ #undef Status /* avoid conflict with wintrnl.h */ typedef int Status; +/* avoid conflict with processthreadsapi.h */ +#undef ControlMask + #include "windef.h" #include "winbase.h" #include "ntgdi.h" diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 40d0e750d1b..a118757dfbe 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -45,14 +45,12 @@ #include "ntstatus.h" #define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winreg.h" #define VK_NO_PROTOTYPES #define WINE_VK_HOST #include "x11drv.h" +#include "winreg.h" #include "xcomposite.h" #include "wine/server.h" #include "wine/debug.h"

1 0

Alistair Leslie-Hughes : include: Add THREAD_POWER_THROTTLING_STATE type.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 1e7c6d73c8f558668c6140d4a97fae0ad51d71eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e7c6d73c8f558668c6140d4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun May 22 16:09:23 2022 +1000 include: Add THREAD_POWER_THROTTLING_STATE type. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/processthreadsapi.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/processthreadsapi.h b/include/processthreadsapi.h index d266b7a727b..f2554950952 100644 --- a/include/processthreadsapi.h +++ b/include/processthreadsapi.h @@ -37,6 +37,13 @@ typedef struct _MEMORY_PRIORITY_INFORMATION ULONG MemoryPriority; } MEMORY_PRIORITY_INFORMATION, *PMEMORY_PRIORITY_INFORMATION; +typedef struct _THREAD_POWER_THROTTLING_STATE +{ + ULONG Version; + ULONG ControlMask; + ULONG StateMask; +} THREAD_POWER_THROTTLING_STATE; + WINBASEAPI HRESULT WINAPI GetThreadDescription(HANDLE,PWSTR *); WINBASEAPI HRESULT WINAPI SetThreadDescription(HANDLE,PCWSTR); WINBASEAPI BOOL WINAPI SetThreadInformation(HANDLE,THREAD_INFORMATION_CLASS,LPVOID,DWORD);

1 0

Alistair Leslie-Hughes : ntdll: Fake success for ThreadPowerThrottlingState.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: bf86dfbcadbe0e79ae07afb57e469f388a9104a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf86dfbcadbe0e79ae07afb5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun May 22 16:10:27 2022 +1000 ntdll: Fake success for ThreadPowerThrottlingState. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52956 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/thread.c | 6 ++++++ dlls/wow64/process.c | 1 + 2 files changed, 7 insertions(+) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 6d937675bcb..15bb3be34b2 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -2255,6 +2255,12 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, FIXME( "ThreadEnableAlignmentFaultFixup stub!\n" ); return STATUS_SUCCESS; + case ThreadPowerThrottlingState: + if (length != sizeof(THREAD_POWER_THROTTLING_STATE)) return STATUS_INFO_LENGTH_MISMATCH; + if (!data) return STATUS_ACCESS_VIOLATION; + FIXME( "ThreadPowerThrottling stub!\n" ); + return STATUS_SUCCESS; + case ThreadBasicInformation: case ThreadTimes: case ThreadPriority: diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 82ca4181116..0c6726b9c6e 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -1158,6 +1158,7 @@ NTSTATUS WINAPI wow64_NtSetInformationThread( UINT *args ) case ThreadBasePriority: /* ULONG */ case ThreadHideFromDebugger: /* void */ case ThreadEnableAlignmentFaultFixup: /* BOOLEAN */ + case ThreadPowerThrottlingState: /* THREAD_POWER_THROTTLING_STATE */ return NtSetInformationThread( handle, class, ptr, len ); case ThreadImpersonationToken: /* HANDLE */

1 0

Hans Leidekker : secur32: Add support for SCH_CREDENTIALS.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 0a8adeba9237abd06d2186ef81107d9fec6d478b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a8adeba9237abd06d2186ef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 25 12:09:01 2022 +0200 secur32: Add support for SCH_CREDENTIALS. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 104 +++++++++++++++++++++++++++++++----------- dlls/secur32/tests/schannel.c | 11 ++++- include/schannel.h | 49 ++++++++++++++++++++ 3 files changed, 137 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0a8adeba9237abd06d21…

1 0

Nikolay Sivov : kernel32/tests: Run process information tests over defined test data.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: d9c4974c9c5d17f703d47b11ba566e39a84867cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9c4974c9c5d17f703d47b11… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 24 19:18:18 2022 +0300 kernel32/tests: Run process information tests over defined test data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index c1312bd8916..4a6451a23fe 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3773,7 +3773,7 @@ static void test_process_info(HANDLE hproc) return; } - for (i = 0; i < MaxProcessInfoClass; i++) + for (i = 0; i < ARRAY_SIZE(info_size); i++) { ret_len = 0; status = pNtQueryInformationProcess(hproc, i, buf, info_size[i], &ret_len);

1 0

Nikolay Sivov : include: Add some more process information class constants.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 0c7f4ad916b7f89bfdd5d3dbb244b15f7752944d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c7f4ad916b7f89bfdd5d3db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 24 19:18:19 2022 +0300 include: Add some more process information class constants. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winternl.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/winternl.h b/include/winternl.h index bfb211128a8..85aac653a21 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1566,6 +1566,14 @@ typedef enum _PROCESSINFOCLASS { ProcessThreadStackAllocation = 41, ProcessWorkingSetWatchEx = 42, ProcessImageFileNameWin32 = 43, + ProcessImageFileMapping = 44, + ProcessAffinityUpdateMode = 45, + ProcessMemoryAllocationMode = 46, + ProcessGroupInformation = 47, + ProcessTokenVirtualizationEnabled = 48, + ProcessConsoleHostProcess = 49, + ProcessWindowInformation = 50, + ProcessHandleInformation = 51, MaxProcessInfoClass, #ifdef __WINESRC__ ProcessWineMakeProcessSystem = 1000,

1 0

Nikolay Sivov : ntdll/tests: Use NtQueryInformationProcess() directly.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: f97f5e1350746e4e69c2f1acdbe2d3b838eb746d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f97f5e1350746e4e69c2f1ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 24 19:18:20 2022 +0300 ntdll/tests: Use NtQueryInformationProcess() directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 8 +- dlls/ntdll/tests/info.c | 198 +++++++++++++++++++++---------------------- dlls/ntdll/tests/reg.c | 4 +- 3 files changed, 102 insertions(+), 108 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f97f5e1350746e4e69c2…

1 0

Jacek Caban : winemac: Directly use win32u in query_pasteboard_data.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: ff88345f7dd4496b0ec61e526203746a4dc0ccf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff88345f7dd4496b0ec61e52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 23 00:59:39 2022 +0200 winemac: Directly use win32u in query_pasteboard_data. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/clipboard.c | 152 +++++++++++++------------------------------ 1 file changed, 47 insertions(+), 105 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ff88345f7dd4496b0ec6…

1 0

Jacek Caban : winemac: Directly use wine_unix_to_nt_file_name.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 58343b63273402e3a7393cd84ef3a75d2bced3b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58343b63273402e3a7393cd8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 23 20:24:12 2022 +0200 winemac: Directly use wine_unix_to_nt_file_name. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/clipboard.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index b11b56a9ac4..93706680470 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -565,6 +565,29 @@ static void *import_html(CFDataRef data, size_t *ret_size) } +/* based on wine_get_dos_file_name */ +static WCHAR *get_dos_file_name(const char *path) +{ + ULONG len = strlen(path) + 9; /* \??\unix prefix */ + WCHAR *ret; + + if (!(ret = malloc(len * sizeof(WCHAR)))) return NULL; + if (wine_unix_to_nt_file_name(path, ret, &len)) + { + free(ret); + return NULL; + } + + if (ret[5] == ':') + { + /* get rid of the \??\ prefix */ + memmove(ret, ret + 4, (len - 4) * sizeof(WCHAR)); + } + else ret[1] = '\\'; + return ret; +} + + /************************************************************************** * import_nsfilenames_to_hdrop * @@ -632,7 +655,7 @@ static void *import_nsfilenames_to_hdrop(CFDataRef data, size_t *ret_size) WARN("failed to get file-system representation for %s\n", debugstr_cf(name)); goto done; } - paths[i] = wine_get_dos_file_name(buffer); + paths[i] = get_dos_file_name(buffer); if (!paths[i]) { WARN("failed to get DOS path for %s\n", debugstr_a(buffer)); @@ -668,8 +691,7 @@ static void *import_nsfilenames_to_hdrop(CFDataRef data, size_t *ret_size) done: if (paths) { - for (i = 0; i < count; i++) - HeapFree(GetProcessHeap(), 0, paths[i]); + for (i = 0; i < count; i++) free(paths[i]); HeapFree(GetProcessHeap(), 0, paths); } HeapFree(GetProcessHeap(), 0, buffer);

1 0