wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

Alexandre Julliard : taskmgr: Fetch the debug channels from the PEB memory block.
by Alexandre Julliard 24 May '21

24 May '21

Module: wine Branch: master Commit: 0913e43bf976b5607665c416e979193a6078bd89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0913e43bf976b5607665c416… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 24 21:32:11 2021 +0200 taskmgr: Fetch the debug channels from the PEB memory block. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/dbgchnl.c | 60 ++++++--------------------------------------- programs/taskmgr/procpage.c | 3 --- programs/taskmgr/taskmgr.h | 2 -- 3 files changed, 7 insertions(+), 58 deletions(-) diff --git a/programs/taskmgr/dbgchnl.c b/programs/taskmgr/dbgchnl.c index 7200eb476c7..2d160bf4b50 100644 --- a/programs/taskmgr/dbgchnl.c +++ b/programs/taskmgr/dbgchnl.c @@ -28,7 +28,6 @@ #include <windows.h> #include <commctrl.h> #include <winnt.h> -#include <dbghelp.h> #include "taskmgr.h" #include "perfdata.h" @@ -49,35 +48,6 @@ * setting for a fixme:s or err:s */ -static DWORD (WINAPI *pSymSetOptions)(DWORD); -static BOOL (WINAPI *pSymInitialize)(HANDLE, PSTR, BOOL); -static DWORD (WINAPI *pSymLoadModule)(HANDLE, HANDLE, PCSTR, PCSTR, DWORD, DWORD); -static BOOL (WINAPI *pSymCleanup)(HANDLE); -static BOOL (WINAPI *pSymFromName)(HANDLE, PCSTR, PSYMBOL_INFO); - -BOOL AreDebugChannelsSupported(void) -{ - static HANDLE hDbgHelp /* = NULL */; - - static const WCHAR wszDbgHelp[] = {'D','B','G','H','E','L','P','.','D','L','L',0}; - - if (hDbgHelp) return TRUE; - - if (!(hDbgHelp = LoadLibraryW(wszDbgHelp))) return FALSE; - pSymSetOptions = (void*)GetProcAddress(hDbgHelp, "SymSetOptions"); - pSymInitialize = (void*)GetProcAddress(hDbgHelp, "SymInitialize"); - pSymLoadModule = (void*)GetProcAddress(hDbgHelp, "SymLoadModule"); - pSymFromName = (void*)GetProcAddress(hDbgHelp, "SymFromName"); - pSymCleanup = (void*)GetProcAddress(hDbgHelp, "SymCleanup"); - if (!pSymSetOptions || !pSymInitialize || !pSymLoadModule || !pSymCleanup || !pSymFromName) - { - FreeLibrary(hDbgHelp); - hDbgHelp = NULL; - return FALSE; - } - return TRUE; -} - static DWORD get_selected_pid(void) { LVITEMW lvitem; @@ -160,27 +130,6 @@ static int change_channel_CB(HANDLE hProcess, void* addr, struct __wine_debug_ch return 1; } -static void* get_symbol(HANDLE hProcess, const char* name) -{ - char buffer[sizeof(IMAGEHLP_SYMBOL) + 256]; - SYMBOL_INFO* si = (SYMBOL_INFO*)buffer; - void* ret = NULL; - - /* also ask for wine extensions (loading symbols from ELF files) */ - pSymSetOptions(SYMOPT_DEFERRED_LOADS | SYMOPT_PUBLICS_ONLY | 0x40000000); - /* FIXME: the TRUE option is due to the fact that dbghelp requires it - * when loading an ELF module - */ - if (pSymInitialize(hProcess, NULL, TRUE)) - { - si->SizeOfStruct = sizeof(*si); - si->MaxNameLen = sizeof(buffer) - sizeof(IMAGEHLP_SYMBOL); - if (pSymFromName(hProcess, name, si)) - ret = (void*)(ULONG_PTR)si->Address; - pSymCleanup(hProcess); - } - return ret; -} typedef int (*EnumChannelCB)(HANDLE, void*, struct __wine_debug_channel*, void*); @@ -193,11 +142,16 @@ typedef int (*EnumChannelCB)(HANDLE, void*, struct __wine_debug_channel*, void*) static int enum_channel(HANDLE hProcess, EnumChannelCB ce, void* user) { struct __wine_debug_channel channel; + PROCESS_BASIC_INFORMATION info; int ret = 1; void* addr; - if (!(addr = get_symbol(hProcess, "libwine.so.1!debug_options"))) return -1; - + NtQueryInformationProcess( hProcess, ProcessBasicInformation, &info, sizeof(info), NULL ); +#ifdef _WIN64 + addr = (char *)info.PebBaseAddress + 0x2000; +#else + addr = (char *)info.PebBaseAddress + 0x1000; +#endif while (ret && addr && ReadProcessMemory(hProcess, addr, &channel, sizeof(channel), NULL)) { if (!channel.name[0]) break; diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c index 5ea2e6b044f..baba6c6a06b 100644 --- a/programs/taskmgr/procpage.c +++ b/programs/taskmgr/procpage.c @@ -97,9 +97,6 @@ static void ProcessPageShowContextMenu(DWORD dwProcessId) if (si.dwNumberOfProcessors < 2) RemoveMenu(hSubMenu, ID_PROCESS_PAGE_SETAFFINITY, MF_BYCOMMAND); - - if (!AreDebugChannelsSupported()) - RemoveMenu(hSubMenu, ID_PROCESS_PAGE_DEBUGCHANNELS, MF_BYCOMMAND); switch (dwProcessPriorityClass) { case REALTIME_PRIORITY_CLASS: diff --git a/programs/taskmgr/taskmgr.h b/programs/taskmgr/taskmgr.h index ed220beebd2..b8c383d5f4d 100644 --- a/programs/taskmgr/taskmgr.h +++ b/programs/taskmgr/taskmgr.h @@ -157,8 +157,6 @@ LPWSTR GetLastErrorText( LPWSTR lpwszBuf, DWORD dwSize ); void OnAbout(void); -BOOL AreDebugChannelsSupported(void); - void ProcessPage_OnSetAffinity(void); void ProcessPage_OnDebug(void); void ProcessPage_OnEndProcess(void);

