November 2013 - Wine-Commits

Andrew Eikum : winecoreaudio.drv: Don' t return 0 absolute position if AudioQueue call fails.
by Alexandre Julliard Nov. 22, 2013

Nov. 22, 2013

Module: wine Branch: master Commit: f53dd40ad881cc7f887c0587d42f70bb07ddd2e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f53dd40ad881cc7f887c0587d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Nov 21 12:42:35 2013 -0600 winecoreaudio.drv: Don't return 0 absolute position if AudioQueue call fails. Some failures are temporary, for example if the user reconfigures their audio setup while playing audio. Returning 0 could have bad "going backward in time" effects which can break audio even after the call starts to succeed again. --- dlls/winecoreaudio.drv/mmdevdrv.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 914baa9..5e32229 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -688,6 +688,8 @@ static UINT64 get_current_aqbuffer_position(ACImpl *This, int mode) if(sc != noErr){ if(sc != kAudioQueueErr_InvalidRunState) WARN("Unable to get current time: %lx\n", sc); + if(mode == BUFPOS_ABSOLUTE) + return This->highest_sampletime; return 0; }

1 0

Ken Thomases : winemac: Cache the "natural" clipboard format entry associated with synthesized built-in entries at startup .
by Alexandre Julliard Nov. 22, 2013

Nov. 22, 2013

Module: wine Branch: master Commit: b28a014c44e71f2be71daac62006e48fccd840fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b28a014c44e71f2be71daac62… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 22 04:31:44 2013 -0600 winemac: Cache the "natural" clipboard format entry associated with synthesized built-in entries at startup. --- dlls/winemac.drv/clipboard.c | 51 +++++++++++++++++++++++------------------ 1 files changed, 29 insertions(+), 22 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 039cccd..b65391d 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -49,14 +49,15 @@ typedef struct typedef HANDLE (*DRVIMPORTFUNC)(CFDataRef data); typedef CFDataRef (*DRVEXPORTFUNC)(HANDLE data); -typedef struct -{ - struct list entry; - UINT format_id; - CFStringRef type; - DRVIMPORTFUNC import_func; - DRVEXPORTFUNC export_func; - BOOL synthesized; +typedef struct _WINE_CLIPFORMAT +{ + struct list entry; + UINT format_id; + CFStringRef type; + DRVIMPORTFUNC import_func; + DRVEXPORTFUNC export_func; + BOOL synthesized; + struct _WINE_CLIPFORMAT *natural_format; } WINE_CLIPFORMAT; @@ -300,6 +301,7 @@ static WINE_CLIPFORMAT *insert_clipboard_format(UINT id, CFStringRef type) format->import_func = import_clipboard_data; format->export_func = export_clipboard_data; format->synthesized = FALSE; + format->natural_format = NULL; if (type) format->type = CFStringCreateCopy(NULL, type); @@ -2109,23 +2111,31 @@ void macdrv_clipboard_process_attach(void) for (i = 0; i < sizeof(builtin_format_ids)/sizeof(builtin_format_ids[0]); i++) { if (!(format = HeapAlloc(GetProcessHeap(), 0, sizeof(*format)))) break; - format->format_id = builtin_format_ids[i].id; - format->type = CFRetain(builtin_format_ids[i].type); - format->import_func = builtin_format_ids[i].import; - format->export_func = builtin_format_ids[i].export; - format->synthesized = builtin_format_ids[i].synthesized; + format->format_id = builtin_format_ids[i].id; + format->type = CFRetain(builtin_format_ids[i].type); + format->import_func = builtin_format_ids[i].import; + format->export_func = builtin_format_ids[i].export; + format->synthesized = builtin_format_ids[i].synthesized; + format->natural_format = NULL; list_add_tail(&format_list, &format->entry); } + LIST_FOR_EACH_ENTRY(format, &format_list, WINE_CLIPFORMAT, entry) + { + if (format->synthesized) + format->natural_format = natural_format_for_format(format->format_id); + } + /* Register known mappings between Windows formats and Mac types */ for (i = 0; i < sizeof(builtin_format_names)/sizeof(builtin_format_names[0]); i++) { if (!(format = HeapAlloc(GetProcessHeap(), 0, sizeof(*format)))) break; - format->format_id = RegisterClipboardFormatW(builtin_format_names[i].name); - format->type = CFRetain(builtin_format_names[i].type); - format->import_func = builtin_format_names[i].import; - format->export_func = builtin_format_names[i].export; - format->synthesized = FALSE; + format->format_id = RegisterClipboardFormatW(builtin_format_names[i].name); + format->type = CFRetain(builtin_format_names[i].type); + format->import_func = builtin_format_names[i].import; + format->export_func = builtin_format_names[i].export; + format->synthesized = FALSE; + format->natural_format = NULL; list_add_tail(&format_list, &format->entry); } } @@ -2150,8 +2160,6 @@ BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) format = NULL; while ((format = format_for_type(format, type))) { - WINE_CLIPFORMAT* base_format; - TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); if (!format->synthesized) @@ -2182,8 +2190,7 @@ BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) pasteboard would also have data for "public.utf8-plain-text" and we wouldn't be here.) If "org.winehq.builtin.text" is not on the pasteboard, then one of the other text formats is presumably responsible for the promise that we're trying to satisfy, so we keep looking. */ - if ((base_format = natural_format_for_format(format->format_id)) && - CFArrayContainsValue(types, range, base_format->type)) + if (format->natural_format && CFArrayContainsValue(types, range, format->natural_format->type)) { TRACE("Sending WM_RENDERFORMAT message for format %s to hwnd %p\n", debugstr_format(format->format_id), hwnd); SendMessageW(hwnd, WM_RENDERFORMAT, format->format_id, 0);

1 0

Ken Thomases : winemac: Add a function to find the "natural" clipboard format entry for a format ID.
by Alexandre Julliard Nov. 22, 2013

Nov. 22, 2013

Module: wine Branch: master Commit: ee53ea4b933f1c794d236d5424a3c6ded124a9c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee53ea4b933f1c794d236d542… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 22 04:31:42 2013 -0600 winemac: Add a function to find the "natural" clipboard format entry for a format ID. --- dlls/winemac.drv/clipboard.c | 44 +++++++++++++++++++++++++++-------------- 1 files changed, 29 insertions(+), 15 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index f428ab6..039cccd 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -394,6 +394,27 @@ done: /************************************************************************** + * natural_format_for_format + * + * Find the "natural" format for this format_id (the one which isn't + * synthesized from another type). + */ +static WINE_CLIPFORMAT* natural_format_for_format(UINT format_id) +{ + WINE_CLIPFORMAT *format; + + LIST_FOR_EACH_ENTRY(format, &format_list, WINE_CLIPFORMAT, entry) + if (format->format_id == format_id && !format->synthesized) break; + + if (&format->entry == &format_list) + format = NULL; + + TRACE("%s -> %p/%s\n", debugstr_format(format_id), format, debugstr_cf(format ? format->type : NULL)); + return format; +} + + +/************************************************************************** * convert_text * * Convert string data between code pages or to/from wide characters. The @@ -1984,12 +2005,8 @@ BOOL CDECL macdrv_SetClipboardData(UINT format_id, HANDLE data, BOOL owner) window = macdrv_get_cocoa_window(GetAncestor(hwnd_owner, GA_ROOT), FALSE); TRACE("format_id %s data %p owner %d hwnd_owner %p window %p)\n", debugstr_format(format_id), data, owner, hwnd_owner, window); - /* Find the "natural" format for this format_id (the one which isn't - synthesized from another type). */ - LIST_FOR_EACH_ENTRY(format, &format_list, WINE_CLIPFORMAT, entry) - if (format->format_id == format_id && !format->synthesized) break; - - if (&format->entry == &format_list && !(format = insert_clipboard_format(format_id, NULL))) + format = natural_format_for_format(format_id); + if (!format && !(format = insert_clipboard_format(format_id, NULL))) { WARN("Failed to register clipboard format %s\n", debugstr_format(format_id)); return FALSE; @@ -2165,16 +2182,13 @@ BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) pasteboard would also have data for "public.utf8-plain-text" and we wouldn't be here.) If "org.winehq.builtin.text" is not on the pasteboard, then one of the other text formats is presumably responsible for the promise that we're trying to satisfy, so we keep looking. */ - LIST_FOR_EACH_ENTRY(base_format, &format_list, WINE_CLIPFORMAT, entry) + if ((base_format = natural_format_for_format(format->format_id)) && + CFArrayContainsValue(types, range, base_format->type)) { - if (base_format->format_id == format->format_id && !base_format->synthesized && - CFArrayContainsValue(types, range, base_format->type)) - { - TRACE("Sending WM_RENDERFORMAT message for format %s to hwnd %p\n", debugstr_format(base_format->format_id), hwnd); - SendMessageW(hwnd, WM_RENDERFORMAT, base_format->format_id, 0); - ret = TRUE; - goto done; - } + TRACE("Sending WM_RENDERFORMAT message for format %s to hwnd %p\n", debugstr_format(format->format_id), hwnd); + SendMessageW(hwnd, WM_RENDERFORMAT, format->format_id, 0); + ret = TRUE; + goto done; } }

