December 2023 - Wine-commits

Alexandros Frantzis : winewayland.drv: Lock the pointer if confined without cursor.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: wine Branch: master Commit: 140f0c03d004e78953ddc0f16732cdfcab4cc652 URL: https://gitlab.winehq.org/wine/wine/-/commit/140f0c03d004e78953ddc0f16732cd… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Dec 6 15:08:31 2023 +0200 winewayland.drv: Lock the pointer if confined without cursor. Pointer confinement may only be enabled by the compositor if the pointer enters the confine region. If the region is small (as in many mouselook cases) it's very likely that this will never happen and the pointer will remained unconfined. To allow mouselook to work more reliably, prefer to lock the pointer if a window is confined and the cursor is not visible. --- dlls/winewayland.drv/wayland_pointer.c | 50 +++++++++++++++++++++++++++++----- dlls/winewayland.drv/waylanddrv.h | 1 + 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/dlls/winewayland.drv/wayland_pointer.c b/dlls/winewayland.drv/wayland_pointer.c index c422e7e958e..ccd477b3c91 100644 --- a/dlls/winewayland.drv/wayland_pointer.c +++ b/dlls/winewayland.drv/wayland_pointer.c @@ -338,6 +338,11 @@ void wayland_pointer_deinit(void) zwp_confined_pointer_v1_destroy(pointer->zwp_confined_pointer_v1); pointer->zwp_confined_pointer_v1 = NULL; } + if (pointer->zwp_locked_pointer_v1) + { + zwp_locked_pointer_v1_destroy(pointer->zwp_locked_pointer_v1); + pointer->zwp_locked_pointer_v1 = NULL; + } if (pointer->zwp_relative_pointer_v1) { zwp_relative_pointer_v1_destroy(pointer->zwp_relative_pointer_v1); @@ -729,11 +734,30 @@ static void wayland_pointer_update_constraint(RECT *confine_rect, struct wl_surface *wl_surface) { struct wayland_pointer *pointer = &process_wayland.pointer; - BOOL needs_relative; + BOOL needs_relative, needs_lock, needs_confine; assert(!confine_rect || wl_surface); - if (confine_rect) + needs_lock = confine_rect && !pointer->cursor.wl_surface; + needs_confine = confine_rect && pointer->cursor.wl_surface; + + if (!needs_confine && pointer->zwp_confined_pointer_v1) + { + TRACE("Unconfining from hwnd=%p\n", pointer->constraint_hwnd); + zwp_confined_pointer_v1_destroy(pointer->zwp_confined_pointer_v1); + pointer->zwp_confined_pointer_v1 = NULL; + pointer->constraint_hwnd = NULL; + } + + if (!needs_lock && pointer->zwp_locked_pointer_v1) + { + TRACE("Unlocking from hwnd=%p\n", pointer->constraint_hwnd); + zwp_locked_pointer_v1_destroy(pointer->zwp_locked_pointer_v1); + pointer->zwp_locked_pointer_v1 = NULL; + pointer->constraint_hwnd = NULL; + } + + if (needs_confine) { HWND hwnd = wl_surface_get_user_data(wl_surface); struct wl_region *region; @@ -770,12 +794,24 @@ static void wayland_pointer_update_constraint(RECT *confine_rect, wl_region_destroy(region); } - else if (pointer->zwp_confined_pointer_v1) + else if (needs_lock) { - TRACE("Unconfining from hwnd=%p\n", pointer->constraint_hwnd); - zwp_confined_pointer_v1_destroy(pointer->zwp_confined_pointer_v1); - pointer->zwp_confined_pointer_v1 = NULL; - pointer->constraint_hwnd = NULL; + HWND hwnd = wl_surface_get_user_data(wl_surface); + + if (!pointer->zwp_locked_pointer_v1 || pointer->constraint_hwnd != hwnd) + { + if (pointer->zwp_locked_pointer_v1) + zwp_locked_pointer_v1_destroy(pointer->zwp_locked_pointer_v1); + pointer->zwp_locked_pointer_v1 = + zwp_pointer_constraints_v1_lock_pointer( + process_wayland.zwp_pointer_constraints_v1, + wl_surface, + pointer->wl_pointer, + NULL, + ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_PERSISTENT); + pointer->constraint_hwnd = hwnd; + TRACE("Locking to hwnd=%p\n", pointer->constraint_hwnd); + } } needs_relative = !pointer->cursor.wl_surface && diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 8a8a4fe798b..c6db31369b2 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -92,6 +92,7 @@ struct wayland_pointer { struct wl_pointer *wl_pointer; struct zwp_confined_pointer_v1 *zwp_confined_pointer_v1; + struct zwp_locked_pointer_v1 *zwp_locked_pointer_v1; struct zwp_relative_pointer_v1 *zwp_relative_pointer_v1; HWND focused_hwnd; HWND constraint_hwnd;

