March 2018 - Wine-devel - list.winehq.org

[PATCH 1/4] advapi32: Use GetWindowsAccountDomainSid() to retrieve the domain SID.
by Dmitry Timoshkov 02 Mar '18

02 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/lsa.c | 23 ++++++++++++++++------- include/winbase.h | 1 + 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 6f51f9df57..f2fcc0701b 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -763,16 +763,24 @@ NTSTATUS WINAPI LsaQueryInformationPolicy( break; case PolicyDnsDomainInformation: /* 12 (0xc) */ { - struct di + struct { POLICY_DNS_DOMAIN_INFO info; - SID sid; + struct + { + SID sid; + DWORD sid_subauthority[3]; + } domain_sid; WCHAR domain_name[MAX_COMPUTERNAME_LENGTH + 1]; WCHAR dns_domain_name[MAX_COMPUTERNAME_LENGTH + 1]; WCHAR dns_forest_name[MAX_COMPUTERNAME_LENGTH + 1]; - }; + } *xdi; + struct + { + SID sid; + DWORD sid_subauthority[3]; + } computer_sid; DWORD dwSize; - struct di *xdi; xdi = heap_alloc_zero(sizeof(*xdi)); if (!xdi) return STATUS_NO_MEMORY; @@ -788,10 +796,11 @@ NTSTATUS WINAPI LsaQueryInformationPolicy( /* FIXME: also set DnsDomainName and DnsForestName */ - if (ADVAPI_GetComputerSid(&xdi->sid)) + dwSize = sizeof(xdi->domain_sid); + if (ADVAPI_GetComputerSid(&computer_sid.sid) && GetWindowsAccountDomainSid(&computer_sid.sid, &xdi->domain_sid.sid, &dwSize)) { - xdi->info.Sid = &xdi->sid; - TRACE("setting SID to %s\n", debugstr_sid(&xdi->sid)); + xdi->info.Sid = &xdi->domain_sid.sid; + TRACE("setting SID to %s\n", debugstr_sid(&xdi->domain_sid.sid)); } *Buffer = xdi; diff --git a/include/winbase.h b/include/winbase.h index e47c87a544..f6cca1d2d2 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2245,6 +2245,7 @@ WINBASEAPI BOOL WINAPI GetVolumePathNameW(LPCWSTR,LPWSTR,DWORD); WINBASEAPI BOOL WINAPI GetVolumePathNamesForVolumeNameA(LPCSTR,LPSTR,DWORD,PDWORD); WINBASEAPI BOOL WINAPI GetVolumePathNamesForVolumeNameW(LPCWSTR,LPWSTR,DWORD,PDWORD); #define GetVolumePathNamesForVolumeName WINELIB_NAME_AW(GetVolumePathNamesForVolumeName) +WINBASEAPI BOOL WINAPI GetWindowsAccountDomainSid(PSID,PSID,DWORD*); WINBASEAPI UINT WINAPI GetWindowsDirectoryA(LPSTR,UINT); WINBASEAPI UINT WINAPI GetWindowsDirectoryW(LPWSTR,UINT); #define GetWindowsDirectory WINELIB_NAME_AW(GetWindowsDirectory) -- 2.16.2

1 0

[PATCH] secur32/tests: Fix HeapAlloc in setup_buffers().
by Andrey Gusev 02 Mar '18

02 Mar '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/secur32/tests/negotiate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/tests/negotiate.c b/dlls/secur32/tests/negotiate.c index 095aee6cb5..44dfc52868 100644 --- a/dlls/secur32/tests/negotiate.c +++ b/dlls/secur32/tests/negotiate.c @@ -100,7 +100,7 @@ static void setup_buffers( struct sspi_data *data, SecPkgInfoA *info ) buffer->BufferType = SECBUFFER_TOKEN; buffer->pvBuffer = HeapAlloc( GetProcessHeap(), 0, info->cbMaxToken ); - buffer = HeapAlloc( GetProcessHeap(), 0, sizeof(SecBuffer) ); + SecBuffer *buffer = HeapAlloc( GetProcessHeap(), 0, sizeof(SecBuffer) ); data->out_buf->ulVersion = SECBUFFER_VERSION; data->out_buf->cBuffers = 1; -- 2.13.6

3 2

[PATCH 1/6] wined3d: Remove redundant if statement from device_init_swapchain_state().
by Józef Kucia 02 Mar '18

02 Mar '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/device.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 648e35203709..92dfa0ccf931 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -949,15 +949,12 @@ static void device_init_swapchain_state(struct wined3d_device *device, struct wi BOOL ds_enable = swapchain->desc.enable_auto_depth_stencil; unsigned int i; - if (device->fb.render_targets) + for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) { - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) - { - wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); - } - if (device->back_buffer_view) - wined3d_device_set_rendertarget_view(device, 0, device->back_buffer_view, TRUE); + wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); } + if (device->back_buffer_view) + wined3d_device_set_rendertarget_view(device, 0, device->back_buffer_view, TRUE); wined3d_device_set_depth_stencil_view(device, ds_enable ? device->auto_depth_stencil_view : NULL); } -- 2.16.1

3 12

[PATCH 4/5] wined3d: Explicitly calculate the sub-resource level in wined3d_texture_allocate_gl_mutable_storage().
by Henri Verbeet 02 Mar '18

02 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 58 +++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ebaa3b9..1ffc2a6 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -492,42 +492,42 @@ static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture * GLenum gl_internal_format, const struct wined3d_format *format, const struct wined3d_gl_info *gl_info) { - unsigned int i, level, sub_call_count; + unsigned int level, level_count, layer, layer_count; + GLsizei width, height; + GLenum target; - sub_call_count = texture->level_count; - if (texture->target != GL_TEXTURE_2D_ARRAY) - sub_call_count *= texture->layer_count; + level_count = texture->level_count; + layer_count = texture->target == GL_TEXTURE_2D_ARRAY ? 1 : texture->layer_count; - for (i = 0; i < sub_call_count; ++i) + for (layer = 0; layer < layer_count; ++layer) { - struct wined3d_surface *surface = texture->sub_resources[i].u.surface; - GLsizei width, height; - GLenum target; + target = wined3d_texture_get_sub_resource_target(texture, layer * level_count); - level = surface->texture_level; - width = wined3d_texture_get_level_pow2_width(texture, level); - height = wined3d_texture_get_level_pow2_height(texture, level); - if (texture->resource.format_flags & WINED3DFMT_FLAG_HEIGHT_SCALE) + for (level = 0; level < level_count; ++level) { - height *= format->height_scale.numerator; - height /= format->height_scale.denominator; - } - target = wined3d_texture_get_sub_resource_target(texture, i); + width = wined3d_texture_get_level_pow2_width(texture, level); + height = wined3d_texture_get_level_pow2_height(texture, level); + if (texture->resource.format_flags & WINED3DFMT_FLAG_HEIGHT_SCALE) + { + height *= format->height_scale.numerator; + height /= format->height_scale.denominator; + } - TRACE("surface %p, target %#x, level %u, width %u, height %u.\n", - surface, target, level, width, height); + TRACE("texture %p, layer %u, level %u, target %#x, width %u, height %u.\n", + texture, layer, level, target, width, height); - if (texture->target == GL_TEXTURE_2D_ARRAY) - { - GL_EXTCALL(glTexImage3D(target, level, gl_internal_format, width, height, - texture->layer_count, 0, format->glFormat, format->glType, NULL)); - checkGLcall("glTexImage3D"); - } - else - { - gl_info->gl_ops.gl.p_glTexImage2D(target, level, gl_internal_format, - width, height, 0, format->glFormat, format->glType, NULL); - checkGLcall("glTexImage2D"); + if (texture->target == GL_TEXTURE_2D_ARRAY) + { + GL_EXTCALL(glTexImage3D(target, level, gl_internal_format, width, height, + texture->layer_count, 0, format->glFormat, format->glType, NULL)); + checkGLcall("glTexImage3D"); + } + else + { + gl_info->gl_ops.gl.p_glTexImage2D(target, level, gl_internal_format, + width, height, 0, format->glFormat, format->glType, NULL); + checkGLcall("glTexImage2D"); + } } } } -- 2.1.4

1 0

[PATCH 3/5] wined3d: Explicitly pass the sub-resource level to surface_is_full_rect().
by Henri Verbeet 02 Mar '18

02 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fdf670c..421b01c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -246,14 +246,14 @@ static void get_color_masks(const struct wined3d_format *format, DWORD *masks) masks[2] = ((1u << format->blue_size) - 1) << format->blue_offset; } -static BOOL surface_is_full_rect(const struct wined3d_surface *surface, const RECT *r) +static BOOL texture2d_is_full_rect(const struct wined3d_texture *texture, unsigned int level, const RECT *r) { unsigned int t; - t = wined3d_texture_get_level_width(surface->container, surface->texture_level); + t = wined3d_texture_get_level_width(texture, level); if ((r->left && r->right) || abs(r->right - r->left) != t) return FALSE; - t = wined3d_texture_get_level_height(surface->container, surface->texture_level); + t = wined3d_texture_get_level_height(texture, level); if ((r->top && r->bottom) || abs(r->bottom - r->top) != t) return FALSE; return TRUE; @@ -313,7 +313,7 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device, /* Make sure the locations are up-to-date. Loading the destination * surface isn't required if the entire surface is overwritten. */ wined3d_texture_load_location(src_texture, src_sub_resource_idx, context, src_location); - if (!surface_is_full_rect(dst_surface, dst_rect)) + if (!texture2d_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, dst_rect)) wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, dst_location); else wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); @@ -419,7 +419,7 @@ static void surface_blt_fbo(const struct wined3d_device *device, * in fact harmful if we're being called by surface_load_location() with * the purpose of loading the destination surface.) */ wined3d_texture_load_location(src_texture, src_sub_resource_idx, old_ctx, src_location); - if (!surface_is_full_rect(dst_surface, &dst_rect)) + if (!texture2d_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, &dst_rect)) wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, old_ctx, dst_location); else wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, old_ctx, dst_location); @@ -2679,7 +2679,7 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit if (!location) location = dst_texture->flags & WINED3D_TEXTURE_IS_SRGB ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; - if (surface_is_full_rect(dst_surface, dst_rect)) + if (texture2d_is_full_rect(dst_texture, dst_level, dst_rect)) { if (!wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, location)) ERR("Failed to prepare the destination sub-resource into %s.\n", wined3d_debug_location(location)); -- 2.1.4

1 0

[PATCH 2/5] wined3d: Explicitly calculate the sub-resource level in raw_blitter_blit().
by Henri Verbeet 02 Mar '18

02 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4a7ed19..fdf670c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2629,8 +2629,8 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit { const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int src_sub_resource_idx, dst_sub_resource_idx; + unsigned int src_level, src_layer, dst_level, dst_layer; struct wined3d_texture *src_texture, *dst_texture; - unsigned int src_layer, dst_layer; struct wined3d_blitter *next; GLuint src_name, dst_name; DWORD location; @@ -2660,7 +2660,12 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit TRACE("Blit using ARB_copy_image.\n"); src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); + src_level = src_sub_resource_idx % src_texture->level_count; + src_layer = src_sub_resource_idx / src_texture->level_count; + dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); + dst_level = dst_sub_resource_idx % dst_texture->level_count; + dst_layer = dst_sub_resource_idx / dst_texture->level_count; location = src_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB); if (!location) @@ -2669,7 +2674,6 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit if (!wined3d_texture_load_location(src_texture, src_sub_resource_idx, context, location)) ERR("Failed to load the source sub-resource into %s.\n", wined3d_debug_location(location)); src_name = wined3d_texture_get_texture_name(src_texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); - src_layer = src_sub_resource_idx / src_texture->level_count; location = dst_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB); if (!location) @@ -2686,10 +2690,9 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit ERR("Failed to load the destination sub-resource into %s.\n", wined3d_debug_location(location)); } dst_name = wined3d_texture_get_texture_name(dst_texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); - dst_layer = dst_sub_resource_idx / dst_texture->level_count; - GL_EXTCALL(glCopyImageSubData(src_name, src_texture->target, src_surface->texture_level, - src_rect->left, src_rect->top, src_layer, dst_name, dst_texture->target, dst_surface->texture_level, + GL_EXTCALL(glCopyImageSubData(src_name, src_texture->target, src_level, + src_rect->left, src_rect->top, src_layer, dst_name, dst_texture->target, dst_level, dst_rect->left, dst_rect->top, dst_layer, src_rect->right - src_rect->left, src_rect->bottom - src_rect->top, 1)); checkGLcall("copy image data"); -- 2.1.4

1 0

[PATCH 1/5] wined3d: Explicitly calculate the sub-resource level in surface_load_renderbuffer().
by Henri Verbeet 02 Mar '18

02 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c82da87..4a7ed19 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2441,9 +2441,10 @@ static BOOL surface_load_renderbuffer(struct wined3d_surface *surface, struct wi DWORD dst_location) { struct wined3d_texture *texture = surface->container; + unsigned int level = surface_get_sub_resource_idx(surface) % texture->level_count; const RECT rect = {0, 0, - wined3d_texture_get_level_width(texture, surface->texture_level), - wined3d_texture_get_level_height(texture, surface->texture_level)}; + wined3d_texture_get_level_width(texture, level), + wined3d_texture_get_level_height(texture, level)}; DWORD locations = surface_get_sub_resource(surface)->locations; DWORD src_location; -- 2.1.4

1 0

[PATCH] kernel32: Treat Vulkan environment variables as special variables.
by Józef Kucia 02 Mar '18

02 Mar '18

We do not want to inherit Vulkan environment variables from the Unix environment, e.g. VK_ICD_FILENAMES confuses Windows Vulkan loader. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/kernel32/process.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 0a3fd70b3862..b883087fd7a1 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -136,7 +136,8 @@ static inline BOOL is_special_env_var( const char *var ) !strncmp( var, "HOME=", sizeof("HOME=")-1 ) || !strncmp( var, "TEMP=", sizeof("TEMP=")-1 ) || !strncmp( var, "TMP=", sizeof("TMP=")-1 ) || - !strncmp( var, "QT_", sizeof("QT_")-1 )); + !strncmp( var, "QT_", sizeof("QT_")-1 ) || + !strncmp( var, "VK_", sizeof("VK_")-1 )); } -- 2.16.1

