- Wine-Devel - list.winehq.org

[PATCH 3/3] winemac.drv: Use the default frequency in ChangeDisplaySettingsExW() if dmDisplayFrequency is 1.
by Zhiyi Zhang June 12, 2020

June 12, 2020

0 or 1 in dmDisplayFrequency means to use the default frequency. Fix Disgaea PC and Ostriv failing to launch in exclusive fullscreen mode. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 1a3cc349b52..001906efdf8 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -893,7 +893,9 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, if (devmode->dmPelsHeight != height) continue; } - if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && devmode->dmDisplayFrequency != 0) + if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && + devmode->dmDisplayFrequency != 0 && + devmode->dmDisplayFrequency != 1) { double refresh_rate = CGDisplayModeGetRefreshRate(display_mode); if (!refresh_rate) -- 2.25.1

1 0

[PATCH 2/3] winex11.drv: Use the default frequency in ChangeDisplaySettingsExW() if dmDisplayFrequency is 1.
by Zhiyi Zhang June 12, 2020

June 12, 2020

0 or 1 in dmDisplayFrequency means to use the default frequency. Fix Disgaea PC and Ostriv failing to launch in exclusive fullscreen mode. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 1 - dlls/winex11.drv/settings.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 482e2f1301f..afde67cd034 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -448,7 +448,6 @@ static void test_ChangeDisplaySettingsEx(void) dm.dmDisplayFrequency = vid_modes_test[i].freq; dm.dmFields = vid_modes_test[i].fields; res = ChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); - todo_wine_if(i == 2) ok(vid_modes_test[i].must_succeed ? (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_RESTART) : (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_RESTART || diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index c3f31d0430d..bbbb6fdf0a3 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -420,7 +420,7 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, continue; } if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && (dd_modes[i].refresh_rate != 0) && - devmode->dmDisplayFrequency != 0) + devmode->dmDisplayFrequency != 0 && devmode->dmDisplayFrequency != 1) { if (devmode->dmDisplayFrequency != dd_modes[i].refresh_rate) continue; -- 2.25.1

1 0

[PATCH 3/4] winex11.drv: Add a RandR provider ID property for GPUs.
by Zhiyi Zhang June 12, 2020

June 12, 2020

A RandR provider ID is needed to identify the corresponding GPU. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 13 ++++++++++++- dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/xrandr.c | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 1dedf32a52f..0a8d809cc71 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -43,11 +43,12 @@ DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0 DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_GPU_LUID, 0xca085853, 0x16ce, 0x48aa, 0xb1, 0x14, 0xde, 0x9c, 0x72, 0x33, 0x42, 0x23, 1); DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_OUTPUT_ID, 0xca085853, 0x16ce, 0x48aa, 0xb1, 0x14, 0xde, 0x9c, 0x72, 0x33, 0x42, 0x23, 2); -/* Wine specific monitor properties */ +/* Wine specific properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 4); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_GPU_RANDR_PROVIDER_ID, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5c, 2); static const WCHAR driver_date_dataW[] = {'D','r','i','v','e','r','D','a','t','e','D','a','t','a',0}; static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; @@ -357,6 +358,16 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g (const BYTE *)&present, sizeof(present), 0)) goto done; + /* Write WINE_DEVPROPKEY_GPU_RANDR_PROVIDER_ID property */ + if (gpu->randr_provider_id) + { + TRACE("RandR provider ID: 0x%s.\n", wine_dbgstr_longlong(gpu->randr_provider_id)); + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_GPU_RANDR_PROVIDER_ID, + DEVPROP_TYPE_UINT64, (const BYTE *)&gpu->randr_provider_id, + sizeof(gpu->randr_provider_id), 0)) + goto done; + } + /* Write DEVPROPKEY_GPU_LUID property */ if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &property_type, (BYTE *)&luid, sizeof(luid), NULL, 0)) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a9eaed20cab..d9f8b250f51 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -690,6 +690,8 @@ struct x11drv_gpu UINT device_id; UINT subsys_id; UINT revision_id; + /* Optional RandR provider ID. If it's not supported, set it to zero */ + UINT64 randr_provider_id; }; /* Represent an adapter in EnumDisplayDevices context */ diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 76e76806c55..ce7efc9deb4 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -711,6 +711,7 @@ static BOOL xrandr14_get_gpus( struct x11drv_gpu **new_gpus, int *count ) { WARN("XRandR implementation doesn't report any providers, faking one.\n"); lstrcpyW( gpus[0].name, wine_adapterW ); + gpus[0].randr_provider_id = 1; *new_gpus = gpus; *count = 1; ret = TRUE; @@ -742,6 +743,7 @@ static BOOL xrandr14_get_gpus( struct x11drv_gpu **new_gpus, int *count ) } gpus[i].id = provider_resources->providers[i]; + gpus[i].randr_provider_id = provider_resources->providers[i]; MultiByteToWideChar( CP_UTF8, 0, provider_info->name, -1, gpus[i].name, ARRAY_SIZE(gpus[i].name) ); /* PCI IDs are all zero because there is currently no portable way to get it via XRandR. Some AMD drivers report * their PCI address in the name but many others don't */ -- 2.25.1

