June 2019 - Wine-devel - list.winehq.org

[PATCH 5/5] wined3d: Download texture data through the texture ops in wined3d_texture_download_from_texture().
by Henri Verbeet 14 Jun '19

14 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 87 ++++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 5 +++ 2 files changed, 88 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 71bec04ed11..16f0a56875f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2494,10 +2494,74 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, src_box, src_bo_addr, src_row_pitch, src_slice_pitch, dst_x, dst_y, dst_z, srgb); } +static void wined3d_texture_gl_download_data(struct wined3d_context *context, + struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, unsigned int src_location, + const struct wined3d_box *src_box, const struct wined3d_bo_address *dst_bo_addr, + const struct wined3d_format *dst_format, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, + unsigned int dst_row_pitch, unsigned int dst_slice_pitch) +{ + unsigned int src_level, src_width, src_height, src_depth; + unsigned int src_row_pitch, src_slice_pitch; + BOOL srgb = FALSE; + + TRACE("context %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_box %s, dst_bo_addr %s, " + "dst_format %s, dst_x %u, dst_y %u, dst_z %u, dst_row_pitch %u, dst_slice_pitch %u.\n", + context, src_texture, src_sub_resource_idx, wined3d_debug_location(src_location), + debug_box(src_box), debug_bo_address(dst_bo_addr), debug_d3dformat(dst_format->id), + dst_x, dst_y, dst_z, dst_row_pitch, dst_slice_pitch); + + if (src_location == WINED3D_LOCATION_TEXTURE_SRGB) + { + srgb = TRUE; + } + else if (src_location != WINED3D_LOCATION_TEXTURE_RGB) + { + FIXME("Unhandled location %s.\n", wined3d_debug_location(src_location)); + return; + } + + src_level = src_sub_resource_idx % src_texture->level_count; + src_width = wined3d_texture_get_level_width(src_texture, src_level); + src_height = wined3d_texture_get_level_height(src_texture, src_level); + src_depth = wined3d_texture_get_level_depth(src_texture, src_level); + if (src_box->left || src_box->top || src_box->right != src_width || src_box->bottom != src_height + || src_box->front || src_box->back != src_depth) + { + FIXME("Unhandled source box %s.\n", debug_box(src_box)); + return; + } + + if (dst_x || dst_y || dst_z) + { + FIXME("Unhandled destination (%u, %u, %u).\n", dst_x, dst_y, dst_z); + return; + } + + if (dst_format->id != src_texture->resource.format->id) + { + FIXME("Unhandled format conversion (%s -> %s).\n", + debug_d3dformat(src_texture->resource.format->id), + debug_d3dformat(dst_format->id)); + return; + } + + wined3d_texture_get_pitch(src_texture, src_level, &src_row_pitch, &src_slice_pitch); + if (src_row_pitch != dst_row_pitch || src_slice_pitch != dst_slice_pitch) + { + FIXME("Unhandled destination pitches %u/%u (source pitches %u/%u).\n", + dst_row_pitch, dst_slice_pitch, src_row_pitch, src_slice_pitch); + return; + } + + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(src_texture), wined3d_context_gl(context), srgb); + wined3d_texture_download_data(src_texture, src_sub_resource_idx, context, dst_bo_addr); +} + static const struct wined3d_texture_ops texture2d_ops = { texture2d_load_location, wined3d_texture_gl_upload_data, + wined3d_texture_gl_download_data, }; struct wined3d_texture * __cdecl wined3d_texture_from_resource(struct wined3d_resource *resource) @@ -2881,6 +2945,7 @@ static const struct wined3d_texture_ops texture1d_ops = { texture1d_load_location, wined3d_texture_gl_upload_data, + wined3d_texture_gl_download_data, }; static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, @@ -3297,6 +3362,7 @@ static const struct wined3d_texture_ops texture3d_ops = { texture3d_load_location, wined3d_texture_gl_upload_data, + wined3d_texture_gl_download_data, }; HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, @@ -3870,17 +3936,30 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx) { + unsigned int src_level, dst_level, dst_row_pitch, dst_slice_pitch; + unsigned int dst_location = dst_texture->resource.map_binding; struct wined3d_context *context; struct wined3d_bo_address data; - DWORD dst_location = dst_texture->resource.map_binding; + struct wined3d_box src_box; + unsigned int src_location; context = context_acquire(src_texture->resource.device, NULL, 0); wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); wined3d_texture_get_memory(dst_texture, dst_sub_resource_idx, &data, dst_location); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(src_texture), wined3d_context_gl(context), - !(src_texture->sub_resources[src_sub_resource_idx].locations & WINED3D_LOCATION_TEXTURE_RGB)); - wined3d_texture_download_data(src_texture, src_sub_resource_idx, context, &data); + + if (src_texture->sub_resources[src_sub_resource_idx].locations & WINED3D_LOCATION_TEXTURE_RGB) + src_location = WINED3D_LOCATION_TEXTURE_RGB; + else + src_location = WINED3D_LOCATION_TEXTURE_SRGB; + src_level = src_sub_resource_idx % src_texture->level_count; + wined3d_texture_get_level_box(src_texture, src_level, &src_box); + + dst_level = dst_sub_resource_idx % dst_texture->level_count; + wined3d_texture_get_pitch(dst_texture, dst_level, &dst_row_pitch, &dst_slice_pitch); + + src_texture->texture_ops->texture_download_data(context, src_texture, src_sub_resource_idx, src_location, + &src_box, &data, dst_texture->resource.format, 0, 0, 0, dst_row_pitch, dst_slice_pitch); context_release(context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 31eb31a52f8..bbcc6acf164 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3386,6 +3386,11 @@ struct wined3d_texture_ops const struct wined3d_format *src_format, const struct wined3d_box *src_box, unsigned int src_row_pitch, unsigned int src_slice_pitch, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, unsigned int dst_location, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z); + void (*texture_download_data)(struct wined3d_context *context, struct wined3d_texture *src_texture, + unsigned int src_sub_resource_idx, unsigned int src_location, const struct wined3d_box *src_box, + const struct wined3d_bo_address *dst_bo_addr, const struct wined3d_format *dst_format, + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, + unsigned int dst_row_pitch, unsigned int dst_slice_pitch); }; #define WINED3D_TEXTURE_COND_NP2 0x00000001 -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to context_generate_fbo_key().
by Henri Verbeet 14 Jun '19

