September 2013 - Wine-commits

Nikolay Sivov : comctl32/tests: Manually load comctl32. dll with newly activated context.
by Alexandre Julliard 09 Sep '13

09 Sep '13

Module: wine Branch: master Commit: 88d5cab5e980d85417812a8ef44fe2b46f51f31f URL: http://source.winehq.org/git/wine.git/?a=commit;h=88d5cab5e980d85417812a8ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 9 10:00:47 2013 +0400 comctl32/tests: Manually load comctl32.dll with newly activated context. --- dlls/comctl32/tests/header.c | 17 ----------------- dlls/comctl32/tests/listview.c | 16 ---------------- dlls/comctl32/tests/monthcal.c | 16 ---------------- dlls/comctl32/tests/treeview.c | 16 ---------------- dlls/comctl32/tests/v6util.h | 11 +++++++++++ 5 files changed, 11 insertions(+), 65 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 6ad0aa8..02fa61a 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1814,7 +1814,6 @@ START_TEST(header) HWND parent_hwnd; ULONG_PTR ctx_cookie; HANDLE hCtx; - HWND hwnd; if (!init()) return; @@ -1847,22 +1846,6 @@ START_TEST(header) return; } - /* this is a XP SP3 failure workaround */ - hwnd = CreateWindowExA(0, WC_HEADER, NULL, - WS_CHILD|WS_BORDER|WS_VISIBLE|HDS_BUTTONS|HDS_HORZ, - 0, 0, 100, 100, - parent_hwnd, NULL, GetModuleHandleA(NULL), NULL); - - if (!IsWindow(hwnd)) - { - win_skip("FIXME: failed to create Header window.\n"); - unload_v6_module(ctx_cookie, hCtx); - DestroyWindow(parent_hwnd); - return; - } - else - DestroyWindow(hwnd); - /* comctl32 version 6 tests start here */ test_hdf_fixedwidth(parent_hwnd); test_hds_nosizing(parent_hwnd); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 1ac4333..344d084 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5554,7 +5554,6 @@ START_TEST(listview) ULONG_PTR ctx_cookie; HANDLE hCtx; - HWND hwnd; hComctl32 = GetModuleHandleA("comctl32.dll"); pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); @@ -5623,21 +5622,6 @@ START_TEST(listview) return; } - /* this is a XP SP3 failure workaround */ - hwnd = CreateWindowExA(0, WC_LISTVIEW, "foo", - WS_CHILD | WS_BORDER | WS_VISIBLE | LVS_REPORT, - 0, 0, 100, 100, - hwndparent, NULL, GetModuleHandleA(NULL), NULL); - if (!IsWindow(hwnd)) - { - win_skip("FIXME: failed to create ListView window.\n"); - unload_v6_module(ctx_cookie, hCtx); - DestroyWindow(hwndparent); - return; - } - else - DestroyWindow(hwnd); - /* comctl32 version 6 tests start here */ test_get_set_view(); test_canceleditlabel(); diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 1cadf44..1a6c366 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -2002,7 +2002,6 @@ START_TEST(monthcal) BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); INITCOMMONCONTROLSEX iccex; HMODULE hComctl32; - HWND hwnd; ULONG_PTR ctx_cookie; HANDLE hCtx; @@ -2048,21 +2047,6 @@ START_TEST(monthcal) return; } - /* this is a XP SP3 failure workaround */ - hwnd = CreateWindowExA(0, MONTHCAL_CLASSA, "foo", - WS_CHILD | WS_BORDER | WS_VISIBLE, - 0, 0, 100, 100, - parent_wnd, NULL, GetModuleHandleA(NULL), NULL); - if (!IsWindow(hwnd)) - { - win_skip("FIXME: failed to create Monthcal window.\n"); - unload_v6_module(ctx_cookie, hCtx); - DestroyWindow(parent_wnd); - return; - } - else - DestroyWindow(hwnd); - test_hittest_v6(); test_get_set_border(); test_MCM_SIZERECTTOMIN(); diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 3c437de..b784140 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1972,7 +1972,6 @@ START_TEST(treeview) ULONG_PTR ctx_cookie; HANDLE hCtx; - HWND hwnd; hComctl32 = GetModuleHandleA("comctl32.dll"); pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); @@ -2044,21 +2043,6 @@ START_TEST(treeview) return; } - /* this is a XP SP3 failure workaround */ - hwnd = CreateWindowExA(0, WC_TREEVIEW, "foo", - WS_CHILD | WS_BORDER | WS_VISIBLE, - 0, 0, 100, 100, - hMainWnd, NULL, GetModuleHandleA(NULL), NULL); - if (!IsWindow(hwnd)) - { - win_skip("FIXME: failed to create TreeView window.\n"); - unload_v6_module(ctx_cookie, hCtx); - DestroyWindow(hMainWnd); - return; - } - else - DestroyWindow(hwnd); - /* comctl32 version 6 tests start here */ test_expandedimage(); test_htreeitem_layout(); diff --git a/dlls/comctl32/tests/v6util.h b/dlls/comctl32/tests/v6util.h index 848e95b..1300598 100644 --- a/dlls/comctl32/tests/v6util.h +++ b/dlls/comctl32/tests/v6util.h @@ -82,6 +82,9 @@ static BOOL load_v6_module(ULONG_PTR *pcookie, HANDLE *hCtx) HANDLE hKernel32; HANDLE (WINAPI *pCreateActCtxA)(ACTCTXA*); BOOL (WINAPI *pActivateActCtx)(HANDLE, ULONG_PTR*); + BOOL (WINAPI *pFindActCtxSectionStringA)(DWORD,const GUID *,ULONG,LPCSTR,PACTCTX_SECTION_KEYED_DATA); + + ACTCTX_SECTION_KEYED_DATA data; ACTCTXA ctx; BOOL ret; @@ -91,6 +94,7 @@ static BOOL load_v6_module(ULONG_PTR *pcookie, HANDLE *hCtx) hKernel32 = GetModuleHandleA("kernel32.dll"); pCreateActCtxA = (void*)GetProcAddress(hKernel32, "CreateActCtxA"); pActivateActCtx = (void*)GetProcAddress(hKernel32, "ActivateActCtx"); + pFindActCtxSectionStringA = (void*)GetProcAddress(hKernel32, "FindActCtxSectionStringA"); if (!(pCreateActCtxA && pActivateActCtx)) { win_skip("Activation contexts unsupported. No version 6 tests possible.\n"); @@ -135,6 +139,13 @@ static BOOL load_v6_module(ULONG_PTR *pcookie, HANDLE *hCtx) DeleteFileA(manifest_name); } + data.cbSize = sizeof(data); + ret = pFindActCtxSectionStringA(0, NULL, ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, + "comctl32.dll", &data); + ok(ret, "failed to find comctl32.dll in active context, %u\n", GetLastError()); + if (ret) + LoadLibraryA("comctl32.dll"); + return ret; }

