wine-devel February 2021

wine-devel@winehq.org

81 participants
640 discussions

[PATCH] wined3d: Invalidate STATE_STENCIL_REF when switching between NULL and non-NULL depth/stencil views.
by Henri Verbeet 05 Feb '21

05 Feb '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 1dfc881905bb..0385b8f46937 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1229,6 +1229,7 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const { /* Swapping NULL / non NULL depth stencil affects the depth and tests */ device_invalidate_state(device, STATE_DEPTH_STENCIL); + device_invalidate_state(device, STATE_STENCIL_REF); device_invalidate_state(device, STATE_RASTERIZER); } else if (prev) -- 2.20.1

1 0

[PATCH] wined3d: Add AMD Radeon RX 5500M.
by Andrey Gusev 05 Feb '21

05 Feb '21

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/wined3d/adapter_gl.c | 3 ++- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index d9f70049e6f..a9454ee38eb 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1646,8 +1646,9 @@ cards_intel[] = * drivers: R700, RV790, R680, RV535, RV516, R410, RS485, RV360, RV351. */ cards_amd_mesa[] = { - /* Navi 10 */ + /* Navi 10/14 */ {"NAVI10", CARD_AMD_RADEON_RX_NAVI_10}, + {"NAVI14", CARD_AMD_RADEON_RX_NAVI_14}, /* Polaris 10/11 */ {"POLARIS10", CARD_AMD_RADEON_RX_480}, {"POLARIS11", CARD_AMD_RADEON_RX_460}, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 040a9f81083..b0521bdc7cb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -513,6 +513,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_RAVEN, "AMD Radeon(TM) Vega 10 Mobile Graphics", DRIVER_AMD_RX, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_20, "Radeon RX Vega 20", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_10, "Radeon RX 5700 / 5700 XT", DRIVER_AMD_RX, 8192}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_14, "Radeon RX 5500M", DRIVER_AMD_RX, 4096}, /* Red Hat */ {HW_VENDOR_REDHAT, CARD_REDHAT_VIRGL, "Red Hat VirtIO GPU", DRIVER_REDHAT_VIRGL, 1024}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 101c0287936..9aa8d521660 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2891,6 +2891,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_RAVEN = 0x15dd, CARD_AMD_RADEON_RX_VEGA_20 = 0x66af, CARD_AMD_RADEON_RX_NAVI_10 = 0x731f, + CARD_AMD_RADEON_RX_NAVI_14 = 0x7340, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020, -- 2.29.2

2 1

[PATCH] configure: Silence a linker warning about no-PIC .text relocations.
by Rémi Bernon 05 Feb '21

05 Feb '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- configure.ac | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3a0bc6e713a..27ff4b78630 100644 --- a/configure.ac +++ b/configure.ac @@ -911,7 +911,11 @@ case $host_os in case $host_cpu in *i[[3456789]]86*) DLLFLAGS="$DLLFLAGS -fno-PIC" - LDDLLFLAGS="-fno-PIC" ;; + LDDLLFLAGS="-fno-PIC" + WINE_TRY_CFLAGS([-fno-PIC -Wl,-z,notext], + [DLLFLAGS="$DLLFLAGS -Wl,-z,notext" + LDDLLFLAGS="$LDDLLFLAGS -Wl,-z,notext"]) + ;; *) DLLFLAGS="$DLLFLAGS -fPIC" LDDLLFLAGS="-fPIC" ;; -- 2.30.0

1 0

[PATCH 1/3] ntdll: Print a warning for thread rename exceptions.
by Rémi Bernon 05 Feb '21

