May 2024 - Wine-Commits - list.winehq.org

Fabian Maurer : oleaut32: Handle cases where invoking a get-only property with INVOKE_PROPERTYPUT returns DISP_E_BADPARAMCOUNT.
by Alexandre Julliard May 20, 2024

May 20, 2024

Module: wine Branch: master Commit: 033cf797607a8a21f0851fcef3d19a73c6d6d70e URL: https://gitlab.winehq.org/wine/wine/-/commit/033cf797607a8a21f0851fcef3d19a… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed May 15 23:50:32 2024 +0200 oleaut32: Handle cases where invoking a get-only property with INVOKE_PROPERTYPUT returns DISP_E_BADPARAMCOUNT. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56666 --- dlls/oleaut32/tests/typelib.c | 12 ------------ dlls/oleaut32/typelib.c | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index ce60e99aa9d..eb5407f034f 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1241,49 +1241,41 @@ static void test_TypeInfo(void) /* call propget with DISPATCH_PROPERTYPUT on HRESULT func(out int) - 0 params */ dispparams.cArgs = 0; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 5, DISPATCH_PROPERTYPUT, &dispparams, &res, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on HRESULT func(out int) - 1 param */ dispparams.cArgs = 1; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 5, DISPATCH_PROPERTYPUT, &dispparams, &res, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on HRESULT func(out int) - 0 params - NULL result passed */ dispparams.cArgs = 0; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 5, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on on HRESULT func(out int) - 1 params - NULL result passed */ dispparams.cArgs = 1; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 5, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on int func() - 0 params */ dispparams.cArgs = 0; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 6, DISPATCH_PROPERTYPUT, &dispparams, &res, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on int func() - 1 params */ dispparams.cArgs = 1; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 6, DISPATCH_PROPERTYPUT, &dispparams, &res, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on int func() - 0 params - NULL result passed */ dispparams.cArgs = 0; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 6, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on int func() - 1 param - NULL result passed */ dispparams.cArgs = 1; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 6, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on int func(int) - 0 param - NULL result passed */ @@ -1299,7 +1291,6 @@ static void test_TypeInfo(void) /* call propget with DISPATCH_PROPERTYPUT on int func(int) - 2 params - NULL result passed */ dispparams.cArgs = 2; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 7, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on int func(int) - 3 params - NULL result passed */ @@ -1320,7 +1311,6 @@ static void test_TypeInfo(void) /* call propget with DISPATCH_PROPERTYPUT on HRESULT func(out int, int) - 2 params - NULL result passed */ dispparams.cArgs = 2; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 8, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on HRESULT func(out int, int) - 3 params - NULL result passed */ @@ -1346,7 +1336,6 @@ static void test_TypeInfo(void) /* call propget with DISPATCH_PROPERTYPUT on int func(int, int) - 3 params - NULL result passed */ dispparams.cArgs = 3; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 9, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on void func(int, int) - 0 params - NULL result passed */ @@ -1367,7 +1356,6 @@ static void test_TypeInfo(void) /* call propget with DISPATCH_PROPERTYPUT on void func(int, int) - 3 params - NULL result passed */ dispparams.cArgs = 3; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 10, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* If there's get and put, the put must work */ diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b1fbcdfed0a..196f059a587 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7547,6 +7547,28 @@ func_fail: return E_NOTIMPL; } + /* not found, check for special error cases */ + for (fdc = 0; fdc < This->typeattr.cFuncs; ++fdc) + { + const FUNCDESC *func_desc = &This->funcdescs[fdc].funcdesc; + if (memid == func_desc->memid) + { + if ((wFlags & INVOKE_PROPERTYPUT) && (func_desc->invkind & INVOKE_PROPERTYGET)) + { + int count_inputs = 0; + for (i = 0; i < func_desc->cParams; i++) + { + USHORT wParamFlags = func_desc->lprgelemdescParam[i].paramdesc.wParamFlags; + if (!(wParamFlags & PARAMFLAG_FRETVAL)) + count_inputs++; + } + + if (count_inputs == 0 || pDispParams->cArgs == count_inputs + 1) + return DISP_E_BADPARAMCOUNT; + } + } + } + /* not found, look for it in inherited interfaces */ ITypeInfo2_GetTypeKind(iface, &type_kind); if(type_kind == TKIND_INTERFACE || type_kind == TKIND_DISPATCH) {

1 0

Alexandre Julliard : msvcrt: Add helpers to abstract RVA accesses to RTTI data.
by Alexandre Julliard May 20, 2024

May 20, 2024

