wine-commits January 2023

wine-commits@winehq.org

1 participants
467 discussions

Eric Pouech : dbghelp: Don't search path when we have a file handle to loaded image.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 168c7a475d43cb7688636f0eb13b3892322333c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/168c7a475d43cb7688636f0eb13b38… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Jan 5 12:58:20 2023 +0100 dbghelp: Don't search path when we have a file handle to loaded image. When the handle to the loaded module is passed in SymLoadModule*(), don't try to search for the module's image path and use only the file handle. Co-authored-by: Ake Rehnman <ake.rehnman(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/pe_module.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 4a7e68d5483..91a018c526b 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -784,6 +784,7 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, BOOL opened = FALSE; struct module_format* modfmt; WCHAR loaded_name[MAX_PATH]; + WCHAR* real_path = NULL; loaded_name[0] = '\0'; if (!hFile) @@ -802,11 +803,12 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, if (pe_map_file(hFile, &modfmt->u.pe_info->fmap, DMT_PE)) { struct builtin_search builtin = { NULL }; - if (modfmt->u.pe_info->fmap.u.pe.builtin && search_dll_path(pcs, loaded_name, search_builtin_pe, &builtin)) + if (opened && modfmt->u.pe_info->fmap.u.pe.builtin && search_dll_path(pcs, loaded_name, search_builtin_pe, &builtin)) { TRACE("reloaded %s from %s\n", debugstr_w(loaded_name), debugstr_w(builtin.path)); image_unmap_file(&modfmt->u.pe_info->fmap); modfmt->u.pe_info->fmap = builtin.fmap; + real_path = builtin.path; } if (!base) base = PE_FROM_OPTHDR(&modfmt->u.pe_info->fmap, ImageBase); if (!size) size = PE_FROM_OPTHDR(&modfmt->u.pe_info->fmap, SizeOfImage); @@ -817,7 +819,7 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, modfmt->u.pe_info->fmap.u.pe.file_header.Machine); if (module) { - module->real_path = builtin.path; + module->real_path = real_path; modfmt->module = module; modfmt->remove = pe_module_remove; modfmt->loc_compute = NULL; @@ -827,7 +829,7 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, else { ERR("could not load the module '%s'\n", debugstr_w(loaded_name)); - heap_free(builtin.path); + heap_free(real_path); image_unmap_file(&modfmt->u.pe_info->fmap); } }

1 0

Nikolay Sivov : include: Add recent DirectWrite API changes.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: cab673f8b32562656d8f5c45baf6624e8fd2bd99 URL: https://gitlab.winehq.org/wine/wine/-/commit/cab673f8b32562656d8f5c45baf662… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 17 18:37:32 2022 +0300 include: Add recent DirectWrite API changes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/dwrite_3.idl | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index 845754f6e3f..e67c8ab6364 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -473,6 +473,29 @@ interface IDWriteFontSet3 : IDWriteFontSet2 HRESULT GetFontSourceName(UINT32 index, WCHAR *buffer, UINT32 buffer_size); } +[ + local, + object, + uuid(eec175fc-bea9-4c86-8b53-ccbdd7df0c82) +] +interface IDWriteFontSet4 : IDWriteFontSet3 +{ + UINT32 ConvertWeightStretchStyleToFontAxisValues( + DWRITE_FONT_AXIS_VALUE const *input_axis_values, + UINT32 input_axis_count, + DWRITE_FONT_WEIGHT weight, + DWRITE_FONT_STRETCH stretch, + DWRITE_FONT_STYLE style, + float size, + DWRITE_FONT_AXIS_VALUE *output_axis_values); + HRESULT GetMatchingFonts( + WCHAR const *family_name, + DWRITE_FONT_AXIS_VALUE const *axis_values, + UINT32 axis_value_count, + DWRITE_FONT_SIMULATIONS allowed_simulations, + IDWriteFontSet4 **fonts); +} + [ local, object, @@ -795,6 +818,21 @@ interface IDWriteFontFace5 : IDWriteFontFace4 BOOL Equals(IDWriteFontFace *fontface); } +[ + local, + object, + uuid(c4b1fe1b-6e84-47d5-b54c-a597981b06ad) +] +interface IDWriteFontFace6 : IDWriteFontFace5 +{ + HRESULT GetFamilyNames( + DWRITE_FONT_FAMILY_MODEL font_family_model, + IDWriteLocalizedStrings **names); + HRESULT GetFaceNames( + DWRITE_FONT_FAMILY_MODEL font_family_model, + IDWriteLocalizedStrings **names); +} + typedef struct DWRITE_COLOR_GLYPH_RUN1 DWRITE_COLOR_GLYPH_RUN1; cpp_quote("struct DWRITE_COLOR_GLYPH_RUN1")

1 0

Fabian Maurer : user32/tests: Don't assign const variable to other const (gcc 4.7).
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 4bc6aad375e552fa5930c65c0e9c434f1848286e URL: https://gitlab.winehq.org/wine/wine/-/commit/4bc6aad375e552fa5930c65c0e9c43… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Dec 12 18:45:17 2022 +0100 user32/tests: Don't assign const variable to other const (gcc 4.7). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/tests/sysparams.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 5c199a07769..6ed7755b91b 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3123,7 +3123,8 @@ static void test_EnumDisplaySettings(void) { static const DWORD mode_fields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY; - static const DWORD setting_fields = mode_fields | DM_POSITION; + static const DWORD setting_fields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | + DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY | DM_POSITION; CHAR primary_adapter[CCHDEVICENAME]; DPI_AWARENESS_CONTEXT ctx = NULL; DWORD err, val, device, mode;

1 0

Alex Henrie : include: Add RTL_CONSTANT_STRING.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 7ada8b96fb1dc305028a29fd3f4d1b0f019da75c URL: https://gitlab.winehq.org/wine/wine/-/commit/7ada8b96fb1dc305028a29fd3f4d1b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 12 22:49:24 2022 -0700 include: Add RTL_CONSTANT_STRING. --- include/ntdef.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/ntdef.h b/include/ntdef.h index 92366c3f3bb..8d04f83da5d 100644 --- a/include/ntdef.h +++ b/include/ntdef.h @@ -84,4 +84,6 @@ typedef struct _RTL_BALANCED_NODE #define RTL_BALANCED_NODE_RESERVED_PARENT_MASK 3 +#define RTL_CONSTANT_STRING(s) { sizeof(s) - sizeof(s[0]), sizeof(s), (void*)s } + #endif /* _NTDEF_ */

1 0

Zebediah Figura : rpcrt4: Use CONTAINING_RECORD in release_delegating_vtbl().
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: fe8f63ce729db45f5dd05699540b0e3778a8e17d URL: https://gitlab.winehq.org/wine/wine/-/commit/fe8f63ce729db45f5dd05699540b0e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 14:06:31 2022 -0600 rpcrt4: Use CONTAINING_RECORD in release_delegating_vtbl(). --- dlls/rpcrt4/cstub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index c9dbbb18b60..0f5bd0eda9f 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -334,7 +334,7 @@ IUnknownVtbl *get_delegating_vtbl(DWORD num_methods) void release_delegating_vtbl(IUnknownVtbl *vtbl) { - struct delegating_vtbl *table = (struct delegating_vtbl *)((DWORD *)vtbl - 1); + struct delegating_vtbl *table = CONTAINING_RECORD(vtbl, struct delegating_vtbl, vtbl); EnterCriticalSection(&delegating_vtbl_section); table->ref--;

1 0

Zebediah Figura : rpcrt4: Use a flexible array member in struct delegating_vtbl.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 10bbf79d53ae4c668b1737655b5fbe299d4f9d0d URL: https://gitlab.winehq.org/wine/wine/-/commit/10bbf79d53ae4c668b1737655b5fbe… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 14:00:48 2022 -0600 rpcrt4: Use a flexible array member in struct delegating_vtbl. --- dlls/rpcrt4/cstub.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 42bdb51cc27..c9dbbb18b60 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -115,7 +115,7 @@ struct delegating_vtbl DWORD ref; DWORD size; IUnknownVtbl vtbl; - /* remaining entries in vtbl */ + const void *methods[]; }; static struct delegating_vtbl *current_vtbl; @@ -251,24 +251,27 @@ static const vtbl_method_t *allocate_block( unsigned int num ) return block; } -static BOOL fill_delegated_stub_table(IUnknownVtbl *vtbl, DWORD num) +static BOOL init_delegating_vtbl(struct delegating_vtbl *table, DWORD num) { - const void **entry = (const void **)(vtbl + 1); DWORD i, j; + table->ref = 0; + table->size = num; + if (num - 3 > BLOCK_SIZE * MAX_BLOCKS) { FIXME( "%lu methods not supported\n", num ); return FALSE; } - vtbl->QueryInterface = delegating_QueryInterface; - vtbl->AddRef = delegating_AddRef; - vtbl->Release = delegating_Release; + table->vtbl.QueryInterface = delegating_QueryInterface; + table->vtbl.AddRef = delegating_AddRef; + table->vtbl.Release = delegating_Release; for (i = 0; i < (num - 3 + BLOCK_SIZE - 1) / BLOCK_SIZE; i++) { const vtbl_method_t *block = method_blocks[i]; if (!block && !(block = allocate_block( i ))) return FALSE; - for (j = 0; j < BLOCK_SIZE && j < num - 3 - i * BLOCK_SIZE; j++) *entry++ = &block[j]; + for (j = 0; j < BLOCK_SIZE && j < num - 3 - i * BLOCK_SIZE; j++) + table->methods[j] = &block[j]; } return TRUE; } @@ -306,16 +309,14 @@ IUnknownVtbl *get_delegating_vtbl(DWORD num_methods) if(!current_vtbl || num_methods > current_vtbl->size) { - struct delegating_vtbl *table = malloc(FIELD_OFFSET(struct delegating_vtbl, vtbl) + num_methods * sizeof(void *)); + struct delegating_vtbl *table = malloc(FIELD_OFFSET(struct delegating_vtbl, methods[num_methods])); if (!table) { LeaveCriticalSection(&delegating_vtbl_section); return NULL; } - table->ref = 0; - table->size = num_methods; - fill_delegated_stub_table(&table->vtbl, num_methods); + init_delegating_vtbl(table, num_methods); if (current_vtbl && current_vtbl->ref == 0) {

1 0

Zebediah Figura : rpcrt4: Rename "ref_counted_vtbl" to "struct delegating_vtbl".
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: e85afda3b5212a0398cb2dd105e232cfdbfc1329 URL: https://gitlab.winehq.org/wine/wine/-/commit/e85afda3b5212a0398cb2dd105e232… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 13:54:58 2022 -0600 rpcrt4: Rename "ref_counted_vtbl" to "struct delegating_vtbl". Get rid of the typedef, and give it a slightly more salient name (and one that matches more of the surrounding code). --- dlls/rpcrt4/cstub.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index b420b008065..42bdb51cc27 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -110,15 +110,15 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION delegating_vtbl_section = { &critsect_debug, -1, 0, 0, 0, 0 }; -typedef struct +struct delegating_vtbl { DWORD ref; DWORD size; IUnknownVtbl vtbl; /* remaining entries in vtbl */ -} ref_counted_vtbl; +}; -static ref_counted_vtbl *current_vtbl; +static struct delegating_vtbl *current_vtbl; static HRESULT WINAPI delegating_QueryInterface(IUnknown *pUnk, REFIID iid, void **ppv) @@ -306,7 +306,7 @@ IUnknownVtbl *get_delegating_vtbl(DWORD num_methods) if(!current_vtbl || num_methods > current_vtbl->size) { - ref_counted_vtbl *table = malloc(FIELD_OFFSET(ref_counted_vtbl, vtbl) + num_methods * sizeof(void *)); + struct delegating_vtbl *table = malloc(FIELD_OFFSET(struct delegating_vtbl, vtbl) + num_methods * sizeof(void *)); if (!table) { LeaveCriticalSection(&delegating_vtbl_section); @@ -333,7 +333,7 @@ IUnknownVtbl *get_delegating_vtbl(DWORD num_methods) void release_delegating_vtbl(IUnknownVtbl *vtbl) { - ref_counted_vtbl *table = (ref_counted_vtbl*)((DWORD *)vtbl - 1); + struct delegating_vtbl *table = (struct delegating_vtbl *)((DWORD *)vtbl - 1); EnterCriticalSection(&delegating_vtbl_section); table->ref--;

1 0

Zebediah Figura : rpcrt4: Use a CONTAINING_RECORD helper to retrieve CInterfaceStubHeader from CStdStubBuffer.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 4ad5de28419228868b734e29d915e450de83c1b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/4ad5de28419228868b734e29d915e4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 13:46:56 2022 -0600 rpcrt4: Use a CONTAINING_RECORD helper to retrieve CInterfaceStubHeader from CStdStubBuffer. --- dlls/rpcrt4/cstub.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index c03335e2821..b420b008065 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -38,8 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -#define STUB_HEADER(This) (((const CInterfaceStubHeader*)((This)->lpVtbl))[-1]) - static LONG WINAPI stub_filter(EXCEPTION_POINTERS *eptr) { if (eptr->ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE) @@ -57,6 +55,13 @@ static inline cstdstubbuffer_delegating_t *impl_from_delegating( IRpcStubBuffer return CONTAINING_RECORD(impl_from_IRpcStubBuffer(iface), cstdstubbuffer_delegating_t, stub_buffer); } +static const CInterfaceStubHeader *get_stub_header(const CStdStubBuffer *stub) +{ + const CInterfaceStubVtbl *vtbl = CONTAINING_RECORD(stub->lpVtbl, CInterfaceStubVtbl, Vtbl); + + return &vtbl->header; +} + HRESULT CStdStubBuffer_Construct(REFIID riid, LPUNKNOWN pUnkServer, PCInterfaceName name, @@ -473,7 +478,7 @@ HRESULT WINAPI CStdStubBuffer_Connect(LPRPCSTUBBUFFER iface, TRACE("(%p)->Connect(%p)\n",This,lpUnkServer); - r = IUnknown_QueryInterface(lpUnkServer, STUB_HEADER(This).piid, (void**)&new); + r = IUnknown_QueryInterface(lpUnkServer, get_stub_header(This)->piid, (void**)&new); new = InterlockedExchangePointer((void**)&This->pvServerObject, new); if(new) IUnknown_Release(new); @@ -497,6 +502,7 @@ HRESULT WINAPI CStdStubBuffer_Invoke(LPRPCSTUBBUFFER iface, LPRPCCHANNELBUFFER pChannel) { CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); + const CInterfaceStubHeader *header = get_stub_header(This); DWORD dwPhase = STUB_UNMARSHAL; HRESULT hr = S_OK; @@ -504,8 +510,8 @@ HRESULT WINAPI CStdStubBuffer_Invoke(LPRPCSTUBBUFFER iface, __TRY { - if (STUB_HEADER(This).pDispatchTable) - STUB_HEADER(This).pDispatchTable[pMsg->iMethod](iface, pChannel, (PRPC_MESSAGE)pMsg, &dwPhase); + if (header->pDispatchTable) + header->pDispatchTable[pMsg->iMethod](iface, pChannel, (PRPC_MESSAGE)pMsg, &dwPhase); else /* pure interpreted */ NdrStubCall2(iface, pChannel, (PRPC_MESSAGE)pMsg, &dwPhase); } @@ -526,9 +532,13 @@ HRESULT WINAPI CStdStubBuffer_Invoke(LPRPCSTUBBUFFER iface, LPRPCSTUBBUFFER WINAPI CStdStubBuffer_IsIIDSupported(LPRPCSTUBBUFFER iface, REFIID riid) { - CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); - TRACE("(%p)->IsIIDSupported(%s)\n",This,debugstr_guid(riid)); - return IsEqualGUID(STUB_HEADER(This).piid, riid) ? iface : NULL; + CStdStubBuffer *stub = impl_from_IRpcStubBuffer(iface); + + TRACE("(%p)->IsIIDSupported(%s)\n", stub, debugstr_guid(riid)); + + if (IsEqualGUID(get_stub_header(stub)->piid, riid)) + return iface; + return NULL; } ULONG WINAPI CStdStubBuffer_CountRefs(LPRPCSTUBBUFFER iface) @@ -618,8 +628,9 @@ const IRpcStubBufferVtbl CStdStubBuffer_Delegating_Vtbl = const MIDL_SERVER_INFO *CStdStubBuffer_GetServerInfo(IRpcStubBuffer *iface) { - CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); - return STUB_HEADER(This).pServerInfo; + CStdStubBuffer *stub = impl_from_IRpcStubBuffer(iface); + + return get_stub_header(stub)->pServerInfo; } /************************************************************************ @@ -666,7 +677,7 @@ void WINAPI NdrStubGetBuffer(LPRPCSTUBBUFFER iface, pStubMsg->RpcMsg->BufferLength = pStubMsg->BufferLength; hr = IRpcChannelBuffer_GetBuffer(pRpcChannelBuffer, - (RPCOLEMESSAGE *)pStubMsg->RpcMsg, STUB_HEADER(This).piid); + (RPCOLEMESSAGE *)pStubMsg->RpcMsg, get_stub_header(This)->piid); if (FAILED(hr)) { RpcRaiseException(hr);

1 0

Zebediah Figura : rpcrt4: Use a CONTAINING_RECORD helper to retrieve CStdStubBuffer from IRpcStubBuffer.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 180edc5a4f31e1e2846c25fd9788dbda1648e659 URL: https://gitlab.winehq.org/wine/wine/-/commit/180edc5a4f31e1e2846c25fd9788db… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 13:39:40 2022 -0600 rpcrt4: Use a CONTAINING_RECORD helper to retrieve CStdStubBuffer from IRpcStubBuffer. --- dlls/rpcrt4/cstub.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 47d5e301c0f..c03335e2821 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -47,9 +47,14 @@ static LONG WINAPI stub_filter(EXCEPTION_POINTERS *eptr) return EXCEPTION_EXECUTE_HANDLER; } +static CStdStubBuffer *impl_from_IRpcStubBuffer(IRpcStubBuffer *iface) +{ + return CONTAINING_RECORD(&iface->lpVtbl, CStdStubBuffer, lpVtbl); +} + static inline cstdstubbuffer_delegating_t *impl_from_delegating( IRpcStubBuffer *iface ) { - return CONTAINING_RECORD(iface, cstdstubbuffer_delegating_t, stub_buffer); + return CONTAINING_RECORD(impl_from_IRpcStubBuffer(iface), cstdstubbuffer_delegating_t, stub_buffer); } HRESULT CStdStubBuffer_Construct(REFIID riid, @@ -392,7 +397,7 @@ HRESULT WINAPI CStdStubBuffer_QueryInterface(LPRPCSTUBBUFFER iface, REFIID riid, LPVOID *obj) { - CStdStubBuffer *This = (CStdStubBuffer *)iface; + CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); TRACE("(%p)->QueryInterface(%s,%p)\n",This,debugstr_guid(riid),obj); if (IsEqualIID(&IID_IUnknown, riid) || @@ -408,7 +413,7 @@ HRESULT WINAPI CStdStubBuffer_QueryInterface(LPRPCSTUBBUFFER iface, ULONG WINAPI CStdStubBuffer_AddRef(LPRPCSTUBBUFFER iface) { - CStdStubBuffer *This = (CStdStubBuffer *)iface; + CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); TRACE("(%p)->AddRef()\n",This); return InterlockedIncrement(&This->RefCount); } @@ -416,7 +421,7 @@ ULONG WINAPI CStdStubBuffer_AddRef(LPRPCSTUBBUFFER iface) ULONG WINAPI NdrCStdStubBuffer_Release(LPRPCSTUBBUFFER iface, LPPSFACTORYBUFFER pPSF) { - CStdStubBuffer *This = (CStdStubBuffer *)iface; + CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); ULONG refs; TRACE("(%p)->Release()\n",This); @@ -462,7 +467,7 @@ ULONG WINAPI NdrCStdStubBuffer2_Release(LPRPCSTUBBUFFER iface, HRESULT WINAPI CStdStubBuffer_Connect(LPRPCSTUBBUFFER iface, LPUNKNOWN lpUnkServer) { - CStdStubBuffer *This = (CStdStubBuffer *)iface; + CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); HRESULT r; IUnknown *new = NULL; @@ -477,7 +482,7 @@ HRESULT WINAPI CStdStubBuffer_Connect(LPRPCSTUBBUFFER iface, void WINAPI CStdStubBuffer_Disconnect(LPRPCSTUBBUFFER iface) { - CStdStubBuffer *This = (CStdStubBuffer *)iface; + CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); IUnknown *old; TRACE("(%p)->Disconnect()\n",This); @@ -491,7 +496,7 @@ HRESULT WINAPI CStdStubBuffer_Invoke(LPRPCSTUBBUFFER iface, PRPCOLEMESSAGE pMsg, LPRPCCHANNELBUFFER pChannel) { - CStdStubBuffer *This = (CStdStubBuffer *)iface; + CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); DWORD dwPhase = STUB_UNMARSHAL; HRESULT hr = S_OK; @@ -521,14 +526,14 @@ HRESULT WINAPI CStdStubBuffer_Invoke(LPRPCSTUBBUFFER iface, LPRPCSTUBBUFFER WINAPI CStdStubBuffer_IsIIDSupported(LPRPCSTUBBUFFER iface, REFIID riid) { - CStdStubBuffer *This = (CStdStubBuffer *)iface; + CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); TRACE("(%p)->IsIIDSupported(%s)\n",This,debugstr_guid(riid)); return IsEqualGUID(STUB_HEADER(This).piid, riid) ? iface : NULL; } ULONG WINAPI CStdStubBuffer_CountRefs(LPRPCSTUBBUFFER iface) { - CStdStubBuffer *This = (CStdStubBuffer *)iface; + CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); TRACE("(%p)->CountRefs()\n",This); return This->RefCount; } @@ -536,7 +541,7 @@ ULONG WINAPI CStdStubBuffer_CountRefs(LPRPCSTUBBUFFER iface) HRESULT WINAPI CStdStubBuffer_DebugServerQueryInterface(LPRPCSTUBBUFFER iface, LPVOID *ppv) { - CStdStubBuffer *This = (CStdStubBuffer *)iface; + CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); TRACE("(%p)->DebugServerQueryInterface(%p)\n",This,ppv); return S_OK; } @@ -544,7 +549,7 @@ HRESULT WINAPI CStdStubBuffer_DebugServerQueryInterface(LPRPCSTUBBUFFER iface, void WINAPI CStdStubBuffer_DebugServerRelease(LPRPCSTUBBUFFER iface, LPVOID pv) { - CStdStubBuffer *This = (CStdStubBuffer *)iface; + CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); TRACE("(%p)->DebugServerRelease(%p)\n",This,pv); } @@ -613,7 +618,7 @@ const IRpcStubBufferVtbl CStdStubBuffer_Delegating_Vtbl = const MIDL_SERVER_INFO *CStdStubBuffer_GetServerInfo(IRpcStubBuffer *iface) { - CStdStubBuffer *This = (CStdStubBuffer *)iface; + CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); return STUB_HEADER(This).pServerInfo; } @@ -654,7 +659,7 @@ void WINAPI NdrStubGetBuffer(LPRPCSTUBBUFFER iface, LPRPCCHANNELBUFFER pRpcChannelBuffer, PMIDL_STUB_MESSAGE pStubMsg) { - CStdStubBuffer *This = (CStdStubBuffer *)iface; + CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); HRESULT hr; TRACE("(%p, %p, %p)\n", This, pRpcChannelBuffer, pStubMsg);

1 0

Shaun Ren : mfplay/tests: Add tests for MF_SD_LANGUAGE.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: c97b8a8f1a5df34e3d03c405bda5f76356123da4 URL: https://gitlab.winehq.org/wine/wine/-/commit/c97b8a8f1a5df34e3d03c405bda5f7… Author: Shaun Ren <sren(a)codeweavers.com> Date: Fri Dec 2 22:05:20 2022 -0500 mfplay/tests: Add tests for MF_SD_LANGUAGE. --- dlls/mfplay/tests/mfplay.c | 70 +++++++++++++++++++++++++++++++++++++++ dlls/mfplay/tests/resource.rc | 27 +++++++++++++++ dlls/mfplay/tests/test-ang.mp4 | Bin 0 -> 860 bytes dlls/mfplay/tests/test-ang.wma | Bin 0 -> 3867 bytes dlls/mfplay/tests/test-en-US.mp4 | Bin 0 -> 866 bytes dlls/mfplay/tests/test-en-US.wma | Bin 0 -> 3871 bytes dlls/mfplay/tests/test-en.wma | Bin 0 -> 3865 bytes dlls/mfplay/tests/test-eng.mp4 | Bin 0 -> 860 bytes dlls/mfplay/tests/test-eng.wma | Bin 0 -> 3867 bytes dlls/mfplay/tests/test-und.mp4 | Bin 0 -> 860 bytes dlls/mfplay/tests/test-und.wma | Bin 0 -> 3867 bytes 11 files changed, 97 insertions(+) diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index 6cecd3bbdd9..fa66ccae57e 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -437,6 +437,75 @@ static void test_media_item(void) IMFPMediaPlayer_Release(player); } +#define check_media_language(player, resource_name, expected_lang) \ + _check_media_language(__LINE__, FALSE, player, resource_name, expected_lang) +#define todo_check_media_language(player, resource_name, expected_lang) \ + _check_media_language(__LINE__, TRUE, player, resource_name, expected_lang) +static void _check_media_language(unsigned line, BOOL todo, IMFPMediaPlayer *player, + const WCHAR *resource_name, const WCHAR *expected_lang) +{ + WCHAR *filename; + IMFPMediaItem *item; + PROPVARIANT propvar; + const WCHAR *lang = NULL; + HRESULT hr; + + filename = load_resource(resource_name); + + hr = IMFPMediaPlayer_CreateMediaItemFromURL(player, filename, TRUE, 123, &item); + ok_(__FILE__, line)(hr == S_OK || broken(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE) /* win8 - win10 1507 */, + "Unexpected hr %#lx.\n", hr); + if (hr != S_OK) + { + DeleteFileW(filename); + return; + } + + hr = IMFPMediaItem_GetStreamAttribute(item, 0, &MF_SD_LANGUAGE, &propvar); + ok_(__FILE__, line)(hr == S_OK || hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); + + if (hr == S_OK) + { + ok_(__FILE__, line)(propvar.vt == VT_LPWSTR, "Unexpected vt %u.\n", propvar.vt); + if (propvar.vt == VT_LPWSTR) + lang = propvar.pwszVal; + } + + todo_wine_if(todo) + { + if (expected_lang) + ok_(__FILE__, line)(lang && !wcscmp(lang, expected_lang), "Unexpected value %s.\n", debugstr_w(lang)); + else + ok_(__FILE__, line)(!lang, "Unexpected value %s.\n", debugstr_w(lang)); + } + + PropVariantClear(&propvar); + IMFPMediaItem_Release(item); + DeleteFileW(filename); +} + +static void test_media_language(void) +{ + IMFPMediaPlayer *player; + HRESULT hr; + + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + check_media_language(player, L"test-eng.mp4", L"en"); + check_media_language(player, L"test-ang.mp4", NULL); + check_media_language(player, L"test-und.mp4", NULL); + check_media_language(player, L"test-en-US.mp4", L"en"); + + check_media_language(player, L"test-en.wma", L"en"); + check_media_language(player, L"test-eng.wma", L"eng"); + check_media_language(player, L"test-ang.wma", L"ang"); + check_media_language(player, L"test-und.wma", L"und"); + todo_check_media_language(player, L"test-en-US.wma", L"en-US"); + + IMFPMediaPlayer_Release(player); +} + static void test_video_control(void) { MFVideoNormalizedRect rect; @@ -599,6 +668,7 @@ START_TEST(mfplay) test_create_player(); test_shutdown(); test_media_item(); + test_media_language(); test_video_control(); test_duration(); test_playback_rate(); diff --git a/dlls/mfplay/tests/resource.rc b/dlls/mfplay/tests/resource.rc index 38c4a5f9e01..bccf60db9ed 100644 --- a/dlls/mfplay/tests/resource.rc +++ b/dlls/mfplay/tests/resource.rc @@ -20,3 +20,30 @@ /* @makedep: test.mp4 */ test.mp4 RCDATA test.mp4 + +/* @makedep: test-eng.mp4 */ +test-eng.mp4 RCDATA test-eng.mp4 + +/* @makedep: test-ang.mp4 */ +test-ang.mp4 RCDATA test-ang.mp4 + +/* @makedep: test-und.mp4 */ +test-und.mp4 RCDATA test-und.mp4 + +/* @makedep: test-en-US.mp4 */ +test-en-US.mp4 RCDATA test-en-US.mp4 + +/* @makedep: test-en.wma */ +test-en.wma RCDATA test-en.wma + +/* @makedep: test-eng.wma */ +test-eng.wma RCDATA test-eng.wma + +/* @makedep: test-ang.wma */ +test-ang.wma RCDATA test-ang.wma + +/* @makedep: test-und.wma */ +test-und.wma RCDATA test-und.wma + +/* @makedep: test-en-US.wma */ +test-en-US.wma RCDATA test-en-US.wma diff --git a/dlls/mfplay/tests/test-ang.mp4 b/dlls/mfplay/tests/test-ang.mp4 new file mode 100644 index 00000000000..864e5347eab Binary files /dev/null and b/dlls/mfplay/tests/test-ang.mp4 differ diff --git a/dlls/mfplay/tests/test-ang.wma b/dlls/mfplay/tests/test-ang.wma new file mode 100644 index 00000000000..ab15ca3c5af Binary files /dev/null and b/dlls/mfplay/tests/test-ang.wma differ diff --git a/dlls/mfplay/tests/test-en-US.mp4 b/dlls/mfplay/tests/test-en-US.mp4 new file mode 100644 index 00000000000..e023fd5af40 Binary files /dev/null and b/dlls/mfplay/tests/test-en-US.mp4 differ diff --git a/dlls/mfplay/tests/test-en-US.wma b/dlls/mfplay/tests/test-en-US.wma new file mode 100644 index 00000000000..61939c4deb5 Binary files /dev/null and b/dlls/mfplay/tests/test-en-US.wma differ diff --git a/dlls/mfplay/tests/test-en.wma b/dlls/mfplay/tests/test-en.wma new file mode 100644 index 00000000000..b3a9187785e Binary files /dev/null and b/dlls/mfplay/tests/test-en.wma differ diff --git a/dlls/mfplay/tests/test-eng.mp4 b/dlls/mfplay/tests/test-eng.mp4 new file mode 100644 index 00000000000..7be1ad4e0e3 Binary files /dev/null and b/dlls/mfplay/tests/test-eng.mp4 differ diff --git a/dlls/mfplay/tests/test-eng.wma b/dlls/mfplay/tests/test-eng.wma new file mode 100644 index 00000000000..730516354e3 Binary files /dev/null and b/dlls/mfplay/tests/test-eng.wma differ diff --git a/dlls/mfplay/tests/test-und.mp4 b/dlls/mfplay/tests/test-und.mp4 new file mode 100644 index 00000000000..302afb13c72 Binary files /dev/null and b/dlls/mfplay/tests/test-und.mp4 differ diff --git a/dlls/mfplay/tests/test-und.wma b/dlls/mfplay/tests/test-und.wma new file mode 100644 index 00000000000..54243cee77f Binary files /dev/null and b/dlls/mfplay/tests/test-und.wma differ

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
47
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 January 2023