3 2

GSoC Application
by 孟华 02 Mar '18

02 Mar '18

Dear Sir/Madam, I am a sophomore in Nanjing University, China, majored in computer science. And I desire to work on the project "Implement calculator app". My courses are based on both Windows and Linux and I have implemented some projects alone, including a simulation of CPU, MMU and device. So I have a good command of Linux and c. When I install Wine for saving my QQ in Linux, I think it must be wonderful to work for the Wine. So if I have the opportunity, it will be my pleasure. My CV is attached in case its needed for detail information. Sincerely hope to work with you. Thank you for your consideration. Best Regards, Meng Hua

2 1

[PATCH] dwmapi: Add stub for DwmSetIconicLivePreviewBitmap.
by Alistair Leslie-Hughes 02 Mar '18

02 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 697cefc..3744719 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -80,7 +80,7 @@ @ stdcall DwmRegisterThumbnail(long long ptr) # @ stub DwmRenderGesture @ stub DwmSetDxFrameDuration -@ stub DwmSetIconicLivePreviewBitmap +@ stdcall DwmSetIconicLivePreviewBitmap(long long ptr long) @ stdcall DwmSetIconicThumbnail(long long long) @ stdcall DwmSetPresentParameters(ptr ptr) @ stdcall DwmSetWindowAttribute(long long ptr long) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 7ac0b2b..0e6ba3b 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -270,6 +270,15 @@ HRESULT WINAPI DwmSetPresentParameters(HWND hwnd, DWM_PRESENT_PARAMETERS *params }; /********************************************************************** + * DwmSetIconicLivePreviewBitmap (DWMAPI.@) + */ +HRESULT WINAPI DwmSetIconicLivePreviewBitmap(HWND hwnd, HBITMAP hbmp, POINT *pos, DWORD flags) +{ + FIXME("(%p %p %p %x) stub\n", hwnd, hbmp, pos, flags); + return S_OK; +}; + +/********************************************************************** * DwmSetIconicThumbnail (DWMAPI.@) */ HRESULT WINAPI DwmSetIconicThumbnail(HWND hwnd, HBITMAP hbmp, DWORD flags) -- 1.9.1

1 0