January 2022 - Wine-Commits

Roman Pišl : comctl32: Fix return type of ImageList_WriteEx.
by Alexandre Julliard Jan. 3, 2022

Jan. 3, 2022

Module: wine Branch: master Commit: dd7d344f292d860eb2b9a4512bb9b69a682856ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd7d344f292d860eb2b9a451… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sun Jan 2 22:27:05 2022 +0100 comctl32: Fix return type of ImageList_WriteEx. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52323 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/imagelist.c | 4 ++-- include/commctrl.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 8da8beec1e0..155d4b2a956 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3061,10 +3061,10 @@ failed: /************************************************************************* * ImageList_WriteEx [COMCTL32.@] */ -BOOL WINAPI ImageList_WriteEx(HIMAGELIST himl, DWORD flags, IStream *pstm) +HRESULT WINAPI ImageList_WriteEx(HIMAGELIST himl, DWORD flags, IStream *pstm) { FIXME("%p %08x %p: semi-stub\n", himl, flags, pstm); - return ImageList_Write(himl, pstm); + return ImageList_Write(himl, pstm) ? S_OK : E_FAIL; } /************************************************************************* diff --git a/include/commctrl.h b/include/commctrl.h index 025eb328c32..c6d9dd32928 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -602,7 +602,7 @@ BOOL WINAPI ImageList_SetOverlayImage(HIMAGELIST,INT,INT); #ifdef __IStream_INTERFACE_DEFINED__ HIMAGELIST WINAPI ImageList_Read(LPSTREAM); BOOL WINAPI ImageList_Write(HIMAGELIST,IStream*); -BOOL WINAPI ImageList_WriteEx(HIMAGELIST,DWORD,IStream*); +HRESULT WINAPI ImageList_WriteEx(HIMAGELIST,DWORD,IStream*); #endif #define ImageList_AddIcon(himl,hicon) ImageList_ReplaceIcon(himl,-1,hicon)

1 0

Alex Henrie : wmphoto: Fix memory leak on error path in wmp_decoder_create (Coverity).
by Alexandre Julliard Jan. 3, 2022

Jan. 3, 2022

Module: wine Branch: master Commit: adc3492107467d0877342ca084b8b6f64c623c9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=adc3492107467d0877342ca0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 28 21:04:02 2021 -0700 wmphoto: Fix memory leak on error path in wmp_decoder_create (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmphoto/jxrlib.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wmphoto/jxrlib.c b/dlls/wmphoto/jxrlib.c index 757312b5f0f..3d7dedb869d 100644 --- a/dlls/wmphoto/jxrlib.c +++ b/dlls/wmphoto/jxrlib.c @@ -358,7 +358,10 @@ HRESULT CDECL wmp_decoder_create(struct decoder_info *info, struct decoder **res if (PKImageDecode_Create_WMP(&decoder)) return E_FAIL; This = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(*This)); if (!This) + { + decoder->Release(&decoder); return E_OUTOFMEMORY; + } This->decoder_iface.vtable = &wmp_decoder_vtable; This->WMPStream_iface.Close = &wmp_stream_Close;

1 0

Eric Pouech : po: Some more French translations.
by Alexandre Julliard Jan. 3, 2022

Jan. 3, 2022

Module: wine Branch: master Commit: 39f77b25aacf248e18e747bf31c2055a9cfbc89a URL: https://source.winehq.org/git/wine.git/?a=commit;h=39f77b25aacf248e18e747bf… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 3 15:43:21 2022 +0100 po: Some more French translations. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fr.po | 160 +++++++++++++++++++++++---------------------------------------- 1 file changed, 58 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=39f77b25aacf248e18e7…

1 0

Rémi Bernon : dinput/tests: Split joystick tests into separate sources.
by Alexandre Julliard Jan. 3, 2022

Jan. 3, 2022

Module: wine Branch: master Commit: 4c4dedb941c14af1a523a63d71b065ff4458cfaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c4dedb941c14af1a523a63d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 3 14:43:35 2022 +0100 dinput/tests: Split joystick tests into separate sources. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/Makefile.in | 2 + dlls/dinput/tests/dinput_test.h | 100 + dlls/dinput/tests/driver_hid.c | 1 + dlls/dinput/tests/driver_hid.h | 2 - dlls/dinput/tests/force_feedback.c | 4337 +++++++++++++++++++++++ dlls/dinput/tests/hid.c | 6761 +----------------------------------- dlls/dinput/tests/joystick8.c | 2594 ++++++++++++++ 7 files changed, 7122 insertions(+), 6675 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4c4dedb941c14af1a523…

1 0

Alexandre Julliard : server: Don't return image information for terminating processes.
by Alexandre Julliard Jan. 3, 2022

Jan. 3, 2022

Module: wine Branch: master Commit: 14645b06a79f726965ae11d17db69a9521de6a2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=14645b06a79f726965ae11d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 3 16:59:50 2022 +0100 server: Don't return image information for terminating processes. Fixes a test failure caused by 8eacd3e50792925cbd209f8a1940f3e96b725137. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/process.c b/server/process.c index bcb66271771..58ae97cdb2f 100644 --- a/server/process.c +++ b/server/process.c @@ -1503,7 +1503,10 @@ DECL_HANDLER(get_process_info) reply->session_id = process->session_id; reply->machine = process->machine; if (get_reply_max_size()) - set_reply_data( &process->image_info, min( sizeof(process->image_info), get_reply_max_size() )); + { + if (!process->running_threads) set_error( STATUS_PROCESS_IS_TERMINATING ); + else set_reply_data( &process->image_info, min( sizeof(process->image_info), get_reply_max_size() )); + } release_object( process ); } }

1 0

Alexandre Julliard : Wine release 7.0-rc4
by Alexandre Julliard Jan. 2, 2022

Jan. 2, 2022

Module: website Branch: master Commit: 719acbc64c09b7ef5cee0d144d9f0993548e0beb URL: https://source.winehq.org/git/website.git/?a=commit;h=719acbc64c09b7ef5cee0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 2 22:29:29 2022 +0100 Wine release 7.0-rc4 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022010201.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2022010201.xml b/news/en/2022010201.xml new file mode 100644 index 00000000..a75005c0 --- /dev/null +++ b/news/en/2022010201.xml @@ -0,0 +1,13 @@ +<news> +<date>January 2, 2022</date> +<title>Wine 7.0-rc4 Released</title> +<body> + The Wine development release 7.0-rc4 is now available. + <a href="{$root}/announce/7.0-rc4">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.0/wine-7.0-rc4.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : ntdll: Fix current directory initialization on removable devices.
by Alexandre Julliard Jan. 2, 2022

Jan. 2, 2022

Module: wine Branch: master Commit: 15101bae7b9a10d73b8edc05e0ea58590378db29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15101bae7b9a10d73b8edc05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 2 13:45:40 2022 +0100 ntdll: Fix current directory initialization on removable devices. Fix a regression caused by 3e73437ae8f04a12200bf537758d22e5f9723637. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52311 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index b8c7ce715e6..6a3224d8385 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -104,6 +104,7 @@ timeout_t server_start_time = 0; /* time of server startup */ sigset_t server_block_set; /* signals to block during server calls */ static int fd_socket = -1; /* socket to exchange file descriptors with the server */ +static int initial_cwd = -1; static pid_t server_pid; static pthread_mutex_t fd_cache_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -1173,16 +1174,6 @@ static int setup_config_dir(void) } else if (errno != EEXIST) fatal_perror( "cannot create %s/dosdevices", config_dir ); - if (fd_cwd != -1) - { - FILE_FS_DEVICE_INFORMATION info; - if (!get_device_info( fd_cwd, &info ) && (info.Characteristics & FILE_REMOVABLE_MEDIA)) - { - close( fd_cwd ); - fd_cwd = -1; - } - } - if (fd_cwd == -1) fd_cwd = open( "dosdevices/c:", O_RDONLY ); fcntl( fd_cwd, F_SETFD, FD_CLOEXEC ); return fd_cwd; @@ -1231,9 +1222,9 @@ static int server_connect(void) { struct sockaddr_un addr; struct stat st; - int s, slen, retry, fd_cwd; + int s, slen, retry; - fd_cwd = setup_config_dir(); + initial_cwd = setup_config_dir(); /* chdir to the server directory */ if (chdir( server_dir ) == -1) @@ -1287,12 +1278,7 @@ static int server_connect(void) #endif if (connect( s, (struct sockaddr *)&addr, slen ) != -1) { - /* switch back to the starting directory */ - if (fd_cwd != -1) - { - fchdir( fd_cwd ); - close( fd_cwd ); - } + fchdir( initial_cwd ); /* switch back to the starting directory */ fcntl( s, F_SETFD, FD_CLOEXEC ); return s; } @@ -1555,6 +1541,11 @@ void server_init_process_done(void) void *entry, *teb; NTSTATUS status; int suspend; + FILE_FS_DEVICE_INFORMATION info; + + if (!get_device_info( initial_cwd, &info ) && (info.Characteristics & FILE_REMOVABLE_MEDIA)) + chdir( "/" ); + close( initial_cwd ); #ifdef __APPLE__ send_server_task_port();

1 0

Alex Henrie : faultrep/tests: Drop workarounds for Windows <= 2000.
by Alexandre Julliard Jan. 2, 2022

Jan. 2, 2022

Module: wine Branch: master Commit: e69d218d57b92790f82f988dbe568076ca04c07a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e69d218d57b92790f82f988d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jan 2 00:11:43 2022 -0700 faultrep/tests: Drop workarounds for Windows <= 2000. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/faultrep/tests/faultrep.c | 62 ++++-------------------------------------- 1 file changed, 6 insertions(+), 56 deletions(-) diff --git a/dlls/faultrep/tests/faultrep.c b/dlls/faultrep/tests/faultrep.c index d0b30f70cf1..30664bd29be 100644 --- a/dlls/faultrep/tests/faultrep.c +++ b/dlls/faultrep/tests/faultrep.c @@ -36,65 +36,15 @@ static const char regpath_exclude[] = "ExclusionList"; static BOOL is_process_limited(void) { - static BOOL (WINAPI *pCheckTokenMembership)(HANDLE,PSID,PBOOL) = NULL; - static BOOL (WINAPI *pOpenProcessToken)(HANDLE, DWORD, PHANDLE) = NULL; - SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; - PSID Group; - BOOL IsInGroup; HANDLE token; + TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; + DWORD size; - if (!pOpenProcessToken) - { - HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); - pOpenProcessToken = (void*)GetProcAddress(hadvapi32, "OpenProcessToken"); - pCheckTokenMembership = (void*)GetProcAddress(hadvapi32, "CheckTokenMembership"); - if (!pCheckTokenMembership || !pOpenProcessToken) - { - /* Win9x (power to the masses) or NT4 (no way to know) */ - trace("missing pOpenProcessToken or CheckTokenMembership\n"); - return FALSE; - } - } - - if (!AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - 0, 0, 0, 0, 0, 0, &Group) || - !pCheckTokenMembership(NULL, Group, &IsInGroup)) - { - trace("Could not check if the current user is an administrator\n"); - return FALSE; - } - FreeSid(Group); - if (!IsInGroup) - { - if (!AllocateAndInitializeSid(&NtAuthority, 2, - SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_POWER_USERS, - 0, 0, 0, 0, 0, 0, &Group) || - !pCheckTokenMembership(NULL, Group, &IsInGroup)) - { - trace("Could not check if the current user is a power user\n"); - return FALSE; - } - FreeSid(Group); - if (!IsInGroup) - { - /* Only administrators and power users can be powerful */ - return TRUE; - } - } + OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); + GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); + CloseHandle(token); - if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) - { - BOOL ret; - TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; - DWORD size; - - ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); - CloseHandle(token); - return (ret && type == TokenElevationTypeLimited); - } - return FALSE; + return type == TokenElevationTypeLimited; }