05 Feb '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I personally find +seh a bit too verbose to track exceptions, this series is trying to make warn+seh a bit more informative without spamming the debug log too much. About PATCH 2, it is a bit redundant with +debugstr, but as the exceptions may be raised manually, +debugstr won't catch everything. It also adds support for the new DBG_PRINTEXCEPTION_WIDE_C exception code. dlls/ntdll/signal_arm.c | 4 ++++ dlls/ntdll/signal_arm64.c | 4 ++++ dlls/ntdll/signal_i386.c | 4 ++++ dlls/ntdll/signal_x86_64.c | 4 ++++ include/wine/exception.h | 6 ++++++ programs/winedbg/debugger.h | 6 ------ programs/winedbg/gdbproxy.c | 5 +++-- programs/winedbg/tgt_active.c | 2 +- 8 files changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index b1544ba15fe..f4da2e5c71d 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -160,6 +160,10 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte rec->ExceptionAddress, (char*)rec->ExceptionInformation[0], rec->ExceptionInformation[1] ); } + else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000) + { + WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); + } else { TRACE( " r0=%08x r1=%08x r2=%08x r3=%08x r4=%08x r5=%08x\n", diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 9db8a8b17b4..88e31d88f7b 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -501,6 +501,10 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte rec->ExceptionAddress, (char*)rec->ExceptionInformation[0], rec->ExceptionInformation[1] ); } + else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000) + { + WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); + } else { TRACE(" x0=%016lx x1=%016lx x2=%016lx x3=%016lx\n", diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 93e03ae5b8b..a570be10024 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -192,6 +192,10 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) rec->ExceptionAddress, (char*)rec->ExceptionInformation[0], rec->ExceptionInformation[1] ); } + else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000) + { + WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); + } else { TRACE(" eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x\n", diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7e39991ad1a..7a3fd4be204 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -538,6 +538,10 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) rec->ExceptionAddress, (char*)rec->ExceptionInformation[0], rec->ExceptionInformation[1] ); } + else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000) + { + WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); + } else { TRACE(" rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n", diff --git a/include/wine/exception.h b/include/wine/exception.h index a2b0bb08dc3..3d28ff6b110 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -302,6 +302,12 @@ static inline EXCEPTION_REGISTRATION_RECORD *__wine_get_frame(void) #define EXCEPTION_WINE_STUB 0x80000100 /* stub entry point called */ #define EXCEPTION_WINE_ASSERTION 0x80000101 /* assertion failed */ +/* Wine extension; Windows doesn't have a name for this code. This is an + undocumented exception understood by MS VC debugger, allowing the program + to name a particular thread. Search google.com or deja.com for "0x406d1388" + for more info. */ +#define EXCEPTION_WINE_NAME_THREAD 0x406D1388 + #ifdef __cplusplus } #endif diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index ddac129bab5..05bf0c047ba 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -155,12 +155,6 @@ struct dbg_breakpoint #define CXX_EXCEPTION 0xe06d7363 #define CXX_FRAME_MAGIC 0x19930520 -/* Wine extension; Windows doesn't have a name for this code. This is an - undocumented exception understood by MS VC debugger, allowing the program - to name a particular thread. Search google.com or deja.com for "0x406d1388" - for more info. */ -#define EXCEPTION_NAME_THREAD 0x406D1388 - /* Helper structure */ typedef struct tagTHREADNAME_INFO { diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index c51fd342496..3c1b3e85df8 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -63,6 +63,7 @@ #include "windef.h" #include "winbase.h" #include "tlhelp32.h" +#include "wine/exception.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(winedbg); @@ -349,7 +350,7 @@ static unsigned char signal_from_debug_event(DEBUG_EVENT* de) return SIGALRM; /* should not be here */ case EXCEPTION_INVALID_HANDLE: - case EXCEPTION_NAME_THREAD: + case EXCEPTION_WINE_NAME_THREAD: return SIGTRAP; default: ERR("Unknown exception code 0x%08x\n", ec); @@ -363,7 +364,7 @@ static BOOL handle_exception(struct gdb_context* gdbctx, EXCEPTION_DEBUG_INFO* e switch (rec->ExceptionCode) { - case EXCEPTION_NAME_THREAD: + case EXCEPTION_WINE_NAME_THREAD: { const THREADNAME_INFO *threadname = (const THREADNAME_INFO *)rec->ExceptionInformation; struct dbg_thread *thread; diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index d4e2d7d6347..e71f4615735 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -246,7 +246,7 @@ static DWORD dbg_handle_exception(const EXCEPTION_RECORD* rec, BOOL first_chance case EXCEPTION_SINGLE_STEP: is_debug = TRUE; break; - case EXCEPTION_NAME_THREAD: + case EXCEPTION_WINE_NAME_THREAD: pThreadName = (const THREADNAME_INFO*)(rec->ExceptionInformation); if (pThreadName->dwThreadID == -1) pThread = dbg_curr_thread; -- 2.30.0

1 2

[v3 PATCH] oleaut32: Added ICreateTypeInfo2::DeleteFuncDesc().
by Nikolay Sivov 05 Feb '21

05 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/tests/typelib.c | 78 +++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 52 ++++++++++++++++------- 2 files changed, 116 insertions(+), 14 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index ff709ddef62..825851c948e 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -8241,6 +8241,83 @@ static void test_DeleteImplType(void) DeleteFileW(filenameW); } +static void test_DeleteFuncDesc(void) +{ + OLECHAR interface1W[] = L"interface1"; + WCHAR filenameW[MAX_PATH], temp_path[MAX_PATH]; + ICreateTypeInfo2 *createti2; + ICreateTypeInfo *createti; + ICreateTypeLib2 *createtl; + FUNCDESC funcdesc; + TYPEATTR *typeattr; + ITypeInfo *ti; + ITypeLib *tl; + HRESULT hr; + + GetTempPathW(ARRAY_SIZE(temp_path), temp_path); + GetTempFileNameW(temp_path, L"tlb", 0, filenameW); + + hr = CreateTypeLib2(SYS_WIN32, filenameW, &createtl); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + + hr = ICreateTypeLib2_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + hr = ICreateTypeInfo_QueryInterface(createti, &IID_ICreateTypeInfo2, (void **)&createti2); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + ICreateTypeInfo_Release(createti); + + hr = ICreateTypeInfo2_QueryInterface(createti2, &IID_ITypeInfo, (void **)&ti); + ok(hr == S_OK, "Failed to get typeinfo, hr %#x.\n", hr); + + memset(&funcdesc, 0, sizeof(FUNCDESC)); + funcdesc.funckind = FUNC_PUREVIRTUAL; + funcdesc.invkind = INVOKE_PROPERTYGET; + funcdesc.callconv = CC_STDCALL; + funcdesc.elemdescFunc.tdesc.vt = VT_BSTR; + U(funcdesc.elemdescFunc).idldesc.wIDLFlags = IDLFLAG_NONE; + + hr = ICreateTypeInfo2_AddFuncDesc(createti2, 0, &funcdesc); + ok(hr == S_OK, "Failed to add a funcdesc, hr %#x.\n", hr); + + hr = ITypeInfo_GetTypeAttr(ti, &typeattr); + ok(hr == S_OK, "Failed to get type attr, hr %#x.\n", hr); + ok(typeattr->cFuncs == 1, "Unexpected cFuncs %u.\n", typeattr->cFuncs); + ITypeInfo_ReleaseTypeAttr(ti, typeattr); + + hr = ICreateTypeInfo2_DeleteFuncDesc(createti2, 1); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "Unexpected hr %#x.\n", hr); + + hr = ICreateTypeInfo2_DeleteFuncDesc(createti2, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = ITypeInfo_GetTypeAttr(ti, &typeattr); + ok(hr == S_OK, "Failed to get type attr, hr %#x.\n", hr); + ok(!typeattr->cFuncs, "Unexpected cFuncs %u.\n", typeattr->cFuncs); + ITypeInfo_ReleaseTypeAttr(ti, typeattr); + + hr = ICreateTypeLib2_SaveAllChanges(createtl); + ok(hr == S_OK, "Failed to save changes, hr %#x.\n", hr); + ICreateTypeLib2_Release(createtl); + ITypeInfo_Release(ti); + ICreateTypeInfo2_Release(createti2); + + /* Load and check typeinfo. */ + hr = LoadTypeLibEx(filenameW, REGKIND_NONE, &tl); + ok(hr == S_OK, "Failed to load typelib, hr %#x.\n", hr); + + hr = ITypeLib_GetTypeInfo(tl, 0, &ti); + ok(hr == S_OK, "Failed to get typeinfo, hr %#x.\n", hr); + hr = ITypeInfo_GetTypeAttr(ti, &typeattr); + ok(hr == S_OK, "Failed to get type attr, hr %#x.\n", hr); + ok(!typeattr->cFuncs, "Unexpected cFuncs value.\n"); + ITypeInfo_ReleaseTypeAttr(ti, typeattr); + ITypeInfo_Release(ti); + + ITypeLib_Release(tl); + + DeleteFileW(filenameW); +} + START_TEST(typelib) { const WCHAR *filename; @@ -8282,4 +8359,5 @@ START_TEST(typelib) test_stub(); test_dep(); test_DeleteImplType(); + test_DeleteFuncDesc(); } diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 65d29734800..4669b03d5fc 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5587,6 +5587,22 @@ static ULONG WINAPI ITypeInfo_fnAddRef( ITypeInfo2 *iface) return ref; } +static void typeinfo_release_funcdesc(TLBFuncDesc *func) +{ + unsigned int i; + + for (i = 0; i < func->funcdesc.cParams; ++i) + { + ELEMDESC *elemdesc = &func->funcdesc.lprgelemdescParam[i]; + if (elemdesc->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) + VariantClear(&elemdesc->u.paramdesc.pparamdescex->varDefaultValue); + TLB_FreeCustData(&func->pParamDesc[i].custdata_list); + } + heap_free(func->funcdesc.lprgelemdescParam); + heap_free(func->pParamDesc); + TLB_FreeCustData(&func->custdata_list); +} + static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This) { UINT i; @@ -5595,18 +5611,7 @@ static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This) for (i = 0; i < This->typeattr.cFuncs; ++i) { - int j; - TLBFuncDesc *pFInfo = &This->funcdescs[i]; - for(j = 0; j < pFInfo->funcdesc.cParams; j++) - { - ELEMDESC *elemdesc = &pFInfo->funcdesc.lprgelemdescParam[j]; - if (elemdesc->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) - VariantClear(&elemdesc->u.paramdesc.pparamdescex->varDefaultValue); - TLB_FreeCustData(&pFInfo->pParamDesc[j].custdata_list); - } - heap_free(pFInfo->funcdesc.lprgelemdescParam); - heap_free(pFInfo->pParamDesc); - TLB_FreeCustData(&pFInfo->custdata_list); + typeinfo_release_funcdesc(&This->funcdescs[i]); } heap_free(This->funcdescs); @@ -11373,8 +11378,27 @@ static HRESULT WINAPI ICreateTypeInfo2_fnDeleteFuncDesc(ICreateTypeInfo2 *iface, UINT index) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u - stub\n", This, index); - return E_NOTIMPL; + unsigned int i; + + TRACE("%p %u\n", This, index); + + if (index >= This->typeattr.cFuncs) + return TYPE_E_ELEMENTNOTFOUND; + + typeinfo_release_funcdesc(&This->funcdescs[index]); + + --This->typeattr.cFuncs; + if (index != This->typeattr.cFuncs) + { + memmove(This->funcdescs + index, This->funcdescs + index + 1, + sizeof(*This->funcdescs) * (This->typeattr.cFuncs - index)); + for (i = index; i < This->typeattr.cFuncs; ++i) + TLB_relink_custdata(&This->funcdescs[i].custdata_list); + } + + This->needs_layout = TRUE; + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnDeleteFuncDescByMemId(ICreateTypeInfo2 *iface, -- 2.30.0