1 0

Nikolay Sivov : ntdll: Added compatible sections for clrClass data.
by Alexandre Julliard 09 Sep '13

09 Sep '13

Module: wine Branch: master Commit: bcbd13b70c06984426658dc9dff749d0c043d448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcbd13b70c06984426658dc9d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 9 10:01:28 2013 +0400 ntdll: Added compatible sections for clrClass data. --- dlls/kernel32/tests/actctx.c | 8 +- dlls/ntdll/actctx.c | 387 ++++++++++++++++++++++++++++-------------- 2 files changed, 266 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bcbd13b70c06984426658…

1 0

Henri Verbeet : wined3d: Get rid of the "dirty" flag to wined3d_texture_set_dirty().
by Alexandre Julliard 09 Sep '13

09 Sep '13

Module: wine Branch: master Commit: c44012f0c1d75e999206a67af607473ea3b3ecae URL: http://source.winehq.org/git/wine.git/?a=commit;h=c44012f0c1d75e999206a67af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 9 10:26:17 2013 +0200 wined3d: Get rid of the "dirty" flag to wined3d_texture_set_dirty(). --- dlls/wined3d/surface.c | 8 ++++---- dlls/wined3d/texture.c | 12 ++++++------ dlls/wined3d/volume.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 011be7a..fb88082 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2488,7 +2488,7 @@ void surface_add_dirty_rect(struct wined3d_surface *surface, const struct wined3 if (surface->container) { TRACE("Passing to container.\n"); - wined3d_texture_set_dirty(surface->container, TRUE); + wined3d_texture_set_dirty(surface->container); } } @@ -5162,7 +5162,7 @@ void surface_modify_ds_location(struct wined3d_surface *surface, if (surface->container) { TRACE("Passing to container.\n"); - wined3d_texture_set_dirty(surface->container, TRUE); + wined3d_texture_set_dirty(surface->container); } } @@ -5354,7 +5354,7 @@ void surface_modify_location(struct wined3d_surface *surface, DWORD location, BO if (surface->container) { TRACE("Passing to container.\n"); - wined3d_texture_set_dirty(surface->container, TRUE); + wined3d_texture_set_dirty(surface->container); } } surface->flags &= ~SFLAG_LOCATIONS; @@ -5376,7 +5376,7 @@ void surface_modify_location(struct wined3d_surface *surface, DWORD location, BO if (surface->container) { TRACE("Passing to container\n"); - wined3d_texture_set_dirty(surface->container, TRUE); + wined3d_texture_set_dirty(surface->container); } } surface->flags &= ~location; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e60a426..e9173ce 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -114,7 +114,7 @@ static void wined3d_texture_unload(struct wined3d_texture *texture) if (context) context_release(context); - wined3d_texture_set_dirty(texture, TRUE); + wined3d_texture_set_dirty(texture); resource_unload(&texture->resource); } @@ -139,10 +139,10 @@ static void wined3d_texture_cleanup(struct wined3d_texture *texture) resource_cleanup(&texture->resource); } -void wined3d_texture_set_dirty(struct wined3d_texture *texture, BOOL dirty) +void wined3d_texture_set_dirty(struct wined3d_texture *texture) { - texture->texture_rgb.dirty = dirty; - texture->texture_srgb.dirty = dirty; + texture->texture_rgb.dirty = TRUE; + texture->texture_srgb.dirty = TRUE; } /* Context activation is done by the caller. */ @@ -195,7 +195,7 @@ static HRESULT wined3d_texture_bind(struct wined3d_texture *texture, else gl_tex->states[WINED3DTEXSTA_SRGBTEXTURE] = srgb; gl_tex->states[WINED3DTEXSTA_SHADOW] = FALSE; - wined3d_texture_set_dirty(texture, TRUE); + wined3d_texture_set_dirty(texture); new_texture = TRUE; if (texture->resource.usage & WINED3DUSAGE_AUTOGENMIPMAP) @@ -592,7 +592,7 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, return WINED3DERR_INVALIDCALL; } - wined3d_texture_set_dirty(texture, TRUE); + wined3d_texture_set_dirty(texture); texture->texture_ops->texture_sub_resource_add_dirty_region(sub_resource, dirty_region); return WINED3D_OK; diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index a1c7876..7f2dbf9 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -605,7 +605,7 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) { - wined3d_texture_set_dirty(volume->container, TRUE); + wined3d_texture_set_dirty(volume->container); if (volume->flags & WINED3D_VFLAG_PBO) wined3d_volume_invalidate_location(volume, ~WINED3D_LOCATION_BUFFER); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5a8ced0..b771869 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2108,7 +2108,7 @@ static inline struct gl_texture *wined3d_texture_get_gl_texture(struct wined3d_t void wined3d_texture_apply_state_changes(struct wined3d_texture *texture, const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1], const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; -void wined3d_texture_set_dirty(struct wined3d_texture *texture, BOOL dirty) DECLSPEC_HIDDEN; +void wined3d_texture_set_dirty(struct wined3d_texture *texture) DECLSPEC_HIDDEN; #define WINED3D_VFLAG_LOCKED 0x00000001 #define WINED3D_VFLAG_ALLOCATED 0x00000002

