wine-commits November 2023

wine-commits@winehq.org

1 participants
989 discussions

Alexandre Julliard : ntdll: Generate syscall entry points from the C code with asm macros.
by Alexandre Julliard 20 Nov '23

20 Nov '23

Module: wine Branch: master Commit: 48a54598279c638070c890bd6a8be305b4bfda7d URL: https://gitlab.winehq.org/wine/wine/-/commit/48a54598279c638070c890bd6a8be3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 18:06:33 2023 +0100 ntdll: Generate syscall entry points from the C code with asm macros. --- dlls/ntdll/signal_arm.c | 11 ++++- dlls/ntdll/signal_arm64.c | 10 ++++- dlls/ntdll/signal_i386.c | 11 +++++ dlls/ntdll/signal_x86_64.c | 10 +++++ include/wine/asm.h | 107 +++++++++++++++++++++++++++++++++++++++++++++ tools/winebuild/import.c | 2 + 6 files changed, 149 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 9a9fc6483f1..475fd6afc34 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -31,7 +31,7 @@ #include "wine/exception.h" #include "ntdll_misc.h" #include "wine/debug.h" -#include "winnt.h" +#include "ntsyscalls.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(relay); @@ -93,6 +93,15 @@ static inline BOOL is_valid_frame( ULONG_PTR frame ) } +/******************************************************************* + * syscalls + */ +#define SYSCALL_ENTRY(id,name,args) __ASM_SYSCALL_FUNC( id, name, args ) +ALL_SYSCALLS32 +DEFINE_SYSCALL_HELPER32() +#undef SYSCALL_ENTRY + + /************************************************************************** * __chkstk (NTDLL.@) * diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index cb796141871..9ceb3540a38 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -33,7 +33,7 @@ #include "wine/exception.h" #include "ntdll_misc.h" #include "wine/debug.h" -#include "winnt.h" +#include "ntsyscalls.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(relay); @@ -100,6 +100,14 @@ static inline BOOL is_valid_frame( ULONG_PTR frame ) } +/******************************************************************* + * syscalls + */ +#define SYSCALL_ENTRY(id,name,args) __ASM_SYSCALL_FUNC( id, name ) +ALL_SYSCALLS64 +#undef SYSCALL_ENTRY + + /************************************************************************** * __chkstk (NTDLL.@) * diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index c4d0f0e6898..27a65f24076 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -33,6 +33,7 @@ #include "ntdll_misc.h" #include "wine/exception.h" #include "wine/debug.h" +#include "ntsyscalls.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(relay); @@ -71,6 +72,16 @@ extern DWORD EXC_CallHandler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_R CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher, PEXCEPTION_HANDLER handler, PEXCEPTION_HANDLER nested_handler ); + +/******************************************************************* + * syscalls + */ +#define SYSCALL_ENTRY(id,name,args) __ASM_SYSCALL_FUNC( id, name, args ) +ALL_SYSCALLS32 +DEFINE_SYSCALL_HELPER32() +#undef SYSCALL_ENTRY + + /******************************************************************* * is_valid_frame */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7f09ec0abea..f578d082b69 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -31,6 +31,7 @@ #include "wine/list.h" #include "ntdll_misc.h" #include "wine/debug.h" +#include "ntsyscalls.h" WINE_DEFAULT_DEBUG_CHANNEL(unwind); WINE_DECLARE_DEBUG_CHANNEL(seh); @@ -79,6 +80,15 @@ struct MSVCRT_JUMP_BUFFER M128A Xmm15; }; + +/******************************************************************* + * syscalls + */ +#define SYSCALL_ENTRY(id,name,args) __ASM_SYSCALL_FUNC( id, name ) +ALL_SYSCALLS64 +#undef SYSCALL_ENTRY + + /*********************************************************************** * Definitions for Win32 unwind tables */ diff --git a/include/wine/asm.h b/include/wine/asm.h index 2a21bceb55e..a1a61532f44 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -192,4 +192,111 @@ #endif /* __i386__ */ +/* syscall support */ + +#ifdef __i386__ +# ifdef __PIC__ +# define __ASM_SYSCALL_FUNC(id,name,args) \ + __ASM_STDCALL_FUNC( name, args, \ + "call 1f\n" \ + "1:\tpopl %eax\n\t" \ + "movl " __ASM_NAME("__wine_syscall_dispatcher") "-1b(%eax),%edx\n\t" \ + "movl $(" #id "),%eax\n\t" \ + "call *%edx\n\t" \ + "ret $" #args ) +# define DEFINE_SYSCALL_HELPER32() +# else +# define __ASM_SYSCALL_FUNC(id,name,args) \ + __ASM_STDCALL_FUNC( name, args, \ + "movl $(" #id "),%eax\n\t" \ + "movl $" __ASM_NAME("__wine_syscall") ",%edx\n\t" \ + "call *%edx\n\t" \ + "ret $" #args ) +# define DEFINE_SYSCALL_HELPER32() \ + __ASM_GLOBAL_FUNC( __wine_syscall, "jmp *(" __ASM_NAME("__wine_syscall_dispatcher") ")" ) +# endif +#elif defined __aarch64__ +# define __ASM_SYSCALL_FUNC(id,name) \ + __ASM_GLOBAL_FUNC( name, \ + __ASM_SEH(".seh_endprologue\n\t") \ + "mov x8, #(" #id ")\n\t" \ + "mov x9, x30\n\t" \ + "ldr x16, 1f\n\t" \ + "ldr x16, [x16]\n\t" \ + "blr x16\n\t" \ + "ret\n" \ + "1:\t.quad " __ASM_NAME("__wine_syscall_dispatcher") ) +#elif defined __x86_64__ +/* Chromium depends on syscall thunks having the same form as on + * Windows. For 64-bit systems the only viable form we can emulate is + * having an int $0x2e fallback. Since actually using an interrupt is + * expensive, and since for some reason Chromium doesn't actually + * validate that instruction, we can just put a jmp there instead. */ +# ifdef __WINE_PE_BUILD +# define __ASM_SYSCALL_FUNC(id,name) \ + __ASM_GLOBAL_FUNC( name, \ + __ASM_SEH(".seh_endprologue\n\t") \ + ".byte 0x4c,0x8b,0xd1\n\t" /* movq %rcx,%r10 */ \ + ".byte 0xb8\n\t" /* movl $i,%eax */ \ + ".long (" #id ")\n\t" \ + ".byte 0xf6,0x04,0x25,0x08,0x03,0xfe,0x7f,0x01\n\t" /* testb $1,0x7ffe0308 */ \ + ".byte 0x75,0x03\n\t" /* jne 1f */ \ + ".byte 0x0f,0x05\n\t" /* syscall */ \ + ".byte 0xc3\n\t" /* ret */ \ + "jmp 1f\n\t" \ + ".byte 0xc3\n" /* ret */ \ + "1:\t.byte 0xff,0x14,0x25\n\t" /* 1: callq *(0x7ffe1000) */ \ + ".long 0x7ffe1000\n\t" \ + "ret" ) +# else +# define __ASM_SYSCALL_FUNC(id,name) \ + __ASM_GLOBAL_FUNC( name, \ + __ASM_SEH(".seh_endprologue\n\t") \ + ".byte 0x4c,0x8b,0xd1\n\t" /* movq %rcx,%r10 */ \ + ".byte 0xb8\n\t" /* movl $i,%eax */ \ + ".long (" #id ")\n\t" \ + ".byte 0xf6,0x04,0x25,0x08,0x03,0xfe,0x7f,0x01\n\t" /* testb $1,0x7ffe0308 */ \ + ".byte 0x75,0x03\n\t" /* jne 1f */ \ + ".byte 0x0f,0x05\n\t" /* syscall */ \ + ".byte 0xc3\n\t" /* ret */ \ + "jmp 1f\n\t" \ + ".byte 0xc3\n" /* ret */ \ + "nop\n" \ + "1:\tcallq *" __ASM_NAME("__wine_syscall_dispatcher") "(%rip)\n\t" \ + "ret" ) +# endif +#elif defined __arm__ +# define __ASM_SYSCALL_FUNC(id,name,args) \ + __ASM_GLOBAL_FUNC( name, \ + "push {r0-r3}\n\t" \ + "movw ip, #(" #id ")\n\t" \ + "mov r3, lr\n\t" \ + "bl " __ASM_NAME("__wine_syscall") "\n\t" \ + "bx lr" ) +# ifndef __PIC__ +# define DEFINE_SYSCALL_HELPER32() \ + __ASM_GLOBAL_FUNC( __wine_syscall, \ + "movw r0, :lower16:" __ASM_NAME("__wine_syscall_dispatcher") "\n\t" \ + "movt r0, :upper16:" __ASM_NAME("__wine_syscall_dispatcher") "\n\t" \ + "ldr r0, [r0]\n\t" \ + "bx r0" ) +# elif defined __thumb__ +# define DEFINE_SYSCALL_HELPER32() \ + __ASM_GLOBAL_FUNC( __wine_syscall, \ + "ldr r0, 2f\n" \ + "1:\tadd r0, pc\n\t" \ + "ldr r0, [r0]\n\t" \ + "bx r0\n" \ + "2:\t.long " __ASM_NAME("__wine_syscall_dispatcher") "-1b-4" ) +# else +# define DEFINE_SYSCALL_HELPER32() \ + __ASM_GLOBAL_FUNC( __wine_syscall, \ + "ldr r0, 2f\n" \ + "1:\tadd r0, pc\n\t" \ + "ldr r0, [r0]\n\t" \ + "bx r0\n" \ + "2:\t.long " __ASM_NAME("__wine_syscall_dispatcher") "-1b-8" ) +# endif +#endif + #endif /* __WINE_WINE_ASM_H */ diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index e3bb8b7f3db..4a1146c8c9d 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1399,6 +1399,8 @@ void output_syscalls( DLLSPEC *spec ) int i, count; ORDDEF **syscalls = NULL; + if (!spec->syscall_table) return; + for (i = count = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i];