1 0

Alexandre Julliard : Update copyright info for 2022.
by Alexandre Julliard Jan. 2, 2022

Jan. 2, 2022

Module: wine Branch: master Commit: cd2b8b64f7d34d1713813a5e4bb66495db4c5f33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd2b8b64f7d34d1713813a5e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 2 13:50:20 2022 +0100 Update copyright info for 2022. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- LICENSE | 2 +- dlls/opengl32/version.rc | 2 +- include/wine/wine_common_ver.rc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 1a12a1e3a92..e8275c2cfc9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2021 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2022 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/dlls/opengl32/version.rc b/dlls/opengl32/version.rc index f17f3ce0d74..b8e01166a44 100644 --- a/dlls/opengl32/version.rc +++ b/dlls/opengl32/version.rc @@ -20,7 +20,7 @@ #define WINE_FILENAME_STR "opengl32.dll" #define WINE_FILEVERSION 5,1,2600,2082 #define WINE_FILEVERSION_STR "5.1.2600.2082" -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2021 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2022 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ #define WINE_PRODUCTVERSION 5,1,2600,2082 #define WINE_PRODUCTVERSION_STR "5.1" diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index 989192dc6fc..29b499c796c 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -76,7 +76,7 @@ never complain. #endif #ifndef WINE_LEGALCOPYRIGHT -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2021 the Wine project authors (see the file AUTHORS for a complete list)" +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2022 the Wine project authors (see the file AUTHORS for a complete list)" #endif #ifndef WINE_PRODUCTVERSION

1 0

Jactry Zeng : po: Update Simplified Chinese translation.
by Alexandre Julliard Jan. 2, 2022

Jan. 2, 2022

Module: wine Branch: master Commit: 46516cf0038fd7cd0fc0480d79e767c215ba84fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=46516cf0038fd7cd0fc0480d… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sun Jan 2 11:26:27 2022 -0600 po: Update Simplified Chinese translation. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 1868 ++++++++++++++++++++++++++--------------------------------- 1 file changed, 808 insertions(+), 1060 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=46516cf0038fd7cd0fc0…

1 0