Module: wine Branch: master Commit: 3447792a5ad683000bd333d59aa0a10afeab00ec URL: https://gitlab.winehq.org/wine/wine/-/commit/3447792a5ad683000bd333d59aa0a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 16:31:34 2024 +0200 msvcrt: Add helpers to abstract RVA accesses to RTTI data. --- dlls/msvcp90/cxx.h | 40 ++++++++++++++++++++++++++++++++++-- dlls/msvcrt/cpp.c | 54 ++++++++++++++----------------------------------- dlls/msvcrt/cppexcept.h | 2 +- dlls/msvcrt/cxx.h | 40 ++++++++++++++++++++++++++++++++++-- 4 files changed, 92 insertions(+), 44 deletions(-) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index a7c7a86a899..c0b43f78256 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -16,8 +16,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "winternl.h" +#include "rtlsupportapi.h" #include "wine/asm.h" +#ifndef __x86_64__ +#undef RTTI_USE_RVA +#else +#define RTTI_USE_RVA 1 +#endif + #ifdef _WIN64 #define VTABLE_ADD_FUNC(name) "\t.quad " THISCALL_NAME(name) "\n" @@ -44,7 +53,7 @@ #endif /* _WIN64 */ -#ifndef __x86_64__ +#ifndef RTTI_USE_RVA #define DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ static type_info name ## _type_info = { \ @@ -330,7 +339,7 @@ typedef struct int vbase_offset; /* offset of this pointer offset in virtual base class descriptor */ } this_ptr_offsets; -#ifndef __x86_64__ +#ifndef RTTI_USE_RVA typedef struct _rtti_base_descriptor { @@ -445,6 +454,33 @@ typedef struct extern const vtable_ptr type_info_vtable; +#ifdef RTTI_USE_RVA + +static inline uintptr_t rtti_rva_base( const void *ptr ) +{ + void *base; + return (uintptr_t)RtlPcToFileHeader( (void *)ptr, &base ); +} + +static inline void *rtti_rva( unsigned int rva, uintptr_t base ) +{ + return (void *)(base + rva); +} + +#else + +static inline uintptr_t rtti_rva_base( const void *ptr ) +{ + return 0; +} + +static inline void *rtti_rva( const void *ptr, uintptr_t base ) +{ + return (void *)ptr; +} + +#endif + #define CREATE_TYPE_INFO_VTABLE \ DEFINE_THISCALL_WRAPPER(type_info_vector_dtor,8) \ void * __thiscall type_info_vector_dtor(type_info * _this, unsigned int flags) \ diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 943f5936a19..b98dca4ee6c 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -65,62 +65,38 @@ static inline const rtti_object_locator *get_obj_locator( void *cppobj ) return (const rtti_object_locator *)vtable[-1]; } -#ifndef __x86_64__ -static void dump_obj_locator( const rtti_object_locator *ptr ) +static uintptr_t get_obj_locator_base( const rtti_object_locator *ptr ) { - int i; - const rtti_object_hierarchy *h = ptr->type_hierarchy; - - TRACE( "%p: sig=%08x base_offset=%08x flags=%08x type=%p %s hierarchy=%p\n", - ptr, ptr->signature, ptr->base_class_offset, ptr->flags, - ptr->type_descriptor, dbgstr_type_info(ptr->type_descriptor), ptr->type_hierarchy ); - TRACE( " hierarchy: sig=%08x attr=%08x len=%d base classes=%p\n", - h->signature, h->attributes, h->array_len, h->base_classes ); - for (i = 0; i < h->array_len; i++) - { - TRACE( " base class %p: num %d off %d,%d,%d attr %08x type %p %s\n", - h->base_classes->bases[i], - h->base_classes->bases[i]->num_base_classes, - h->base_classes->bases[i]->offsets.this_offset, - h->base_classes->bases[i]->offsets.vbase_descr, - h->base_classes->bases[i]->offsets.vbase_offset, - h->base_classes->bases[i]->attributes, - h->base_classes->bases[i]->type_descriptor, - dbgstr_type_info(h->base_classes->bases[i]->type_descriptor) ); - } +#ifdef RTTI_USE_RVA + if (ptr->signature) return (uintptr_t)ptr - ptr->object_locator; +#endif + return rtti_rva_base( ptr ); } -#else - static void dump_obj_locator( const rtti_object_locator *ptr ) { int i; - char *base = ptr->signature == 0 ? RtlPcToFileHeader((void*)ptr, (void**)&base) : (char*)ptr - ptr->object_locator; - const rtti_object_hierarchy *h = (const rtti_object_hierarchy*)(base + ptr->type_hierarchy); - const type_info *type_descriptor = (const type_info*)(base + ptr->type_descriptor); + uintptr_t base = get_obj_locator_base( ptr ); + const rtti_object_hierarchy *h = rtti_rva( ptr->type_hierarchy, base ); + const type_info *type_descriptor = rtti_rva( ptr->type_descriptor, base ); TRACE( "%p: sig=%08x base_offset=%08x flags=%08x type=%p %s hierarchy=%p\n", ptr, ptr->signature, ptr->base_class_offset, ptr->flags, type_descriptor, dbgstr_type_info(type_descriptor), h ); TRACE( " hierarchy: sig=%08x attr=%08x len=%d base classes=%p\n", - h->signature, h->attributes, h->array_len, base + h->base_classes ); + h->signature, h->attributes, h->array_len, rtti_rva(h->base_classes, base) ); for (i = 0; i < h->array_len; i++) { - const rtti_base_descriptor *bases = (rtti_base_descriptor*)(base + - ((const rtti_base_array*)(base + h->base_classes))->bases[i]); + const rtti_base_array *base_array = rtti_rva( h->base_classes, base ); + const rtti_base_descriptor *bases = rtti_rva( base_array->bases[i], base ); TRACE( " base class %p: num %d off %d,%d,%d attr %08x type %p %s\n", - bases, - bases->num_base_classes, - bases->offsets.this_offset, - bases->offsets.vbase_descr, - bases->offsets.vbase_offset, - bases->attributes, - base + bases->type_descriptor, - dbgstr_type_info((const type_info*)(base + bases->type_descriptor)) ); + bases, bases->num_base_classes, bases->offsets.this_offset, + bases->offsets.vbase_descr, bases->offsets.vbase_offset, bases->attributes, + rtti_rva( bases->type_descriptor, base ), + dbgstr_type_info((const type_info*)(base + bases->type_descriptor)) ); } } -#endif /****************************************************************** * ??0exception@@QAE(a)ABQBD@Z (MSVCRT.@) diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index 48b370d1be6..adde30b6d15 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -28,7 +28,7 @@ #define CXX_FRAME_MAGIC_VC8 0x19930522 #define CXX_EXCEPTION 0xe06d7363 -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA #define CXX_EXCEPTION_PARAMS 4 #else #define CXX_EXCEPTION_PARAMS 3 diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index a7c7a86a899..c0b43f78256 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -16,8 +16,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "winternl.h" +#include "rtlsupportapi.h" #include "wine/asm.h" +#ifndef __x86_64__ +#undef RTTI_USE_RVA +#else +#define RTTI_USE_RVA 1 +#endif + #ifdef _WIN64 #define VTABLE_ADD_FUNC(name) "\t.quad " THISCALL_NAME(name) "\n" @@ -44,7 +53,7 @@ #endif /* _WIN64 */ -#ifndef __x86_64__ +#ifndef RTTI_USE_RVA #define DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ static type_info name ## _type_info = { \ @@ -330,7 +339,7 @@ typedef struct int vbase_offset; /* offset of this pointer offset in virtual base class descriptor */ } this_ptr_offsets; -#ifndef __x86_64__ +#ifndef RTTI_USE_RVA typedef struct _rtti_base_descriptor { @@ -445,6 +454,33 @@ typedef struct extern const vtable_ptr type_info_vtable; +#ifdef RTTI_USE_RVA + +static inline uintptr_t rtti_rva_base( const void *ptr ) +{ + void *base; + return (uintptr_t)RtlPcToFileHeader( (void *)ptr, &base ); +} + +static inline void *rtti_rva( unsigned int rva, uintptr_t base ) +{ + return (void *)(base + rva); +} + +#else + +static inline uintptr_t rtti_rva_base( const void *ptr ) +{ + return 0; +} + +static inline void *rtti_rva( const void *ptr, uintptr_t base ) +{ + return (void *)ptr; +} + +#endif + #define CREATE_TYPE_INFO_VTABLE \ DEFINE_THISCALL_WRAPPER(type_info_vector_dtor,8) \ void * __thiscall type_info_vector_dtor(type_info * _this, unsigned int flags) \