1 0

Alexandre Julliard : wusa: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 20 Nov '23

20 Nov '23

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

Alexandre Julliard : explorer: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 20 Nov '23

20 Nov '23

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 20 Nov '23

20 Nov '23

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: Fix GetStrCodePages for characters with different codepages.
by Alexandre Julliard 20 Nov '23

20 Nov '23

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

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

20 Nov '23

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

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

20 Nov '23

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

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

20 Nov '23

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

Dmitry Timoshkov : shell32: Improve FolderView2::GetViewModeAndIconSize() stub.
by Alexandre Julliard 20 Nov '23

20 Nov '23

Module: wine Branch: master Commit: a8e1ab6422f6028a260fafde40ddfdc24f334a61 URL: https://gitlab.winehq.org/wine/wine/-/commit/a8e1ab6422f6028a260fafde40ddfd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 4 11:11:04 2022 +0300 shell32: Improve FolderView2::GetViewModeAndIconSize() stub. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/shlview.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index d6b917496c2..83fb206af52 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -3038,8 +3038,13 @@ static HRESULT WINAPI FolderView2_GetViewModeAndIconSize(IFolderView2 *iface, FO int *size) { IShellViewImpl *This = impl_from_IFolderView2(iface); + FIXME("(%p)->(%p %p), stub\n", This, mode, size); - return E_NOTIMPL; + + *size = 16; /* FIXME */ + *mode = This->FolderSettings.ViewMode; + + return S_OK; } static HRESULT WINAPI FolderView2_SetGroupSubsetCount(IFolderView2 *iface, UINT visible_rows)

1 0

Nell Hardcastle : hidclass.sys: Add DualSense Edge to device_strings.
by Alexandre Julliard 20 Nov '23

20 Nov '23

Module: wine Branch: master Commit: 12f50afe9a1bce267ca0d154e53d71a837929419 URL: https://gitlab.winehq.org/wine/wine/-/commit/12f50afe9a1bce267ca0d154e53d71… Author: Nell Hardcastle <nell(a)dev-nell.com> Date: Sun Nov 19 09:27:41 2023 -0800 hidclass.sys: Add DualSense Edge to device_strings. --- dlls/hidclass.sys/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index d673a8c2e88..8fde1fe10a5 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -403,6 +403,7 @@ static const struct device_strings device_strings[] = { .id = L"VID_054C&PID_09CC", .product = L"Wireless Controller" }, { .id = L"VID_054C&PID_0BA0", .product = L"Wireless Controller" }, { .id = L"VID_054C&PID_0CE6", .product = L"Wireless Controller" }, + { .id = L"VID_054C&PID_0DF2", .product = L"Wireless Controller" }, }; static const WCHAR *find_device_string( const WCHAR *device_id, ULONG index )

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
99
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 November 2023