1 0

[PATCH] wldap32: Cyrus SASL's sasl_interact_t.result should be null-terminated
by Damjan Jovanovic 05 Feb '21

05 Feb '21

Sometimes AD authentication fails as LDAP packets have garbage characters trailing the username. Reading its source code confirms that Cyrus SASL often completely ignores the sasl_interact_t.len field, and expects sasl_interact_t.result to be null-terminated. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/wldap32/wldap32.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

1 0

[v2 PATCH] oleaut32: Added ICreateTypeInfo2::DeleteFuncDesc().
by Nikolay Sivov 05 Feb '21

05 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: fixed a test dlls/oleaut32/tests/typelib.c | 77 +++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 52 ++++++++++++++++------- 2 files changed, 115 insertions(+), 14 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index ff709ddef62..c635a05d576 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -8241,6 +8241,82 @@ static void test_DeleteImplType(void) DeleteFileW(filenameW); } +static void test_DeleteFuncDesc(void) +{ + static OLECHAR interface1W[] = L"interface1"; + ICreateTypeInfo2 *createti2; + ICreateTypeInfo *createti; + ICreateTypeLib2 *createtl; + WCHAR filenameW[MAX_PATH]; + ITypeInfo *ti; + ITypeLib *tl; + TYPEATTR *typeattr; + HRESULT hr; + FUNCDESC funcdesc; + + GetTempFileNameW(L".", L"tlb", 0, filenameW); + + hr = CreateTypeLib2(SYS_WIN32, filenameW, &createtl); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + + hr = ICreateTypeLib2_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + hr = ICreateTypeInfo_QueryInterface(createti, &IID_ICreateTypeInfo2, (void **)&createti2); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + ICreateTypeInfo_Release(createti); + + hr = ICreateTypeInfo2_QueryInterface(createti2, &IID_ITypeInfo, (void **)&ti); + ok(hr == S_OK, "Failed to get typeinfo, hr %#x.\n", hr); + + memset(&funcdesc, 0, sizeof(FUNCDESC)); + funcdesc.funckind = FUNC_PUREVIRTUAL; + funcdesc.invkind = INVOKE_PROPERTYGET; + funcdesc.callconv = CC_STDCALL; + funcdesc.elemdescFunc.tdesc.vt = VT_BSTR; + U(funcdesc.elemdescFunc).idldesc.wIDLFlags = IDLFLAG_NONE; + + hr = ICreateTypeInfo2_AddFuncDesc(createti2, 0, &funcdesc); + ok(hr == S_OK, "Failed to add a funcdesc, hr %#x.\n", hr); + + hr = ITypeInfo_GetTypeAttr(ti, &typeattr); + ok(hr == S_OK, "Failed to get type attr, hr %#x.\n", hr); + ok(typeattr->cFuncs == 1, "Unexpected cFuncs %u.\n", typeattr->cFuncs); + ITypeInfo_ReleaseTypeAttr(ti, typeattr); + + hr = ICreateTypeInfo2_DeleteFuncDesc(createti2, 1); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "Unexpected hr %#x.\n", hr); + + hr = ICreateTypeInfo2_DeleteFuncDesc(createti2, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = ITypeInfo_GetTypeAttr(ti, &typeattr); + ok(hr == S_OK, "Failed to get type attr, hr %#x.\n", hr); + ok(!typeattr->cFuncs, "Unexpected cFuncs %u.\n", typeattr->cFuncs); + ITypeInfo_ReleaseTypeAttr(ti, typeattr); + + hr = ICreateTypeLib2_SaveAllChanges(createtl); + ok(hr == S_OK, "Failed to save changes, hr %#x.\n", hr); + ICreateTypeLib2_Release(createtl); + ITypeInfo_Release(ti); + ICreateTypeInfo2_Release(createti2); + + /* Load and check typeinfo. */ + hr = LoadTypeLibEx(filenameW, REGKIND_NONE, &tl); + ok(hr == S_OK, "Failed to load typelib, hr %#x.\n", hr); + + hr = ITypeLib_GetTypeInfo(tl, 0, &ti); + ok(hr == S_OK, "Failed to get typeinfo, hr %#x.\n", hr); + hr = ITypeInfo_GetTypeAttr(ti, &typeattr); + ok(hr == S_OK, "Failed to get type attr, hr %#x.\n", hr); + ok(!typeattr->cFuncs, "Unexpected cFuncs value.\n"); + ITypeInfo_ReleaseTypeAttr(ti, typeattr); + ITypeInfo_Release(ti); + + ITypeLib_Release(tl); + + DeleteFileW(filenameW); +} + START_TEST(typelib) { const WCHAR *filename; @@ -8282,4 +8358,5 @@ START_TEST(typelib) test_stub(); test_dep(); test_DeleteImplType(); + test_DeleteFuncDesc(); } diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 65d29734800..4669b03d5fc 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5587,6 +5587,22 @@ static ULONG WINAPI ITypeInfo_fnAddRef( ITypeInfo2 *iface) return ref; } +static void typeinfo_release_funcdesc(TLBFuncDesc *func) +{ + unsigned int i; + + for (i = 0; i < func->funcdesc.cParams; ++i) + { + ELEMDESC *elemdesc = &func->funcdesc.lprgelemdescParam[i]; + if (elemdesc->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) + VariantClear(&elemdesc->u.paramdesc.pparamdescex->varDefaultValue); + TLB_FreeCustData(&func->pParamDesc[i].custdata_list); + } + heap_free(func->funcdesc.lprgelemdescParam); + heap_free(func->pParamDesc); + TLB_FreeCustData(&func->custdata_list); +} + static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This) { UINT i; @@ -5595,18 +5611,7 @@ static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This) for (i = 0; i < This->typeattr.cFuncs; ++i) { - int j; - TLBFuncDesc *pFInfo = &This->funcdescs[i]; - for(j = 0; j < pFInfo->funcdesc.cParams; j++) - { - ELEMDESC *elemdesc = &pFInfo->funcdesc.lprgelemdescParam[j]; - if (elemdesc->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) - VariantClear(&elemdesc->u.paramdesc.pparamdescex->varDefaultValue); - TLB_FreeCustData(&pFInfo->pParamDesc[j].custdata_list); - } - heap_free(pFInfo->funcdesc.lprgelemdescParam); - heap_free(pFInfo->pParamDesc); - TLB_FreeCustData(&pFInfo->custdata_list); + typeinfo_release_funcdesc(&This->funcdescs[i]); } heap_free(This->funcdescs); @@ -11373,8 +11378,27 @@ static HRESULT WINAPI ICreateTypeInfo2_fnDeleteFuncDesc(ICreateTypeInfo2 *iface, UINT index) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u - stub\n", This, index); - return E_NOTIMPL; + unsigned int i; + + TRACE("%p %u\n", This, index); + + if (index >= This->typeattr.cFuncs) + return TYPE_E_ELEMENTNOTFOUND; + + typeinfo_release_funcdesc(&This->funcdescs[index]); + + --This->typeattr.cFuncs; + if (index != This->typeattr.cFuncs) + { + memmove(This->funcdescs + index, This->funcdescs + index + 1, + sizeof(*This->funcdescs) * (This->typeattr.cFuncs - index)); + for (i = index; i < This->typeattr.cFuncs; ++i) + TLB_relink_custdata(&This->funcdescs[i].custdata_list); + } + + This->needs_layout = TRUE; + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnDeleteFuncDescByMemId(ICreateTypeInfo2 *iface, -- 2.30.0