1 0

Alexandre Julliard : msvcrt: Unify __RTDynamicCast implementation.
by Alexandre Julliard May 20, 2024

May 20, 2024

Module: wine Branch: master Commit: df4c55624957f4d55ac394ed4445759b4d0d3366 URL: https://gitlab.winehq.org/wine/wine/-/commit/df4c55624957f4d55ac394ed444575… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 16:35:04 2024 +0200 msvcrt: Unify __RTDynamicCast implementation. --- dlls/msvcrt/cpp.c | 74 +++++-------------------------------------------------- 1 file changed, 6 insertions(+), 68 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 60a3da82773..08bed2d178c 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -781,7 +781,6 @@ const type_info* CDECL __RTtypeid(void *cppobj) * This function is usually called by compiler generated code as a result * of using one of the C++ dynamic cast statements. */ -#ifndef __x86_64__ void* CDECL __RTDynamicCast(void *cppobj, int unknown, type_info *src, type_info *dst, int do_throw) @@ -805,21 +804,23 @@ void* CDECL __RTDynamicCast(void *cppobj, int unknown, { int i; const rtti_object_locator *obj_locator = get_obj_locator( cppobj ); - const rtti_object_hierarchy *obj_bases = obj_locator->type_hierarchy; - const rtti_base_descriptor * const* base_desc = obj_bases->base_classes->bases; + uintptr_t base = get_obj_locator_base( obj_locator ); + const rtti_object_hierarchy *obj_bases = rtti_rva( obj_locator->type_hierarchy, base ); + const rtti_base_array *base_array = rtti_rva( obj_bases->base_classes, base ); if (TRACE_ON(msvcrt)) dump_obj_locator(obj_locator); ret = NULL; for (i = 0; i < obj_bases->array_len; i++) { - const type_info *typ = base_desc[i]->type_descriptor; + const rtti_base_descriptor *base_desc = rtti_rva( base_array->bases[i], base ); + const type_info *typ = rtti_rva( base_desc->type_descriptor, base ); if (!strcmp(typ->mangled, dst->mangled)) { /* compute the correct this pointer for that base class */ void *this_ptr = (char *)cppobj - obj_locator->base_class_offset; - ret = get_this_pointer( &base_desc[i]->offsets, this_ptr ); + ret = get_this_pointer( &base_desc->offsets, this_ptr ); break; } } @@ -844,69 +845,6 @@ void* CDECL __RTDynamicCast(void *cppobj, int unknown, return ret; } -#else - -void* CDECL __RTDynamicCast(void *cppobj, int unknown, - type_info *src, type_info *dst, - int do_throw) -{ - void *ret; - - if (!cppobj) return NULL; - - TRACE("obj: %p unknown: %d src: %p %s dst: %p %s do_throw: %d)\n", - cppobj, unknown, src, dbgstr_type_info(src), dst, dbgstr_type_info(dst), do_throw); - - __TRY - { - int i; - const rtti_object_locator *obj_locator = get_obj_locator( cppobj ); - const rtti_object_hierarchy *obj_bases; - const rtti_base_array *base_array; - char *base; - - if (TRACE_ON(msvcrt)) dump_obj_locator(obj_locator); - - if(obj_locator->signature == 0) - base = RtlPcToFileHeader((void*)obj_locator, (void**)&base); - else - base = (char*)obj_locator - obj_locator->object_locator; - - obj_bases = (const rtti_object_hierarchy*)(base + obj_locator->type_hierarchy); - base_array = (const rtti_base_array*)(base + obj_bases->base_classes); - - ret = NULL; - for (i = 0; i < obj_bases->array_len; i++) - { - const rtti_base_descriptor *base_desc = (const rtti_base_descriptor*)(base + base_array->bases[i]); - const type_info *typ = (const type_info*)(base + base_desc->type_descriptor); - - if (!strcmp(typ->mangled, dst->mangled)) - { - void *this_ptr = (char *)cppobj - obj_locator->base_class_offset; - ret = get_this_pointer( &base_desc->offsets, this_ptr ); - break; - } - } - if (!ret && do_throw) - { - const char *msg = "Bad dynamic_cast!"; - bad_cast e; - bad_cast_ctor( &e, &msg ); - _CxxThrowException( &e, &bad_cast_exception_type ); - } - } - __EXCEPT_PAGE_FAULT - { - __non_rtti_object e; - __non_rtti_object_ctor( &e, "Access violation - no RTTI data!" ); - _CxxThrowException( &e, &__non_rtti_object_exception_type ); - } - __ENDTRY - return ret; -} -#endif - /****************************************************************** * __RTCastToVoid (MSVCRT.@)

