July 2023 - Wine-commits - list.winehq.org

Gabriel Ivăncescu : jscript: Implement WeakMap.get().
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: bc1b8b277aa830d3e4f55ca638a6e761824946e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/bc1b8b277aa830d3e4f55ca638a6e7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 20 16:59:46 2023 +0300 jscript: Implement WeakMap.get(). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/set.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index f8c07474632..2ad6c683a46 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -683,8 +683,23 @@ static HRESULT WeakMap_delete(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsi static HRESULT WeakMap_get(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("\n"); - return E_NOTIMPL; + jsdisp_t *key = (argc >= 1 && is_object_instance(argv[0])) ? to_jsdisp(get_object(argv[0])) : NULL; + struct weakmap_entry *entry; + WeakMapInstance *weakmap; + HRESULT hres; + + hres = get_weakmap_this(ctx, vthis, &weakmap); + if(FAILED(hres)) + return hres; + + TRACE("%p (%p)\n", weakmap, key); + + if(!(entry = get_weakmap_entry(weakmap, key))) { + if(r) *r = jsval_undefined(); + return S_OK; + } + + return r ? jsval_copy(entry->value, r) : S_OK; } static HRESULT WeakMap_set(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,

1 0

Gabriel Ivăncescu : jscript: Implement WeakMap.delete().
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: 56c74e381b1a538cba3008be1969194641a91157 URL: https://gitlab.winehq.org/wine/wine/-/commit/56c74e381b1a538cba3008be196919… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 20 16:59:47 2023 +0300 jscript: Implement WeakMap.delete(). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/set.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 2ad6c683a46..96375ce4b16 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -676,8 +676,21 @@ static HRESULT WeakMap_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsig static HRESULT WeakMap_delete(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("\n"); - return E_NOTIMPL; + jsdisp_t *key = (argc >= 1 && is_object_instance(argv[0])) ? to_jsdisp(get_object(argv[0])) : NULL; + struct weakmap_entry *entry; + WeakMapInstance *weakmap; + HRESULT hres; + + hres = get_weakmap_this(ctx, vthis, &weakmap); + if(FAILED(hres)) + return hres; + + TRACE("%p (%p)\n", weakmap, key); + + if((entry = get_weakmap_entry(weakmap, key))) + remove_weakmap_entry(entry); + if(r) *r = jsval_bool(!!entry); + return S_OK; } static HRESULT WeakMap_get(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,

1 0

Gabriel Ivăncescu : jscript: Implement WeakMap.clear().
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: 6a22b304b20b9d13bc897f6b8ea5820ece14ed68 URL: https://gitlab.winehq.org/wine/wine/-/commit/6a22b304b20b9d13bc897f6b8ea582… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 20 16:59:47 2023 +0300 jscript: Implement WeakMap.clear(). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/set.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 96375ce4b16..1730abb0328 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -669,8 +669,20 @@ void remove_weakmap_entry(struct weakmap_entry *entry) static HRESULT WeakMap_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("\n"); - return E_NOTIMPL; + WeakMapInstance *weakmap; + HRESULT hres; + + hres = get_weakmap_this(ctx, vthis, &weakmap); + if(FAILED(hres)) + return hres; + + TRACE("%p\n", weakmap); + + while(weakmap->map.root) + remove_weakmap_entry(RB_ENTRY_VALUE(weakmap->map.root, struct weakmap_entry, entry)); + + if(r) *r = jsval_undefined(); + return S_OK; } static HRESULT WeakMap_delete(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,

1 0

Gabriel Ivăncescu : jscript: Implement WeakMap.has().
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: 1b14d7b46d114eab1e2139c2fc57a996ff97b931 URL: https://gitlab.winehq.org/wine/wine/-/commit/1b14d7b46d114eab1e2139c2fc57a9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 20 16:59:47 2023 +0300 jscript: Implement WeakMap.has(). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/set.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 1730abb0328..ac9efbb4da0 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -796,8 +796,18 @@ static HRESULT WeakMap_set(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigne static HRESULT WeakMap_has(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("\n"); - return E_NOTIMPL; + jsdisp_t *key = (argc >= 1 && is_object_instance(argv[0])) ? to_jsdisp(get_object(argv[0])) : NULL; + WeakMapInstance *weakmap; + HRESULT hres; + + hres = get_weakmap_this(ctx, vthis, &weakmap); + if(FAILED(hres)) + return hres; + + TRACE("%p (%p)\n", weakmap, key); + + if(r) *r = jsval_bool(!!get_weakmap_entry(weakmap, key)); + return S_OK; } static HRESULT WeakMap_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,

1 0

Gabriel Ivăncescu : mshtml/tests: Add tests for WeakMap.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: 62cee996585aa71d0c7af3a925c184c88fb7a726 URL: https://gitlab.winehq.org/wine/wine/-/commit/62cee996585aa71d0c7af3a925c184… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 20 16:59:47 2023 +0300 mshtml/tests: Add tests for WeakMap. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/documentmode.js | 130 +++++++++++++++++++++++ dlls/mshtml/tests/script.c | 210 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 340 insertions(+)

1 0

Gabriel Ivăncescu : jscript: Properly set JS_E_WRONG_THIS as a TypeError.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: 3ab9a1da45f37e69069e54576df97f88367d675b URL: https://gitlab.winehq.org/wine/wine/-/commit/3ab9a1da45f37e69069e54576df97f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 20 16:59:47 2023 +0300 jscript: Properly set JS_E_WRONG_THIS as a TypeError. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/error.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index cf0ece42f15..f6eda62b88d 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -483,6 +483,7 @@ jsdisp_t *create_builtin_error(script_ctx_t *ctx) case JS_E_OBJECT_NONEXTENSIBLE: case JS_E_NONCONFIGURABLE_REDEFINED: case JS_E_NONWRITABLE_MODIFIED: + case JS_E_WRONG_THIS: case JS_E_KEY_NOT_OBJECT: case JS_E_PROP_DESC_MISMATCH: case JS_E_INVALID_WRITABLE_PROP_DESC:

1 0

Yuxuan Shui : msvcrt: Fix out-of-bound access in create_locinfo.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: f66c8972129e81707292a210ef4989a9ad57da89 URL: https://gitlab.winehq.org/wine/wine/-/commit/f66c8972129e81707292a210ef4989… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Wed Jul 19 22:17:25 2023 +0100 msvcrt: Fix out-of-bound access in create_locinfo. Fixes regression introduced by 24a2b625545f1875b5c3177f2b9. Signed-off-by: Yuxuan Shui <yshui(a)codeweavers.com> --- dlls/msvcrt/locale.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 9fa6ba76143..10682990bfc 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1226,7 +1226,7 @@ static __lc_time_data* create_time_data(WCHAR *sname) int i, ret, size; LCID lcid = LocaleNameToLCID(sname, LCID_CONVERSION_FLAGS); - size = sizeof(__lc_time_data); + size = 0; for(i=0; i<ARRAY_SIZE(time_data); i++) { ret = GetLocaleInfoA(lcid, time_data[i], NULL, 0); if(!ret) @@ -1241,10 +1241,10 @@ static __lc_time_data* create_time_data(WCHAR *sname) #endif } #if _MSVCR_VER >= 110 - size += wcslen(sname)*sizeof(wchar_t); + size += (wcslen(sname) + 1) * sizeof(wchar_t); #endif - cur = malloc(size); + cur = malloc(FIELD_OFFSET(__lc_time_data, data[size])); if(!cur) return NULL; @@ -1256,13 +1256,13 @@ static __lc_time_data* create_time_data(WCHAR *sname) #if _MSVCR_VER == 0 || _MSVCR_VER >= 100 for(i=0; i<ARRAY_SIZE(time_data); i++) { cur->wstr.wstr[i] = (wchar_t*)&cur->data[ret]; - ret += GetLocaleInfoEx(sname, time_data[i], - (wchar_t*)&cur->data[ret], size-ret)*sizeof(wchar_t); + ret += GetLocaleInfoEx(sname, time_data[i], (wchar_t*)&cur->data[ret], + (size - ret) / sizeof(wchar_t)) * sizeof(wchar_t); } #endif #if _MSVCR_VER >= 110 cur->locname = (wchar_t*)&cur->data[ret]; - wcsncpy((wchar_t *) &cur->data[ret], sname, size-ret); + wcscpy((wchar_t*)&cur->data[ret], sname); #else cur->lcid = lcid; #endif

1 0

Gabriel Ivăncescu : jscript: Convert unlink_props to a helper that unlinks the entire object.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: 3f20b8aa3ec8381db17e6f5813e65b8ac98c273c URL: https://gitlab.winehq.org/wine/wine/-/commit/3f20b8aa3ec8381db17e6f5813e65b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 20 16:59:46 2023 +0300 jscript: Convert unlink_props to a helper that unlinks the entire object. It will be useful for other cases, and we don't need the gc_ctx for unlinking. Also set the PROP_PROTREFs to PROP_DELETED since we're unliking the prototype. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index b5fc3699212..9e87c38004f 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -665,14 +665,13 @@ static HRESULT fill_protrefs(jsdisp_t *This) return S_OK; } -static void unlink_props(jsdisp_t *jsdisp) +static void unlink_jsdisp(jsdisp_t *jsdisp) { dispex_prop_t *prop = jsdisp->props, *end; for(end = prop + jsdisp->prop_cnt; prop < end; prop++) { switch(prop->type) { case PROP_DELETED: - case PROP_PROTREF: continue; case PROP_JSVAL: jsval_release(prop->u.val); @@ -688,6 +687,14 @@ static void unlink_props(jsdisp_t *jsdisp) } prop->type = PROP_DELETED; } + + if(jsdisp->prototype) { + jsdisp_release(jsdisp->prototype); + jsdisp->prototype = NULL; + } + + if(jsdisp->builtin_info->gc_traverse) + jsdisp->builtin_info->gc_traverse(NULL, GC_TRAVERSE_UNLINK, jsdisp); } @@ -927,15 +934,7 @@ HRESULT gc_run(script_ctx_t *ctx) /* Grab it since it gets removed when unlinked */ jsdisp_addref(obj); - unlink_props(obj); - - if(obj->prototype) { - jsdisp_release(obj->prototype); - obj->prototype = NULL; - } - - if(obj->builtin_info->gc_traverse) - obj->builtin_info->gc_traverse(&gc_ctx, GC_TRAVERSE_UNLINK, obj); + unlink_jsdisp(obj); /* Releasing unlinked object should not delete any other object, so we can safely obtain the next pointer now */

1 0

Gabriel Ivăncescu : jscript: Implement WeakMap instance stub and constructor.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: b8dbee6916520fcbbfbe82dae1b701f587f1a4ce URL: https://gitlab.winehq.org/wine/wine/-/commit/b8dbee6916520fcbbfbe82dae1b701… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 20 16:59:46 2023 +0300 jscript: Implement WeakMap instance stub and constructor. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/jscript.h | 6 ++- dlls/jscript/object.c | 1 + dlls/jscript/set.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 139 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 46644b8247b..d907da3a36c 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -117,6 +117,7 @@ typedef enum { JSCLASS_JSON, JSCLASS_MAP, JSCLASS_SET, + JSCLASS_WEAKMAP, } jsclass_t; jsdisp_t *iface_to_jsdisp(IDispatch*); @@ -418,11 +419,12 @@ struct _script_ctx_t { jsdisp_t *vbarray_constr; jsdisp_t *map_prototype; jsdisp_t *set_prototype; + jsdisp_t *weakmap_prototype; }; - jsdisp_t *global_objects[22]; + jsdisp_t *global_objects[23]; }; }; -C_ASSERT(RTL_SIZEOF_THROUGH_FIELD(script_ctx_t, set_prototype) == RTL_SIZEOF_THROUGH_FIELD(script_ctx_t, global_objects)); +C_ASSERT(RTL_SIZEOF_THROUGH_FIELD(script_ctx_t, weakmap_prototype) == RTL_SIZEOF_THROUGH_FIELD(script_ctx_t, global_objects)); void script_release(script_ctx_t*); diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 4f6acacbc95..65b25cab239 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -51,6 +51,7 @@ static HRESULT Object_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns L"[object Object]", L"[object Object]", L"[object Object]", + L"[object Object]", L"[object Object]" }; diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index eca26a890f7..2afb763f4d7 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -614,6 +614,125 @@ static HRESULT Set_constructor(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns } } +typedef struct { + jsdisp_t dispex; +} WeakMapInstance; + +static HRESULT WeakMap_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WeakMap_delete(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WeakMap_get(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WeakMap_set(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WeakMap_has(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WeakMap_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static void WeakMap_destructor(jsdisp_t *dispex) +{ + WeakMapInstance *weakmap = (WeakMapInstance*)dispex; + + free(weakmap); +} + +static HRESULT WeakMap_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsdisp_t *dispex) +{ + return S_OK; +} + +static const builtin_prop_t WeakMap_prototype_props[] = { + {L"clear", WeakMap_clear, PROPF_METHOD}, + {L"delete", WeakMap_delete, PROPF_METHOD|1}, + {L"get", WeakMap_get, PROPF_METHOD|1}, + {L"has", WeakMap_has, PROPF_METHOD|1}, + {L"set", WeakMap_set, PROPF_METHOD|2}, +}; + +static const builtin_info_t WeakMap_prototype_info = { + JSCLASS_OBJECT, + WeakMap_value, + ARRAY_SIZE(WeakMap_prototype_props), + WeakMap_prototype_props, + NULL, + NULL +}; + +static const builtin_info_t WeakMap_info = { + JSCLASS_WEAKMAP, + WeakMap_value, + 0, + NULL, + WeakMap_destructor, + NULL, + NULL, + NULL, + NULL, + WeakMap_gc_traverse +}; + +static HRESULT WeakMap_constructor(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + WeakMapInstance *weakmap; + HRESULT hres; + + switch(flags) { + case DISPATCH_CONSTRUCT: + TRACE("\n"); + + if(!r) + return S_OK; + if(!(weakmap = calloc(1, sizeof(*weakmap)))) + return E_OUTOFMEMORY; + + hres = init_dispex(&weakmap->dispex, ctx, &WeakMap_info, ctx->weakmap_prototype); + if(FAILED(hres)) + return hres; + + *r = jsval_obj(&weakmap->dispex); + return S_OK; + + case DISPATCH_METHOD: + return throw_error(ctx, JS_E_WRONG_THIS, L"WeakMap"); + + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } +} + HRESULT init_set_constructor(script_ctx_t *ctx) { jsdisp_t *constructor; @@ -649,5 +768,20 @@ HRESULT init_set_constructor(script_ctx_t *ctx) hres = jsdisp_define_data_property(ctx->global, L"Map", PROPF_WRITABLE, jsval_obj(constructor)); jsdisp_release(constructor); + if(FAILED(hres)) + return hres; + + hres = create_dispex(ctx, &WeakMap_prototype_info, ctx->object_prototype, &ctx->weakmap_prototype); + if(FAILED(hres)) + return hres; + + hres = create_builtin_constructor(ctx, WeakMap_constructor, L"WeakMap", NULL, + PROPF_CONSTR, ctx->weakmap_prototype, &constructor); + if(FAILED(hres)) + return hres; + + hres = jsdisp_define_data_property(ctx->global, L"WeakMap", PROPF_WRITABLE, + jsval_obj(constructor)); + jsdisp_release(constructor); return hres; }

1 0

Alexandre Julliard : ieframe/tests: Use nameless unions/structs.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: 8fe23255a57b2ee14c0e75735aa8e7de58728d00 URL: https://gitlab.winehq.org/wine/wine/-/commit/8fe23255a57b2ee14c0e75735aa8e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 11:34:53 2023 +0200 ieframe/tests: Use nameless unions/structs. --- dlls/ieframe/tests/intshcut.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ieframe/tests/intshcut.c b/dlls/ieframe/tests/intshcut.c index b5487491414..cac0e301dd2 100644 --- a/dlls/ieframe/tests/intshcut.c +++ b/dlls/ieframe/tests/intshcut.c @@ -176,14 +176,14 @@ static void test_ReadAndWriteProperties(void) PROPVARIANT pv[2], pvread[2]; ps[0].ulKind = PRSPEC_PROPID; - U(ps[0]).propid = PID_IS_ICONFILE; + ps[0].propid = PID_IS_ICONFILE; ps[1].ulKind = PRSPEC_PROPID; - U(ps[1]).propid = PID_IS_ICONINDEX; + ps[1].propid = PID_IS_ICONINDEX; pv[0].vt = VT_LPWSTR; - U(pv[0]).pwszVal = iconPath; + pv[0].pwszVal = iconPath; pv[1].vt = VT_I4; - U(pv[1]).lVal = iconIndex; + pv[1].lVal = iconIndex; /* Make sure we have a valid temporary directory */ GetTempPathW(MAX_PATH, fileNameW); @@ -223,9 +223,9 @@ static void test_ReadAndWriteProperties(void) hr = IPropertyStorage_ReadMultiple(pPropStgWrite, 2, ps, pvread); ok(hr == S_OK, "Unable to read properties, hr=0x%lx\n", hr); ok(pvread[1].vt == VT_I4, "got %d\n", pvread[1].vt); - ok(U(pvread[1]).lVal == iconIndex, "Read wrong icon index: %d\n", U(pvread[1]).iVal); + ok(pvread[1].lVal == iconIndex, "Read wrong icon index: %d\n", pvread[1].iVal); ok(pvread[0].vt == VT_LPWSTR, "got %d\n", pvread[0].vt); - ok(lstrcmpW(U(pvread[0]).pwszVal, iconPath) == 0, "Wrong icon path read: %s\n", wine_dbgstr_w(U(pvread[0]).pwszVal)); + ok(lstrcmpW(pvread[0].pwszVal, iconPath) == 0, "Wrong icon path read: %s\n", wine_dbgstr_w(pvread[0].pwszVal)); PropVariantClear(&pvread[0]); PropVariantClear(&pvread[1]); @@ -244,9 +244,9 @@ static void test_ReadAndWriteProperties(void) hr = IPropertyStorage_ReadMultiple(pPropStgWrite, 2, ps, pvread); ok(hr == S_OK, "Unable to read properties, hr=0x%lx\n", hr); ok(pvread[1].vt == VT_I4, "got %d\n", pvread[1].vt); - ok(U(pvread[1]).lVal == iconIndex, "Read wrong icon index: %d\n", U(pvread[1]).iVal); + ok(pvread[1].lVal == iconIndex, "Read wrong icon index: %d\n", pvread[1].iVal); ok(pvread[0].vt == VT_LPWSTR, "got %d\n", pvread[0].vt); - ok(lstrcmpW(U(pvread[0]).pwszVal, iconPath) == 0, "Wrong icon path read: %s\n", wine_dbgstr_w(U(pvread[0]).pwszVal)); + ok(lstrcmpW(pvread[0].pwszVal, iconPath) == 0, "Wrong icon path read: %s\n", wine_dbgstr_w(pvread[0].pwszVal)); PropVariantClear(&pvread[0]); PropVariantClear(&pvread[1]); @@ -292,9 +292,9 @@ static void test_ReadAndWriteProperties(void) { ok(hr == S_OK, "Unable to read properties, hr=0x%lx\n", hr); ok(pvread[1].vt == VT_I4, "got %d\n", pvread[1].vt); - ok(U(pvread[1]).lVal == iconIndex, "Read wrong icon index: %d\n", U(pvread[1]).iVal); + ok(pvread[1].lVal == iconIndex, "Read wrong icon index: %d\n", pvread[1].iVal); ok(pvread[0].vt == VT_LPWSTR, "got %d\n", pvread[0].vt); - ok(lstrcmpW(U(pvread[0]).pwszVal, iconPath) == 0, "Wrong icon path read: %s\n", wine_dbgstr_w(U(pvread[0]).pwszVal)); + ok(lstrcmpW(pvread[0].pwszVal, iconPath) == 0, "Wrong icon path read: %s\n", wine_dbgstr_w(pvread[0].pwszVal)); } PropVariantClear(&pvread[0]); PropVariantClear(&pvread[1]); @@ -390,14 +390,14 @@ static void test_Load(void) ok(hres == S_OK, "Unable to get an IPropertyStorage for reading, hr=0x%lx\n", hres); ps.ulKind = PRSPEC_PROPID; - U(ps).propid = PID_IS_ICONFILE; + ps.propid = PID_IS_ICONFILE; v.vt = VT_NULL; hres = IPropertyStorage_ReadMultiple(propstorage, 1, &ps, &v); ok(hres == S_FALSE, "got 0x%08lx\n", hres); ok(v.vt == VT_EMPTY, "got %d\n", v.vt); ps.ulKind = PRSPEC_PROPID; - U(ps).propid = PID_IS_ICONINDEX; + ps.propid = PID_IS_ICONINDEX; v.vt = VT_EMPTY; hres = IPropertyStorage_ReadMultiple(propstorage, 1, &ps, &v); ok(hres == S_FALSE, "got 0x%08lx\n", hres);

1 0