November 2023 - Wine-Commits

Alexandre Julliard : win32u: Generate syscall entry points from the C code with asm macros.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 2dda6a28946879947189cac272891336a3565264 URL: https://gitlab.winehq.org/wine/wine/-/commit/2dda6a28946879947189cac2728913… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 18:09:13 2023 +0100 win32u: Generate syscall entry points from the C code with asm macros. --- dlls/win32u/Makefile.in | 2 +- dlls/win32u/main.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/Makefile.in b/dlls/win32u/Makefile.in index a4730737db6..e3ba0db82be 100644 --- a/dlls/win32u/Makefile.in +++ b/dlls/win32u/Makefile.in @@ -6,7 +6,7 @@ IMPORTS = ntdll winecrt0 UNIX_CFLAGS = $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) UNIX_LIBS = $(CARBON_LIBS) $(APPKIT_LIBS) $(PTHREAD_LIBS) -lm -EXTRADLLFLAGS = -nodefaultlibs -Wb,--syscall-table,1 +EXTRADLLFLAGS = -nodefaultlibs SOURCES = \ bitblt.c \ diff --git a/dlls/win32u/main.c b/dlls/win32u/main.c index d650483fb99..0489a95f1df 100644 --- a/dlls/win32u/main.c +++ b/dlls/win32u/main.c @@ -26,11 +26,27 @@ #include "winbase.h" #include "ntgdi.h" #include "wine/unixlib.h" +#include "wine/asm.h" +#include "win32syscalls.h" void *__wine_syscall_dispatcher = NULL; static unixlib_handle_t win32u_handle; +/******************************************************************* + * syscalls + */ +#ifdef _WIN64 +#define SYSCALL_ENTRY(id,name,args) __ASM_SYSCALL_FUNC( id + 0x1000, name ) +ALL_SYSCALLS64 +#else +#define SYSCALL_ENTRY(id,name,args) __ASM_SYSCALL_FUNC( id + 0x1000, name, args ) +DEFINE_SYSCALL_HELPER32() +ALL_SYSCALLS32 +#endif +#undef SYSCALL_ENTRY + + void __cdecl __wine_spec_unimplemented_stub( const char *module, const char *function ) { EXCEPTION_RECORD record;

1 0

Alexandre Julliard : wusa: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 5148911b818e385bc437ac7b256b7cef826f8065 URL: https://gitlab.winehq.org/wine/wine/-/commit/5148911b818e385bc437ac7b256b7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 17:55:39 2023 +0100 wusa: Remove DECLSPEC_HIDDEN usage. --- programs/wusa/wusa.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/wusa/wusa.h b/programs/wusa/wusa.h index e61fc025e09..dcc4850f10e 100644 --- a/programs/wusa/wusa.h +++ b/programs/wusa/wusa.h @@ -73,10 +73,10 @@ struct assembly_entry struct list registryops; }; -void free_assembly(struct assembly_entry *entry) DECLSPEC_HIDDEN; -void free_dependency(struct dependency_entry *entry) DECLSPEC_HIDDEN; -struct assembly_entry *load_manifest(const WCHAR *filename) DECLSPEC_HIDDEN; -BOOL load_update(const WCHAR *filename, struct list *update_list) DECLSPEC_HIDDEN; +void free_assembly(struct assembly_entry *entry); +void free_dependency(struct dependency_entry *entry); +struct assembly_entry *load_manifest(const WCHAR *filename); +BOOL load_update(const WCHAR *filename, struct list *update_list); static inline char *strdupWtoA(const WCHAR *str) {

1 0

Dmitry Timoshkov : shell32: Return S_OK from IFolderView2::SetViewModeAndIconSize() stub.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 3ee56808e46624b2b7f0a4e67ce55c6765360c53 URL: https://gitlab.winehq.org/wine/wine/-/commit/3ee56808e46624b2b7f0a4e67ce55c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 6 13:36:51 2022 +0300 shell32: Return S_OK from IFolderView2::SetViewModeAndIconSize() stub. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/shlview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 83fb206af52..71f60c2db89 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -3031,7 +3031,7 @@ static HRESULT WINAPI FolderView2_SetViewModeAndIconSize(IFolderView2 *iface, FO { IShellViewImpl *This = impl_from_IFolderView2(iface); FIXME("(%p)->(%d %d), stub\n", This, mode, size); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI FolderView2_GetViewModeAndIconSize(IFolderView2 *iface, FOLDERVIEWMODE *mode,

1 0