1 0

Piotr Caban : wineps: Don't write image content upside-down in PSDRV_WriteDIBPatternDict.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: wine Branch: master Commit: 5cf45f28fea5c6cf23c29205e20ff996c07e1be3 URL: https://gitlab.winehq.org/wine/wine/-/commit/5cf45f28fea5c6cf23c29205e20ff9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 6 21:26:05 2023 +0100 wineps: Don't write image content upside-down in PSDRV_WriteDIBPatternDict. Image rotation is done in PSDRV_WriteImageDict. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55210 --- dlls/wineps.drv/ps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index a8050abe19b..f4f8850d65f 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -990,7 +990,7 @@ BOOL PSDRV_WriteDIBPatternDict(print_ctx *ctx, const BITMAPINFO *bmi, BYTE *bits buf = HeapAlloc( GetProcessHeap(), 0, max(sizeof(do_pattern) + 100, 2 * w/8 * h + 1) ); ptr = buf; - for(y = h-1; y >= 0; y--) { + for(y = 0; y < h; y++) { for(x = 0; x < w/8; x++) { sprintf(ptr, "%02x", *(bits + x/8 + y * ((bmi->bmiHeader.biWidth + 31) / 32) * 4));

1 0

Piotr Caban : wineps: Fix handling of patterns that are not 8x8 in PSDRV_WriteDIBPatternDict.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: wine Branch: master Commit: 8be8d18831cc575e685e61f299a7c75c45d9a3b7 URL: https://gitlab.winehq.org/wine/wine/-/commit/8be8d18831cc575e685e61f299a7c7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 6 21:28:41 2023 +0100 wineps: Fix handling of patterns that are not 8x8 in PSDRV_WriteDIBPatternDict. --- dlls/wineps.drv/ps.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index f4f8850d65f..2a3da737c81 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -985,20 +985,20 @@ BOOL PSDRV_WriteDIBPatternDict(print_ctx *ctx, const BITMAPINFO *bmi, BYTE *bits return FALSE; } - w = bmi->bmiHeader.biWidth & ~0x7; - h = abs_height & ~0x7; + w = bmi->bmiHeader.biWidth; + h = abs_height; buf = HeapAlloc( GetProcessHeap(), 0, max(sizeof(do_pattern) + 100, 2 * w/8 * h + 1) ); ptr = buf; for(y = 0; y < h; y++) { - for(x = 0; x < w/8; x++) { - sprintf(ptr, "%02x", *(bits + x/8 + y * + for(x = 0; x < (w + 7) / 8; x++) { + sprintf(ptr, "%02x", *(bits + x + y * ((bmi->bmiHeader.biWidth + 31) / 32) * 4)); ptr += 2; } } PSDRV_WriteSpool(ctx, mypat, sizeof(mypat) - 1); - PSDRV_WriteImageDict(ctx, 1, FALSE, 8, 8, buf, bmi->bmiHeader.biHeight < 0); + PSDRV_WriteImageDict(ctx, 1, FALSE, w, h, buf, bmi->bmiHeader.biHeight < 0); PSDRV_WriteSpool(ctx, "def\n", 4); PSDRV_WriteIndexColorSpaceBegin(ctx, 1);

1 0

Piotr Caban : wineps: Fix color handling in PSDRV_WriteDIBPatternDict.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: wine Branch: master Commit: 38e06bfbe343abd8227dd2be227325290c77e42b URL: https://gitlab.winehq.org/wine/wine/-/commit/38e06bfbe343abd8227dd2be227325… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 7 11:42:22 2023 +0100 wineps: Fix color handling in PSDRV_WriteDIBPatternDict. --- dlls/wineps.drv/ps.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 2a3da737c81..03c92aa00f0 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -1002,8 +1002,34 @@ BOOL PSDRV_WriteDIBPatternDict(print_ctx *ctx, const BITMAPINFO *bmi, BYTE *bits PSDRV_WriteSpool(ctx, "def\n", 4); PSDRV_WriteIndexColorSpaceBegin(ctx, 1); - map[0] = GetTextColor( ctx->hdc ); - map[1] = GetBkColor( ctx->hdc ); + if (usage == DIB_RGB_COLORS) + { + map[0] = RGB( bmi->bmiColors[0].rgbRed, bmi->bmiColors[0].rgbGreen, + bmi->bmiColors[0].rgbBlue ); + map[1] = RGB( bmi->bmiColors[1].rgbRed, bmi->bmiColors[1].rgbGreen, + bmi->bmiColors[1].rgbBlue ); + } + else if (usage == DIB_PAL_COLORS) + { + HPALETTE hpal = GetCurrentObject( ctx->hdc, OBJ_PAL ); + PALETTEENTRY pal[2]; + + memset(pal, 0, sizeof(pal)); + if (hpal) GetPaletteEntries(hpal, 0, 2, pal); + + map[0] = RGB(pal[0].peRed, pal[0].peGreen, pal[0].peBlue); + map[1] = RGB(pal[1].peRed, pal[1].peGreen, pal[1].peBlue); + } + else if (usage == 2 /* DIB_PAL_INDICES */) + { + map[0] = GetTextColor( ctx->hdc ); + map[1] = GetBkColor( ctx->hdc ); + } + else + { + FIXME("wrong usage: %d\n", usage); + return FALSE; + } PSDRV_WriteRGB(ctx, map, 2); PSDRV_WriteIndexColorSpaceEnd(ctx);

1 0

Brendan Shanks : winecoreaudio: Use UID as device string.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: wine Branch: master Commit: 8e338fbba74ff6a06fb6f8022fd2c6bf0a3de3f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e338fbba74ff6a06fb6f8022fd2c6… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Sun Dec 3 21:27:24 2023 -0800 winecoreaudio: Use UID as device string. --- dlls/winecoreaudio.drv/coreaudio.c | 49 +++++++++++++++++++++++++++++++++----- dlls/winecoreaudio.drv/mmdevdrv.c | 6 ++--- 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 3299b84d489..d78744455a8 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -84,8 +84,6 @@ typedef OSSpinLock os_unfair_lock; WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); -#define MAX_DEV_NAME_LEN 10 /* Max 32 bit digits */ - struct coreaudio_stream { os_unfair_lock lock; @@ -242,6 +240,7 @@ static NTSTATUS unix_get_endpoint_ids(void *args) struct endpoint_info { CFStringRef name; + CFStringRef uid; AudioDeviceID id; } *info; OSStatus sc; @@ -293,13 +292,13 @@ static NTSTATUS unix_get_endpoint_ids(void *args) return STATUS_SUCCESS; } - addr.mSelector = kAudioObjectPropertyName; addr.mScope = get_scope(params->flow); addr.mElement = 0; for(i = 0; i < num_devices; i++){ if(!device_has_channels(devices[i], params->flow)) continue; + addr.mSelector = kAudioObjectPropertyName; size = sizeof(CFStringRef); sc = AudioObjectGetPropertyData(devices[i], &addr, 0, NULL, &size, &info[params->num].name); if(sc != noErr){ @@ -307,6 +306,16 @@ static NTSTATUS unix_get_endpoint_ids(void *args) (unsigned int)devices[i], (int)sc); continue; } + + addr.mSelector = kAudioDevicePropertyDeviceUID; + size = sizeof(CFStringRef); + sc = AudioObjectGetPropertyData(devices[i], &addr, 0, NULL, &size, &info[params->num].uid); + if(sc != noErr){ + WARN("Unable to get UID property for device %u: %x\n", + (unsigned int)devices[i], (int)sc); + continue; + } + info[params->num++].id = devices[i]; } free(devices); @@ -316,7 +325,7 @@ static NTSTATUS unix_get_endpoint_ids(void *args) for(i = 0; i < params->num; i++){ const SIZE_T name_len = CFStringGetLength(info[i].name) + 1; - const SIZE_T device_len = MAX_DEV_NAME_LEN + 1; + const SIZE_T device_len = CFStringGetLength(info[i].uid) + 1; needed += name_len * sizeof(WCHAR) + ((device_len + 1) & ~1); if(needed <= params->size){ @@ -325,12 +334,16 @@ static NTSTATUS unix_get_endpoint_ids(void *args) CFStringGetCharacters(info[i].name, CFRangeMake(0, name_len - 1), ptr); ptr[name_len - 1] = 0; offset += name_len * sizeof(WCHAR); + endpoint->device = offset; - sprintf((char *)params->endpoints + offset, "%u", (unsigned int)info[i].id); + CFStringGetCString(info[i].uid, (char *)params->endpoints + offset, params->size - offset, kCFStringEncodingUTF8); + ((char *)params->endpoints)[offset + device_len - 1] = '\0'; offset += (device_len + 1) & ~1; + endpoint++; } CFRelease(info[i].name); + CFRelease(info[i].uid); if(info[i].id == default_id) params->default_idx = i; } free(info); @@ -669,7 +682,31 @@ static HRESULT ca_setup_audiounit(EDataFlow dataflow, AudioComponentInstance uni static AudioDeviceID dev_id_from_device(const char *device) { - return strtoul(device, NULL, 10); + AudioDeviceID id; + CFStringRef uid; + UInt32 size; + OSStatus sc; + const AudioObjectPropertyAddress addr = + { + .mScope = kAudioObjectPropertyScopeGlobal, + .mElement = kAudioObjectPropertyElementMain, + .mSelector = kAudioHardwarePropertyTranslateUIDToDevice, + }; + + uid = CFStringCreateWithCStringNoCopy(NULL, device, kCFStringEncodingUTF8, kCFAllocatorNull); + + size = sizeof(id); + sc = AudioObjectGetPropertyData(kAudioObjectSystemObject, &addr, sizeof(uid), &uid, &size, &id); + CFRelease(uid); + if(sc != noErr){ + WARN("Failed to get device ID for UID %s: %x\n", device, (int)sc); + return kAudioObjectUnknown; + } + + if (id == kAudioObjectUnknown) + WARN("Failed to get device ID for UID %s\n", device); + + return id; } static NTSTATUS unix_create_stream(void *args) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 59bdb7b7488..65e965c5556 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -124,7 +124,7 @@ void WINAPI get_device_guid(EDataFlow flow, const char *dev, GUID *guid) key_name[0] = '0'; key_name[1] = ','; - MultiByteToWideChar(CP_UNIXCP, 0, dev, -1, key_name + 2, ARRAY_SIZE(key_name) - 2); + MultiByteToWideChar(CP_UTF8, 0, dev, -1, key_name + 2, ARRAY_SIZE(key_name) - 2); if(RegOpenKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, KEY_WRITE|KEY_READ, &key) == ERROR_SUCCESS){ if(RegOpenKeyExW(key, key_name, 0, KEY_READ, &dev_key) == ERROR_SUCCESS){ @@ -195,13 +195,13 @@ BOOL WINAPI get_device_name_from_guid(const GUID *guid, char **name, EDataFlow * return FALSE; } - if(!(size = WideCharToMultiByte(CP_UNIXCP, 0, key_name + 2, -1, NULL, 0, NULL, NULL))) + if(!(size = WideCharToMultiByte(CP_UTF8, 0, key_name + 2, -1, NULL, 0, NULL, NULL))) return FALSE; if(!(*name = malloc(size))) return FALSE; - if(!WideCharToMultiByte(CP_UNIXCP, 0, key_name + 2, -1, *name, size, NULL, NULL)){ + if(!WideCharToMultiByte(CP_UTF8, 0, key_name + 2, -1, *name, size, NULL, NULL)){ free(*name); return FALSE; }

1 0

Robert Wilhelm : vbscript: For for loop bounds coerce string to real.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: wine Branch: master Commit: e0d027830e6d359d390c257bbb5419157d9d5aac URL: https://gitlab.winehq.org/wine/wine/-/commit/e0d027830e6d359d390c257bbb5419… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Wed Dec 6 12:48:30 2023 +0100 vbscript: For for loop bounds coerce string to real. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55052 --- dlls/vbscript/compile.c | 6 ++++-- dlls/vbscript/interp.c | 31 +++++++++++++++++++++++++++++++ dlls/vbscript/tests/lang.vbs | 27 +++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 4 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 683c71e2f4e..baddc51d7e4 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -875,6 +875,8 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st hres = compile_expression(ctx, stat->from_expr); if(FAILED(hres)) return hres; + if(!push_instr(ctx, OP_numval)) + return E_OUTOFMEMORY; /* FIXME: Assign should happen after both expressions evaluation. */ instr = push_instr(ctx, OP_assign_ident); @@ -887,7 +889,7 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st if(FAILED(hres)) return hres; - if(!push_instr(ctx, OP_val)) + if(!push_instr(ctx, OP_numval)) return E_OUTOFMEMORY; if(stat->step_expr) { @@ -895,7 +897,7 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st if(FAILED(hres)) return hres; - if(!push_instr(ctx, OP_val)) + if(!push_instr(ctx, OP_numval)) return E_OUTOFMEMORY; }else { hres = push_instr_int(ctx, OP_int, 1); diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 2d979f07605..937cdaf1c8c 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1088,6 +1088,37 @@ static HRESULT interp_val(exec_ctx_t *ctx) return stack_push(ctx, val.owned ? val.v : &v); } +static HRESULT interp_numval(exec_ctx_t *ctx) +{ + variant_val_t val; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &val); + if(FAILED(hres)) + return hres; + + if (V_VT(val.v) == VT_BSTR) { + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, val.v, 0, VT_R8); + if(FAILED(hres)) + return hres; + release_val(&val); + return stack_push(ctx, &v); + } + + if(!val.owned) { + V_VT(&v) = VT_EMPTY; + hres = VariantCopy(&v, val.v); + if(FAILED(hres)) + return hres; + } + + return stack_push(ctx, val.owned ? val.v : &v); +} + static HRESULT interp_pop(exec_ctx_t *ctx) { const unsigned n = ctx->instr->arg1.uint; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 42af6df0e76..3c6ce656f1c 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -679,6 +679,33 @@ for x = 5 to 8 next Call ok(y = "for8: 5 7", "y = " & y) +function testfor( startvalue, endvalue, stepvalue, steps) + Dim s + s=0 + for x=startvalue to endvalue step stepvalue + s = s + 1 + Next + Call ok( s = steps, "counted " & s & " steps in for loop, expected " & steps) +end function + +Call testfor (1, 2, 1, 2) +Call testfor ("1", 2, 1, 2) +Call testfor (1, "2", 1, 2) +Call testfor (1, 2, "1", 2) +Call testfor ("1", "2", "1", 2) +if (isEnglishLang) then + Call testfor (1, 2, 0.5, 3) + Call testfor (1, 2.5, 0.5, 4) + Call testfor ("1", 2, 0.5, 3) + Call testfor ("1", 2.5, 0.5, 4) + Call testfor (1, "2", 0.5, 3) + Call testfor (1, "2.5", 0.5, 4) + Call testfor (1, 2, "0.5", 3) + Call testfor (1, 2.5, "0.5", 4) + Call testfor ("1", "2", "0.5", 3) + Call testfor ("1", "2.5", "0.5", 4) +end if + for x = 1.5 to 1 Call ok(false, "for..to called when unexpected") next diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 24915a5ca04..56e68411f45 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -278,6 +278,7 @@ typedef enum { X(not, 1, 0, 0) \ X(nothing, 1, 0, 0) \ X(null, 1, 0, 0) \ + X(numval, 1, 0, 0) \ X(or, 1, 0, 0) \ X(pop, 1, ARG_UINT, 0) \ X(redim, 1, ARG_BSTR, ARG_UINT) \

1 0

Piotr Caban : winedump: Sync demangling code with msvcrt.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: wine Branch: master Commit: 9a42affc344da1d68b7236b4e19b0adfb2a47b96 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a42affc344da1d68b7236b4e19b0a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 7 20:30:15 2023 +0100 winedump: Sync demangling code with msvcrt. --- tools/winedump/msmangle.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c index 19ccc18f714..e49dd14ac2a 100644 --- a/tools/winedump/msmangle.c +++ b/tools/winedump/msmangle.c @@ -410,6 +410,28 @@ static BOOL get_qualified_type(struct datatype_t *ct, struct parsed_symbol* sym, ct->right = NULL; ct->flags = 0; + /* parse managed handle information */ + if (sym->current[0] == '$' && sym->current[1] == 'A') + { + sym->current += 2; + + switch (qualif) + { + case 'A': + case 'B': + ref = " %"; + break; + case 'P': + case 'Q': + case 'R': + case 'S': + ref = " ^"; + break; + default: + return FALSE; + } + } + if (get_qualifier(sym, &xdt2, &class)) { unsigned mark = sym->stack.num; @@ -482,7 +504,8 @@ static char* get_literal_string(struct parsed_symbol* sym) if (!((*sym->current >= 'A' && *sym->current <= 'Z') || (*sym->current >= 'a' && *sym->current <= 'z') || (*sym->current >= '0' && *sym->current <= '9') || - *sym->current == '_' || *sym->current == '$')) { + *sym->current == '_' || *sym->current == '$' || + *sym->current == '<' || *sym->current == '>')) { return NULL; } } while (*++sym->current != '@');

1 0

Gabriel Ivăncescu : mshtml: Expose the other IHTMLEventObj* interfaces.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: wine Branch: master Commit: 39f86db516b8ae5018521e90e3a659f8fd300488 URL: https://gitlab.winehq.org/wine/wine/-/commit/39f86db516b8ae5018521e90e3a659… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 6 20:16:34 2023 +0200 mshtml: Expose the other IHTMLEventObj* interfaces. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 1107 +++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/events.c | 58 ++- dlls/mshtml/tests/events.html | 9 + 3 files changed, 1166 insertions(+), 8 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Don't expose "restricted" members.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: wine Branch: master Commit: 7ca9e4ac9ff1dc8da3512dc2bcb0bb2743fb3dbf URL: https://gitlab.winehq.org/wine/wine/-/commit/7ca9e4ac9ff1dc8da3512dc2bcb0bb… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 6 20:16:34 2023 +0200 mshtml: Don't expose "restricted" members. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index e47e4d2dc45..07c26e2e762 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -277,6 +277,8 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, if(name_override) name = SysAllocString(name_override); + else if(desc->wFuncFlags & FUNCFLAG_FRESTRICTED) + return; else { hres = ITypeInfo_GetDocumentation(dti, desc->memid, &name, NULL, NULL, NULL); if(FAILED(hres)) {

1 0

Gabriel Ivăncescu : mshtml: Send proper legacy storage event with actual url.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: wine Branch: master Commit: cfefbb8f458d6096fe25a2f7a9b73e87b8e6c755 URL: https://gitlab.winehq.org/wine/wine/-/commit/cfefbb8f458d6096fe25a2f7a9b73e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 6 20:16:34 2023 +0200 mshtml: Send proper legacy storage event with actual url. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlevent.c | 4 ++-- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/htmlstorage.c | 15 ++++++++++++--- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a20472d22b8..e7eca058c23 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3045,7 +3045,7 @@ static HRESULT WINAPI HTMLDocument4_createEventObject(IHTMLDocument4 *iface, return E_NOTIMPL; } - return create_event_obj(dispex_compat_mode(&This->node.event_target.dispex), ppEventObj); + return create_event_obj(NULL, dispex_compat_mode(&This->node.event_target.dispex), ppEventObj); } static HRESULT WINAPI HTMLDocument4_fireEvent(IHTMLDocument4 *iface, BSTR bstrEventName, diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 50f40ea62ae..f72670ad1c4 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2035,11 +2035,11 @@ static HTMLEventObj *alloc_event_obj(DOMEvent *event, compat_mode_t compat_mode) return event_obj; } -HRESULT create_event_obj(compat_mode_t compat_mode, IHTMLEventObj **ret) +HRESULT create_event_obj(DOMEvent *event, compat_mode_t compat_mode, IHTMLEventObj **ret) { HTMLEventObj *event_obj; - event_obj = alloc_event_obj(NULL, compat_mode); + event_obj = alloc_event_obj(event, compat_mode); if(!event_obj) return E_OUTOFMEMORY; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index b50c74c029f..2d86ba08782 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -107,7 +107,7 @@ HRESULT fire_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*); void update_doc_cp_events(HTMLDocumentNode*,cp_static_data_t*); HRESULT doc_init_events(HTMLDocumentNode*); void detach_events(HTMLDocumentNode *doc); -HRESULT create_event_obj(compat_mode_t,IHTMLEventObj**); +HRESULT create_event_obj(DOMEvent*,compat_mode_t,IHTMLEventObj**); void bind_target_event(HTMLDocumentNode*,EventTarget*,const WCHAR*,IDispatch*); HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode*,nsIDOMNode*,eventid_t); diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 06d16e4e4aa..68452794449 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -208,12 +208,21 @@ static void storage_event_proc(event_task_t *_task) struct storage_event_task *task = (struct storage_event_task*)_task; HTMLInnerWindow *window = task->header.window; DOMEvent *event = task->event; + compat_mode_t compat_mode; VARIANT_BOOL cancelled; + HRESULT hres; + VARIANT var; - if(event->event_id == EVENTID_STORAGE && dispex_compat_mode(&window->event_target.dispex) >= COMPAT_MODE_IE9) { + if(event->event_id == EVENTID_STORAGE && (compat_mode = dispex_compat_mode(&window->event_target.dispex)) >= COMPAT_MODE_IE9) { dispatch_event(&window->event_target, event); - if(window->doc) - fire_event(&window->doc->node, L"onstorage", NULL, &cancelled); + if(window->doc) { + hres = create_event_obj(event, compat_mode, (IHTMLEventObj**)&V_DISPATCH(&var)); + if(SUCCEEDED(hres)) { + V_VT(&var) = VT_DISPATCH; + fire_event(&window->doc->node, L"onstorage", &var, &cancelled); + IDispatch_Release(V_DISPATCH(&var)); + } + } }else if(window->doc) { dispatch_event(&window->doc->node.event_target, event); }

1 0