1 0

[PATCH 2/4] winex11.drv: Enable VK_EXT_acquire_xlib_display if VK_KHR_get_physical_device_properties2 is enabled.
by Zhiyi Zhang June 12, 2020

June 12, 2020

VK_KHR_get_physical_device_properties2 doesn't report a valid LUID on non-Windows hosts. Extension VK_EXT_acquire_xlib_display is needed for the use of vkGetRandROutputDisplayEXT(), which will be used to fill in the LUID property of Vulkan devices. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/vulkan-1/tests/vulkan.c | 1 + dlls/winex11.drv/vulkan.c | 55 +++++++++++++++++++++++++++++++----- 2 files changed, 49 insertions(+), 7 deletions(-) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 63fd48b33d3..4ebfe6815bf 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -352,6 +352,7 @@ static void test_unsupported_instance_extensions(void) { "VK_KHR_xcb_surface", "VK_KHR_xlib_surface", + "VK_EXT_acquire_xlib_display", }; for (i = 0; i < ARRAY_SIZE(extensions); ++i) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index c988b1a6b27..9ee79220f76 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -155,9 +155,9 @@ fail: * Caller is responsible for allocation and cleanup of 'dst'. */ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src, - VkInstanceCreateInfo *dst) + VkInstanceCreateInfo *dst, BOOL enable_acquire_xlib_display) { - unsigned int i; + unsigned int i, extension_count; const char **enabled_extensions = NULL; dst->sType = src->sType; @@ -169,9 +169,13 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo dst->enabledExtensionCount = 0; dst->ppEnabledExtensionNames = NULL; - if (src->enabledExtensionCount > 0) + extension_count = src->enabledExtensionCount; + if (enable_acquire_xlib_display) + ++extension_count; + + if (extension_count) { - enabled_extensions = heap_calloc(src->enabledExtensionCount, sizeof(*src->ppEnabledExtensionNames)); + enabled_extensions = heap_calloc(extension_count, sizeof(*src->ppEnabledExtensionNames)); if (!enabled_extensions) { ERR("Failed to allocate memory for enabled extensions\n"); @@ -192,8 +196,12 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo enabled_extensions[i] = src->ppEnabledExtensionNames[i]; } } + + if (enable_acquire_xlib_display) + enabled_extensions[i] = "VK_EXT_acquire_xlib_display"; + dst->ppEnabledExtensionNames = enabled_extensions; - dst->enabledExtensionCount = src->enabledExtensionCount; + dst->enabledExtensionCount = extension_count; } return VK_SUCCESS; @@ -232,6 +240,7 @@ static VkResult X11DRV_vkCreateInstance(const VkInstanceCreateInfo *create_info, const VkAllocationCallbacks *allocator, VkInstance *instance) { VkInstanceCreateInfo create_info_host; + unsigned int i; VkResult res; TRACE("create_info %p, allocator %p, instance %p\n", create_info, allocator, instance); @@ -240,9 +249,33 @@ static VkResult X11DRV_vkCreateInstance(const VkInstanceCreateInfo *create_info, /* Perform a second pass on converting VkInstanceCreateInfo. Winevulkan * performed a first pass in which it handles everything except for WSI - * functionality such as VK_KHR_win32_surface. Handle this now. + * functionality such as VK_KHR_win32_surface. Handle this now. And try + * to enable VK_EXT_acquire_xlib_display if VK_KHR_get_physical_device_properties2 + * is enabled for getting valid LUIDs. */ - res = wine_vk_instance_convert_create_info(create_info, &create_info_host); + for (i = 0; i < create_info->enabledExtensionCount; ++i) + { + if (!strcmp(create_info->ppEnabledExtensionNames[i], + VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME)) + break; + } + + if (i < create_info->enabledExtensionCount) + { + res = wine_vk_instance_convert_create_info(create_info, &create_info_host, TRUE); + if (res != VK_SUCCESS) + { + ERR("Failed to convert instance create info, res=%d\n", res); + return res; + } + + res = pvkCreateInstance(&create_info_host, NULL /* allocator */, instance); + heap_free((void *)create_info_host.ppEnabledExtensionNames); + if (res != VK_ERROR_EXTENSION_NOT_PRESENT) + return res; + } + + res = wine_vk_instance_convert_create_info(create_info, &create_info_host, FALSE); if (res != VK_SUCCESS) { ERR("Failed to convert instance create info, res=%d\n", res); @@ -413,6 +446,14 @@ static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_ VK_KHR_WIN32_SURFACE_EXTENSION_NAME); properties[i].specVersion = VK_KHR_WIN32_SURFACE_SPEC_VERSION; } + + /* Do not report VK_EXT_acquire_xlib_display */ + if (!strcmp(properties[i].extensionName, "VK_EXT_acquire_xlib_display")) + { + if (i + 1 < *count) + memmove(&properties[i], &properties[i + 1], sizeof(*properties) * (*count - (i + 1))); + *count = *count - 1; + } } TRACE("Returning %u extensions.\n", *count); -- 2.25.1

