- Wine-Devel - list.winehq.org

[PATCH] wbemprox: add ProductType to win32_operatingsystem class
by Louis Lenders March 15, 2021

March 15, 2021

https://bugs.winehq.org/show_bug.cgi?id=50805 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index dbf9173d21d..3922331f650 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -247,6 +247,7 @@ static const struct column col_operatingsystem[] = { L"OSProductSuite", CIM_UINT32 }, { L"OSType", CIM_UINT16 }, { L"Primary", CIM_BOOLEAN }, + { L"ProductType", CIM_UINT32 }, { L"SerialNumber", CIM_STRING|COL_FLAG_DYNAMIC }, { L"ServicePackMajorVersion", CIM_UINT16 }, { L"ServicePackMinorVersion", CIM_UINT16 }, @@ -659,6 +660,7 @@ struct record_operatingsystem UINT32 osproductsuite; UINT16 ostype; int primary; + UINT32 producttype; const WCHAR *serialnumber; UINT16 servicepackmajor; UINT16 servicepackminor; @@ -3574,6 +3576,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec->osproductsuite = 2461140; /* Windows XP Professional */ rec->ostype = 18; /* WINNT */ rec->primary = -1; + rec->producttype = 1; rec->serialnumber = get_osserialnumber(); rec->servicepackmajor = ver.wServicePackMajor; rec->servicepackminor = ver.wServicePackMinor; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index f650418e51f..a79bc759bea 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1299,6 +1299,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) check_property( obj, L"CurrentTimeZone", VT_I2, CIM_SINT16 ); check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); check_property( obj, L"OSType", VT_I4, CIM_UINT16 ); + check_property( obj, L"ProductType", VT_I4, CIM_UINT32 ); check_property( obj, L"ServicePackMajorVersion", VT_I4, CIM_UINT16 ); check_property( obj, L"ServicePackMinorVersion", VT_I4, CIM_UINT16 ); check_property( obj, L"SuiteMask", VT_I4, CIM_UINT32 ); -- 2.30.1

2 1

[PATCH 1/5] dwrite: Test simulations mask bitwise for consistency.
by Nikolay Sivov March 15, 2021

March 15, 2021