Alexandre Julliard : explorer: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: e040777841d92703d68658e139b7918de9495d47 URL: https://gitlab.winehq.org/wine/wine/-/commit/e040777841d92703d68658e139b791… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 17:55:23 2023 +0100 explorer: Remove DECLSPEC_HIDDEN usage. --- programs/explorer/explorer_private.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/explorer/explorer_private.h b/programs/explorer/explorer_private.h index 995e7eb803e..df598187fc1 100644 --- a/programs/explorer/explorer_private.h +++ b/programs/explorer/explorer_private.h @@ -21,11 +21,11 @@ #ifndef __WINE_EXPLORER_PRIVATE_H #define __WINE_EXPLORER_PRIVATE_H -extern void manage_desktop( WCHAR *arg ) DECLSPEC_HIDDEN; -extern void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL enable_shell ) DECLSPEC_HIDDEN; -extern void initialize_appbar(void) DECLSPEC_HIDDEN; -extern void handle_parent_notify( HWND hwnd, WPARAM wp ) DECLSPEC_HIDDEN; -extern void do_startmenu( HWND owner ) DECLSPEC_HIDDEN; -extern LRESULT menu_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) DECLSPEC_HIDDEN; +extern void manage_desktop( WCHAR *arg ); +extern void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL enable_shell ); +extern void initialize_appbar(void); +extern void handle_parent_notify( HWND hwnd, WPARAM wp ); +extern void do_startmenu( HWND owner ); +extern LRESULT menu_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam); #endif /* __WINE_EXPLORER_PRIVATE_H */

1 0

Alexandre Julliard : tools: Upgrade the config.guess/config.sub scripts.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 3aca5994584b3e91bc2abc138dde8422d0d15f24 URL: https://gitlab.winehq.org/wine/wine/-/commit/3aca5994584b3e91bc2abc138dde84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 17:49:46 2023 +0100 tools: Upgrade the config.guess/config.sub scripts. --- tools/config.guess | 107 ++++++++++++++++++------ tools/config.sub | 236 +++++++++++++++++++++++++++++++++++------------------ 2 files changed, 239 insertions(+), 104 deletions(-)

1 0

Santino Mazza : mlang/tests: Test GetStrCodePages with different codepages character.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: b413d4974af3985507619503e78c3af68cfbdf6d URL: https://gitlab.winehq.org/wine/wine/-/commit/b413d4974af3985507619503e78c3a… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Wed Nov 15 13:46:56 2023 -0300 mlang/tests: Test GetStrCodePages with different codepages character. --- dlls/mlang/tests/mlang.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index da0b87ed729..8e55b07b021 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1163,7 +1163,7 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) DWORD dwCodePages, dwManyCodePages; DWORD dwCmpCodePages; UINT CodePage; - static const WCHAR str[] = { 'd', 0x0436, 0xff90 }; + static const WCHAR str[] = { 'd', 0x0436, 0xff90, 0x0160 }; LONG processed; HRESULT ret; @@ -1220,6 +1220,19 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); ok(processed == 1, "expected 1, got %ld\n", processed); + /* Latin 2 */ + dwCmpCodePages = FS_LATIN1 | FS_LATIN2 | FS_TURKISH | FS_BALTIC; + ret = IMLangFontLink_GetCharCodePages(iMLFL, 0x0160, &dwCodePages); + ok(ret == S_OK, "IMLangFontLink_GetCharCodePages error %lx\n", ret); + ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); + + dwCodePages = 0; + processed = 0; + ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[3], 1, 0, &dwCodePages, &processed); + ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %lx\n", ret); + ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); + ok(processed == 1, "expected 1, got %ld\n", processed); + /* Cyrillic */ dwCmpCodePages = FS_CYRILLIC | FS_JISJAPAN | FS_CHINESESIMP | FS_WANSUNG; ret = IMLangFontLink_GetCharCodePages(iMLFL, 0x0436, &dwCodePages); @@ -1262,6 +1275,14 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); ok(processed == 3, "expected 3, got %ld\n", processed); + dwCmpCodePages = FS_JISJAPAN; + dwCodePages = 0; + processed = 0; + ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 4, 0, &dwCodePages, &processed); + ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %lx\n", ret); + todo_wine ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); + todo_wine ok(processed == 3, "expected 3, got %ld\n", processed); + dwCodePages = 0xffff; processed = -1; ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[2], 1, 0, &dwCodePages, &processed);

1 0

Santino Mazza : mlang: Fix GetStrCodePages for characters with different codepages.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 4ad1474678d440080fe659e5c21d3ecf90b18a2f URL: https://gitlab.winehq.org/wine/wine/-/commit/4ad1474678d440080fe659e5c21d3e… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Wed Nov 15 13:59:17 2023 -0300 mlang: Fix GetStrCodePages for characters with different codepages. --- dlls/mlang/mlang.c | 7 ++++++- dlls/mlang/tests/mlang.c | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index add0dd0a104..6b0f2922a77 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3340,7 +3340,12 @@ static HRESULT WINAPI fnIMLangFontLink2_GetStrCodePages( IMLangFontLink2* iface, if (ret != S_OK) return E_FAIL; if (!cps) cps = cp; - else cps &= cp; + else if ((cps & cp) != 0) cps &= cp; + else + { + i--; + break; + } /* FIXME: not tested */ if (priority_cp & cps) break; diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 8e55b07b021..3240d945245 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1280,8 +1280,8 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) processed = 0; ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 4, 0, &dwCodePages, &processed); ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %lx\n", ret); - todo_wine ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); - todo_wine ok(processed == 3, "expected 3, got %ld\n", processed); + ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); + ok(processed == 3, "expected 3, got %ld\n", processed); dwCodePages = 0xffff; processed = -1;

