wine-devel May 2022

wine-devel@winehq.org

77 participants
705 discussions

[PATCH 0/2] MR95: combase: Try loading WinRT activatable classes from the activation context path.
by Rémi Bernon (＠rbernon) 19 May '22

19 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/95

3 3

[PATCH v2] d2d1: Make ID2D1Device::CreateImageBrush() accept only bitmap as a source image.
by Dmitry Timoshkov 19 May '22

19 May '22

ID2D1Bitmap derives from ID2D1Image, which in turn derives from ID2D1Resource. That means that ID2D1Device::CreateImageBrush() can't be really passed anything but a ID2D1Bitmap* represented as a ID2D1Image*. I've added QueryInterface+FIXME just in case, probably it could be dropped. v2: Fix test crashes with image == NULL. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/brush.c | 15 ++++++++++++++- dlls/d2d1/d2d1_private.h | 1 - 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index b9a673fe54c..2632b5892da 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -1327,7 +1327,20 @@ HRESULT d2d_image_brush_create(ID2D1Factory *factory, ID2D1Image *image, if (!(*brush = heap_alloc_zero(sizeof(**brush)))) return E_OUTOFMEMORY; - d2d_brush_init(*brush, factory, D2D_BRUSH_TYPE_IMAGE, + if (image) + { + ID2D1Bitmap *bitmap; + + if (FAILED(ID2D1Image_QueryInterface(image, &IID_ID2D1Bitmap, (void **)&bitmap))) + { + FIXME("ID2D1Image doesn't support ID2D1Bitmap interface.\n"); + return E_FAIL; + } + + ID2D1Bitmap_Release(bitmap); + } + + d2d_brush_init(*brush, factory, D2D_BRUSH_TYPE_BITMAP, brush_desc, (ID2D1BrushVtbl *)&d2d_image_brush_vtbl); if (((*brush)->u.image.image = image)) ID2D1Image_AddRef((*brush)->u.image.image); diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 29469f5142e..6183d9d4c99 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -42,7 +42,6 @@ enum d2d_brush_type D2D_BRUSH_TYPE_LINEAR, D2D_BRUSH_TYPE_RADIAL, D2D_BRUSH_TYPE_BITMAP, - D2D_BRUSH_TYPE_IMAGE, D2D_BRUSH_TYPE_COUNT, }; -- 2.36.1

2 1

[v2 PATCH 1/2] vbscript: Implement Weekday().
by Nikolay Sivov 19 May '22

19 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: removed duplicated test call dlls/vbscript/global.c | 43 ++++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 47 +++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 1d3929ba249..62b41cea39d 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1982,10 +1982,47 @@ static HRESULT Global_Month(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, return FAILED(hres) ? hres : return_short(res, st.wMonth); } -static HRESULT Global_Weekday(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_Weekday(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + int first_day = 0; + SYSTEMTIME st; + HRESULT hres; + + TRACE("(%s)\n", debugstr_variant(args)); + + assert(args_cnt == 1 || args_cnt == 2); + + /* [vbSunday = 1, vbSaturday = 7] -> wDayOfWeek [0, 6] */ + if (args_cnt == 2) + { + if (V_VT(args + 1) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + hres = to_int(args + 1, &first_day); + if (SUCCEEDED(hres)) + { + if (!first_day) + { + /* vbUseSystemDayOfWeek */ + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_RETURN_NUMBER | LOCALE_IFIRSTDAYOFWEEK, (LPWSTR)&first_day, + sizeof(&first_day) / sizeof(WCHAR)); + first_day = (first_day + 1) % 7; + } + else if (first_day >= 1 && first_day <= 7) + { + first_day--; + } + else + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + } + } + + if (V_VT(args) == VT_NULL) + return return_null(res); + + if (FAILED(hres = to_system_time(args, &st))) return hres; + + return FAILED(hres) ? hres : return_short(res, 1 + (7 - first_day + st.wDayOfWeek) % 7); } static HRESULT Global_Year(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index a765eb1fcda..3429a1bbef5 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -2036,4 +2036,51 @@ call testDateAdd(DateSerial(2000, 1, 1), "ww", -1, DateSerial(1999, 12, 25)) call testDateAdd(DateSerial(2000, 1, 1), "Ww", -1, DateSerial(1999, 12, 25)) call testDateAddError() +sub testWeekday(d, firstday, wd) + dim x, x2 + x = Weekday(d, firstday) + call ok(x = wd, "weekday = " & x & " expected " & wd) + call ok(getVT(x) = "VT_I2*", "getVT = " & getVT(x)) + if firstday = vbSunday then + x = Weekday(d) + call ok(x = wd, "weekday = " & x & " expected " & wd) + end if + x = Weekday(d, vbUseSystemDayOfWeek) + x2 = Weekday(d, firstDayOfWeek) + call ok(x = x2, "weekday = " & x & " expected " & x2) +end sub + +sub testWeekdayError() + on error resume next + dim x + call Err.clear() + call Weekday(DateSerial(1000, 1, 1), 10) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Weekday(DateSerial(1000, 1, 1), -1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Weekday(null, -1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Weekday(DateSerial(1000, 1, 1), null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call Err.clear() + x = Weekday(null, vbSunday) + call ok(Err.number = 0, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_NULL*", "getVT = " & getVT(x)) + call Err.clear() + call Weekday(null, null) + call ok(Err.number = 94, "Err.number = " & Err.number) +end sub + +call testWeekday(DateSerial(2000, 1, 1), vbSunday, 7) +call testWeekday(DateSerial(2000, 1, 1), vbMonday, 6) +call testWeekday(DateSerial(2000, 1, 1), vbTuesday, 5) +call testWeekday(DateSerial(2000, 1, 1), vbWednesday, 4) +call testWeekday(DateSerial(2000, 1, 1), vbThursday, 3) +call testWeekday(DateSerial(2000, 1, 1), vbFriday, 2) +call testWeekday(DateSerial(2000, 1, 1), vbSaturday, 1) +call testWeekdayError() + Call reportSuccess() -- 2.35.1

2 3

[PATCH] winedump: Add support for dumping UnloadedModuleListStream.
by Nikolay Sivov 19 May '22

19 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/minidumpapiset.h | 16 +++++++++++++++ tools/winedump/minidump.c | 43 +++++++++++++++++++++++++++++++-------- 2 files changed, 51 insertions(+), 8 deletions(-) diff --git a/include/minidumpapiset.h b/include/minidumpapiset.h index b3a7737bd13..fed3e4cac03 100644 --- a/include/minidumpapiset.h +++ b/include/minidumpapiset.h @@ -426,6 +426,22 @@ typedef struct _MINIDUMP_THREAD_INFO_LIST ULONG NumberOfEntries; } MINIDUMP_THREAD_INFO_LIST, *PMINIDUMP_THREAD_INFO_LIST; +typedef struct _MINIDUMP_UNLOADED_MODULE +{ + ULONG64 BaseOfImage; + ULONG32 SizeOfImage; + ULONG32 CheckSum; + ULONG32 TimeDateStamp; + RVA ModuleNameRva; +} MINIDUMP_UNLOADED_MODULE, *PMINIDUMP_UNLOADED_MODULE; + +typedef struct _MINIDUMP_UNLOADED_MODULE_LIST +{ + ULONG32 SizeOfHeader; + ULONG32 SizeOfEntry; + ULONG32 NumberOfEntries; +} MINIDUMP_UNLOADED_MODULE_LIST, *PMINIDUMP_UNLOADED_MODULE_LIST; + typedef enum _MINIDUMP_STREAM_TYPE { UnusedStream = 0, diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index 734c754e6be..8190df937af 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -83,6 +83,7 @@ void mdmp_dump(void) const MINIDUMP_DIRECTORY* dir; const void* stream; unsigned int i, idx; + const BYTE *ptr; if (!hdr) { @@ -439,17 +440,16 @@ void mdmp_dump(void) case HandleDataStream: { const MINIDUMP_HANDLE_DATA_STREAM *mhd = stream; - const BYTE *desc; printf("Handle data:\n"); printf(" SizeOfHeader: %u\n", mhd->SizeOfHeader); printf(" SizeOfDescriptor: %u\n", mhd->SizeOfDescriptor); printf(" NumberOfDescriptors: %u\n", mhd->NumberOfDescriptors); - desc = (BYTE *)mhd + sizeof(*mhd); + ptr = (BYTE *)mhd + sizeof(*mhd); for (i = 0; i < mhd->NumberOfDescriptors; ++i) { - const MINIDUMP_HANDLE_DESCRIPTOR_2 *hd = (void *)desc; + const MINIDUMP_HANDLE_DESCRIPTOR_2 *hd = (void *)ptr; printf(" Handle [%u]:\n", i); print_longlong(" Handle", hd->Handle); @@ -472,24 +472,23 @@ void mdmp_dump(void) printf(" Reserved0: %#x\n", hd->Reserved0); } - desc += mhd->SizeOfDescriptor; + ptr += mhd->SizeOfDescriptor; } } break; case ThreadInfoListStream: { const MINIDUMP_THREAD_INFO_LIST *til = stream; - const BYTE *desc; printf("Thread Info List:\n"); printf(" SizeOfHeader: %u\n", (UINT)til->SizeOfHeader); printf(" SizeOfEntry: %u\n", (UINT)til->SizeOfEntry); printf(" NumberOfEntries: %u\n", (UINT)til->NumberOfEntries); - desc = (BYTE *)til + sizeof(*til); + ptr = (BYTE *)til + sizeof(*til); for (i = 0; i < til->NumberOfEntries; ++i) { - const MINIDUMP_THREAD_INFO *ti = (void *)desc; + const MINIDUMP_THREAD_INFO *ti = (void *)ptr; printf(" Thread [%u]:\n", i); printf(" ThreadId: %u\n", ti->ThreadId); @@ -503,7 +502,35 @@ void mdmp_dump(void) print_longlong(" StartAddress", ti->StartAddress); print_longlong(" Affinity", ti->Affinity); - desc += til->SizeOfEntry; + ptr += til->SizeOfEntry; + } + } + break; + + case UnloadedModuleListStream: + { + const MINIDUMP_UNLOADED_MODULE_LIST *uml = stream; + + printf("Unloaded module list:\n"); + printf(" SizeOfHeader: %u\n", uml->SizeOfHeader); + printf(" SizeOfEntry: %u\n", uml->SizeOfEntry); + printf(" NumberOfEntries: %u\n", uml->NumberOfEntries); + + ptr = (BYTE *)uml + sizeof(*uml); + for (i = 0; i < uml->NumberOfEntries; ++i) + { + const MINIDUMP_UNLOADED_MODULE *mod = (void *)ptr; + + printf(" Module [%u]:\n", i); + print_longlong(" BaseOfImage", mod->BaseOfImage); + printf(" SizeOfImage: %u\n", mod->SizeOfImage); + printf(" CheckSum: %#x\n", mod->CheckSum); + printf(" TimeDateStamp: %s\n", get_time_str(mod->TimeDateStamp)); + printf(" ModuleName: "); + dump_mdmp_string(mod->ModuleNameRva); + printf("\n"); + + ptr += uml->SizeOfEntry; } } break; -- 2.35.1

1 0

[PATCH 0/4] MR94: windows.gaming.input: More force feedback effect support.
by Rémi Bernon (＠rbernon) 19 May '22

19 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/94

2 4

[PATCH 0/6] MR93: ntdll: More heap code cleanup.
by Rémi Bernon (＠rbernon) 19 May '22

19 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/93

2 6

[PATCH 0/1] MR92: dwmapi: Clear DWM_TIMING_INFO structure before returning
by Alistair Leslie-Hughes (＠alesliehughes) 19 May '22

19 May '22

Clearing the structure passed in, allows Chromium to calculate a fallback value for the refresh rate. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53016 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/92

2 1

[PATCH v3 0/10] MR79: wined3d: Refactor format flags into two groups.
by Chip Davis (＠cdavis5e) 18 May '22

18 May '22

There are only three unused format flags left. I will soon submit changes which add four more format flags. I've noticed that format flags generally fall into two groups: * The first group consists of flags describing the content of a pixel format, e.g. whether or not this is a depth format, or whether this is a blocked format. These flags are the same for all resource types. * The second group consists of flags describing capabilities of the implementation with this format. These can and do vary by resource type. Only the second group needs to be stored per-resource-type. -- v3: wined3d: Rename format flags to caps. wined3d: Move WINED3DFMT_FLAG_CAST_TO_BLOCK to the attributes group. wined3d: Move WINED3DFMT_FLAG_MAPPABLE to the attributes group. wined3d: Move WINED3DFMT_FLAG_COMPRESSED and HEIGHT_SCALE to the attributes group. wined3d: Move WINED3DFMT_FLAG_BLOCKS, BROKEN_PITCH, and BLOCKS_NO_VERIFY to the attributes group. wined3d: Move WINED3DFMT_FLAG_EXTENSION to the attributes group. wined3d: Move WINED3DFMT_FLAG_BUMPMAP to the attributes group. wined3d: Move WINED3DFMT_FLAG_NORMALISED to the attributes group. wined3d: Move WINED3DFMT_FLAG_INTEGER to the attributes group. wined3d: Move WINED3DFMT_FLAG_FLOAT to a separate group. https://gitlab.winehq.org/wine/wine/-/merge_requests/79

2 10

[PATCH v2 0/2] MR66: mf/tests: Move WMA decoder aggregation tests from wmadmod.
by Rémi Bernon (＠rbernon) 18 May '22

18 May '22

-- v2: wmadmod: Remove unnecessary DLL. mf/tests: Move WMA decoder aggregation tests from wmadmod. https://gitlab.winehq.org/wine/wine/-/merge_requests/66

4 4

Re: [PATCH v3 0/8] MR87: windows.gaming.input: More force feedback effect implementation. - approved
by Alexandre Julliard (＠julliard) 18 May '22

18 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/87

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
71
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 May 2022