1 0

Alexandre Julliard : ntdll: Fetch the debug channels from the PEB memory block on the PE side.
by Alexandre Julliard 24 May '21

24 May '21

Module: wine Branch: master Commit: 1e5eee0fc318459d7ef071998e8ed05f2530d2c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e5eee0fc318459d7ef07199… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 24 21:35:12 2021 +0200 ntdll: Fetch the debug channels from the PEB memory block on the PE side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 30 +++++++++++++++++++++++++++++- dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unixlib.h | 3 +-- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index a95880ca4bd..bcf010724c4 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -37,6 +37,16 @@ WINE_DECLARE_DEBUG_CHANNEL(thread); struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffe0000; +static int nb_debug_options; +static struct __wine_debug_channel *debug_options; + +static void init_options(void) +{ + unsigned int offset = page_size * (sizeof(void *) / 4); + + debug_options = (struct __wine_debug_channel *)((char *)NtCurrentTeb()->Peb + offset); + while (debug_options[nb_debug_options].name[0]) nb_debug_options++; +} /*********************************************************************** * __wine_dbg_get_channel_flags (NTDLL.@) @@ -45,7 +55,25 @@ struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffe0000; */ unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ) { - return unix_funcs->dbg_get_channel_flags( channel ); + int min, max, pos, res; + unsigned char default_flags; + + if (!debug_options) init_options(); + + min = 0; + max = nb_debug_options - 1; + while (min <= max) + { + pos = (min + max) / 2; + res = strcmp( channel->name, debug_options[pos].name ); + if (!res) return debug_options[pos].flags; + if (res < 0) max = pos - 1; + else min = pos + 1; + } + /* no option for this channel */ + default_flags = debug_options[nb_debug_options].flags; + if (channel->flags & (1 << __WINE_DBCL_INIT)) channel->flags = default_flags; + return default_flags; } /*********************************************************************** diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 1b79b71b252..ff49cd5f26b 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1840,7 +1840,6 @@ static struct unix_funcs unix_funcs = init_builtin_dll, init_unix_lib, unwind_builtin_dll, - __wine_dbg_get_channel_flags, __wine_dbg_strdup, __wine_dbg_output, __wine_dbg_header, diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 04ae8230b1a..d0f2f4ed508 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,7 +26,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 120 +#define NTDLL_UNIXLIB_VERSION 121 struct unix_funcs { @@ -80,7 +80,6 @@ struct unix_funcs CONTEXT *context ); /* debugging functions */ - unsigned char (CDECL *dbg_get_channel_flags)( struct __wine_debug_channel *channel ); const char * (CDECL *dbg_strdup)( const char *str ); int (CDECL *dbg_output)( const char *str ); int (CDECL *dbg_header)( enum __wine_debug_class cls, struct __wine_debug_channel *channel,

1 0

Alexandre Julliard : ntdll: Store debug options in the PEB memory block.
by Alexandre Julliard 24 May '21

24 May '21

Module: wine Branch: master Commit: d389da095313682681298af1351c79511337508e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d389da095313682681298af1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 24 21:29:14 2021 +0200 ntdll: Store debug options in the PEB memory block. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/debug.c | 11 +++++++++++ dlls/ntdll/unix/virtual.c | 3 --- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index e6c3f67523e..71e4acc483a 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -292,7 +292,18 @@ int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_ */ void dbg_init(void) { + struct __wine_debug_channel *options, default_option = { default_flags }; + setbuf( stdout, NULL ); setbuf( stderr, NULL ); + + if (nb_debug_options == -1) init_options(); + + options = (struct __wine_debug_channel *)((char *)NtCurrentTeb()->Peb + (is_win64 ? 2 : 1) * page_size); + memcpy( options, debug_options, nb_debug_options * sizeof(*options) ); + free( debug_options ); + debug_options = options; + options[nb_debug_options] = default_option; + ntdll_get_thread_data()->debug_info = (struct debug_info *)(options + nb_debug_options + 1); init_done = TRUE; } diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index bcab898b0fc..4c26e807918 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2894,7 +2894,6 @@ static TEB *init_teb( void *ptr, PEB *peb, BOOL is_wow ) */ TEB *virtual_alloc_first_teb(void) { - struct ntdll_thread_data *thread_data; TEB *teb; PEB *peb; void *ptr; @@ -2921,8 +2920,6 @@ TEB *virtual_alloc_first_teb(void) peb = init_peb( (char *)teb_block + 31 * block_size ); teb = init_teb( ptr, peb, FALSE ); *(ULONG_PTR *)&peb->CloudFileFlags = get_image_address(); - thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; - thread_data->debug_info = (struct debug_info *)((char *)teb_block + 31 * block_size + 2 * page_size); return teb; }

1 0

Alexandre Julliard : ntdll: Replace __wine_make_process_system by a Wine-specific NtSetInformationProcess() class.
by Alexandre Julliard 24 May '21

24 May '21

Module: wine Branch: master Commit: 4e8fcc41ca42f7e047e4a5cb708a75447a753143 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e8fcc41ca42f7e047e4a5cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 24 15:56:26 2021 +0200 ntdll: Replace __wine_make_process_system by a Wine-specific NtSetInformationProcess() class. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 - dlls/ntdll/unix/process.c | 30 +++++++++++------------------- dlls/sechost/service.c | 5 ++--- include/wine/server_protocol.h | 4 ++-- include/winternl.h | 5 ++++- programs/services/rpc.c | 5 ++--- server/process.c | 8 +++++++- server/protocol.def | 1 + server/request.h | 1 + server/trace.c | 1 + 10 files changed, 31 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index f05e9c39a88..4eb7aec1aa5 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1610,7 +1610,6 @@ @ cdecl -syscall -norelay wine_server_call(ptr) @ cdecl -syscall wine_server_fd_to_handle(long long long ptr) @ cdecl -syscall wine_server_handle_to_fd(long long ptr ptr) -@ cdecl -syscall __wine_make_process_system() # Unix interface @ cdecl __wine_set_unix_funcs(long ptr) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 340fe9cc304..c1ff0289cf2 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1485,6 +1485,17 @@ NTSTATUS WINAPI NtSetInformationProcess( HANDLE handle, PROCESSINFOCLASS class, break; } + case ProcessWineMakeProcessSystem: + if (size != sizeof(HANDLE *)) return STATUS_INFO_LENGTH_MISMATCH; + SERVER_START_REQ( make_process_system ) + { + req->handle = wine_server_obj_handle( handle ); + if (!(ret = wine_server_call( req ))) + *(HANDLE *)info = wine_server_ptr_handle( reply->event ); + } + SERVER_END_REQ; + return ret; + default: FIXME( "(%p,0x%08x,%p,0x%08x) stub\n", handle, class, info, size ); ret = STATUS_NOT_IMPLEMENTED; @@ -1605,22 +1616,3 @@ NTSTATUS WINAPI NtDebugContinue( HANDLE handle, CLIENT_ID *client, NTSTATUS stat SERVER_END_REQ; return ret; } - - -/*********************************************************************** - * __wine_make_process_system (NTDLL.@) - * - * Mark the current process as a system process. - * Returns the event that is signaled when all non-system processes have exited. - */ -HANDLE CDECL __wine_make_process_system(void) -{ - HANDLE ret = 0; - - SERVER_START_REQ( make_process_system ) - { - if (!wine_server_call( req )) ret = wine_server_ptr_handle( reply->event ); - } - SERVER_END_REQ; - return ret; -} diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c index 305c1169bd4..e4e152b0824 100644 --- a/dlls/sechost/service.c +++ b/dlls/sechost/service.c @@ -90,8 +90,6 @@ static unsigned int nb_services; static HANDLE service_event; static BOOL stop_service; -extern HANDLE CDECL __wine_make_process_system(void); - static WCHAR *heap_strdupAtoW( const char *src ) { WCHAR *dst = NULL; @@ -1845,7 +1843,8 @@ static BOOL service_run_main_thread(void) stop_service = FALSE; /* FIXME: service_control_dispatcher should be merged into the main thread */ - wait_handles[0] = __wine_make_process_system(); + NtSetInformationProcess( GetCurrentProcess(), ProcessWineMakeProcessSystem, + &wait_handles[0], sizeof(HANDLE *) ); wait_handles[1] = CreateThread( NULL, 0, service_control_dispatcher, disp, 0, NULL ); wait_handles[2] = service_event; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e6775959a22..b9d29c1d560 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4917,7 +4917,7 @@ struct get_kernel_object_handle_reply struct make_process_system_request { struct request_header __header; - char __pad_12[4]; + obj_handle_t handle; }; struct make_process_system_reply { @@ -6267,7 +6267,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 703 +#define SERVER_PROTOCOL_VERSION 704 /* ### protocol_version end ### */ diff --git a/include/winternl.h b/include/winternl.h index 691638f359c..aa8c76a536a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1455,7 +1455,10 @@ typedef enum _PROCESSINFOCLASS { ProcessThreadStackAllocation = 41, ProcessWorkingSetWatchEx = 42, ProcessImageFileNameWin32 = 43, - MaxProcessInfoClass + MaxProcessInfoClass, +#ifdef __WINESRC__ + ProcessWineMakeProcessSystem = 1000, +#endif } PROCESSINFOCLASS, PROCESS_INFORMATION_CLASS; #define MEM_EXECUTE_OPTION_DISABLE 0x01 diff --git a/programs/services/rpc.c b/programs/services/rpc.c index df69a741b51..8d688c2f904 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -35,8 +35,6 @@ #include "services.h" #include "svcctl.h" -extern HANDLE CDECL __wine_make_process_system(void); - WINE_DEFAULT_DEBUG_CHANNEL(service); static const GENERIC_MAPPING g_scm_generic = @@ -2135,7 +2133,8 @@ DWORD RPC_Init(void) return err; } - exit_event = __wine_make_process_system(); + NtSetInformationProcess( GetCurrentProcess(), ProcessWineMakeProcessSystem, + &exit_event, sizeof(HANDLE *) ); return ERROR_SUCCESS; } diff --git a/server/process.c b/server/process.c index e91a63bed08..87ff3186bb5 100644 --- a/server/process.c +++ b/server/process.c @@ -1635,7 +1635,7 @@ DECL_HANDLER(get_process_idle_event) /* make the current process a system process */ DECL_HANDLER(make_process_system) { - struct process *process = current->process; + struct process *process; struct thread *thread; if (!shutdown_event) @@ -1644,8 +1644,13 @@ DECL_HANDLER(make_process_system) release_object( shutdown_event ); } + if (!(process = get_process_from_handle( req->handle, PROCESS_SET_INFORMATION ))) return; + if (!(reply->event = alloc_handle( current->process, shutdown_event, SYNCHRONIZE, 0 ))) + { + release_object( process ); return; + } if (!process->is_system) { @@ -1655,6 +1660,7 @@ DECL_HANDLER(make_process_system) if (!--user_processes && !shutdown_stage && master_socket_timeout != TIMEOUT_INFINITE) shutdown_timeout = add_timeout_user( master_socket_timeout, server_shutdown_timeout, NULL ); } + release_object( process ); } /* create a new job object */ diff --git a/server/protocol.def b/server/protocol.def index 1407a7b4a54..62a584e4cc9 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3430,6 +3430,7 @@ struct handle_info /* Make the current process a system process */ @REQ(make_process_system) + obj_handle_t handle; /* handle to the process */ @REPLY obj_handle_t event; /* event signaled when all user processes have exited */ @END diff --git a/server/request.h b/server/request.h index 3261308265f..ce1edb548b7 100644 --- a/server/request.h +++ b/server/request.h @@ -2091,6 +2091,7 @@ C_ASSERT( FIELD_OFFSET(struct get_kernel_object_handle_request, access) == 24 ); C_ASSERT( sizeof(struct get_kernel_object_handle_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_kernel_object_handle_reply, handle) == 8 ); C_ASSERT( sizeof(struct get_kernel_object_handle_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct make_process_system_request, handle) == 12 ); C_ASSERT( sizeof(struct make_process_system_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct make_process_system_reply, event) == 8 ); C_ASSERT( sizeof(struct make_process_system_reply) == 16 ); diff --git a/server/trace.c b/server/trace.c index 6084f876875..ab805a05234 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4181,6 +4181,7 @@ static void dump_get_kernel_object_handle_reply( const struct get_kernel_object_ static void dump_make_process_system_request( const struct make_process_system_request *req ) { + fprintf( stderr, " handle=%04x", req->handle ); } static void dump_make_process_system_reply( const struct make_process_system_reply *req )

1 0

Jiangyi Chen : gdi32: Delete the external font reg key when face's name matches but the file path does not.
by Alexandre Julliard 24 May '21

24 May '21

Module: wine Branch: master Commit: d7b9b306cb94a43ac2cd44feac8adbf639f5ec78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7b9b306cb94a43ac2cd44fe… Author: Jiangyi Chen <cjy520lcy(a)163.com> Date: Mon May 24 11:30:46 2021 +0100 gdi32: Delete the external font reg key when face's name matches but the file path does not. Signed-off-by: Jiangyi Chen <chenjiangyi(a)uniontech.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 2d2831ec725..49775b7a806 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -7881,9 +7881,9 @@ static void update_external_font_keys(void) { if (type != REG_SZ) goto next; if ((tmp = wcsrchr( value, ' ' )) && !facename_compare( tmp, L" (TrueType)", -1 )) *tmp = 0; - if ((face = find_face_from_full_name( value ))) + if ((face = find_face_from_full_name( value )) && !wcsicmp( face->file, path )) { - if (!wcsicmp( face->file, path )) face->flags |= ADDFONT_EXTERNAL_FOUND; + face->flags |= ADDFONT_EXTERNAL_FOUND; goto next; } if (tmp && !*tmp) *tmp = ' ';

1 0

Jactry Zeng : riched20/tests: Test ITextServices_TxGetText() with OLE obejct.
by Alexandre Julliard 24 May '21

24 May '21

Module: wine Branch: master Commit: 3e08cebeee6e6fd56a47cea62bb1ae58232c6d21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e08cebeee6e6fd56a47cea6… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu May 20 15:56:12 2021 +0800 riched20/tests: Test ITextServices_TxGetText() with OLE obejct. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/txtsrv.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index fe27be26edb..1f789da8a37 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -650,9 +650,30 @@ static BOOL init_texthost(ITextServices **txtserv, ITextHost **ret) return TRUE; } +static void fill_reobject_struct(REOBJECT *reobj, LONG cp, LPOLEOBJECT poleobj, + LPSTORAGE pstg, LPOLECLIENTSITE polesite, LONG sizel_cx, + LONG sizel_cy, DWORD aspect, DWORD flags, DWORD user) +{ + reobj->cbStruct = sizeof(*reobj); + reobj->clsid = CLSID_NULL; + reobj->cp = cp; + reobj->poleobj = poleobj; + reobj->pstg = pstg; + reobj->polesite = polesite; + reobj->sizel.cx = sizel_cx; + reobj->sizel.cy = sizel_cy; + reobj->dvaspect = aspect; + reobj->dwFlags = flags; + reobj->dwUser = user; +} + static void test_TxGetText(void) { + const WCHAR *expected_string; + IOleClientSite *clientsite; ITextServices *txtserv; + IRichEditOle *reole; + REOBJECT reobject; ITextHost *host; HRESULT hres; BSTR rettext; @@ -664,6 +685,24 @@ static void test_TxGetText(void) ok(hres == S_OK, "ITextServices_TxGetText failed (result = %x)\n", hres); SysFreeString(rettext); + hres = ITextServices_TxSetText(txtserv, L"abcdefg"); + ok(hres == S_OK, "Got hres: %#x.\n", hres); + hres = ITextServices_QueryInterface(txtserv, &IID_IRichEditOle, (void **)&reole); + ok(hres == S_OK, "Got hres: %#x.\n", hres); + hres = IRichEditOle_GetClientSite(reole, &clientsite); + ok(hres == S_OK, "Got hres: %#x.\n", hres); + expected_string = L"abc\xfffc""defg"; + fill_reobject_struct(&reobject, 3, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, 1); + hres = IRichEditOle_InsertObject(reole, &reobject); + ok(hres == S_OK, "Got hres: %#x.\n", hres); + hres = ITextServices_TxGetText(txtserv, &rettext); + ok(hres == S_OK, "Got hres: %#x.\n", hres); + ok(lstrlenW(rettext) == lstrlenW(expected_string), "Got wrong length: %d.\n", lstrlenW(rettext)); + todo_wine ok(!lstrcmpW(rettext, expected_string), "Got wrong content: %s.\n", debugstr_w(rettext)); + SysFreeString(rettext); + IOleClientSite_Release(clientsite); + IRichEditOle_Release(reole); + ITextServices_Release(txtserv); ITextHost_Release(host); }