1 0

Alexandre Julliard : msvcrt: Unify __RTtypeid implementation.
by Alexandre Julliard May 20, 2024

May 20, 2024

Module: wine Branch: master Commit: 04755e4aac432de9c2dad9e0a252ff8e98b8dc47 URL: https://gitlab.winehq.org/wine/wine/-/commit/04755e4aac432de9c2dad9e0a252ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 16:33:54 2024 +0200 msvcrt: Unify __RTtypeid implementation. --- dlls/msvcrt/cpp.c | 39 ++------------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index b98dca4ee6c..60a3da82773 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -731,7 +731,6 @@ void CDECL unexpected(void) * This function is usually called by compiler generated code as a result * of using one of the C++ dynamic cast statements. */ -#ifndef __x86_64__ const type_info* CDECL __RTtypeid(void *cppobj) { const type_info *ret; @@ -746,42 +745,9 @@ const type_info* CDECL __RTtypeid(void *cppobj) __TRY { const rtti_object_locator *obj_locator = get_obj_locator( cppobj ); - ret = obj_locator->type_descriptor; - } - __EXCEPT_PAGE_FAULT - { - __non_rtti_object e; - __non_rtti_object_ctor( &e, "Bad read pointer - no RTTI data!" ); - _CxxThrowException( &e, &__non_rtti_object_exception_type ); - } - __ENDTRY - return ret; -} + uintptr_t base = get_obj_locator_base( obj_locator ); -#else - -const type_info* CDECL __RTtypeid(void *cppobj) -{ - const type_info *ret; - - if (!cppobj) - { - bad_typeid e; - bad_typeid_ctor( &e, "Attempted a typeid of NULL pointer!" ); - _CxxThrowException( &e, &bad_typeid_exception_type ); - } - - __TRY - { - const rtti_object_locator *obj_locator = get_obj_locator( cppobj ); - char *base; - - if(obj_locator->signature == 0) - base = RtlPcToFileHeader((void*)obj_locator, (void**)&base); - else - base = (char*)obj_locator - obj_locator->object_locator; - - ret = (type_info*)(base + obj_locator->type_descriptor); + ret = rtti_rva( obj_locator->type_descriptor, base ); } __EXCEPT_PAGE_FAULT { @@ -792,7 +758,6 @@ const type_info* CDECL __RTtypeid(void *cppobj) __ENDTRY return ret; } -#endif /****************************************************************** * __RTDynamicCast (MSVCRT.@)

1 0

Brendan Shanks : ntdll: Don't warn on macOS and FreeBSD when xattr doesn't exist.
by Alexandre Julliard May 20, 2024

May 20, 2024