1 0

[PATCH v2 1/6] d3dcompiler: Use the cached scalar type in expr_common_type() where possible.
by Zebediah Figura June 11, 2020

June 11, 2020

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index ec0da2d4034..97e3cdf1a3f 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1294,6 +1294,8 @@ static struct hlsl_type *expr_common_type(struct hlsl_type *t1, struct hlsl_type } } + if (type == HLSL_CLASS_SCALAR) + return hlsl_ctx.builtin_types.scalar[base]; return new_hlsl_type(NULL, type, base, dimx, dimy); } -- 2.26.2

4 16

[PATCH] d3dcompiler: Print float constants with more precision.
by Matteo Bruni June 11, 2020

June 11, 2020

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dcompiler_43/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 4769ebc399b3..4b1e8f7ff061 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1831,10 +1831,10 @@ static void debug_dump_ir_constant(const struct hlsl_ir_constant *constant) switch (type->base_type) { case HLSL_TYPE_FLOAT: - wine_dbg_printf("%g ", (double)constant->value.f[y * type->dimx + x]); + wine_dbg_printf("%.8e ", constant->value.f[y * type->dimx + x]); break; case HLSL_TYPE_DOUBLE: - wine_dbg_printf("%g ", constant->value.d[y * type->dimx + x]); + wine_dbg_printf("%.16e ", constant->value.d[y * type->dimx + x]); break; case HLSL_TYPE_INT: wine_dbg_printf("%d ", constant->value.i[y * type->dimx + x]); -- 2.26.2

2 1

[PATCH] ntdll: Fix a typo in security descriptor flags.
by Nikolay Sivov June 11, 2020

June 11, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/unix/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 03b511881b7..5e327d0a667 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -214,7 +214,7 @@ NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_a owner = sd->Owner; group = sd->Group; if (sd->Control & SE_SACL_PRESENT) sacl = sd->Sacl; - if (sd->Control & SE_SACL_PRESENT) dacl = sd->Dacl; + if (sd->Control & SE_DACL_PRESENT) dacl = sd->Dacl; } if (owner) len += offsetof( SID, SubAuthority[owner->SubAuthorityCount] ); -- 2.26.2

1 0

[PATCH 2/2] oleaut32: Fix CompObj stream name in SLTG_Magic
by Vijay Kiran Kamuju June 11, 2020