1 0

Henri Verbeet : wined3d: Replace the "dirty" field in struct gl_texture with WINED3D_TEXTURE_ flags.
by Alexandre Julliard 09 Sep '13

09 Sep '13

Module: wine Branch: master Commit: 59e2f52ff8743825e81c0f2ef6afaa9892503098 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e2f52ff8743825e81c0f2ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 9 10:26:18 2013 +0200 wined3d: Replace the "dirty" field in struct gl_texture with WINED3D_TEXTURE_ flags. --- dlls/wined3d/texture.c | 66 +++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 9 +++-- 2 files changed, 36 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e9173ce..5d24ada 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -71,8 +71,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->level_count = level_count; texture->filter_type = (desc->usage & WINED3DUSAGE_AUTOGENMIPMAP) ? WINED3D_TEXF_LINEAR : WINED3D_TEXF_NONE; texture->lod = 0; - texture->texture_rgb.dirty = TRUE; - texture->texture_srgb.dirty = TRUE; texture->flags = WINED3D_TEXTURE_POW2_MAT_IDENT; if (texture->resource.format->flags & WINED3DFMT_FLAG_FILTERING) @@ -141,8 +139,7 @@ static void wined3d_texture_cleanup(struct wined3d_texture *texture) void wined3d_texture_set_dirty(struct wined3d_texture *texture) { - texture->texture_rgb.dirty = TRUE; - texture->texture_srgb.dirty = TRUE; + texture->flags &= ~(WINED3D_TEXTURE_RGB_VALID | WINED3D_TEXTURE_SRGB_VALID); } /* Context activation is done by the caller. */ @@ -677,14 +674,23 @@ static void texture2d_preload(struct wined3d_texture *texture, enum WINED3DSRGB struct wined3d_device *device = texture->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_context *context = NULL; - struct gl_texture *gl_tex; BOOL srgb_mode; + DWORD flag; UINT i; TRACE("texture %p, srgb %#x.\n", texture, srgb); srgb_mode = texture_srgb_mode(texture, srgb); - gl_tex = wined3d_texture_get_gl_texture(texture, gl_info, srgb_mode); + if (srgb_mode && !gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + 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; + } if (!device->isInDraw) { @@ -693,21 +699,12 @@ static void texture2d_preload(struct wined3d_texture *texture, enum WINED3DSRGB context = context_acquire(device, NULL); } - if (gl_tex->dirty) - { - /* 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); - } - } - else + /* Reload the surfaces if the texture is marked dirty. */ + for (i = 0; i < sub_count; ++i) { - TRACE("Texture %p not dirty, nothing to do.\n", texture); + surface_load(surface_from_resource(texture->sub_resources[i]), srgb_mode); } - - /* No longer dirty. */ - gl_tex->dirty = FALSE; + texture->flags |= flag; if (context) context_release(context); } @@ -1059,35 +1056,34 @@ static void texture3d_preload(struct wined3d_texture *texture, enum WINED3DSRGB struct wined3d_device *device = texture->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_context *context = NULL; - struct gl_texture *gl_tex; BOOL srgb_mode; + DWORD flag; UINT i; TRACE("texture %p, srgb %#x.\n", texture, srgb); srgb_mode = texture_srgb_mode(texture, srgb); - gl_tex = wined3d_texture_get_gl_texture(texture, gl_info, srgb_mode); + if (srgb_mode && !gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + flag = WINED3D_TEXTURE_SRGB_VALID; + else + flag = WINED3D_TEXTURE_RGB_VALID; - if (gl_tex->dirty) + if (texture->flags & flag) { - context = context_acquire(device, NULL); + 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); - } + context = context_acquire(device, NULL); - context_release(context); - } - else + /* Reload the surfaces if the texture is marked dirty. */ + for (i = 0; i < sub_count; ++i) { - TRACE("Texture %p not dirty, nothing to do.\n", texture); + wined3d_volume_load(volume_from_resource(texture->sub_resources[i]), context, srgb_mode); } + texture->flags |= flag; - /* No longer dirty. */ - gl_tex->dirty = FALSE; + context_release(context); } static void texture3d_sub_resource_add_dirty_region(struct wined3d_resource *sub_resource, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b771869..925b9ca 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2057,7 +2057,6 @@ enum WINED3DSRGB struct gl_texture { DWORD states[MAX_WINETEXTURESTATES]; - BOOL dirty; GLuint name; }; @@ -2071,9 +2070,11 @@ struct wined3d_texture_ops void (*texture_sub_resource_cleanup)(struct wined3d_resource *sub_resource); }; -#define WINED3D_TEXTURE_COND_NP2 0x1 -#define WINED3D_TEXTURE_POW2_MAT_IDENT 0x2 -#define WINED3D_TEXTURE_IS_SRGB 0x4 +#define WINED3D_TEXTURE_COND_NP2 0x00000001 +#define WINED3D_TEXTURE_POW2_MAT_IDENT 0x00000002 +#define WINED3D_TEXTURE_IS_SRGB 0x00000004 +#define WINED3D_TEXTURE_RGB_VALID 0x00000008 +#define WINED3D_TEXTURE_SRGB_VALID 0x00000010 struct wined3d_texture {

1 0

Henri Verbeet : wined3d: Rewrite surface_modify_location() on top of surface_validate_location() and surface_invalidate_location().
by Alexandre Julliard 09 Sep '13

09 Sep '13

Module: wine Branch: master Commit: e2f4ab46077f22d399f50c51abc2fc7bb429a613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f4ab46077f22d399f50c51a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 9 10:26:19 2013 +0200 wined3d: Rewrite surface_modify_location() on top of surface_validate_location() and surface_invalidate_location(). --- dlls/wined3d/surface.c | 68 +++++++++++++++++++++++------------------------ 1 files changed, 33 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fb88082..385a994 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5329,10 +5329,39 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co surface->ds_current_size.cy = surface->resource.height; } +static void surface_validate_location(struct wined3d_surface *surface, DWORD location) +{ + struct wined3d_surface *overlay; + + TRACE("surface %p, location %s.\n", surface, debug_surflocation(location & SFLAG_LOCATIONS)); + + surface->flags |= (location & SFLAG_LOCATIONS); + + /* Redraw emulated overlays, if any. */ + if (location & SFLAG_INDRAWABLE && !list_empty(&surface->overlays)) + { + LIST_FOR_EACH_ENTRY(overlay, &surface->overlays, struct wined3d_surface, overlay_entry) + { + surface_draw_overlay(overlay); + } + } +} + +static void surface_invalidate_location(struct wined3d_surface *surface, DWORD location) +{ + TRACE("surface %p, location %s.\n", surface, debug_surflocation(location & SFLAG_LOCATIONS)); + + if ((location & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX)) && surface->container) + wined3d_texture_set_dirty(surface->container); + surface->flags &= ~(location & SFLAG_LOCATIONS); + + if (!(surface->flags & SFLAG_LOCATIONS)) + ERR("Surface %p does not have any up to date location.\n", surface); +} + void surface_modify_location(struct wined3d_surface *surface, DWORD location, BOOL persistent) { const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; - struct wined3d_surface *overlay; TRACE("surface %p, location %s, persistent %#x.\n", surface, debug_surflocation(location), persistent); @@ -5348,43 +5377,12 @@ void surface_modify_location(struct wined3d_surface *surface, DWORD location, BO if (persistent) { - if (((surface->flags & SFLAG_INTEXTURE) && !(location & SFLAG_INTEXTURE)) - || ((surface->flags & SFLAG_INSRGBTEX) && !(location & SFLAG_INSRGBTEX))) - { - if (surface->container) - { - TRACE("Passing to container.\n"); - wined3d_texture_set_dirty(surface->container); - } - } - surface->flags &= ~SFLAG_LOCATIONS; - surface->flags |= location; - - /* Redraw emulated overlays, if any */ - if (location & SFLAG_INDRAWABLE && !list_empty(&surface->overlays)) - { - LIST_FOR_EACH_ENTRY(overlay, &surface->overlays, struct wined3d_surface, overlay_entry) - { - surface_draw_overlay(overlay); - } - } + surface_validate_location(surface, location); + surface_invalidate_location(surface, ~location); } else { - if ((surface->flags & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX)) && (location & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX))) - { - if (surface->container) - { - TRACE("Passing to container\n"); - wined3d_texture_set_dirty(surface->container); - } - } - surface->flags &= ~location; - } - - if (!(surface->flags & SFLAG_LOCATIONS)) - { - ERR("Surface %p does not have any up to date location.\n", surface); + surface_invalidate_location(surface, location); } }