1 0

Jactry Zeng : riched20/tests: Test IRichEditOle_InsertObject() with specified character position.
by Alexandre Julliard 24 May '21

24 May '21

Module: wine Branch: master Commit: db7964bb2cffe04a483ac913158379544a573e7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=db7964bb2cffe04a483ac913… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu May 20 15:56:11 2021 +0800 riched20/tests: Test IRichEditOle_InsertObject() with specified character position. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/richole.c | 180 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 177 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 9f463fd69e0..c2457ae5146 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3252,9 +3252,22 @@ static void test_InsertObject(void) REOBJECT reo1, reo2, reo3, received_reo; HRESULT hr; HWND hwnd; - LONG count; + const WCHAR *expected_string; + const CHAR *expected_stringA; + ITextSelection *selection; + IDataObject *dataobject; + TEXTRANGEA textrange; + FORMATETC formatetc; + CHARRANGE charrange; + GETTEXTEX gettextex; + STGMEDIUM stgmedium; + WCHAR buffer[1024]; + CHAR bufferA[1024]; + LONG count, result; + ITextRange *range; + BSTR bstr; - create_interfaces(&hwnd, &reole, &doc, NULL); + create_interfaces(&hwnd, &reole, &doc, &selection); SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); hr = IRichEditOle_InsertObject(reole, NULL); @@ -3352,7 +3365,168 @@ static void test_InsertObject(void) hr = IRichEditOle_GetObject(reole, REO_IOB_SELECTION, &received_reo, REO_GETOBJ_ALL_INTERFACES); ok(hr == E_INVALIDARG, "IRichEditOle_GetObject should fail: 0x%08x\n", hr); - release_interfaces(&hwnd, &reole, &doc, NULL); + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); + + /* "abc|d|efg" */ + INSERT_REOBJECT(reole, &reo1, 3, 1); + INSERT_REOBJECT(reole, &reo2, 5, 2); + + SendMessageW(hwnd, EM_SETSEL, 2, 3); + result = SendMessageW(hwnd, EM_SELECTIONTYPE, 0, 0); + ok(result == SEL_TEXT, "Got selection type: %x.\n", result); + + SendMessageW(hwnd, EM_SETSEL, 3, 4); + result = SendMessageW(hwnd, EM_SELECTIONTYPE, 0, 0); + todo_wine ok(result == SEL_OBJECT, "Got selection type: %x.\n", result); + todo_wine CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 1, NULL, NULL, reo1.polesite, 1); + + SendMessageW(hwnd, EM_SETSEL, 2, 4); + result = SendMessageW(hwnd, EM_SELECTIONTYPE, 0, 0); + todo_wine ok(result == (SEL_TEXT | SEL_OBJECT), "Got selection type: %x.\n", result); + + SendMessageW(hwnd, EM_SETSEL, 5, 6); + todo_wine CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 1, NULL, NULL, reo2.polesite, 2); + + expected_string = L"abc\xfffc""d\xfffc""efg"; + gettextex.cb = sizeof(buffer); + gettextex.flags = GT_DEFAULT; + gettextex.codepage = 1200; + gettextex.lpDefaultChar = NULL; + gettextex.lpUsedDefChar = NULL; + result = SendMessageW(hwnd, EM_GETTEXTEX, (WPARAM)&gettextex, (LPARAM)buffer); + ok(result == lstrlenW(expected_string), "Got wrong length: %d.\n", result); + todo_wine ok(!lstrcmpW(buffer, expected_string), "Got wrong content: %s.\n", debugstr_w(buffer)); + + gettextex.flags = GT_RAWTEXT; + memset(buffer, 0, sizeof(buffer)); + result = SendMessageW(hwnd, EM_GETTEXTEX, (WPARAM)&gettextex, (LPARAM)buffer); + ok(result == lstrlenW(expected_string), "Got wrong length: %d.\n", result); + todo_wine ok(!lstrcmpW(buffer, expected_string), "Got wrong content: %s.\n", debugstr_w(buffer)); + + expected_stringA = "abc d efg"; + memset(bufferA, 0, sizeof(bufferA)); + SendMessageA(hwnd, EM_SETSEL, 0, -1); + result = SendMessageA(hwnd, EM_GETSELTEXT, (WPARAM)sizeof(bufferA), (LPARAM)bufferA); + ok(result == strlen(expected_stringA), "Got wrong length: %d.\n", result); + todo_wine ok(!strcmp(bufferA, expected_stringA), "Got wrong content: %s.\n", bufferA); + + memset(bufferA, 0, sizeof(bufferA)); + textrange.lpstrText = bufferA; + textrange.chrg.cpMin = 0; + textrange.chrg.cpMax = 11; + result = SendMessageA(hwnd, EM_GETTEXTRANGE, 0, (LPARAM)&textrange); + ok(result == strlen(expected_stringA), "Got wrong length: %d.\n", result); + todo_wine ok(!strcmp(bufferA, expected_stringA), "Got wrong content: %s.\n", bufferA); + + expected_string = L"abc\xfffc""d\xfffc""efg\r"; + hr = ITextDocument_Range(doc, 0, 11, &range); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = ITextRange_GetText(range, &bstr); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(lstrlenW(bstr) == lstrlenW(expected_string), "Got wrong length: %d.\n", lstrlenW(bstr)); + todo_wine ok(!lstrcmpW(bstr, expected_string), "Got text: %s.\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = ITextRange_SetRange(range, 3, 4); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = ITextRange_GetChar(range, &result); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(result == 0xfffc, "Got char: %c\n", result); + ITextRange_Release(range); + + SendMessageW(hwnd, EM_SETSEL, 0, -1); + hr = ITextSelection_GetText(selection, &bstr); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(lstrlenW(bstr) == lstrlenW(expected_string), "Got wrong length: %d.\n", lstrlenW(bstr)); + todo_wine ok(!lstrcmpW(bstr, expected_string), "Got text: %s.\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + SendMessageW(hwnd, EM_SETSEL, 3, 4); + result = 0; + hr = ITextSelection_GetChar(selection, &result); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(result == 0xfffc, "Got char: %c\n", result); + + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)""); + result = SendMessageW(hwnd, EM_SETTEXTMODE, (WPARAM)TM_PLAINTEXT, 0); + ok(!result, "Got result %x.\n", result); + /* "abc|d|efg" */ + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); + INSERT_REOBJECT(reole, &reo1, 3, 1); + INSERT_REOBJECT(reole, &reo2, 5, 2); + + expected_string = L"abc d efg"; + charrange.cpMin = 0; + charrange.cpMax = 11; + hr = IRichEditOle_GetClipboardData(reole, &charrange, 1, &dataobject); + ok(hr == S_OK, "Got hr %#x.\n", hr); + formatetc.cfFormat = CF_UNICODETEXT; + formatetc.dwAspect = DVASPECT_CONTENT; + formatetc.ptd = NULL; + formatetc.tymed = TYMED_HGLOBAL; + formatetc.lindex = -1; + hr = IDataObject_GetData(dataobject, &formatetc, &stgmedium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(lstrlenW(stgmedium.hGlobal) == lstrlenW(expected_string), "Got wrong length: %d.\n", result); + todo_wine ok(!lstrcmpW(stgmedium.hGlobal, expected_string), "Got wrong content: %s.\n", debugstr_w(stgmedium.hGlobal)); + + expected_string = L"abc\xfffc""d\xfffc""efg"; + gettextex.cb = sizeof(buffer); + gettextex.flags = GT_DEFAULT; + gettextex.codepage = 1200; + gettextex.lpDefaultChar = NULL; + gettextex.lpUsedDefChar = NULL; + result = SendMessageW(hwnd, EM_GETTEXTEX, (WPARAM)&gettextex, (LPARAM)buffer); + ok(result == lstrlenW(expected_string), "Got wrong length: %d.\n", result); + todo_wine ok(!lstrcmpW(buffer, expected_string), "Got wrong content: %s.\n", debugstr_w(buffer)); + + gettextex.flags = GT_RAWTEXT; + memset(buffer, 0, sizeof(buffer)); + result = SendMessageW(hwnd, EM_GETTEXTEX, (WPARAM)&gettextex, (LPARAM)buffer); + ok(result == lstrlenW(expected_string), "Got wrong length: %d.\n", result); + todo_wine ok(!lstrcmpW(buffer, expected_string), "Got wrong content: %s.\n", debugstr_w(buffer)); + + expected_stringA = "abc d efg"; + memset(bufferA, 0, sizeof(bufferA)); + SendMessageA(hwnd, EM_SETSEL, 0, -1); + result = SendMessageA(hwnd, EM_GETSELTEXT, (WPARAM)sizeof(bufferA), (LPARAM)bufferA); + ok(result == strlen(expected_stringA), "Got wrong length: %d.\n", result); + todo_wine ok(!strcmp(bufferA, expected_stringA), "Got wrong content: %s.\n", bufferA); + + memset(bufferA, 0, sizeof(bufferA)); + textrange.lpstrText = bufferA; + textrange.chrg.cpMin = 0; + textrange.chrg.cpMax = 11; + result = SendMessageA(hwnd, EM_GETTEXTRANGE, 0, (LPARAM)&textrange); + ok(result == strlen(expected_stringA), "Got wrong length: %d.\n", result); + todo_wine ok(!strcmp(bufferA, expected_stringA), "Got wrong content: %s.\n", bufferA); + + expected_string = L"abc\xfffc""d\xfffc""efg"; + hr = ITextDocument_Range(doc, 0, 11, &range); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = ITextRange_GetText(range, &bstr); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(lstrlenW(bstr) == lstrlenW(expected_string), "Got wrong length: %d.\n", lstrlenW(bstr)); + todo_wine ok(!lstrcmpW(bstr, expected_string), "Got text: %s.\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = ITextRange_SetRange(range, 3, 4); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = ITextRange_GetChar(range, &result); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(result == 0xfffc, "Got char: %c\n", result); + ITextRange_Release(range); + + SendMessageW(hwnd, EM_SETSEL, 0, -1); + hr = ITextSelection_GetText(selection, &bstr); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(lstrlenW(bstr) == lstrlenW(expected_string), "Got wrong length: %d.\n", lstrlenW(bstr)); + todo_wine ok(!lstrcmpW(bstr, expected_string), "Got text: %s.\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + SendMessageW(hwnd, EM_SETSEL, 3, 4); + result = 0; + hr = ITextSelection_GetChar(selection, &result); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(result == 0xfffc, "Got char: %c\n", result); + + release_interfaces(&hwnd, &reole, &doc, &selection); } static void test_GetStoryLength(void)

1 0

Jactry Zeng : riched20/tests: Add INSERT_REOBJECT() for simplifying tests of IRichEditOle_InsertObject().
by Alexandre Julliard 24 May '21

24 May '21

Module: wine Branch: master Commit: 919ff18629b398aad56830c179f067dcaca6c69a URL: https://source.winehq.org/git/wine.git/?a=commit;h=919ff18629b398aad56830c1… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu May 20 15:56:10 2021 +0800 riched20/tests: Add INSERT_REOBJECT() for simplifying tests of IRichEditOle_InsertObject(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/richole.c | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 0fab1106a29..9f463fd69e0 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3230,12 +3230,25 @@ static void _check_reobject_struct(IRichEditOle *reole, LONG index, DWORD flags, ok_(__FILE__,line)(reobj.dwUser == user, "got wrong user-defined value.\n"); } +#define INSERT_REOBJECT(reole,reobj,cp,user) \ + _insert_reobject(reole, reobj, cp, user, __LINE__) +static void _insert_reobject(IRichEditOle *reole, REOBJECT *reobj, LONG cp, DWORD user, int line) +{ + IOleClientSite *clientsite; + HRESULT hr; + hr = IRichEditOle_GetClientSite(reole, &clientsite); + ok_(__FILE__,line)(hr == S_OK, "IRichEditOle_GetClientSite got hr %#x.\n", hr); + fill_reobject_struct(reobj, cp, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, user); + hr = IRichEditOle_InsertObject(reole, reobj); + ok_(__FILE__,line)(hr == S_OK, "IRichEditOle_InsertObject got hr %#x.\n", hr); + IOleClientSite_Release(clientsite); +} + static void test_InsertObject(void) { static CHAR test_text1[] = "abcdefg"; IRichEditOle *reole = NULL; ITextDocument *doc = NULL; - IOleClientSite *clientsite; REOBJECT reo1, reo2, reo3, received_reo; HRESULT hr; HWND hwnd; @@ -3249,36 +3262,21 @@ static void test_InsertObject(void) /* insert object1 in (0, 1)*/ SendMessageA(hwnd, EM_SETSEL, 0, 1); - hr = IRichEditOle_GetClientSite(reole, &clientsite); - ok(hr == S_OK, "IRichEditOle_GetClientSite failed: 0x%08x\n", hr); - fill_reobject_struct(&reo1, REO_CP_SELECTION, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, 1); - hr = IRichEditOle_InsertObject(reole, &reo1); - ok(hr == S_OK, "IRichEditOle_InsertObject failed: 0x%08x\n", hr); + INSERT_REOBJECT(reole, &reo1, REO_CP_SELECTION, 1); count = IRichEditOle_GetObjectCount(reole); ok(count == 1, "got wrong object count: %d\n", count); - IOleClientSite_Release(clientsite); /* insert object2 in (2, 3)*/ SendMessageA(hwnd, EM_SETSEL, 2, 3); - hr = IRichEditOle_GetClientSite(reole, &clientsite); - ok(hr == S_OK, "IRichEditOle_GetClientSite failed: 0x%08x\n", hr); - fill_reobject_struct(&reo2, REO_CP_SELECTION, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, 2); - hr = IRichEditOle_InsertObject(reole, &reo2); - ok(hr == S_OK, "IRichEditOle_InsertObject failed: 0x%08x\n", hr); + INSERT_REOBJECT(reole, &reo2, REO_CP_SELECTION, 2); count = IRichEditOle_GetObjectCount(reole); ok(count == 2, "got wrong object count: %d\n", count); - IOleClientSite_Release(clientsite); /* insert object3 in (1, 2)*/ SendMessageA(hwnd, EM_SETSEL, 1, 2); - hr = IRichEditOle_GetClientSite(reole, &clientsite); - ok(hr == S_OK, "IRichEditOle_GetClientSite failed: 0x%08x\n", hr); - fill_reobject_struct(&reo3, REO_CP_SELECTION, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, 3); - hr = IRichEditOle_InsertObject(reole, &reo3); - ok(hr == S_OK, "IRichEditOle_InsertObject failed: 0x%08x\n", hr); + INSERT_REOBJECT(reole, &reo3, REO_CP_SELECTION, 3); count = IRichEditOle_GetObjectCount(reole); ok(count == 3, "got wrong object count: %d\n", count); - IOleClientSite_Release(clientsite); /* tests below show that order of rebject (from 0 to 2) is: reo1,reo3,reo2 */ CHECK_REOBJECT_STRUCT(reole, 0, REO_GETOBJ_ALL_INTERFACES, 0, NULL, NULL, reo1.polesite, 1);

1 0

Jactry Zeng : riched20/tests: Simplify tests of IRichEditOle_InsertObject() by improving CHECK_REOBJECT_STRUCT().
by Alexandre Julliard 24 May '21

24 May '21

Module: wine Branch: master Commit: 99753d0c646cef31eebeec56bd17a26a9895af13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99753d0c646cef31eebeec56… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu May 20 15:56:09 2021 +0800 riched20/tests: Simplify tests of IRichEditOle_InsertObject() by improving CHECK_REOBJECT_STRUCT(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/richole.c | 144 ++++++++++++++---------------------------- 1 file changed, 48 insertions(+), 96 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=99753d0c646cef31eebe…

1 0

Nikolay Sivov : mfplat/allocator: Apply default bindflags only for RGBA formats.
by Alexandre Julliard 24 May '21

24 May '21

Module: wine Branch: master Commit: 093d0a85a8fee8f56e77aba0fbd1a3c4e3ae5743 URL: https://source.winehq.org/git/wine.git/?a=commit;h=093d0a85a8fee8f56e77aba0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 24 11:04:20 2021 +0300 mfplat/allocator: Apply default bindflags only for RGBA formats. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/sample.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index 93c5f923cc2..09c65b5fcf1 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -1379,10 +1379,12 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u unsigned int max_sample_count, IMFAttributes *attributes, IMFMediaType *media_type) { struct surface_service service; + DXGI_FORMAT dxgi_format; unsigned int i; GUID major, subtype; UINT64 frame_size; IMFSample *sample; + D3D11_USAGE usage; HRESULT hr; if (FAILED(hr = IMFMediaType_GetMajorType(media_type, &major))) @@ -1400,22 +1402,30 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u if (sample_count > max_sample_count) return E_INVALIDARG; - allocator->frame_desc.usage = D3D11_USAGE_DEFAULT; + usage = D3D11_USAGE_DEFAULT; if (attributes) { IMFAttributes_GetUINT32(attributes, &MF_SA_BUFFERS_PER_SAMPLE, &allocator->frame_desc.buffer_count); - IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_USAGE, &allocator->frame_desc.usage); + IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_USAGE, &usage); } - if (allocator->frame_desc.usage == D3D11_USAGE_IMMUTABLE || allocator->frame_desc.usage > D3D11_USAGE_STAGING) + if (usage == D3D11_USAGE_IMMUTABLE || usage > D3D11_USAGE_STAGING) return E_INVALIDARG; - if (allocator->frame_desc.usage == D3D11_USAGE_DEFAULT) - allocator->frame_desc.bindflags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET; - else if (allocator->frame_desc.usage == D3D11_USAGE_DYNAMIC) - allocator->frame_desc.bindflags = D3D11_BIND_SHADER_RESOURCE; - else - allocator->frame_desc.bindflags = 0; + dxgi_format = MFMapDX9FormatToDXGIFormat(subtype.Data1); + + allocator->frame_desc.bindflags = 0; + allocator->frame_desc.usage = D3D11_USAGE_DEFAULT; + + if (dxgi_format == DXGI_FORMAT_B8G8R8A8_UNORM || + dxgi_format == DXGI_FORMAT_B8G8R8X8_UNORM) + { + allocator->frame_desc.usage = usage; + if (allocator->frame_desc.usage == D3D11_USAGE_DEFAULT) + allocator->frame_desc.bindflags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET; + else if (allocator->frame_desc.usage == D3D11_USAGE_DYNAMIC) + allocator->frame_desc.bindflags = D3D11_BIND_SHADER_RESOURCE; + } if (attributes) IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_BINDFLAGS, &allocator->frame_desc.bindflags); @@ -1427,7 +1437,7 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u max_sample_count = max(1, max_sample_count); allocator->frame_desc.d3d9_format = subtype.Data1; - allocator->frame_desc.dxgi_format = MFMapDX9FormatToDXGIFormat(allocator->frame_desc.d3d9_format); + allocator->frame_desc.dxgi_format = dxgi_format; allocator->frame_desc.width = frame_size >> 32; allocator->frame_desc.height = frame_size; allocator->frame_desc.buffer_count = max(1, allocator->frame_desc.buffer_count);

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
77
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 May 2021