2 1

[PATCH 1/3] oleaut32/tests: Remove workarounds in VarFormat* tests.
by Nikolay Sivov 05 Feb '21

05 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/tests/varformat.c | 70 +++++++++------------------------ 1 file changed, 19 insertions(+), 51 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 9e4cc063f94..1bd1917d209 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -37,22 +37,9 @@ #include "wtypes.h" #include "oleauto.h" -static HMODULE hOleaut32; - -static HRESULT (WINAPI *pVarFormatNumber)(LPVARIANT,int,int,int,int,ULONG,BSTR*); -static HRESULT (WINAPI *pVarFormat)(LPVARIANT,LPOLESTR,int,int,ULONG,BSTR*); -static HRESULT (WINAPI *pVarWeekdayName)(int,int,int,ULONG,BSTR*); - -/* Has I8/UI8 data type? */ -static BOOL has_i8; - -/* Get a conversion function ptr, return if function not available */ -#define CHECKPTR(func) p##func = (void*)GetProcAddress(hOleaut32, #func); \ - if (!p##func) { win_skip("function " # func " not available, not testing it\n"); return; } - #define FMT_NUMBER(vt,val) \ VariantInit(&v); V_VT(&v) = vt; val(&v) = 1; \ - hres = pVarFormatNumber(&v,2,0,0,0,0,&str); \ + hres = VarFormatNumber(&v,2,0,0,0,0,&str); \ ok(hres == S_OK, "VarFormatNumber (vt %d): returned %8x\n", vt, hres); \ if (hres == S_OK) { \ ok(str && wcscmp(str,szResult1) == 0, \ @@ -71,8 +58,6 @@ static void test_VarFormatNumber(void) VARIANT v; BSTR str = NULL; - CHECKPTR(VarFormatNumber); - GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buff, ARRAY_SIZE(buff)); if (buff[0] != '.' || buff[1]) { @@ -86,11 +71,8 @@ static void test_VarFormatNumber(void) FMT_NUMBER(VT_UI2, V_UI2); FMT_NUMBER(VT_I4, V_I4); FMT_NUMBER(VT_UI4, V_UI4); - if (has_i8) - { - FMT_NUMBER(VT_I8, V_I8); - FMT_NUMBER(VT_UI8, V_UI8); - } + FMT_NUMBER(VT_I8, V_I8); + FMT_NUMBER(VT_UI8, V_UI8); FMT_NUMBER(VT_R4, V_R4); FMT_NUMBER(VT_R8, V_R8); FMT_NUMBER(VT_BOOL, V_BOOL); @@ -98,7 +80,7 @@ static void test_VarFormatNumber(void) V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szSrc1); - hres = pVarFormatNumber(&v,2,0,0,0,0,&str); + hres = VarFormatNumber(&v,2,0,0,0,0,&str); ok(hres == S_OK, "VarFormatNumber (bstr): returned %8x\n", hres); if (hres == S_OK) ok(str && wcscmp(str, szResult1) == 0, "VarFormatNumber (bstr): string different\n"); @@ -106,7 +88,7 @@ static void test_VarFormatNumber(void) SysFreeString(str); V_BSTR(&v) = SysAllocString(szSrc2); - hres = pVarFormatNumber(&v,2,0,-1,0,0,&str); + hres = VarFormatNumber(&v,2,0,-1,0,0,&str); ok(hres == S_OK, "VarFormatNumber (bstr): returned %8x\n", hres); if (hres == S_OK) ok(str && wcscmp(str, szResult2) == 0, "VarFormatNumber (-bstr): string different\n"); @@ -121,7 +103,7 @@ static const char *szVarFmtFail = "VT %d|0x%04x Format %s: expected 0x%08x, '%s' out = NULL; \ V_VT(&in) = (vt); v(&in) = val; \ if (fmt) MultiByteToWideChar(CP_ACP, 0, fmt, -1, buffW, ARRAY_SIZE(buffW)); \ - hres = pVarFormat(&in,fmt ? buffW : NULL,fd,fw,flags,&out); \ + hres = VarFormat(&in,fmt ? buffW : NULL,fd,fw,flags,&out); \ if (SUCCEEDED(hres)) WideCharToMultiByte(CP_ACP, 0, out, -1, buff, sizeof(buff),0,0); \ else buff[0] = '\0'; \ ok(hres == ret && (FAILED(ret) || !strcmp(buff, str)), \ @@ -242,8 +224,6 @@ static void test_VarFormat(void) BSTR bstrin, out = NULL; HRESULT hres; - CHECKPTR(VarFormat); - if (PRIMARYLANGID(LANGIDFROMLCID(GetUserDefaultLCID())) != LANG_ENGLISH) { skip("Skipping VarFormat tests for non English language\n"); @@ -268,18 +248,12 @@ static void test_VarFormat(void) VNUMFMT(VT_I1,V_I1); VNUMFMT(VT_I2,V_I2); VNUMFMT(VT_I4,V_I4); - if (has_i8) - { - VNUMFMT(VT_I8,V_I8); - } + VNUMFMT(VT_I8,V_I8); VNUMFMT(VT_INT,V_INT); VNUMFMT(VT_UI1,V_UI1); VNUMFMT(VT_UI2,V_UI2); VNUMFMT(VT_UI4,V_UI4); - if (has_i8) - { - VNUMFMT(VT_UI8,V_UI8); - } + VNUMFMT(VT_UI8,V_UI8); VNUMFMT(VT_UINT,V_UINT); VNUMFMT(VT_R4,V_R4); VNUMFMT(VT_R8,V_R8); @@ -414,21 +388,21 @@ static void test_VarFormat(void) /* 'out' is not cleared */ out = (BSTR)0x1; - hres = pVarFormat(&in,NULL,fd,fw,flags,&out); /* Would crash if out is cleared */ + hres = VarFormat(&in,NULL,fd,fw,flags,&out); /* Would crash if out is cleared */ ok(hres == S_OK, "got %08x\n", hres); SysFreeString(out); out = NULL; /* VT_NULL */ V_VT(&in) = VT_NULL; - hres = pVarFormat(&in,NULL,fd,fw,0,&out); + hres = VarFormat(&in,NULL,fd,fw,0,&out); ok(hres == S_OK, "VarFormat failed with 0x%08x\n", hres); ok(out == NULL, "expected NULL formatted string\n"); /* Invalid args */ - hres = pVarFormat(&in,NULL,fd,fw,flags,NULL); + hres = VarFormat(&in,NULL,fd,fw,flags,NULL); ok(hres == E_INVALIDARG, "Null out: expected E_INVALIDARG, got 0x%08x\n", hres); - hres = pVarFormat(NULL,NULL,fd,fw,flags,&out); + hres = VarFormat(NULL,NULL,fd,fw,flags,&out); ok(hres == E_INVALIDARG, "Null in: expected E_INVALIDARG, got 0x%08x\n", hres); fd = -1; VARFMT(VT_BOOL,V_BOOL,VARIANT_TRUE,"",E_INVALIDARG,""); @@ -444,7 +418,7 @@ static const char *szVarWdnFail = "VarWeekdayName (%d, %d, %d, %d, %x): returned %8x, expected %8x\n"; #define VARWDN(iWeekday, fAbbrev, iFirstDay, dwFlags, ret, buff, out, freeOut) \ do { \ - hres = pVarWeekdayName(iWeekday, fAbbrev, iFirstDay, dwFlags, &out); \ + hres = VarWeekdayName(iWeekday, fAbbrev, iFirstDay, dwFlags, &out); \ if (SUCCEEDED(hres)) { \ WideCharToMultiByte(CP_ACP, 0, out, -1, buff, sizeof(buff), 0, 0); \ if (freeOut) SysFreeString(out); \ @@ -476,8 +450,6 @@ static void test_VarWeekdayName(void) int size; DWORD localeValue; - CHECKPTR(VarWeekdayName); - SetLastError(0xdeadbeef); GetLocaleInfoW(LOCALE_USER_DEFAULT, 0, NULL, 0); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) @@ -511,7 +483,7 @@ static void test_VarWeekdayName(void) VARWDN_F(4, 0, -1, 0, E_INVALIDARG); VARWDN_F(4, 0, 8, 0, E_INVALIDARG); - hres = pVarWeekdayName(1, 0, 0, 0, NULL); + hres = VarWeekdayName(1, 0, 0, 0, NULL); ok(E_INVALIDARG == hres, "Null pointer: expected E_INVALIDARG, got 0x%08x\n", hres); @@ -668,13 +640,9 @@ static void test_GetAltMonthNames(void) START_TEST(varformat) { - hOleaut32 = GetModuleHandleA("oleaut32.dll"); - - has_i8 = GetProcAddress(hOleaut32, "VarI8FromI1") != NULL; - - test_VarFormatNumber(); - test_VarFormat(); - test_VarWeekdayName(); - test_VarFormatFromTokens(); - test_GetAltMonthNames(); + test_VarFormatNumber(); + test_VarFormat(); + test_VarWeekdayName(); + test_VarFormatFromTokens(); + test_GetAltMonthNames(); } -- 2.30.0

1 2

[PATCH 2/2] mountmgr.sys: Have mountmgr_ioctl return the same status as the IoStatus.
by Erich E. Hoover 05 Feb '21

05 Feb '21

Per article: https://docs.microsoft.com/en-us/windows-hardware/drivers/kernel/different-… Best, Erich

1 0

[PATCH 1/2] mountmgr.sys: Have harddisk_ioctl return the same status as the IoStatus.
by Erich E. Hoover 05 Feb '21

05 Feb '21

Per article: https://docs.microsoft.com/en-us/windows-hardware/drivers/kernel/different-… Best, Erich

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
64
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-devel February 2021