Module: wine Branch: master Commit: ed9ec141d527839160d9b6272e53967777887db1 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed9ec141d527839160d9b6272e5396… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon May 20 12:20:30 2024 -0700 ntdll: Don't warn on macOS and FreeBSD when xattr doesn't exist. --- dlls/ntdll/unix/file.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index d292d934efa..d1a6573ed69 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1595,6 +1595,9 @@ static int fd_get_file_info( int fd, unsigned int options, struct stat *st, ULON if (errno == ENOTSUP) return ret; #ifdef ENODATA if (errno == ENODATA) return ret; +#endif +#ifdef ENOATTR + if (errno == ENOATTR) return ret; #endif WARN( "Failed to get extended attribute " SAMBA_XATTR_DOS_ATTRIB ". errno %d (%s)\n", errno, strerror( errno ) ); @@ -1694,6 +1697,9 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr ) if (errno == ENOTSUP) return ret; #ifdef ENODATA if (errno == ENODATA) return ret; +#endif +#ifdef ENOATTR + if (errno == ENOATTR) return ret; #endif WARN( "Failed to get extended attribute " SAMBA_XATTR_DOS_ATTRIB " from \"%s\". errno %d (%s)\n", path, errno, strerror( errno ) );

1 0

Alexandre Julliard : msvcrt: Unify _is_exception_typeof implementation.
by Alexandre Julliard May 20, 2024

May 20, 2024

Module: wine Branch: master Commit: f7e2ac9546b808aab55535a7fed206a8761d2916 URL: https://gitlab.winehq.org/wine/wine/-/commit/f7e2ac9546b808aab55535a7fed206… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 16:37:15 2024 +0200 msvcrt: Unify _is_exception_typeof implementation. --- dlls/msvcrt/cpp.c | 47 ++++++----------------------------------------- 1 file changed, 6 insertions(+), 41 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index c941be8fd36..7e0d3f69396 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -904,42 +904,6 @@ void WINAPI _CxxThrowException( void *object, const cxx_exception_type *type ) * ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z * ?_is_exception_typeof@@YAHAEBVtype_info@@PEAU_EXCEPTION_POINTERS@@@Z */ -#ifndef __x86_64__ -int __cdecl _is_exception_typeof(const type_info *ti, EXCEPTION_POINTERS *ep) -{ - int ret = -1; - - TRACE("(%p %p)\n", ti, ep); - - __TRY - { - EXCEPTION_RECORD *rec = ep->ExceptionRecord; - - if (is_cxx_exception( rec )) - { - const cxx_type_info_table *tit = ((cxx_exception_type*)rec->ExceptionInformation[2])->type_info_table; - int i; - - for (i=0; i<tit->count; i++) { - if (ti==tit->info[i]->type_info || !strcmp(ti->mangled, tit->info[i]->type_info->mangled)) - { - ret = 1; - break; - } - } - - if (i == tit->count) - ret = 0; - } - } - __EXCEPT_PAGE_FAULT - __ENDTRY - - if(ret == -1) - terminate(); - return ret; -} -#else int __cdecl _is_exception_typeof(const type_info *ti, EXCEPTION_POINTERS *ep) { int ret = -1; @@ -953,12 +917,14 @@ int __cdecl _is_exception_typeof(const type_info *ti, EXCEPTION_POINTERS *ep) if (is_cxx_exception( rec )) { const cxx_exception_type *et = (cxx_exception_type*)rec->ExceptionInformation[2]; - const cxx_type_info_table *tit = (const cxx_type_info_table*)(rec->ExceptionInformation[3]+et->type_info_table); + uintptr_t base = (CXX_EXCEPTION_PARAMS == 4) ? rec->ExceptionInformation[3] : 0; + const cxx_type_info_table *tit = rtti_rva( et->type_info_table, base ); int i; - for (i=0; i<tit->count; i++) { - const cxx_type_info *cti = (const cxx_type_info*)(rec->ExceptionInformation[3]+tit->info[i]); - const type_info *except_ti = (const type_info*)(rec->ExceptionInformation[3]+cti->type_info); + for (i=0; i<tit->count; i++) + { + const cxx_type_info *cti = rtti_rva( tit->info[i], base ); + const type_info *except_ti = rtti_rva( cti->type_info, base ); if (ti==except_ti || !strcmp(ti->mangled, except_ti->mangled)) { ret = 1; @@ -977,7 +943,6 @@ int __cdecl _is_exception_typeof(const type_info *ti, EXCEPTION_POINTERS *ep) terminate(); return ret; } -#endif /********************************************************************* * __clean_type_info_names_internal (MSVCR80.@)

1 0

Alexandre Julliard : msvcrt: Unify _CxxThrowException implementation.
by Alexandre Julliard May 20, 2024

May 20, 2024

Module: wine Branch: master Commit: 6aa08b13e9db5c98d3e98f38d2cfac02e00253d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/6aa08b13e9db5c98d3e98f38d2cfac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 16:36:18 2024 +0200 msvcrt: Unify _CxxThrowException implementation. --- dlls/msvcrt/cpp.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 08bed2d178c..c941be8fd36 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -887,28 +887,16 @@ void* CDECL __RTCastToVoid(void *cppobj) /********************************************************************* * _CxxThrowException (MSVCRT.@) */ -#ifndef __x86_64__ -void WINAPI _CxxThrowException( void *object, const cxx_exception_type *type ) -{ - ULONG_PTR args[3]; - - args[0] = CXX_FRAME_MAGIC_VC6; - args[1] = (ULONG_PTR)object; - args[2] = (ULONG_PTR)type; - RaiseException( CXX_EXCEPTION, EXCEPTION_NONCONTINUABLE, 3, args ); -} -#else void WINAPI _CxxThrowException( void *object, const cxx_exception_type *type ) { - ULONG_PTR args[4]; + ULONG_PTR args[CXX_EXCEPTION_PARAMS]; args[0] = CXX_FRAME_MAGIC_VC6; args[1] = (ULONG_PTR)object; args[2] = (ULONG_PTR)type; - RtlPcToFileHeader( (void*)type, (void**)&args[3]); - RaiseException( CXX_EXCEPTION, EXCEPTION_NONCONTINUABLE, 4, args ); + if (CXX_EXCEPTION_PARAMS == 4) args[3] = rtti_rva_base( type ); + RaiseException( CXX_EXCEPTION, EXCEPTION_NONCONTINUABLE, CXX_EXCEPTION_PARAMS, args ); } -#endif #if _MSVCR_VER >= 80

1 0

Fabian Maurer : oleaut32: Add test for invoking a dispatch get-only property with DISPATCH_PROPERTYPUT.
by Alexandre Julliard May 20, 2024

May 20, 2024

Module: wine Branch: master Commit: 82036f42f18739e42b28772e5f5a048fc94a329b URL: https://gitlab.winehq.org/wine/wine/-/commit/82036f42f18739e42b28772e5f5a04… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed May 15 01:05:04 2024 +0200 oleaut32: Add test for invoking a dispatch get-only property with DISPATCH_PROPERTYPUT. --- dlls/oleaut32/tests/test_reg.idl | 16 +++ dlls/oleaut32/tests/typelib.c | 206 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 220 insertions(+), 2 deletions(-)

1 0

Alexandros Frantzis : opengl32: Remove the wglDescribePixelFormat driver entry point.
by Alexandre Julliard May 20, 2024

May 20, 2024

Module: wine Branch: master Commit: 653f00cf3e81e691cb636d645eb91df3df5a9e39 URL: https://gitlab.winehq.org/wine/wine/-/commit/653f00cf3e81e691cb636d645eb91d… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon May 13 09:48:26 2024 +0300 opengl32: Remove the wglDescribePixelFormat driver entry point. All drivers have now switched to the get_pixel_formats entry point. --- dlls/opengl32/make_opengl | 2 +- dlls/opengl32/unix_thunks.c | 38 -------------------------------------- dlls/opengl32/unixlib.h | 11 ----------- dlls/opengl32/wgl.c | 19 ++++++------------- dlls/win32u/dibdrv/dc.c | 1 - dlls/wineandroid.drv/opengl.c | 1 - dlls/winemac.drv/opengl.c | 1 - dlls/winex11.drv/opengl.c | 1 - include/wine/wgl_driver.h | 3 +-- 9 files changed, 8 insertions(+), 69 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 215caad4639..f1fddb6dcfa 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -149,6 +149,7 @@ my %manual_win_functions = "wglChoosePixelFormat" => 1, "wglCreateLayerContext" => 1, "wglDescribeLayerPlane" => 1, + "wglDescribePixelFormat" => 1, "wglGetCurrentContext" => 1, "wglGetCurrentDC" => 1, "wglGetDefaultProcAddress" => 1, @@ -176,7 +177,6 @@ my %manual_win_thunks = "glUnmapBufferARB" => 1, "glUnmapNamedBuffer" => 1, "glUnmapNamedBufferEXT" => 1, - "wglDescribePixelFormat" => 1, "wglGetCurrentReadDCARB" => 1, "wglGetExtensionsStringARB" => 1, "wglGetExtensionsStringEXT" => 1, diff --git a/dlls/opengl32/unix_thunks.c b/dlls/opengl32/unix_thunks.c index abb436bdc05..ef14887461a 100644 --- a/dlls/opengl32/unix_thunks.c +++ b/dlls/opengl32/unix_thunks.c @@ -48,15 +48,6 @@ extern NTSTATUS ext_wglReleasePbufferDCARB( void *args ); extern NTSTATUS ext_wglReleaseTexImageARB( void *args ); extern NTSTATUS ext_wglSetPbufferAttribARB( void *args ); -static NTSTATUS wgl_wglDescribePixelFormat( void *args ) -{ - struct wglDescribePixelFormat_params *params = args; - const struct opengl_funcs *funcs = get_dc_funcs( params->hdc ); - if (!funcs || !funcs->wgl.p_wglDescribePixelFormat) return STATUS_NOT_IMPLEMENTED; - params->ret = funcs->wgl.p_wglDescribePixelFormat( params->hdc, params->ipfd, params->cjpfd, params->ppfd ); - return STATUS_SUCCESS; -} - static NTSTATUS wgl_wglGetPixelFormat( void *args ) { struct wglGetPixelFormat_params *params = args; @@ -24211,7 +24202,6 @@ const unixlib_entry_t __wine_unix_call_funcs[] = &wgl_wglCopyContext, &wgl_wglCreateContext, &wgl_wglDeleteContext, - &wgl_wglDescribePixelFormat, &wgl_wglGetPixelFormat, &wgl_wglGetProcAddress, &wgl_wglMakeCurrent, @@ -27281,31 +27271,6 @@ static NTSTATUS wow64_wgl_wglCopyContext( void *args ) return status; } -static NTSTATUS wow64_wgl_wglDescribePixelFormat( void *args ) -{ - struct - { - PTR32 teb; - PTR32 hdc; - int ipfd; - UINT cjpfd; - PTR32 ppfd; - int ret; - } *params32 = args; - struct wglDescribePixelFormat_params params = - { - .teb = get_teb64(params32->teb), - .hdc = ULongToPtr(params32->hdc), - .ipfd = params32->ipfd, - .cjpfd = params32->cjpfd, - .ppfd = ULongToPtr(params32->ppfd), - }; - NTSTATUS status; - status = wgl_wglDescribePixelFormat( &params ); - params32->ret = params.ret; - return status; -} - static NTSTATUS wow64_wgl_wglGetPixelFormat( void *args ) { struct @@ -92333,7 +92298,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_wgl_wglCopyContext, wow64_wgl_wglCreateContext, wow64_wgl_wglDeleteContext, - wow64_wgl_wglDescribePixelFormat, wow64_wgl_wglGetPixelFormat, wow64_wgl_wglGetProcAddress, wow64_wgl_wglMakeCurrent, @@ -95377,7 +95341,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = static BOOL null_wglCopyContext( struct wgl_context * hglrcSrc, struct wgl_context * hglrcDst, UINT mask ) { return 0; } static struct wgl_context * null_wglCreateContext( HDC hDc ) { return 0; } static BOOL null_wglDeleteContext( struct wgl_context * oldContext ) { return 0; } -static int null_wglDescribePixelFormat( HDC hdc, int ipfd, UINT cjpfd, PIXELFORMATDESCRIPTOR *ppfd ) { return 0; } static int null_wglGetPixelFormat( HDC hdc ) { return 0; } static PROC null_wglGetProcAddress( LPCSTR lpszProc ) { return 0; } static BOOL null_wglMakeCurrent( HDC hDc, struct wgl_context * newContext ) { return 0; } @@ -98421,7 +98384,6 @@ struct opengl_funcs null_opengl_funcs = null_wglCopyContext, null_wglCreateContext, null_wglDeleteContext, - null_wglDescribePixelFormat, null_wglGetPixelFormat, null_wglGetProcAddress, null_wglMakeCurrent, diff --git a/dlls/opengl32/unixlib.h b/dlls/opengl32/unixlib.h index 3e1e6206478..301038ca102 100644 --- a/dlls/opengl32/unixlib.h +++ b/dlls/opengl32/unixlib.h @@ -39,16 +39,6 @@ struct wglDeleteContext_params BOOL ret; }; -struct wglDescribePixelFormat_params -{ - TEB *teb; - HDC hdc; - int ipfd; - UINT cjpfd; - PIXELFORMATDESCRIPTOR *ppfd; - int ret; -}; - struct wglGetPixelFormat_params { TEB *teb; @@ -25349,7 +25339,6 @@ enum unix_funcs unix_wglCopyContext, unix_wglCreateContext, unix_wglDeleteContext, - unix_wglDescribePixelFormat, unix_wglGetPixelFormat, unix_wglGetProcAddress, unix_wglMakeCurrent, diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 9d2ce4ea215..ff97d31b3eb 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -345,26 +345,19 @@ error: INT WINAPI wglDescribePixelFormat( HDC hdc, int index, UINT size, PIXELFORMATDESCRIPTOR *ppfd ) { - struct wglDescribePixelFormat_params args = { .teb = NtCurrentTeb(), .hdc = hdc, .ipfd = index, .cjpfd = size, .ppfd = ppfd }; - NTSTATUS status; struct wgl_pixel_format *formats; UINT num_formats, num_onscreen_formats; TRACE( "hdc %p, index %d, size %u, ppfd %p\n", hdc, index, index, ppfd ); - if ((formats = get_pixel_formats( hdc, &num_formats, &num_onscreen_formats ))) - { - if (!ppfd) return num_onscreen_formats; - if (size < sizeof(*ppfd)) return 0; - if (index <= 0 || index > num_onscreen_formats) return 0; + if (!(formats = get_pixel_formats( hdc, &num_formats, &num_onscreen_formats ))) return 0; + if (!ppfd) return num_onscreen_formats; + if (size < sizeof(*ppfd)) return 0; + if (index <= 0 || index > num_onscreen_formats) return 0; - *ppfd = formats[index - 1].pfd; + *ppfd = formats[index - 1].pfd; - return num_onscreen_formats; - } - - if ((status = UNIX_CALL( wglDescribePixelFormat, &args ))) WARN( "wglDescribePixelFormat returned %#lx\n", status ); - return args.ret; + return num_onscreen_formats; } /*********************************************************************** diff --git a/dlls/win32u/dibdrv/dc.c b/dlls/win32u/dibdrv/dc.c index 0d53915b2ba..38039e7d6ae 100644 --- a/dlls/win32u/dibdrv/dc.c +++ b/dlls/win32u/dibdrv/dc.c @@ -600,7 +600,6 @@ static struct opengl_funcs opengl_funcs = dibdrv_wglCopyContext, /* p_wglCopyContext */ dibdrv_wglCreateContext, /* p_wglCreateContext */ dibdrv_wglDeleteContext, /* p_wglDeleteContext */ - NULL, /* p_wglDescribePixelFormat */ dibdrv_wglGetPixelFormat, /* p_wglGetPixelFormat */ dibdrv_wglGetProcAddress, /* p_wglGetProcAddress */ dibdrv_wglMakeCurrent, /* p_wglMakeCurrent */ diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index f882c86b976..7981b9be9ee 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -1066,7 +1066,6 @@ static struct opengl_funcs egl_funcs = android_wglCopyContext, android_wglCreateContext, android_wglDeleteContext, - NULL, /* p_wglDescribePixelFormat */ android_wglGetPixelFormat, android_wglGetProcAddress, android_wglMakeCurrent, diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 1c0b87d694a..a614a5b076b 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -4614,7 +4614,6 @@ static struct opengl_funcs opengl_funcs = macdrv_wglCopyContext, /* p_wglCopyContext */ macdrv_wglCreateContext, /* p_wglCreateContext */ macdrv_wglDeleteContext, /* p_wglDeleteContext */ - NULL, /* p_wglDescribePixelFormat */ macdrv_wglGetPixelFormat, /* p_wglGetPixelFormat */ macdrv_wglGetProcAddress, /* p_wglGetProcAddress */ macdrv_wglMakeCurrent, /* p_wglMakeCurrent */ diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 02a7980d911..8ab3e3474d3 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3457,7 +3457,6 @@ static struct opengl_funcs opengl_funcs = glxdrv_wglCopyContext, /* p_wglCopyContext */ glxdrv_wglCreateContext, /* p_wglCreateContext */ glxdrv_wglDeleteContext, /* p_wglDeleteContext */ - NULL, /* p_wglDescribePixelFormat */ glxdrv_wglGetPixelFormat, /* p_wglGetPixelFormat */ glxdrv_wglGetProcAddress, /* p_wglGetProcAddress */ glxdrv_wglMakeCurrent, /* p_wglMakeCurrent */ diff --git a/include/wine/wgl_driver.h b/include/wine/wgl_driver.h index 5bf72a7f269..b08ab4befde 100644 --- a/include/wine/wgl_driver.h +++ b/include/wine/wgl_driver.h @@ -7,7 +7,7 @@ #define WINE_GLAPI #endif -#define WINE_WGL_DRIVER_VERSION 24 +#define WINE_WGL_DRIVER_VERSION 25 struct wgl_context; struct wgl_pbuffer; @@ -24,7 +24,6 @@ struct opengl_funcs BOOL (WINE_GLAPI *p_wglCopyContext)( struct wgl_context * hglrcSrc, struct wgl_context * hglrcDst, UINT mask ); struct wgl_context * (WINE_GLAPI *p_wglCreateContext)( HDC hDc ); BOOL (WINE_GLAPI *p_wglDeleteContext)( struct wgl_context * oldContext ); - int (WINE_GLAPI *p_wglDescribePixelFormat)( HDC hdc, int ipfd, UINT cjpfd, PIXELFORMATDESCRIPTOR *ppfd ); int (WINE_GLAPI *p_wglGetPixelFormat)( HDC hdc ); PROC (WINE_GLAPI *p_wglGetProcAddress)( LPCSTR lpszProc ); BOOL (WINE_GLAPI *p_wglMakeCurrent)( HDC hDc, struct wgl_context * newContext );

1 0

Danyil Blyschak : win32u: Remove external fonts from the registry before writing to it.
by Alexandre Julliard May 20, 2024

May 20, 2024

Module: wine Branch: master Commit: c8117e8b67d8154448a937047047c02b74e41ec0 URL: https://gitlab.winehq.org/wine/wine/-/commit/c8117e8b67d8154448a937047047c0… Author: Danyil Blyschak <dblyschak(a)codeweavers.com> Date: Fri May 17 13:37:22 2024 -0500 win32u: Remove external fonts from the registry before writing to it. In update_external_font_keys(), remove the fonts from the registry immediately after we mark them for deletion, and then proceed to add or update values in the registry. This prevents a font from being marked as deleted, then being updated in the registry, and then removed from the registry regardless. When this happened, the registry would not contain the value for this font that we intended to update it with. This function would need to run again for this value to be added to the registry, but since this function runs during initialization, this means that a subsequent launch of wine was necessary. By removing the old value from the registry first, and then adding the new one, the initialization process becomes idempotent starting from the first run. --- dlls/win32u/font.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 277849ac4d9..7e70cccf568 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -6664,6 +6664,14 @@ static void update_external_font_keys(void) list_add_tail( &external_keys, &key->entry ); } + LIST_FOR_EACH_ENTRY_SAFE( key, next, &external_keys, struct external_key, entry ) + { + reg_delete_value( win9x_key, key->value ); + reg_delete_value( winnt_key, key->value ); + reg_delete_value( hkey, key->value ); + list_remove( &key->entry ); + free( key ); + } WINE_RB_FOR_EACH_ENTRY( family, &family_name_tree, struct gdi_font_family, name_entry ) { LIST_FOR_EACH_ENTRY( face, &family->faces, struct gdi_font_face, entry ) @@ -6690,14 +6698,6 @@ static void update_external_font_keys(void) set_reg_value( hkey, value, REG_SZ, file, len ); } } - LIST_FOR_EACH_ENTRY_SAFE( key, next, &external_keys, struct external_key, entry ) - { - reg_delete_value( win9x_key, key->value ); - reg_delete_value( winnt_key, key->value ); - reg_delete_value( hkey, key->value ); - list_remove( &key->entry ); - free( key ); - } NtClose( win9x_key ); NtClose( winnt_key ); NtClose( hkey );

1 0