14 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 15ee0314daf..6258771976a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -498,12 +498,11 @@ static inline void wined3d_context_gl_set_fbo_key_for_render_target(const struct } } -static void context_generate_fbo_key(const struct wined3d_context *context, +static void wined3d_context_gl_generate_fbo_key(const struct wined3d_context_gl *context_gl, struct wined3d_fbo_entry_key *key, const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); - unsigned int buffers = context->gl_info->limits.buffers; + unsigned int buffers = context_gl->c.gl_info->limits.buffers; unsigned int i; key->rb_namespace = 0; @@ -519,11 +518,13 @@ static struct fbo_entry *context_create_fbo_entry(const struct wined3d_context * const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); const struct wined3d_gl_info *gl_info = context->gl_info; struct fbo_entry *entry; entry = heap_alloc(sizeof(*entry)); - context_generate_fbo_key(context, &entry->key, render_targets, depth_stencil, color_location, ds_location); + wined3d_context_gl_generate_fbo_key(context_gl, &entry->key, + render_targets, depth_stencil, color_location, ds_location); entry->flags = 0; if (depth_stencil->resource) { @@ -550,7 +551,8 @@ static void wined3d_context_gl_reuse_fbo_entry(struct wined3d_context_gl *contex wined3d_context_gl_bind_fbo(context_gl, target, entry->id); context_clean_fbo_attachments(gl_info, target); - context_generate_fbo_key(&context_gl->c, &entry->key, render_targets, depth_stencil, color_location, ds_location); + wined3d_context_gl_generate_fbo_key(context_gl, &entry->key, + render_targets, depth_stencil, color_location, ds_location); entry->flags = 0; if (depth_stencil->resource) { @@ -618,7 +620,8 @@ static struct fbo_entry *wined3d_context_gl_find_fbo_entry(struct wined3d_contex } } - context_generate_fbo_key(&context_gl->c, &fbo_key, render_targets, depth_stencil, color_location, ds_location); + wined3d_context_gl_generate_fbo_key(context_gl, &fbo_key, + render_targets, depth_stencil, color_location, ds_location); if (TRACE_ON(d3d)) { -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to context_set_fbo_key_for_render_target().
by Henri Verbeet 14 Jun '19

14 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2ed1e48dfdd..15ee0314daf 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -428,7 +428,7 @@ static inline DWORD context_generate_rt_mask_from_resource(struct wined3d_resour return (1u << 31) | wined3d_texture_get_gl_buffer(texture_from_resource(resource)); } -static inline void context_set_fbo_key_for_render_target(const struct wined3d_context *context, +static inline void wined3d_context_gl_set_fbo_key_for_render_target(const struct wined3d_context_gl *context_gl, struct wined3d_fbo_entry_key *key, unsigned int idx, const struct wined3d_rendertarget_info *render_target, DWORD location) { @@ -475,11 +475,11 @@ static inline void context_set_fbo_key_for_render_target(const struct wined3d_co switch (location) { case WINED3D_LOCATION_TEXTURE_RGB: - key->objects[idx].object = wined3d_texture_gl_get_texture_name(texture_gl, context, FALSE); + key->objects[idx].object = wined3d_texture_gl_get_texture_name(texture_gl, &context_gl->c, FALSE); break; case WINED3D_LOCATION_TEXTURE_SRGB: - key->objects[idx].object = wined3d_texture_gl_get_texture_name(texture_gl, context, TRUE); + key->objects[idx].object = wined3d_texture_gl_get_texture_name(texture_gl, &context_gl->c, TRUE); break; case WINED3D_LOCATION_RB_MULTISAMPLE: @@ -502,14 +502,15 @@ static void context_generate_fbo_key(const struct wined3d_context *context, struct wined3d_fbo_entry_key *key, const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); unsigned int buffers = context->gl_info->limits.buffers; unsigned int i; key->rb_namespace = 0; - context_set_fbo_key_for_render_target(context, key, 0, depth_stencil, ds_location); + wined3d_context_gl_set_fbo_key_for_render_target(context_gl, key, 0, depth_stencil, ds_location); for (i = 0; i < buffers; ++i) - context_set_fbo_key_for_render_target(context, key, i + 1, &render_targets[i], color_location); + wined3d_context_gl_set_fbo_key_for_render_target(context_gl, key, i + 1, &render_targets[i], color_location); memset(&key->objects[buffers + 1], 0, (ARRAY_SIZE(key->objects) - buffers - 1) * sizeof(*key->objects)); } -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to context_attach_surface_fbo().
by Henri Verbeet 14 Jun '19

14 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d1954692013..2ed1e48dfdd 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -213,10 +213,9 @@ static void wined3d_context_gl_attach_depth_stencil_fbo(struct wined3d_context_g } /* Context activation is done by the caller. */ -static void context_attach_surface_fbo(struct wined3d_context *context, - GLenum fbo_target, DWORD idx, const struct wined3d_fbo_resource *resource, BOOL rb_namespace) +static void wined3d_context_gl_attach_surface_fbo(struct wined3d_context_gl *context_gl, + GLenum fbo_target, unsigned int idx, const struct wined3d_fbo_resource *resource, BOOL rb_namespace) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; TRACE("Attach GL object %u to %u.\n", resource->object, idx); @@ -735,8 +734,8 @@ static void wined3d_context_gl_apply_fbo_entry(struct wined3d_context_gl *contex /* Apply render targets */ for (i = 0; i < gl_info->limits.buffers; ++i) { - context_attach_surface_fbo(&context_gl->c, target, i, &entry->key.objects[i + 1], - entry->key.rb_namespace & (1 << (i + 1))); + wined3d_context_gl_attach_surface_fbo(context_gl, target, i, + &entry->key.objects[i + 1], entry->key.rb_namespace & (1 << (i + 1))); } wined3d_context_gl_attach_depth_stencil_fbo(context_gl, target, -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to context_attach_depth_stencil_fbo().
by Henri Verbeet 14 Jun '19

14 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index be3461493d2..d1954692013 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -173,12 +173,11 @@ static void wined3d_context_gl_attach_gl_texture_fbo(struct wined3d_context_gl * } /* Context activation is done by the caller. */ -static void context_attach_depth_stencil_fbo(struct wined3d_context *context, +static void wined3d_context_gl_attach_depth_stencil_fbo(struct wined3d_context_gl *context_gl, GLenum fbo_target, const struct wined3d_fbo_resource *resource, BOOL rb_namespace, - DWORD flags) + uint32_t flags) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; if (resource->object) { @@ -740,8 +739,8 @@ static void wined3d_context_gl_apply_fbo_entry(struct wined3d_context_gl *contex entry->key.rb_namespace & (1 << (i + 1))); } - context_attach_depth_stencil_fbo(&context_gl->c, target, &entry->key.objects[0], - entry->key.rb_namespace & 0x1, entry->flags); + wined3d_context_gl_attach_depth_stencil_fbo(context_gl, target, + &entry->key.objects[0], entry->key.rb_namespace & 0x1, entry->flags); /* Set valid read and draw buffer bindings to satisfy pedantic pre-ES2_compatibility * GL contexts requirements. */ -- 2.11.0

1 0

[PATCH] kernel32/tests: Add a test for GetTickCount().
by Huw Davies 14 Jun '19

14 Jun '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/kernel32/tests/time.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 536f23359b..5faabd36e1 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -32,6 +32,7 @@ static int (WINAPI *pGetCalendarInfoW)(LCID,CALID,CALTYPE,LPWSTR,int,LPDWORD); static DWORD (WINAPI *pGetDynamicTimeZoneInformation)(DYNAMIC_TIME_ZONE_INFORMATION*); static void (WINAPI *pGetSystemTimePreciseAsFileTime)(LPFILETIME); static BOOL (WINAPI *pGetTimeZoneInformationForYear)(USHORT, PDYNAMIC_TIME_ZONE_INFORMATION, LPTIME_ZONE_INFORMATION); +static ULONG (WINAPI *pNtGetTickCount)(void); #define SECSPERMIN 60 #define SECSPERDAY 86400 @@ -1004,9 +1005,32 @@ static void test_GetTimeZoneInformationForYear(void) "GetTimeZoneInformationForYear err %u\n", GetLastError()); } +static void test_GetTickCount(void) +{ + DWORD t1, t2, t3; + int i = 0; + + if (!pNtGetTickCount) + { + win_skip("NtGetTickCount not implemented\n"); + return; + } + + do + { + t1 = pNtGetTickCount(); + t2 = GetTickCount(); + t3 = pNtGetTickCount(); + } while(t3 < t1 && i++ < 1); /* allow for wrap, but only once */ + + ok(t1 <= t2, "out of order %d %d\n", t1, t2); + ok(t2 <= t3, "out of order %d %d\n", t2, t3); +} + START_TEST(time) { HMODULE hKernel = GetModuleHandleA("kernel32"); + HMODULE hntdll = GetModuleHandleA("ntdll"); pTzSpecificLocalTimeToSystemTime = (void *)GetProcAddress(hKernel, "TzSpecificLocalTimeToSystemTime"); pSystemTimeToTzSpecificLocalTime = (void *)GetProcAddress( hKernel, "SystemTimeToTzSpecificLocalTime"); pGetSystemTimes = (void *)GetProcAddress( hKernel, "GetSystemTimes"); @@ -1015,6 +1039,7 @@ START_TEST(time) pGetDynamicTimeZoneInformation = (void *)GetProcAddress(hKernel, "GetDynamicTimeZoneInformation"); pGetSystemTimePreciseAsFileTime = (void *)GetProcAddress(hKernel, "GetSystemTimePreciseAsFileTime"); pGetTimeZoneInformationForYear = (void *)GetProcAddress(hKernel, "GetTimeZoneInformationForYear"); + pNtGetTickCount = (void *)GetProcAddress(hntdll, "NtGetTickCount"); test_conversions(); test_invalid_arg(); @@ -1029,4 +1054,5 @@ START_TEST(time) test_GetSystemTimeAsFileTime(); test_GetSystemTimePreciseAsFileTime(); test_GetTimeZoneInformationForYear(); + test_GetTickCount(); } -- 2.18.0

1 0

[PATCH v6] ntdll: Add support for EXT4 case folding per directory
by Gabriel Ivăncescu 14 Jun '19

14 Jun '19

This adds support for checking the case-insensitive attribute on ext4 with newer kernels so that Wine can rely on it for performance. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/ntdll/directory.c | 53 ++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index bbdbbe9..b18f56b 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -115,6 +115,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); /* just in case... */ #undef VFAT_IOCTL_READDIR_BOTH +#undef EXT2_IOC_GETFLAGS +#undef EXT4_CASEFOLD_FL #ifdef linux @@ -130,6 +132,12 @@ typedef struct /* Define the VFAT ioctl to get both short and long file names */ #define VFAT_IOCTL_READDIR_BOTH _IOR('r', 1, KERNEL_DIRENT [2] ) +/* Define the ext2 ioctl for handling extra attributes */ +#define EXT2_IOC_GETFLAGS _IOR('f', 1, long) + +/* Case-insensitivity attribute */ +#define EXT4_CASEFOLD_FL 0x40000000 + #ifndef O_DIRECTORY # define O_DIRECTORY 0200000 /* must be directory */ #endif @@ -1113,7 +1121,7 @@ static int get_dir_case_sensitivity_attr( const char *dir ) * get_dir_case_sensitivity_stat * * Checks if the volume containing the specified directory is case - * sensitive or not. Uses statfs(2) or statvfs(2). + * sensitive or not. Uses (f)statfs(2), statvfs(2), fstatat(2), or ioctl(2). */ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) { @@ -1165,32 +1173,33 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) return FALSE; #elif defined(__linux__) + BOOLEAN sens = TRUE; struct statfs stfs; struct stat st; - char *cifile; + int fd, flags; - /* Only assume CIOPFS is case insensitive. */ - if (statfs( dir, &stfs ) == -1) return FALSE; - if (stfs.f_type != 0x65735546 /* FUSE_SUPER_MAGIC */) + if ((fd = open( dir, O_RDONLY | O_NONBLOCK | O_LARGEFILE )) == -1) return TRUE; - /* Normally, we'd have to parse the mtab to find out exactly what - * kind of FUSE FS this is. But, someone on wine-devel suggested - * a shortcut. We'll stat a special file in the directory. If it's - * there, we'll assume it's a CIOPFS, else not. - * This will break if somebody puts a file named ".ciopfs" in a non- - * CIOPFS directory. - */ - cifile = RtlAllocateHeap( GetProcessHeap(), 0, strlen( dir )+sizeof("/.ciopfs") ); - if (!cifile) return TRUE; - strcpy( cifile, dir ); - strcat( cifile, "/.ciopfs" ); - if (stat( cifile, &st ) == 0) + + if (ioctl( fd, EXT2_IOC_GETFLAGS, &flags ) != -1 && (flags & EXT4_CASEFOLD_FL)) { - RtlFreeHeap( GetProcessHeap(), 0, cifile ); - return FALSE; + sens = FALSE; } - RtlFreeHeap( GetProcessHeap(), 0, cifile ); - return TRUE; + else + { + /* Assume CIOPFS is case insensitive. Normally, we'd have to parse + * the mtab to find out exactly what kind of FUSE FS this is. But, + * someone on wine-devel suggested a shortcut. We'll stat a special + * file in the directory. If it's there, we'll assume it's a CIOPFS, + * else not. This will break if somebody puts a file named ".ciopfs" + * in a non-CIOPFS directory. + */ + if (fstatfs( fd, &stfs ) != -1 && stfs.f_type == 0x65735546 /* FUSE_SUPER_MAGIC */ && + fstatat( fd, ".ciopfs", &st, AT_NO_AUTOMOUNT ) == 0) + sens = FALSE; + } + close( fd ); + return sens; #else return TRUE; #endif @@ -1201,7 +1210,7 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) * get_dir_case_sensitivity * * Checks if the volume containing the specified directory is case - * sensitive or not. Uses statfs(2) or statvfs(2). + * sensitive or not. Uses multiple methods, depending on platform. */ static BOOLEAN get_dir_case_sensitivity( const char *dir ) { -- 2.21.0

2 1

[PATCH v7] ntdll: Add support for EXT4 per directory case folding.
by Huw Davies 14 Jun '19

14 Jun '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ntdll/directory.c | 47 ++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 6605999b82..dd0062d6e8 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -115,6 +115,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); /* just in case... */ #undef VFAT_IOCTL_READDIR_BOTH +#undef EXT2_IOC_GETFLAGS +#undef EXT4_CASEFOLD_FL #ifdef linux @@ -130,6 +132,12 @@ typedef struct /* Define the VFAT ioctl to get both short and long file names */ #define VFAT_IOCTL_READDIR_BOTH _IOR('r', 1, KERNEL_DIRENT [2] ) +/* Define the ext2 ioctl for handling extra attributes */ +#define EXT2_IOC_GETFLAGS _IOR('f', 1, long) + +/* Case-insensitivity attribute */ +#define EXT4_CASEFOLD_FL 0x40000000 + #ifndef O_DIRECTORY # define O_DIRECTORY 0200000 /* must be directory */ #endif @@ -1113,7 +1121,7 @@ static int get_dir_case_sensitivity_attr( const char *dir ) * get_dir_case_sensitivity_stat * * Checks if the volume containing the specified directory is case - * sensitive or not. Uses statfs(2) or statvfs(2). + * sensitive or not. Uses (f)statfs(2), statvfs(2), fstatat(2), or ioctl(2). */ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) { @@ -1165,32 +1173,27 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) return FALSE; #elif defined(__linux__) + BOOLEAN sens = TRUE; struct statfs stfs; struct stat st; - char *cifile; + int fd, flags; - /* Only assume CIOPFS is case insensitive. */ - if (statfs( dir, &stfs ) == -1) return FALSE; - if (stfs.f_type != 0x65735546 /* FUSE_SUPER_MAGIC */) + if ((fd = open( dir, O_RDONLY | O_NONBLOCK | O_LARGEFILE )) == -1) return TRUE; - /* Normally, we'd have to parse the mtab to find out exactly what - * kind of FUSE FS this is. But, someone on wine-devel suggested - * a shortcut. We'll stat a special file in the directory. If it's - * there, we'll assume it's a CIOPFS, else not. - * This will break if somebody puts a file named ".ciopfs" in a non- - * CIOPFS directory. - */ - cifile = RtlAllocateHeap( GetProcessHeap(), 0, strlen( dir )+sizeof("/.ciopfs") ); - if (!cifile) return TRUE; - strcpy( cifile, dir ); - strcat( cifile, "/.ciopfs" ); - if (stat( cifile, &st ) == 0) + + if (ioctl( fd, EXT2_IOC_GETFLAGS, &flags ) != -1 && (flags & EXT4_CASEFOLD_FL)) { - RtlFreeHeap( GetProcessHeap(), 0, cifile ); - return FALSE; + sens = FALSE; } - RtlFreeHeap( GetProcessHeap(), 0, cifile ); - return TRUE; + else if (fstatfs( fd, &stfs ) == 0 && /* CIOPFS is case insensitive. Instead of */ + stfs.f_type == 0x65735546 /* FUSE_SUPER_MAGIC */ && /* parsing mtab to discover if the FUSE FS */ + fstatat( fd, ".ciopfs", &st, AT_NO_AUTOMOUNT ) == 0) /* is CIOPFS, look for .ciopfs in the dir. */ + { + sens = FALSE; + } + + close( fd ); + return sens; #else return TRUE; #endif @@ -1201,7 +1204,7 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) * get_dir_case_sensitivity * * Checks if the volume containing the specified directory is case - * sensitive or not. Uses statfs(2) or statvfs(2). + * sensitive or not. Uses multiple methods, depending on platform. */ static BOOLEAN get_dir_case_sensitivity( const char *dir ) { -- 2.17.1

1 0

[PATCH v3] ddraw: Set dwZBufferBitDepth in ddraw7_GetCaps
by David Adam 14 Jun '19

14 Jun '19

This patch was written by Michael Muller.

2 1

[PATCH v2] ddraw: Set dwZBufferBitDepth in ddraw_GetCaps
by David Adam 14 Jun '19

14 Jun '19

This patch was written by Michael Muller.

2 1