1 0

Dmitry Timoshkov : shell32: Implement IFolderView2::Items(&IID_IShellItemArray).
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 03d616b4eb8939b89712304ef34cbc6286665485 URL: https://gitlab.winehq.org/wine/wine/-/commit/03d616b4eb8939b89712304ef34cbc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 6 13:40:36 2022 +0300 shell32: Implement IFolderView2::Items(&IID_IShellItemArray). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/shlview.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 71f60c2db89..bb1119355ab 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2774,8 +2774,49 @@ static HRESULT WINAPI FolderView_ItemCount(IFolderView2 *iface, UINT flags, int static HRESULT WINAPI FolderView_Items(IFolderView2 *iface, UINT flags, REFIID riid, void **ppv) { IShellViewImpl *This = impl_from_IFolderView2(iface); - FIXME("(%p)->(%u %s %p), stub\n", This, flags, debugstr_guid(riid), ppv); - return E_NOTIMPL; + int count, i; + ITEMIDLIST **pidl; + LVITEMW item; + HRESULT hr; + + if (!IsEqualIID(riid, &IID_IShellItemArray)) + { + FIXME("%s is not supported\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + if (flags != SVGIO_ALLVIEW) + FIXME("some flags unsupported, %x\n", flags & ~SVGIO_ALLVIEW); + + count = SendMessageW(This->hWndList, LVM_GETITEMCOUNT, 0, 0); + if (!count) + { + FIXME("Folder is empty\n"); + return E_FAIL; + } + + pidl = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*pidl)); + if (!pidl) return E_OUTOFMEMORY; + + for (i = 0; i < count; i++) + { + item.mask = LVIF_PARAM; + item.iItem = i; + if (!SendMessageW(This->hWndList, LVM_GETITEMW, 0, (LPARAM)&item)) + { + FIXME("LVM_GETITEMW(%d) failed\n" ,i); + HeapFree(GetProcessHeap(), 0, pidl); + return E_FAIL; + } + + pidl[i] = (ITEMIDLIST *)item.lParam; + } + + hr = SHCreateShellItemArray(NULL, This->pSFParent, count, (LPCITEMIDLIST *)pidl, (IShellItemArray **)ppv); + + HeapFree(GetProcessHeap(), 0, pidl); + + return hr; } static HRESULT WINAPI FolderView_GetSelectionMarkedItem(IFolderView2 *iface, int *item)

1 0

Nell Hardcastle : winebus.sys: Identify DualSense Edge as a DualSense controller.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 33a3726a051c2de1ca86717a325487bae92db1fa URL: https://gitlab.winehq.org/wine/wine/-/commit/33a3726a051c2de1ca86717a325487… Author: Nell Hardcastle <nell(a)dev-nell.com> Date: Sun Nov 19 09:25:22 2023 -0800 winebus.sys: Identify DualSense Edge as a DualSense controller. The DualSense Edge implements extra features (haptics and adaptive triggers) in the same way as the DualSense. --- dlls/winebus.sys/unixlib.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 74b4992f07b..82eab3717ca 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -72,7 +72,9 @@ BOOL is_dualshock4_gamepad(WORD vid, WORD pid) BOOL is_dualsense_gamepad(WORD vid, WORD pid) { - if (vid == 0x054c && pid == 0x0ce6) return TRUE; + if (vid != 0x054c) return FALSE; + if (pid == 0x0ce6) return TRUE; /* DualSense */ + if (pid == 0x0df2) return TRUE; /* DualSense Edge */ return FALSE; }

1 0

Nell Hardcastle : mmdevapi: Override product strings for DualSense Edge.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 92dcc916fd747d197996e40a129aa852f8120352 URL: https://gitlab.winehq.org/wine/wine/-/commit/92dcc916fd747d197996e40a129aa8… Author: Nell Hardcastle <nell(a)dev-nell.com> Date: Sun Nov 19 09:26:38 2023 -0800 mmdevapi: Override product strings for DualSense Edge. Enables audio device features for the DualSense Edge. --- dlls/mmdevapi/devenum.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 10037a7affe..246625286b8 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -294,6 +294,7 @@ static const struct product_name_overrides product_name_overrides[] = { /* Sony controllers */ { .id = L"VID_054C&PID_0CE6", .product = L"Wireless Controller" }, + { .id = L"VID_054C&PID_0DF2", .product = L"Wireless Controller" }, }; static const WCHAR *find_product_name_override(const WCHAR *device_id)

1 0