1 0

Ken Thomases : winemac: Ignore Mac-originating pasteboard types which aren' t mapped to standard clipboard formats.
by Alexandre Julliard Nov. 22, 2013

Nov. 22, 2013

Module: wine Branch: master Commit: a983cfb01d84c16ea6ed0cd1173c57e474477f6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a983cfb01d84c16ea6ed0cd11… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 22 04:31:25 2013 -0600 winemac: Ignore Mac-originating pasteboard types which aren't mapped to standard clipboard formats. New clipboard formats had been registered for them, but that was pointless. No Windows app would ever expect or make use of such clipboard formats or the associated pasteboard data. --- dlls/winemac.drv/clipboard.c | 57 +++++++++++++---------------------------- 1 files changed, 18 insertions(+), 39 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index f97faea..a648fcc 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -122,16 +122,13 @@ static struct list format_list = LIST_INIT(format_list); prepending "org.winehq.registered." to the registered name. Likewise, Mac pasteboard types which originate in other apps may have - arbitrary type strings. We construct a Win32 clipboard format name from - these by prepending "org.winehq.mac-type." to the Mac pasteboard type. + arbitrary type strings. We ignore these. Summary: Win32 clipboard format names: <none> standard clipboard format; maps via format_list to either a predefined Mac UTI or org.winehq.builtin.<format>. - org.winehq.mac-type.<Mac type> representation of Mac type in Win32 land; - maps to <Mac type> <other> name registered within Win32 land; maps to org.winehq.registered.<other> Mac pasteboard type names: @@ -142,8 +139,7 @@ static struct list format_list = LIST_INIT(format_list); clipboard format name; maps to <format name> <other> Mac pasteboard type originating with system or other apps; either maps via format_list - to a standard clipboard format or maps to - org.winehq.mac-type.<other> + to a standard clipboard format or ignored */ static const struct @@ -221,9 +217,6 @@ static const struct { CFSTR_SHELLURLW, CFSTR("public.url"), import_utf8_to_text, export_text_to_utf8 }, }; -/* The prefix prepended to an external Mac pasteboard type to make a Win32 clipboard format name. org.winehq.mac-type. */ -static const WCHAR mac_type_name_prefix[] = {'o','r','g','.','w','i','n','e','h','q','.','m','a','c','-','t','y','p','e','.',0}; - /* The prefix prepended to a Win32 clipboard format name to make a Mac pasteboard type. */ static const CFStringRef registered_name_type_prefix = CFSTR("org.winehq.registered."); @@ -309,16 +302,8 @@ static WINE_CLIPFORMAT *insert_clipboard_format(UINT id, CFStringRef type) return NULL; } - if (!strncmpW(buffer, mac_type_name_prefix, strlenW(mac_type_name_prefix))) - { - const WCHAR *p = buffer + strlenW(mac_type_name_prefix); - format->type = CFStringCreateWithCharacters(NULL, (UniChar*)p, strlenW(p)); - } - else - { - format->type = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@%S"), - registered_name_type_prefix, buffer); - } + format->type = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@%S"), + registered_name_type_prefix, buffer); } list_add_tail(&format_list, &format->entry); @@ -367,37 +352,27 @@ static WINE_CLIPFORMAT* format_for_type(WINE_CLIPFORMAT *current, CFStringRef ty format = NULL; if (!current) { - LPWSTR name; - if (CFStringHasPrefix(type, CFSTR("org.winehq.builtin."))) { ERR("Shouldn't happen. Built-in type %s should have matched something in format list.\n", debugstr_cf(type)); - goto done; } else if (CFStringHasPrefix(type, registered_name_type_prefix)) { + LPWSTR name; int len = CFStringGetLength(type) - CFStringGetLength(registered_name_type_prefix); + name = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); CFStringGetCharacters(type, CFRangeMake(CFStringGetLength(registered_name_type_prefix), len), (UniChar*)name); name[len] = 0; - } - else - { - int len = strlenW(mac_type_name_prefix) + CFStringGetLength(type); - name = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); - memcpy(name, mac_type_name_prefix, sizeof(mac_type_name_prefix)); - CFStringGetCharacters(type, CFRangeMake(0, CFStringGetLength(type)), - (UniChar*)name + strlenW(mac_type_name_prefix)); - name[len] = 0; - } - format = register_format(RegisterClipboardFormatW(name), type); - if (!format) - ERR("Failed to register format for type %s name %s\n", debugstr_cf(type), debugstr_w(name)); + format = register_format(RegisterClipboardFormatW(name), type); + if (!format) + ERR("Failed to register format for type %s name %s\n", debugstr_cf(type), debugstr_w(name)); - HeapFree(GetProcessHeap(), 0, name); + HeapFree(GetProcessHeap(), 0, name); + } } done: @@ -1777,12 +1752,16 @@ UINT CDECL macdrv_EnumClipboardFormats(UINT prev_format) count = CFArrayGetCount(types); TRACE("got %ld types\n", count); - if (count) + for (i = 0; i < count; i++) { - CFStringRef type = CFArrayGetValueAtIndex(types, 0); + CFStringRef type = CFArrayGetValueAtIndex(types, i); WINE_CLIPFORMAT *format = format_for_type(NULL, type); - ret = format ? format->format_id : 0; + if (format) + { + ret = format->format_id; + break; + } } CFRelease(types);

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DSRGB enum.
by Alexandre Julliard Nov. 22, 2013