June 11, 2020

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] ntdll: Use single field for misc flags in ComClass redirection section.
by Nikolay Sivov June 11, 2020

June 11, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- There is no evidence that remaining bytes are used for anything. dlls/kernel32/tests/actctx.c | 23 ++++++++++------------- dlls/mscoree/corruntimehost.c | 4 +--- dlls/ntdll/actctx.c | 22 +++++++++------------- dlls/ole32/compobj.c | 9 ++++----- dlls/sxs/sxs.c | 4 +--- 5 files changed, 25 insertions(+), 37 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 2d942cdc981..2093959d98d 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -1422,9 +1422,7 @@ enum comclass_miscfields { struct comclassredirect_data { ULONG size; - BYTE res; - BYTE miscmask; - BYTE res1[2]; + ULONG flags; DWORD model; GUID clsid; GUID alias; @@ -1481,12 +1479,9 @@ static void test_find_com_redirection(HANDLE handle, const GUID *clsid, const GU ok_(__FILE__, line)(comclass->size == sizeof(*comclass), "got %d for header size\n", comclass->size); if (data.lpData && comclass->size == sizeof(*comclass)) { + ULONG len, miscmask; WCHAR *ptr; - ULONG len; - ok_(__FILE__, line)(comclass->res == 0, "got res as %d\n", comclass->res); - ok_(__FILE__, line)(comclass->res1[0] == 0, "got res1[0] as %02x\n", comclass->res1[0]); - ok_(__FILE__, line)(comclass->res1[1] == 0, "got res1[1] as %02x\n", comclass->res1[1]); ok_(__FILE__, line)(comclass->model == ThreadingModel_Neutral, "got model %d\n", comclass->model); ok_(__FILE__, line)(IsEqualGUID(&comclass->clsid, clsid), "got wrong clsid %s\n", wine_dbgstr_guid(&comclass->clsid)); ok_(__FILE__, line)(IsEqualGUID(&comclass->clsid2, clsid), "got wrong clsid2 %s\n", wine_dbgstr_guid(&comclass->clsid2)); @@ -1519,19 +1514,21 @@ static void test_find_com_redirection(HANDLE handle, const GUID *clsid, const GU ok_(__FILE__, line)(data.ulSectionTotalLength > comclass->name_offset, "got wrong offset %d\n", comclass->name_offset); /* check misc fields are set */ - if (comclass->miscmask) + miscmask = (comclass->flags >> 8) & 0xff; + if (miscmask) { - if (comclass->miscmask & MiscStatus) + if (miscmask & MiscStatus) ok_(__FILE__, line)(comclass->miscstatus != 0, "got miscstatus 0x%08x\n", comclass->miscstatus); - if (comclass->miscmask & MiscStatusIcon) + if (miscmask & MiscStatusIcon) ok_(__FILE__, line)(comclass->miscstatusicon != 0, "got miscstatusicon 0x%08x\n", comclass->miscstatusicon); - if (comclass->miscmask & MiscStatusContent) + if (miscmask & MiscStatusContent) ok_(__FILE__, line)(comclass->miscstatuscontent != 0, "got miscstatuscontent 0x%08x\n", comclass->miscstatuscontent); - if (comclass->miscmask & MiscStatusThumbnail) + if (miscmask & MiscStatusThumbnail) ok_(__FILE__, line)(comclass->miscstatusthumbnail != 0, "got miscstatusthumbnail 0x%08x\n", comclass->miscstatusthumbnail); - if (comclass->miscmask & MiscStatusDocPrint) + if (miscmask & MiscStatusDocPrint) ok_(__FILE__, line)(comclass->miscstatusdocprint != 0, "got miscstatusdocprint 0x%08x\n", comclass->miscstatusdocprint); } + ok_(__FILE__, line)(!(comclass->flags & 0xffff00ff), "Unexpected flags %#x.\n", comclass->flags); /* part used for clrClass only */ if (comclass->clrdata_len) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 9f53555ee94..a5b378b9251 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -74,9 +74,7 @@ struct dll_fixup struct comclassredirect_data { ULONG size; - BYTE res; - BYTE miscmask; - BYTE res1[2]; + ULONG flags; DWORD model; GUID clsid; GUID alias; diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index af9499c4044..1fb337ea333 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -242,9 +242,7 @@ enum comclass_miscfields struct comclassredirect_data { ULONG size; - BYTE res; - BYTE miscmask; - BYTE res1[2]; + ULONG flags; DWORD model; GUID clsid; GUID alias; @@ -4030,7 +4028,7 @@ static void add_comserver_record(const struct guidsection_header *section, const struct entity *entity = &entities->base[i]; if (entity->kind == ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION) { - ULONG module_len, progid_len, str_len = 0; + ULONG module_len, progid_len, str_len = 0, miscmask; struct comclassredirect_data *data; struct guid_index *alias_index; struct clrclass_data *clrdata; @@ -4064,9 +4062,6 @@ static void add_comserver_record(const struct guidsection_header *section, const /* setup data */ data = (struct comclassredirect_data*)((BYTE*)section + (*index)->data_offset); data->size = sizeof(*data); - data->res = 0; - data->res1[0] = 0; - data->res1[1] = 0; data->model = entity->u.comclass.model; data->clsid = (*index)->guid; data->alias = alias_index->guid; @@ -4091,17 +4086,18 @@ static void add_comserver_record(const struct guidsection_header *section, const data->miscstatusdocprint = entity->u.comclass.miscstatusdocprint; /* mask describes which misc* data is available */ - data->miscmask = 0; + miscmask = 0; if (data->miscstatus) - data->miscmask |= MiscStatus; + miscmask |= MiscStatus; if (data->miscstatuscontent) - data->miscmask |= MiscStatusContent; + miscmask |= MiscStatusContent; if (data->miscstatusthumbnail) - data->miscmask |= MiscStatusThumbnail; + miscmask |= MiscStatusThumbnail; if (data->miscstatusicon) - data->miscmask |= MiscStatusIcon; + miscmask |= MiscStatusIcon; if (data->miscstatusdocprint) - data->miscmask |= MiscStatusDocPrint; + miscmask |= MiscStatusDocPrint; + data->flags = miscmask << 8; if (data->clrdata_offset) { diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index bd28f42b33b..df234498e65 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -105,9 +105,7 @@ enum comclass_miscfields struct comclassredirect_data { ULONG size; - BYTE res; - BYTE miscmask; - BYTE res1[2]; + ULONG flags; DWORD model; GUID clsid; GUID alias; @@ -265,10 +263,11 @@ BOOL actctx_get_miscstatus(const CLSID *clsid, DWORD aspect, DWORD *status) { struct comclassredirect_data *comclass = (struct comclassredirect_data*)data.lpData; enum comclass_miscfields misc = dvaspect_to_miscfields(aspect); + ULONG miscmask = (comclass->flags >> 8) & 0xff; - if (!(comclass->miscmask & misc)) + if (!(miscmask & misc)) { - if (!(comclass->miscmask & MiscStatus)) + if (!(miscmask & MiscStatus)) { *status = 0; return TRUE; diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c index 5b2db1d997c..0b59eb5d2e9 100644 --- a/dlls/sxs/sxs.c +++ b/dlls/sxs/sxs.c @@ -64,9 +64,7 @@ typedef struct _SXS_GUID_INFORMATION_CLR struct comclassredirect_data { ULONG size; - BYTE res; - BYTE miscmask; - BYTE res1[2]; + ULONG flags; DWORD model; GUID clsid; GUID alias; -- 2.26.2

1 0

[PATCH 1/3] setupapi: Reset the source file pointer when comparing files.
by Zebediah Figura June 11, 2020

June 11, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/misc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 3b5d62b682c..3b0c9477747 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -933,6 +933,8 @@ static BOOL find_existing_inf(const WCHAR *source, WCHAR *target) if (dest_file == INVALID_HANDLE_VALUE) continue; + SetFilePointer( source_file, 0, NULL, FILE_BEGIN ); + if (GetFileSizeEx( dest_file, &dest_file_size ) && dest_file_size.QuadPart == source_file_size.QuadPart && !compare_files( source_file, dest_file )) -- 2.27.0

1 3