1 0

Francois Gouget : winegcc: Solaris uses the same link option detection code as other platforms.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: 575eb6d8e10a7c3f497f1bb26fb83cdef48a6ddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=575eb6d8e10a7c3f497f1bb26… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 6 14:35:07 2013 +0200 winegcc: Solaris uses the same link option detection code as other platforms. --- tools/winegcc/winegcc.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 273210a..be0d31f 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -382,9 +382,6 @@ static const strarray* get_lddllflags( const struct options *opts, const strarra break; case PLATFORM_SOLARIS: - strarray_add( flags, "-Wl,-G,-B,symbolic" ); - break; - case PLATFORM_UNSPECIFIED: strarray_add( flags, "-shared" ); strarray_add( flags, "-Wl,-Bsymbolic" );

1 0

Nikolay Sivov : kernel32/tests: Added some activation context tests for SearchPath().
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: 88c2a189fe3dd770fc2c50507ad1d1aab007a22f URL: http://source.winehq.org/git/wine.git/?a=commit;h=88c2a189fe3dd770fc2c50507… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 6 18:39:48 2013 +0400 kernel32/tests: Added some activation context tests for SearchPath(). --- dlls/kernel32/tests/path.c | 179 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 177 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index c49a76f..fd40547 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -42,6 +42,14 @@ #define NOT_A_VALID_DRIVE '@' +#ifdef __i386__ +#define ARCH "x86" +#elif defined __x86_64__ +#define ARCH "amd64" +#else +#define ARCH "none" +#endif + /* the following characters don't work well with GetFullPathNameA in Win98. I don't know if this is a FAT thing, or if it is an OS thing but I don't test these characters now. @@ -61,6 +69,12 @@ static BOOL (WINAPI *pNeedCurrentDirectoryForExePathW)(LPCWSTR); static DWORD (WINAPI *pSearchPathA)(LPCSTR,LPCSTR,LPCSTR,DWORD,LPSTR,LPSTR*); static DWORD (WINAPI *pSearchPathW)(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPWSTR,LPWSTR*); +static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); +static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); +static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); +static BOOL (WINAPI *pGetCurrentActCtx)(HANDLE *); +static void (WINAPI *pReleaseActCtx)(HANDLE); + /* a structure to deal with wine todos somewhat cleanly */ typedef struct { DWORD shortlen; @@ -1549,10 +1563,89 @@ static void test_drive_letter_case(void) #undef is_upper_case_letter } +static const char manifest_dep[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +"<assemblyIdentity version=\"1.2.3.4\" name=\"testdep1\" type=\"win32\" processorArchitecture=\"" ARCH "\"/>" +" <file name=\"testdep.dll\" />" +" <file name=\"kernel32.dll\" />" +"</assembly>"; + +static const char manifest_main[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +"<assemblyIdentity version=\"1.2.3.4\" name=\"Wine.Test\" type=\"win32\" />" +"<dependency>" +" <dependentAssembly>" +" <assemblyIdentity type=\"win32\" name=\"testdep1\" version=\"1.2.3.4\" processorArchitecture=\"" ARCH "\" />" +" </dependentAssembly>" +"</dependency>" +"</assembly>"; + +static void create_manifest_file(const char *filename, const char *manifest) +{ + WCHAR path[MAX_PATH], manifest_path[MAX_PATH]; + HANDLE file; + DWORD size; + + MultiByteToWideChar( CP_ACP, 0, filename, -1, path, MAX_PATH ); + + GetTempPathW(sizeof(manifest_path)/sizeof(WCHAR), manifest_path); + lstrcatW(manifest_path, path); + + file = CreateFileW(manifest_path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + WriteFile(file, manifest, strlen(manifest), &size, NULL); + CloseHandle(file); +} + +static void delete_manifest_file(const char *filename) +{ + CHAR path[MAX_PATH]; + + GetTempPathA(sizeof(path), path); + strcat(path, filename); + DeleteFileA(path); +} + +static HANDLE test_create(const char *file) +{ + WCHAR path[MAX_PATH], manifest_path[MAX_PATH]; + ACTCTXW actctx; + HANDLE handle; + + MultiByteToWideChar(CP_ACP, 0, file, -1, path, MAX_PATH); + GetTempPathW(sizeof(manifest_path)/sizeof(WCHAR), manifest_path); + lstrcatW(manifest_path, path); + + memset(&actctx, 0, sizeof(ACTCTXW)); + actctx.cbSize = sizeof(ACTCTXW); + actctx.lpSource = manifest_path; + + handle = pCreateActCtxW(&actctx); +todo_wine + ok(handle != INVALID_HANDLE_VALUE, "failed to create context, error %u\n", GetLastError()); + + ok(actctx.cbSize == sizeof(actctx), "cbSize=%d\n", actctx.cbSize); + ok(actctx.dwFlags == 0, "dwFlags=%d\n", actctx.dwFlags); + ok(actctx.lpSource == manifest_path, "lpSource=%p\n", actctx.lpSource); + ok(actctx.wProcessorArchitecture == 0, "wProcessorArchitecture=%d\n", actctx.wProcessorArchitecture); + ok(actctx.wLangId == 0, "wLangId=%d\n", actctx.wLangId); + ok(actctx.lpAssemblyDirectory == NULL, "lpAssemblyDirectory=%p\n", actctx.lpAssemblyDirectory); + ok(actctx.lpResourceName == NULL, "lpResourceName=%p\n", actctx.lpResourceName); + ok(actctx.lpApplicationName == NULL, "lpApplicationName=%p\n", actctx.lpApplicationName); + ok(actctx.hModule == NULL, "hModule=%p\n", actctx.hModule); + + return handle; +} + static void test_SearchPathA(void) { - CHAR pathA[MAX_PATH], fileA[] = "", buffA[MAX_PATH]; + static const CHAR testdepA[] = "testdep.dll"; + static const CHAR kernel32A[] = "kernel32.dll"; + static const CHAR fileA[] = ""; + CHAR pathA[MAX_PATH], buffA[MAX_PATH], path2A[MAX_PATH]; CHAR *ptrA = NULL; + ULONG_PTR cookie; + HANDLE handle; DWORD ret; if (!pSearchPathA) @@ -1576,12 +1669,52 @@ static void test_SearchPathA(void) ok(ret == 0, "Expected failure, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); + + if (!pActivateActCtx) + return; + + create_manifest_file("testdep1.manifest", manifest_dep); + create_manifest_file("main.manifest", manifest_main); + + handle = test_create("main.manifest"); + delete_manifest_file("testdep1.manifest"); + delete_manifest_file("main.manifest"); + + /* search fails without active context */ + ret = pSearchPathA(NULL, testdepA, NULL, sizeof(buffA)/sizeof(CHAR), buffA, NULL); + ok(ret == 0, "got %d\n", ret); + + ret = pSearchPathA(NULL, kernel32A, NULL, sizeof(path2A)/sizeof(CHAR), path2A, NULL); + ok(ret && ret == strlen(path2A), "got %d\n", ret); + + ret = pActivateActCtx(handle, &cookie); + ok(ret, "failed to activate context, %u\n", GetLastError()); + + /* works when activated */ + ret = pSearchPathA(NULL, testdepA, NULL, sizeof(buffA)/sizeof(CHAR), buffA, NULL); +todo_wine + ok(ret && ret == strlen(buffA), "got %d\n", ret); + + /* path is redirect for wellknown names too */ + ret = pSearchPathA(NULL, kernel32A, NULL, sizeof(buffA)/sizeof(CHAR), buffA, NULL); + ok(ret && ret == strlen(buffA), "got %d\n", ret); +todo_wine + ok(strcmp(buffA, path2A), "got wrong path %s, %s\n", buffA, path2A); + + ret = pDeactivateActCtx(0, cookie); + ok(ret, "failed to deactivate context, %u\n", GetLastError()); + pReleaseActCtx(handle); } static void test_SearchPathW(void) { - WCHAR pathW[MAX_PATH], fileW[] = { 0 }, buffW[MAX_PATH]; + static const WCHAR testdepW[] = {'t','e','s','t','d','e','p','.','d','l','l',0}; + static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; + static const WCHAR fileW[] = { 0 }; + WCHAR pathW[MAX_PATH], buffW[MAX_PATH], path2W[MAX_PATH]; WCHAR *ptrW = NULL; + ULONG_PTR cookie; + HANDLE handle; DWORD ret; if (!pSearchPathW) @@ -1602,6 +1735,41 @@ if (0) ok(ret == 0, "Expected failure, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); + + if (!pActivateActCtx) + return; + + create_manifest_file("testdep1.manifest", manifest_dep); + create_manifest_file("main.manifest", manifest_main); + + handle = test_create("main.manifest"); + delete_manifest_file("testdep1.manifest"); + delete_manifest_file("main.manifest"); + + /* search fails without active context */ + ret = pSearchPathW(NULL, testdepW, NULL, sizeof(buffW)/sizeof(WCHAR), buffW, NULL); + ok(ret == 0, "got %d\n", ret); + + ret = pSearchPathW(NULL, kernel32W, NULL, sizeof(path2W)/sizeof(WCHAR), path2W, NULL); + ok(ret && ret == lstrlenW(path2W), "got %d\n", ret); + + ret = pActivateActCtx(handle, &cookie); + ok(ret, "failed to activate context, %u\n", GetLastError()); + + /* works when activated */ + ret = pSearchPathW(NULL, testdepW, NULL, sizeof(buffW)/sizeof(WCHAR), buffW, NULL); +todo_wine + ok(ret && ret == lstrlenW(buffW), "got %d\n", ret); + + /* path is redirect for wellknown names too */ + ret = pSearchPathW(NULL, kernel32W, NULL, sizeof(buffW)/sizeof(WCHAR), buffW, NULL); + ok(ret && ret == lstrlenW(buffW), "got %d\n", ret); +todo_wine + ok(lstrcmpW(buffW, path2W), "got wrong path %s, %s\n", wine_dbgstr_w(buffW), wine_dbgstr_w(path2W)); + + ret = pDeactivateActCtx(0, cookie); + ok(ret, "failed to deactivate context, %u\n", GetLastError()); + pReleaseActCtx(handle); } static void test_GetFullPathNameA(void) @@ -1717,6 +1885,11 @@ static void init_pointers(void) MAKEFUNC(NeedCurrentDirectoryForExePathW); MAKEFUNC(SearchPathA); MAKEFUNC(SearchPathW); + MAKEFUNC(ActivateActCtx); + MAKEFUNC(CreateActCtxW); + MAKEFUNC(DeactivateActCtx); + MAKEFUNC(GetCurrentActCtx); + MAKEFUNC(ReleaseActCtx); #undef MAKEFUNC } @@ -1731,6 +1904,8 @@ START_TEST(path) win_skip("GetLongPathNameA is not available\n"); if (!pGetLongPathNameW) win_skip("GetLongPathNameW is not available\n"); + if (!pActivateActCtx) + win_skip("Activation contexts not supported, some tests will be skipped\n"); test_InitPathA(curdir, &curDrive, &otherDrive); test_CurrentDirectoryA(origdir,curdir);

1 0

Jacek Caban : crypt32: Added support for retrieving certs by URL.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: ba4278a73502916f002e2e81100659f8f632dbc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba4278a73502916f002e2e811… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 6 13:09:11 2013 +0200 crypt32: Added support for retrieving certs by URL. --- dlls/crypt32/chain.c | 38 +++++++++++++++++++------------------- dlls/crypt32/tests/chain.c | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index bbd0aca..1a83dee 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1972,7 +1972,7 @@ static void CRYPT_CheckSimpleChain(CertificateChainEngine *engine, } static PCCERT_CONTEXT CRYPT_FindIssuer(const CertificateChainEngine *engine, const CERT_CONTEXT *cert, - HCERTSTORE store, DWORD type, void *para, PCCERT_CONTEXT prev_issuer) + HCERTSTORE store, DWORD type, void *para, DWORD flags, PCCERT_CONTEXT prev_issuer) { CRYPT_URL_ARRAY *urls; PCCERT_CONTEXT issuer; @@ -2019,7 +2019,7 @@ static PCCERT_CONTEXT CRYPT_FindIssuer(const CertificateChainEngine *engine, con TRACE("Trying URL %s\n", debugstr_w(urls->rgwszUrl[i])); res = CryptRetrieveObjectByUrlW(urls->rgwszUrl[i], CONTEXT_OID_CERTIFICATE, - CRYPT_CACHE_ONLY_RETRIEVAL /* FIXME */, + (flags & CERT_CHAIN_CACHE_ONLY_URL_RETRIEVAL) ? CRYPT_CACHE_ONLY_RETRIEVAL : CRYPT_AIA_RETRIEVAL, 0, (void**)&new_cert, NULL, NULL, NULL, NULL); if(!res) { @@ -2047,7 +2047,7 @@ static PCCERT_CONTEXT CRYPT_FindIssuer(const CertificateChainEngine *engine, con static PCCERT_CONTEXT CRYPT_GetIssuer(const CertificateChainEngine *engine, HCERTSTORE store, PCCERT_CONTEXT subject, PCCERT_CONTEXT prevIssuer, - DWORD *infoStatus) + DWORD flags, DWORD *infoStatus) { PCCERT_CONTEXT issuer = NULL; PCERT_EXTENSION ext; @@ -2076,7 +2076,7 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(const CertificateChainEngine *engine, memcpy(&id.u.IssuerSerialNumber.SerialNumber, &info->CertSerialNumber, sizeof(CRYPT_INTEGER_BLOB)); - issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, prevIssuer); + issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, flags, prevIssuer); if (issuer) { TRACE_(chain)("issuer found by issuer/serial number\n"); @@ -2088,7 +2088,7 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(const CertificateChainEngine *engine, id.dwIdChoice = CERT_ID_KEY_IDENTIFIER; memcpy(&id.u.KeyId, &info->KeyId, sizeof(CRYPT_HASH_BLOB)); - issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, prevIssuer); + issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, flags, prevIssuer); if (issuer) { TRACE_(chain)("issuer found by key id\n"); @@ -2133,7 +2133,7 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(const CertificateChainEngine *engine, &info->AuthorityCertSerialNumber, sizeof(CRYPT_INTEGER_BLOB)); - issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, prevIssuer); + issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, flags, prevIssuer); if (issuer) { TRACE_(chain)("issuer found by directory name\n"); @@ -2147,7 +2147,7 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(const CertificateChainEngine *engine, { id.dwIdChoice = CERT_ID_KEY_IDENTIFIER; memcpy(&id.u.KeyId, &info->KeyId, sizeof(CRYPT_HASH_BLOB)); - issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, prevIssuer); + issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, flags, prevIssuer); if (issuer) { TRACE_(chain)("issuer found by key id\n"); @@ -2160,7 +2160,7 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(const CertificateChainEngine *engine, else { issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_SUBJECT_NAME, - &subject->pCertInfo->Issuer, prevIssuer); + &subject->pCertInfo->Issuer, flags, prevIssuer); TRACE_(chain)("issuer found by name\n"); *infoStatus = CERT_TRUST_HAS_NAME_MATCH_ISSUER; } @@ -2171,7 +2171,7 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(const CertificateChainEngine *engine, * until reaching a self-signed cert, or until no issuer can be found. */ static BOOL CRYPT_BuildSimpleChain(const CertificateChainEngine *engine, - HCERTSTORE world, PCERT_SIMPLE_CHAIN chain) + HCERTSTORE world, DWORD flags, PCERT_SIMPLE_CHAIN chain) { BOOL ret = TRUE; PCCERT_CONTEXT cert = chain->rgpElement[chain->cElement - 1]->pCertContext; @@ -2179,7 +2179,7 @@ static BOOL CRYPT_BuildSimpleChain(const CertificateChainEngine *engine, while (ret && !CRYPT_IsSimpleChainCyclic(chain) && !CRYPT_IsCertificateSelfSigned(cert)) { - PCCERT_CONTEXT issuer = CRYPT_GetIssuer(engine, world, cert, NULL, + PCCERT_CONTEXT issuer = CRYPT_GetIssuer(engine, world, cert, NULL, flags, &chain->rgpElement[chain->cElement - 1]->TrustStatus.dwInfoStatus); if (issuer) @@ -2210,7 +2210,7 @@ static LPCSTR debugstr_filetime(LPFILETIME pTime) } static BOOL CRYPT_GetSimpleChainForCert(CertificateChainEngine *engine, - HCERTSTORE world, PCCERT_CONTEXT cert, LPFILETIME pTime, + HCERTSTORE world, PCCERT_CONTEXT cert, LPFILETIME pTime, DWORD flags, PCERT_SIMPLE_CHAIN *ppChain) { BOOL ret = FALSE; @@ -2226,7 +2226,7 @@ static BOOL CRYPT_GetSimpleChainForCert(CertificateChainEngine *engine, ret = CRYPT_AddCertToSimpleChain(engine, chain, cert, 0); if (ret) { - ret = CRYPT_BuildSimpleChain(engine, world, chain); + ret = CRYPT_BuildSimpleChain(engine, world, flags, chain); if (ret) CRYPT_CheckSimpleChain(engine, chain, pTime); } @@ -2241,7 +2241,7 @@ static BOOL CRYPT_GetSimpleChainForCert(CertificateChainEngine *engine, } static BOOL CRYPT_BuildCandidateChainFromCert(CertificateChainEngine *engine, - PCCERT_CONTEXT cert, LPFILETIME pTime, HCERTSTORE hAdditionalStore, + PCCERT_CONTEXT cert, LPFILETIME pTime, HCERTSTORE hAdditionalStore, DWORD flags, CertificateChain **ppChain) { PCERT_SIMPLE_CHAIN simpleChain = NULL; @@ -2256,7 +2256,7 @@ static BOOL CRYPT_BuildCandidateChainFromCert(CertificateChainEngine *engine, /* FIXME: only simple chains are supported for now, as CTLs aren't * supported yet. */ - if ((ret = CRYPT_GetSimpleChainForCert(engine, world, cert, pTime, &simpleChain))) + if ((ret = CRYPT_GetSimpleChainForCert(engine, world, cert, pTime, flags, &simpleChain))) { CertificateChain *chain = CryptMemAlloc(sizeof(CertificateChain)); @@ -2430,7 +2430,7 @@ static CertificateChain *CRYPT_CopyChainToElement(CertificateChain *chain, static CertificateChain *CRYPT_BuildAlternateContextFromChain( CertificateChainEngine *engine, LPFILETIME pTime, HCERTSTORE hAdditionalStore, - CertificateChain *chain) + DWORD flags, CertificateChain *chain) { CertificateChain *alternate; @@ -2462,7 +2462,7 @@ static CertificateChain *CRYPT_BuildAlternateContextFromChain( chain->context.rgpChain[i]->rgpElement[j + 1]->pCertContext); alternateIssuer = CRYPT_GetIssuer(engine, prevIssuer->hCertStore, - subject, prevIssuer, &infoStatus); + subject, prevIssuer, flags, &infoStatus); } if (alternateIssuer) { @@ -2481,7 +2481,7 @@ static CertificateChain *CRYPT_BuildAlternateContextFromChain( if (ret) { ret = CRYPT_BuildSimpleChain(engine, alternate->world, - alternate->context.rgpChain[i]); + flags, alternate->context.rgpChain[i]); if (ret) CRYPT_CheckSimpleChain(engine, alternate->context.rgpChain[i], pTime); @@ -2892,7 +2892,7 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, dump_chain_para(pChainPara); /* FIXME: what about HCCE_LOCAL_MACHINE? */ ret = CRYPT_BuildCandidateChainFromCert(engine, pCertContext, pTime, - hAdditionalStore, &chain); + hAdditionalStore, dwFlags, &chain); if (ret) { CertificateChain *alternate = NULL; @@ -2900,7 +2900,7 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, do { alternate = CRYPT_BuildAlternateContextFromChain(engine, - pTime, hAdditionalStore, chain); + pTime, hAdditionalStore, dwFlags, chain); /* Alternate contexts are added as "lower quality" contexts of * chain, to avoid loops in alternate chain creation. diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 96eafa2..ec53539 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3998,7 +3998,7 @@ static void testGetCertChain(void) ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); if(chain->TrustStatus.dwErrorStatus == CERT_TRUST_IS_PARTIAL_CHAIN) { /* win2k */ - todo_wine win_skip("winehq cert reported as partial chain, skipping its tests\n"); + win_skip("winehq cert reported as partial chain, skipping its tests\n"); pCertFreeCertificateChain(chain); CertCloseStore(store, 0); return;

1 0

Stefan Dösinger : ddraw: Create a sysmem surface if the format is not supported.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: b464067313bff1fd9a25b284b48a252025c4504f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b464067313bff1fd9a25b284b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 6 00:11:10 2013 +0200 ddraw: Create a sysmem surface if the format is not supported. --- dlls/ddraw/ddraw.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 15ab187..df4dcd6 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3000,6 +3000,27 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, ddrawformat_from_wined3dformat(&desc2.u4.ddpfPixelFormat, mode.format_id); } + if (!(desc2.ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) + && !(desc2.ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE)) + { + enum wined3d_format_id format = wined3dformat_from_ddrawformat(&desc2.u4.ddpfPixelFormat); + enum wined3d_resource_type rtype; + + if (desc2.ddsCaps.dwCaps & DDSCAPS_TEXTURE) + rtype = WINED3D_RTYPE_TEXTURE; + else if (desc2.ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) + rtype = WINED3D_RTYPE_CUBE_TEXTURE; + else + rtype = WINED3D_RTYPE_SURFACE; + + hr = wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, + mode.format_id, 0, rtype, format); + if (SUCCEEDED(hr)) + desc2.ddsCaps.dwCaps |= DDSCAPS_VIDEOMEMORY; + else + desc2.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; + } + /* No Width or no Height? Use the original screen size */ if(!(desc2.dwFlags & DDSD_WIDTH) ||

1 0

Stefan Dösinger : wined3d: Enforce texturing capability format restrictions on resource creation.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: 80638b6d2f2e9a6e71df59e2780ded768219739a URL: http://source.winehq.org/git/wine.git/?a=commit;h=80638b6d2f2e9a6e71df59e27… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 6 00:11:11 2013 +0200 wined3d: Enforce texturing capability format restrictions on resource creation. --- dlls/d3d8/texture.c | 3 +++ dlls/d3d9/texture.c | 3 +++ dlls/ddraw/surface.c | 13 ++++++++++++- dlls/wined3d/resource.c | 5 ++++- include/wine/wined3d.h | 1 + 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index c870612..2388267 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1197,6 +1197,7 @@ HRESULT texture_init(struct d3d8_texture *texture, struct d3d8_device *device, desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = usage & WINED3DUSAGE_MASK; + desc.usage |= WINED3DUSAGE_TEXTURE; desc.pool = pool; desc.width = width; desc.height = height; @@ -1237,6 +1238,7 @@ HRESULT cubetexture_init(struct d3d8_texture *texture, struct d3d8_device *devic desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = usage & WINED3DUSAGE_MASK; + desc.usage |= WINED3DUSAGE_TEXTURE; desc.pool = pool; desc.width = edge_length; desc.height = edge_length; @@ -1276,6 +1278,7 @@ HRESULT volumetexture_init(struct d3d8_texture *texture, struct d3d8_device *dev desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = usage & WINED3DUSAGE_MASK; + desc.usage |= WINED3DUSAGE_TEXTURE; desc.pool = pool; desc.width = width; desc.height = height; diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 7b46e6f..ad48205 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1321,6 +1321,7 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = usage & WINED3DUSAGE_MASK; + desc.usage |= WINED3DUSAGE_TEXTURE; desc.pool = pool; desc.width = width; desc.height = height; @@ -1361,6 +1362,7 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = usage & WINED3DUSAGE_MASK; + desc.usage |= WINED3DUSAGE_TEXTURE; desc.pool = pool; desc.width = edge_length; desc.height = edge_length; @@ -1400,6 +1402,7 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = usage & WINED3DUSAGE_MASK; + desc.usage |= WINED3DUSAGE_TEXTURE; desc.pool = pool; desc.width = width; desc.height = height; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index b7136e1..8627a84 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5608,16 +5608,27 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac layers = 1; if (desc->ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE) + { + wined3d_desc.usage = WINED3DUSAGE_TEXTURE; pool = WINED3D_POOL_MANAGED; + } else if (desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) + { + /* ddraw does not enforce format support restrictions on system memory + * textures. Don't set the texture flag, the texture can't be used for + * texturing anyway. */ + wined3d_desc.usage = 0; pool = WINED3D_POOL_SYSTEM_MEM; + } else + { + wined3d_desc.usage = WINED3DUSAGE_TEXTURE; pool = WINED3D_POOL_DEFAULT; + } wined3d_desc.format = wined3dformat_from_ddrawformat(&surface->surface_desc.u4.ddpfPixelFormat); wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; - wined3d_desc.usage = 0; wined3d_desc.pool = pool; wined3d_desc.width = desc->dwWidth; wined3d_desc.height = desc->dwHeight; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index e97af48..a677d00 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -70,7 +70,8 @@ static void resource_check_usage(DWORD usage) | WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_AUTOGENMIPMAP | WINED3DUSAGE_STATICDECL - | WINED3DUSAGE_OVERLAY; + | WINED3DUSAGE_OVERLAY + | WINED3DUSAGE_TEXTURE; if (usage & ~handled) FIXME("Unhandled usage flags %#x.\n", usage & ~handled); @@ -92,6 +93,8 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * return WINED3DERR_INVALIDCALL; if ((usage & WINED3DUSAGE_DEPTHSTENCIL) && !(format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) return WINED3DERR_INVALIDCALL; + if ((usage & WINED3DUSAGE_TEXTURE) && !(format->flags & WINED3DFMT_FLAG_TEXTURE)) + return WINED3DERR_INVALIDCALL; } resource->ref = 1; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bf4b392..423af91 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -824,6 +824,7 @@ enum wined3d_display_rotation #define WINED3DUSAGE_AUTOGENMIPMAP 0x00000400 #define WINED3DUSAGE_DMAP 0x00004000 #define WINED3DUSAGE_MASK 0x00004fff +#define WINED3DUSAGE_TEXTURE 0x10000000 #define WINED3DUSAGE_OWNDC 0x20000000 #define WINED3DUSAGE_STATICDECL 0x40000000 #define WINED3DUSAGE_OVERLAY 0x80000000

1 0