Nov. 22, 2013

Module: wine Branch: master Commit: f6b5dc246a0d34779338be108d8a155d3bfce47e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b5dc246a0d34779338be108… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 22 10:45:04 2013 +0100 wined3d: Get rid of the WINED3DSRGB enum. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 10 ++++------ dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 8 ++++---- dlls/wined3d/texture.c | 26 +++++--------------------- dlls/wined3d/wined3d_private.h | 9 +-------- 6 files changed, 16 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 96bd1b6..470d9a0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7469,7 +7469,7 @@ HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, src_rect.bottom = src_surface->resource.height - src_rect.bottom; } else - wined3d_texture_load(src_surface->container, context, SRGB_RGB); + wined3d_texture_load(src_surface->container, context, FALSE); context_apply_blit_state(context, device); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3e62839..129926a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2124,7 +2124,7 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine if (context->render_offscreen) { - wined3d_texture_load(rt->container, context, SRGB_RGB); + wined3d_texture_load(rt->container, context, FALSE); context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, rt, NULL, rt->draw_binding); if (rt->resource.format->id != WINED3DFMT_NULL) @@ -2791,13 +2791,11 @@ static void context_preload_texture(struct wined3d_context *context, const struct wined3d_state *state, unsigned int idx) { struct wined3d_texture *texture; - enum WINED3DSRGB srgb; if (!(texture = state->textures[idx])) return; - srgb = state->sampler_states[idx][WINED3D_SAMP_SRGB_TEXTURE] ? SRGB_SRGB : SRGB_RGB; - wined3d_texture_load(texture, context, srgb); + wined3d_texture_load(texture, context, state->sampler_states[idx][WINED3D_SAMP_SRGB_TEXTURE]); } /* Context activation is done by the caller. */ @@ -2942,8 +2940,8 @@ static void context_setup_target(struct wined3d_context *context, struct wined3d /* Read the back buffer of the old drawable into the destination texture. */ if (texture->texture_srgb.name) - wined3d_texture_load(texture, context, SRGB_SRGB); - wined3d_texture_load(texture, context, SRGB_RGB); + wined3d_texture_load(texture, context, TRUE); + wined3d_texture_load(texture, context, FALSE); surface_invalidate_location(context->current_rt, SFLAG_INDRAWABLE); } } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ed5e61c..83b97e7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3402,7 +3402,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, /* Make sure that the destination texture is loaded. */ context = context_acquire(device, NULL); - wined3d_texture_load(dst_texture, context, SRGB_RGB); + wined3d_texture_load(dst_texture, context, FALSE); context_release(context); /* Update every surface level of the texture. */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index df83fc6..6f6b5de 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4085,7 +4085,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc context = context_acquire(device, src_surface); gl_info = context->gl_info; context_apply_blit_state(context, device); - wined3d_texture_load(dst_surface->container, context, SRGB_RGB); + wined3d_texture_load(dst_surface->container, context, FALSE); /* Bind the target texture */ context_bind_texture(context, dst_surface->container->target, dst_surface->container->texture_rgb.name); @@ -4193,14 +4193,14 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st context = context_acquire(device, src_surface); gl_info = context->gl_info; context_apply_blit_state(context, device); - wined3d_texture_load(dst_surface->container, context, SRGB_RGB); + wined3d_texture_load(dst_surface->container, context, FALSE); src_offscreen = surface_is_offscreen(src_surface); noBackBufferBackup = src_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO; if (!noBackBufferBackup && !src_surface->container->texture_rgb.name) { /* Get it a description */ - wined3d_texture_load(src_surface->container, context, SRGB_RGB); + wined3d_texture_load(src_surface->container, context, FALSE); } /* Try to use an aux buffer for drawing the rectangle. This way it doesn't need restoring. @@ -4489,7 +4489,7 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, /* Make sure the surface is up-to-date. This should probably use * surface_load_location() and worry about the destination surface too, * unless we're overwriting it completely. */ - wined3d_texture_load(src_surface->container, context, SRGB_RGB); + wined3d_texture_load(src_surface->container, context, FALSE); /* Activate the destination context, set it up for blitting */ context_apply_blit_state(context, device); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 755335f..6256b91 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -510,35 +510,19 @@ DWORD CDECL wined3d_texture_get_priority(const struct wined3d_texture *texture) /* Context activation is done by the caller */ void wined3d_texture_load(struct wined3d_texture *texture, - struct wined3d_context *context, enum WINED3DSRGB srgb) + struct wined3d_context *context, BOOL srgb) { UINT sub_count = texture->level_count * texture->layer_count; const struct wined3d_gl_info *gl_info = context->gl_info; - BOOL srgb_mode; DWORD flag; UINT i; TRACE("texture %p, srgb %#x.\n", texture, srgb); if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) - srgb = SRGB_RGB; - - switch (srgb) - { - case SRGB_RGB: - srgb_mode = FALSE; - break; - - case SRGB_SRGB: - srgb_mode = TRUE; - break; - - default: - srgb_mode = texture->flags & WINED3D_TEXTURE_IS_SRGB; - break; - } + srgb = FALSE; - if (srgb_mode) + if (srgb) flag = WINED3D_TEXTURE_SRGB_VALID; else flag = WINED3D_TEXTURE_RGB_VALID; @@ -552,7 +536,7 @@ void wined3d_texture_load(struct wined3d_texture *texture, /* Reload the surfaces if the texture is marked dirty. */ for (i = 0; i < sub_count; ++i) { - texture->texture_ops->texture_sub_resource_load(texture->sub_resources[i], context, srgb_mode); + texture->texture_ops->texture_sub_resource_load(texture->sub_resources[i], context, srgb); } texture->flags |= flag; } @@ -561,7 +545,7 @@ void CDECL wined3d_texture_preload(struct wined3d_texture *texture) { struct wined3d_context *context; context = context_acquire(texture->resource.device, NULL); - wined3d_texture_load(texture, context, SRGB_ANY); + wined3d_texture_load(texture, context, texture->flags & WINED3D_TEXTURE_IS_SRGB); context_release(context); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 93e4a90..d7e1c5f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2043,13 +2043,6 @@ enum wined3d_texture_state MAX_WINETEXTURESTATES = 11, }; -enum WINED3DSRGB -{ - SRGB_ANY = 0, /* Uses the cached value(e.g. external calls) */ - SRGB_RGB = 1, /* Loads the rgb texture */ - SRGB_SRGB = 2, /* Loads the srgb texture */ -}; - struct gl_texture { DWORD states[MAX_WINETEXTURESTATES]; @@ -2108,7 +2101,7 @@ void wined3d_texture_bind(struct wined3d_texture *texture, void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_load(struct wined3d_texture *texture, - struct wined3d_context *context, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; + struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_set_dirty(struct wined3d_texture *texture) DECLSPEC_HIDDEN; #define WINED3D_VFLAG_ALLOCATED 0x00000001

1 0

Henri Verbeet : wined3d: Get rid of surface_internal_preload().
by Alexandre Julliard Nov. 22, 2013

Nov. 22, 2013

Module: wine Branch: master Commit: 7427b72250419d0b516fdd79f942b2902793c953 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7427b72250419d0b516fdd79f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 22 10:45:03 2013 +0100 wined3d: Get rid of surface_internal_preload(). --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 10 ++++++---- dlls/wined3d/surface.c | 24 +++++------------------- dlls/wined3d/wined3d_private.h | 2 -- 4 files changed, 12 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index aa62bfe..96bd1b6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7469,7 +7469,7 @@ HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, src_rect.bottom = src_surface->resource.height - src_rect.bottom; } else - surface_internal_preload(src_surface, context, SRGB_RGB); + wined3d_texture_load(src_surface->container, context, SRGB_RGB); context_apply_blit_state(context, device); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e451a67..3e62839 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2124,7 +2124,7 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine if (context->render_offscreen) { - surface_internal_preload(rt, context, SRGB_RGB); + wined3d_texture_load(rt->container, context, SRGB_RGB); context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, rt, NULL, rt->draw_binding); if (rt->resource.format->id != WINED3DFMT_NULL) @@ -2938,10 +2938,12 @@ static void context_setup_target(struct wined3d_context *context, struct wined3d if (wined3d_settings.offscreen_rendering_mode != ORM_FBO && old_render_offscreen && context->current_rt != target) { + struct wined3d_texture *texture = context->current_rt->container; + /* Read the back buffer of the old drawable into the destination texture. */ - if (context->current_rt->container->texture_srgb.name) - surface_internal_preload(context->current_rt, context, SRGB_SRGB); - surface_internal_preload(context->current_rt, context, SRGB_RGB); + if (texture->texture_srgb.name) + wined3d_texture_load(texture, context, SRGB_SRGB); + wined3d_texture_load(texture, context, SRGB_RGB); surface_invalidate_location(context->current_rt, SFLAG_INDRAWABLE); } } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d3a0b13..df83fc6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2419,7 +2419,6 @@ DWORD CDECL wined3d_surface_get_priority(const struct wined3d_surface *surface) void CDECL wined3d_surface_preload(struct wined3d_surface *surface) { - struct wined3d_context *context; TRACE("surface %p.\n", surface); if (!surface->resource.device->d3d_initialized) @@ -2428,9 +2427,7 @@ void CDECL wined3d_surface_preload(struct wined3d_surface *surface) return; } - context = context_acquire(surface->resource.device, NULL); - surface_internal_preload(surface, context, SRGB_ANY); - context_release(context); + wined3d_texture_preload(surface->container); } void * CDECL wined3d_surface_get_parent(const struct wined3d_surface *surface) @@ -3447,17 +3444,6 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined return WINED3D_OK; } -/* Context activation is done by the caller */ -void surface_internal_preload(struct wined3d_surface *surface, - struct wined3d_context *context, enum WINED3DSRGB srgb) -{ - struct wined3d_texture *texture = surface->container; - - TRACE("iface %p, srgb %#x.\n", surface, srgb); - - wined3d_texture_load(texture, context, srgb); -} - /* Read the framebuffer back into the surface */ static void read_from_framebuffer(struct wined3d_surface *surface, void *dest, UINT pitch) { @@ -4099,7 +4085,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc context = context_acquire(device, src_surface); gl_info = context->gl_info; context_apply_blit_state(context, device); - surface_internal_preload(dst_surface, context, SRGB_RGB); + wined3d_texture_load(dst_surface->container, context, SRGB_RGB); /* Bind the target texture */ context_bind_texture(context, dst_surface->container->target, dst_surface->container->texture_rgb.name); @@ -4207,14 +4193,14 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st context = context_acquire(device, src_surface); gl_info = context->gl_info; context_apply_blit_state(context, device); - surface_internal_preload(dst_surface, context, SRGB_RGB); + wined3d_texture_load(dst_surface->container, context, SRGB_RGB); src_offscreen = surface_is_offscreen(src_surface); noBackBufferBackup = src_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO; if (!noBackBufferBackup && !src_surface->container->texture_rgb.name) { /* Get it a description */ - surface_internal_preload(src_surface, context, SRGB_RGB); + wined3d_texture_load(src_surface->container, context, SRGB_RGB); } /* Try to use an aux buffer for drawing the rectangle. This way it doesn't need restoring. @@ -4503,7 +4489,7 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, /* Make sure the surface is up-to-date. This should probably use * surface_load_location() and worry about the destination surface too, * unless we're overwriting it completely. */ - surface_internal_preload(src_surface, context, SRGB_RGB); + wined3d_texture_load(src_surface->container, context, SRGB_RGB); /* Activate the destination context, set it up for blitting */ context_apply_blit_state(context, device); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ff50aec..93e4a90 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2249,8 +2249,6 @@ void surface_set_dirty(struct wined3d_surface *surface) DECLSPEC_HIDDEN; HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const struct wined3d_color *color) DECLSPEC_HIDDEN; GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; -void surface_internal_preload(struct wined3d_surface *surface, - struct wined3d_context *context, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; void surface_invalidate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; BOOL surface_is_offscreen(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; void surface_load(struct wined3d_surface *surface, BOOL srgb) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Merge texture2d_preload() and texture3d_preload() into wined3d_texture_load().
by Alexandre Julliard Nov. 22, 2013

Nov. 22, 2013

Module: wine Branch: master Commit: e0beab8b817d0ad0594c2b157ae5b9d14f4d1a97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0beab8b817d0ad0594c2b157… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 22 10:45:02 2013 +0100 wined3d: Merge texture2d_preload() and texture3d_preload() into wined3d_texture_load(). --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 2 +- dlls/wined3d/texture.c | 140 ++++++++++++++++----------------------- dlls/wined3d/wined3d_private.h | 6 +- 5 files changed, 65 insertions(+), 87 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e5bbb91..e451a67 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2797,7 +2797,7 @@ static void context_preload_texture(struct wined3d_context *context, return; srgb = state->sampler_states[idx][WINED3D_SAMP_SRGB_TEXTURE] ? SRGB_SRGB : SRGB_RGB; - texture->texture_ops->texture_preload(texture, context, srgb); + wined3d_texture_load(texture, context, srgb); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f28ce27..ed5e61c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3402,7 +3402,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, /* Make sure that the destination texture is loaded. */ context = context_acquire(device, NULL); - dst_texture->texture_ops->texture_preload(dst_texture, context, SRGB_RGB); + wined3d_texture_load(dst_texture, context, SRGB_RGB); context_release(context); /* Update every surface level of the texture. */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1523d5c..d3a0b13 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3455,7 +3455,7 @@ void surface_internal_preload(struct wined3d_surface *surface, TRACE("iface %p, srgb %#x.\n", surface, srgb); - texture->texture_ops->texture_preload(texture, context, srgb); + wined3d_texture_load(texture, context, srgb); } /* Read the framebuffer back into the surface */ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 08638a5..755335f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -508,11 +508,60 @@ DWORD CDECL wined3d_texture_get_priority(const struct wined3d_texture *texture) return resource_get_priority(&texture->resource); } +/* Context activation is done by the caller */ +void wined3d_texture_load(struct wined3d_texture *texture, + struct wined3d_context *context, enum WINED3DSRGB srgb) +{ + UINT sub_count = texture->level_count * texture->layer_count; + const struct wined3d_gl_info *gl_info = context->gl_info; + BOOL srgb_mode; + DWORD flag; + UINT i; + + TRACE("texture %p, srgb %#x.\n", texture, srgb); + + if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + srgb = SRGB_RGB; + + switch (srgb) + { + case SRGB_RGB: + srgb_mode = FALSE; + break; + + case SRGB_SRGB: + srgb_mode = TRUE; + break; + + default: + srgb_mode = texture->flags & WINED3D_TEXTURE_IS_SRGB; + break; + } + + if (srgb_mode) + flag = WINED3D_TEXTURE_SRGB_VALID; + else + flag = WINED3D_TEXTURE_RGB_VALID; + + if (texture->flags & flag) + { + TRACE("Texture %p not dirty, nothing to do.\n", texture); + return; + } + + /* Reload the surfaces if the texture is marked dirty. */ + for (i = 0; i < sub_count; ++i) + { + texture->texture_ops->texture_sub_resource_load(texture->sub_resources[i], context, srgb_mode); + } + texture->flags |= flag; +} + void CDECL wined3d_texture_preload(struct wined3d_texture *texture) { struct wined3d_context *context; context = context_acquire(texture->resource.device, NULL); - texture->texture_ops->texture_preload(texture, context, SRGB_ANY); + wined3d_texture_load(texture, context, SRGB_ANY); context_release(context); } @@ -631,54 +680,10 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, return WINED3D_OK; } -static BOOL texture_srgb_mode(const struct wined3d_texture *texture, enum WINED3DSRGB srgb) -{ - switch (srgb) - { - case SRGB_RGB: - return FALSE; - - case SRGB_SRGB: - return TRUE; - - default: - return texture->flags & WINED3D_TEXTURE_IS_SRGB; - } -} - -/* Context activation is done by the caller */ -static void texture2d_preload(struct wined3d_texture *texture, - struct wined3d_context *context, enum WINED3DSRGB srgb) +static void texture2d_sub_resource_load(struct wined3d_resource *sub_resource, + struct wined3d_context *context, BOOL srgb) { - UINT sub_count = texture->level_count * texture->layer_count; - const struct wined3d_gl_info *gl_info = context->gl_info; - BOOL srgb_mode; - DWORD flag; - UINT i; - - TRACE("texture %p, srgb %#x.\n", texture, srgb); - - if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) - srgb = SRGB_RGB; - - srgb_mode = texture_srgb_mode(texture, srgb); - if (srgb_mode) - flag = WINED3D_TEXTURE_SRGB_VALID; - else - flag = WINED3D_TEXTURE_RGB_VALID; - - if (texture->flags & flag) - { - TRACE("Texture %p not dirty, nothing to do.\n", texture); - return; - } - - /* Reload the surfaces if the texture is marked dirty. */ - for (i = 0; i < sub_count; ++i) - { - surface_load(surface_from_resource(texture->sub_resources[i]), srgb_mode); - } - texture->flags |= flag; + surface_load(surface_from_resource(sub_resource), srgb); } static void texture2d_sub_resource_add_dirty_region(struct wined3d_resource *sub_resource, @@ -698,7 +703,7 @@ static void texture2d_sub_resource_cleanup(struct wined3d_resource *sub_resource static const struct wined3d_texture_ops texture2d_ops = { - texture2d_preload, + texture2d_sub_resource_load, texture2d_sub_resource_add_dirty_region, texture2d_sub_resource_cleanup, }; @@ -998,39 +1003,10 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 return WINED3D_OK; } -/* Context activation is done by the caller. */ -static void texture3d_preload(struct wined3d_texture *texture, - struct wined3d_context *context, enum WINED3DSRGB srgb) +static void texture3d_sub_resource_load(struct wined3d_resource *sub_resource, + struct wined3d_context *context, BOOL srgb) { - UINT sub_count = texture->level_count * texture->layer_count; - const struct wined3d_gl_info *gl_info = context->gl_info; - BOOL srgb_mode; - DWORD flag; - UINT i; - - TRACE("texture %p, srgb %#x.\n", texture, srgb); - - if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) - srgb = SRGB_RGB; - - srgb_mode = texture_srgb_mode(texture, srgb); - if (srgb_mode) - flag = WINED3D_TEXTURE_SRGB_VALID; - else - flag = WINED3D_TEXTURE_RGB_VALID; - - if (texture->flags & flag) - { - TRACE("Texture %p not dirty, nothing to do.\n", texture); - return; - } - - /* Reload the surfaces if the texture is marked dirty. */ - for (i = 0; i < sub_count; ++i) - { - wined3d_volume_load(volume_from_resource(texture->sub_resources[i]), context, srgb_mode); - } - texture->flags |= flag; + wined3d_volume_load(volume_from_resource(sub_resource), context, srgb); } static void texture3d_sub_resource_add_dirty_region(struct wined3d_resource *sub_resource, @@ -1049,7 +1025,7 @@ static void texture3d_sub_resource_cleanup(struct wined3d_resource *sub_resource static const struct wined3d_texture_ops texture3d_ops = { - texture3d_preload, + texture3d_sub_resource_load, texture3d_sub_resource_add_dirty_region, texture3d_sub_resource_cleanup, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e8bc18b..ff50aec 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2058,8 +2058,8 @@ struct gl_texture struct wined3d_texture_ops { - void (*texture_preload)(struct wined3d_texture *texture, struct wined3d_context *context, - enum WINED3DSRGB srgb); + void (*texture_sub_resource_load)(struct wined3d_resource *sub_resource, + struct wined3d_context *context, BOOL srgb); void (*texture_sub_resource_add_dirty_region)(struct wined3d_resource *sub_resource, const struct wined3d_box *dirty_region); void (*texture_sub_resource_cleanup)(struct wined3d_resource *sub_resource); @@ -2107,6 +2107,8 @@ void wined3d_texture_bind(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; +void wined3d_texture_load(struct wined3d_texture *texture, + struct wined3d_context *context, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; void wined3d_texture_set_dirty(struct wined3d_texture *texture) DECLSPEC_HIDDEN; #define WINED3D_VFLAG_ALLOCATED 0x00000001

1 0

Erich E. Hoover : server: Create directories with the specified security attributes.
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: d2e216f462c2ccc57cac6c8e683aae2abd719916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e216f462c2ccc57cac6c8e6… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Fri Nov 8 12:04:56 2013 -0700 server: Create directories with the specified security attributes. --- dlls/advapi32/tests/security.c | 5 ++--- server/fd.c | 2 +- server/file.c | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 4de623d..fe31b5c 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3081,9 +3081,8 @@ static void test_CreateDirectoryA(void) bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); ok(bret, "GetAclInformation failed\n"); - todo_wine ok(acl_size.AceCount == 2, - "GetAclInformation returned unexpected entry count (%d != 2).\n", - acl_size.AceCount); + ok(acl_size.AceCount == 2, "GetAclInformation returned unexpected entry count (%d != 2).\n", + acl_size.AceCount); if (acl_size.AceCount > 0) { bret = pGetAce(pDacl, 0, (VOID **)&ace); diff --git a/server/fd.c b/server/fd.c index 32b2a29..fa8874c 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1768,7 +1768,7 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, /* create the directory if needed */ if ((options & FILE_DIRECTORY_FILE) && (flags & O_CREAT)) { - if (mkdir( name, 0777 ) == -1) + if (mkdir( name, *mode ) == -1) { if (errno != EEXIST || (flags & O_EXCL)) { diff --git a/server/file.c b/server/file.c index 94d3060..cceb8ad 100644 --- a/server/file.c +++ b/server/file.c @@ -218,6 +218,8 @@ static struct object *create_file( struct fd *root, const char *nameptr, data_si owner = token_get_user( current->process->token ); mode = sd_to_mode( sd, owner ); } + else if (options & FILE_DIRECTORY_FILE) + mode = (attrs & FILE_ATTRIBUTE_READONLY) ? 0555 : 0777; else mode = (attrs & FILE_ATTRIBUTE_READONLY) ? 0444 : 0666;

1 0

Erich E. Hoover : advapi32/tests: Add tests for creating directories with specific security attributes.
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: 95c414fea7dd17afe81de406f0a26a29e74cece6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95c414fea7dd17afe81de406f… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Fri Nov 8 12:01:49 2013 -0700 advapi32/tests: Add tests for creating directories with specific security attributes. --- dlls/advapi32/tests/security.c | 113 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 113 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 16f8837..4de623d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3003,6 +3003,118 @@ static void test_SetEntriesInAclA(void) HeapFree(GetProcessHeap(), 0, OldAcl); } +static void test_CreateDirectoryA(void) +{ + char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], *user; + DWORD sid_size = sizeof(admin_ptr), user_size; + PSID admin_sid = (PSID) admin_ptr, user_sid; + char sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; + PSECURITY_DESCRIPTOR pSD = &sd; + ACL_SIZE_INFORMATION acl_size; + ACCESS_ALLOWED_ACE *ace; + SECURITY_ATTRIBUTES sa; + char tmpdir[MAX_PATH]; + struct _SID *owner; + BOOL bret = TRUE; + HANDLE token; + DWORD error; + PACL pDacl; + + if (!pGetNamedSecurityInfoA || !pCreateWellKnownSid) + { + win_skip("Required functions are not available\n"); + return; + } + + if (!OpenThreadToken(GetCurrentThread(), TOKEN_READ, TRUE, &token)) + { + if (GetLastError() != ERROR_NO_TOKEN) bret = FALSE; + else if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &token)) bret = FALSE; + } + if (!bret) + { + win_skip("Failed to get current user token\n"); + return; + } + bret = GetTokenInformation(token, TokenUser, NULL, 0, &user_size); + ok(!bret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "GetTokenInformation(TokenUser) failed with error %d\n", GetLastError()); + user = HeapAlloc(GetProcessHeap(), 0, user_size); + bret = GetTokenInformation(token, TokenUser, user, user_size, &user_size); + ok(bret, "GetTokenInformation(TokenUser) failed with error %d\n", GetLastError()); + CloseHandle( token ); + user_sid = ((TOKEN_USER *)user)->User.Sid; + + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = pSD; + sa.bInheritHandle = TRUE; + InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); + pCreateWellKnownSid(WinBuiltinAdministratorsSid, NULL, admin_sid, &sid_size); + pDacl = HeapAlloc(GetProcessHeap(), 0, 100); + bret = InitializeAcl(pDacl, 100, ACL_REVISION); + ok(bret, "Failed to initialize ACL.\n"); + bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE, + GENERIC_ALL, user_sid); + ok(bret, "Failed to add Current User to ACL.\n"); + bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE, + GENERIC_ALL, admin_sid); + ok(bret, "Failed to add Administrator Group to ACL.\n"); + bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); + ok(bret, "Failed to add ACL to security desciptor.\n"); + + GetTempPathA(MAX_PATH, tmpdir); + lstrcatA(tmpdir, "Please Remove Me"); + bret = CreateDirectoryA(tmpdir, &sa); + ok(bret == TRUE, "CreateDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError()); + HeapFree(GetProcessHeap(), 0, pDacl); + + SetLastError(0xdeadbeef); + error = pGetNamedSecurityInfoA(tmpdir, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, (PSID*)&owner, + NULL, &pDacl, NULL, &pSD); + if (error != ERROR_SUCCESS && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + { + win_skip("GetNamedSecurityInfoA is not implemented\n"); + goto done; + } + ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); + + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + todo_wine ok(acl_size.AceCount == 2, + "GetAclInformation returned unexpected entry count (%d != 2).\n", + acl_size.AceCount); + if (acl_size.AceCount > 0) + { + bret = pGetAce(pDacl, 0, (VOID **)&ace); + ok(bret, "Failed to get Current User ACE.\n"); + bret = EqualSid(&ace->SidStart, user_sid); + todo_wine ok(bret, "Current User ACE != Current User SID.\n"); + todo_wine ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), + "Current User ACE has unexpected flags (0x%x != 0x03)\n", + ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", + ace->Mask); + } + if (acl_size.AceCount > 1) + { + bret = pGetAce(pDacl, 1, (VOID **)&ace); + ok(bret, "Failed to get Administators Group ACE.\n"); + bret = EqualSid(&ace->SidStart, admin_sid); + todo_wine ok(bret, "Administators Group ACE != Administators Group SID.\n"); + todo_wine ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), + "Administators Group ACE has unexpected flags (0x%x != 0x03)\n", + ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", + ace->Mask); + } + +done: + HeapFree(GetProcessHeap(), 0, user); + bret = RemoveDirectoryA(tmpdir); + ok(bret == TRUE, "RemoveDirectoryA should always succeed\n"); +} + static void test_GetNamedSecurityInfoA(void) { char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], *user; @@ -4674,6 +4786,7 @@ START_TEST(security) test_impersonation_level(); test_SetEntriesInAclW(); test_SetEntriesInAclA(); + test_CreateDirectoryA(); test_GetNamedSecurityInfoA(); test_ConvertStringSecurityDescriptor(); test_ConvertSecurityDescriptorToString();

1 0

Hans Leidekker : wininet: Reading past end-of-file in chunked mode returns success.
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: a448bbf880ee27eaea87230823e52cfadd956230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a448bbf880ee27eaea8723082… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 21 17:52:54 2013 +0100 wininet: Reading past end-of-file in chunked mode returns success. Found by Andrew Eikum. --- dlls/wininet/http.c | 2 +- dlls/wininet/tests/http.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9c2d5d4..52b64f8 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2761,7 +2761,7 @@ static DWORD start_next_chunk(chunked_stream_t *stream, http_request_t *req) assert(!stream->chunk_size || stream->chunk_size == ~0u); - if (stream->end_of_data) return ERROR_NO_MORE_FILES; + if (stream->end_of_data) return ERROR_SUCCESS; /* read terminator for the previous chunk */ if(!stream->chunk_size && (res = discard_chunked_eol(stream, req)) != ERROR_SUCCESS) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 7b7a33c..ffb5fdf 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -734,7 +734,7 @@ static void InternetReadFile_chunked_test(void) { BOOL res; CHAR buffer[4000]; - DWORD length; + DWORD length, got; const char *types[2] = { "*", NULL }; HINTERNET hi, hic = 0, hor = 0; @@ -814,7 +814,6 @@ static void InternetReadFile_chunked_test(void) trace("got %u available\n",length); if (length) { - DWORD got; char *buffer = HeapAlloc(GetProcessHeap(),0,length+1); res = InternetReadFile(hor,buffer,length,&got); @@ -828,7 +827,13 @@ static void InternetReadFile_chunked_test(void) if (!got) break; } if (length == 0) + { + got = 0xdeadbeef; + res = InternetReadFile( hor, buffer, 1, &got ); + ok( res, "InternetReadFile failed: %u\n", GetLastError() ); + ok( !got, "got %u\n", got ); break; + } } abort: trace("aborting\n");

1 0