This has no functional impact. Internal function is only called with one bit set at a time, but there is no reason to make it more confusing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/font.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 14be1b9fc1b..4e2917854ba 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4022,7 +4022,7 @@ static HRESULT init_font_data(const struct fontface_desc *desc, struct dwrite_fo return S_OK; } -static HRESULT init_font_data_from_font(const struct dwrite_font_data *src, DWRITE_FONT_SIMULATIONS sim, +static HRESULT init_font_data_from_font(const struct dwrite_font_data *src, DWRITE_FONT_SIMULATIONS simulations, const WCHAR *facenameW, struct dwrite_font_data **ret) { struct dwrite_font_data *data; @@ -4035,10 +4035,10 @@ static HRESULT init_font_data_from_font(const struct dwrite_font_data *src, DWRI *data = *src; data->refcount = 1; - data->simulations |= sim; - if (sim == DWRITE_FONT_SIMULATIONS_BOLD) + data->simulations |= simulations; + if (simulations & DWRITE_FONT_SIMULATIONS_BOLD) data->weight = DWRITE_FONT_WEIGHT_BOLD; - else if (sim == DWRITE_FONT_SIMULATIONS_OBLIQUE) + if (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE) data->style = DWRITE_FONT_STYLE_OBLIQUE; memset(data->info_strings, 0, sizeof(data->info_strings)); data->names = NULL; -- 2.30.2

1 4

[PATCH] ws2_32: Add a suitable break in the loop for WSASocketW.
by Jiangyi Chen March 15, 2021

March 15, 2021

2 1

[PATCH v2] gdi32: Font replacements should use original family name.
by Haidong Yu March 15, 2021

March 15, 2021

1 0

[PATCH] devenum: Avoid the comma operator
by Michael Stefaniuc March 14, 2021

March 14, 2021

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/devenum/mediacatenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index f097c580261..b24e24f7f31 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -186,7 +186,7 @@ static HRESULT WINAPI property_bag_Read(IPropertyBag *iface, reg_pins[1].nMediaTypes = output_count; reg_pins[1].lpMediaType = reg_types + count; reg_filter.dwVersion = 2; - reg_filter.dwMerit = MERIT_NORMAL + 0x800, + reg_filter.dwMerit = MERIT_NORMAL + 0x800; reg_filter.cPins2 = 2; reg_filter.rgPins2 = reg_pins; -- 2.26.2

2 1

[PATCH] mshtml: Print the debug string and not the pointer to it
by Michael Stefaniuc March 14, 2021

March 14, 2021

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/nsio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 9ba5a6c8612..1ffc6325725 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2182,7 +2182,7 @@ static nsresult NSAPI nsCacheInfoChannel_GetCacheTokenCachedCharset(nsICacheInfo static nsresult NSAPI nsCacheInfoChannel_SetCacheTokenCachedCharset(nsICacheInfoChannel *iface, const nsACString *p) { nsChannel *This = impl_from_nsICacheInfoChannel(iface); - FIXME("(%p)->(%p)\n", This, debugstr_nsacstr(p)); + FIXME("(%p)->(%s)\n", This, debugstr_nsacstr(p)); return E_NOTIMPL; } -- 2.26.2

1 0

[PATCH] wldap32: Remove redundant NULL check before heap_free()
by Michael Stefaniuc March 14, 2021

March 14, 2021

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wldap32/page.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index a16ea52409e..07f29be0d50 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -241,11 +241,8 @@ ULONG CDECL ldap_get_paged_count( WLDAP32_LDAP *ld, PLDAPSearch search, return WLDAP32_LDAP_SUCCESS; } - if (search->cookie) - { - heap_free( search->cookie ); - search->cookie = NULL; - } + heap_free( search->cookie ); + search->cookie = NULL; ret = ldap_parse_page_controlW( ld, server_ctrls, count, &search->cookie ); if (ret == WLDAP32_LDAP_SUCCESS) -- 2.26.2

1 0

Wine staging 6.4 release
by Alistair Leslie-Hughes March 14, 2021

March 14, 2021

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.4 (686 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * kernel32: Implement K32GetMappedFileName. * wow64cpu: Add stub dll. * ntdll: Add a stub implementation of Wow64Transition. * aclui: Add basic ACE viewer. * ntdll: Implement RtlQueryRegistryValuesEx * setupapi/tests: Add more tests for SPFILENOTIFY_FILEINCABINET handler. * setupapi: Fix CabinetName passed to SPFILENOTIFY_CABINETINFO handler. * setupapi/tests: Add tests for cabinet name passed to SPFILENOTIFY_FILEEXTRACTED. * setupapi: Fix parameters of SPFILENOTIFY_FILEINCABINET handler. * ddraw: Create rendering targets in video memory if possible. Added: * [50624] Waves Central 12.0.5 fails to start. Updated: * ntdll-NtAlertThreadByThreadId * ntdll-Junction_Points Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

Re: [PATCH] ntdll: Implement RtlGetCallersAddress function.
by Vijay Kiran Kamuju March 14, 2021

March 14, 2021

Sorry its RtlCaptureStackBackTrace instead of RtlCaptureBackTrace On Sun, Mar 14, 2021 at 7:13 PM Vijay Kiran Kamuju <infyquest(a)gmail.com> wrote: > From the openrce found that it calls the RtlCaptureBackTrace, found > explanation on www.codewarrior.cn website regarding the function. Checked > the MSDN documentation for RtlCaptureBackTrace > > Lastly inspired by the reactos implementation. > > I tried to put it in exception.c, where in it could not find the RtlCaptureBackTrace, > will check in the headers. > > Thanks, > Vijay > > > On Sun, 14 Mar 2021, 19:00 Nikolay Sivov, <nsivov(a)codeweavers.com> wrote: > >> Where does this implementation come from? You probably don't have to >> duplicate exactly the same function in every arch file. >> >>

1 0

[PATCH v2] ntdll: Implement RtlGetCallersAddress function.
by Vijay Kiran Kamuju March 14, 2021

March 14, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50726 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0