September 2013 - Wine-Commits

Henri Verbeet : wined3d: Rewrite surface_modify_location() on top of surface_validate_location() and surface_invalidate_location().
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

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

Nikolay Sivov : comctl32/tests: Manually load comctl32. dll with newly activated context.
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

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 Sept. 9, 2013

Sept. 9, 2013

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

Nikolay Sivov : comctl32: Fix LVS_OWNERDRAWFIXED handling in hittesting.
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

Module: wine Branch: master Commit: f13d8cc373c533714c2ecad11b2e39e4d6a18953 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f13d8cc373c533714c2ecad11… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 9 10:00:00 2013 +0400 comctl32: Fix LVS_OWNERDRAWFIXED handling in hittesting. --- dlls/comctl32/listview.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index cc90d65..17631b1 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7500,6 +7500,7 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, WCHAR szDispText[DISP_TEXT_SIZE] = { '\0' }; RECT rcBox, rcBounds, rcState, rcIcon, rcLabel, rcSearch; POINT Origin, Position, opt; + BOOL is_fullrow; LVITEMW lvItem; ITERATOR i; INT iItem; @@ -7623,15 +7624,17 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, TRACE("rcBounds=%s\n", wine_dbgstr_rect(&rcBounds)); if (!PtInRect(&rcBounds, opt)) return -1; + /* That's a special case - row rectangle is used as item rectangle and + returned flags contain all item parts. */ + is_fullrow = (infoPtr->uView == LV_VIEW_DETAILS) && ((infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) || (infoPtr->dwStyle & LVS_OWNERDRAWFIXED)); + if (PtInRect(&rcIcon, opt)) lpht->flags |= LVHT_ONITEMICON; else if (PtInRect(&rcLabel, opt)) lpht->flags |= LVHT_ONITEMLABEL; else if (infoPtr->himlState && PtInRect(&rcState, opt)) lpht->flags |= LVHT_ONITEMSTATEICON; - /* special case for LVS_EX_FULLROWSELECT */ - if (infoPtr->uView == LV_VIEW_DETAILS && infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT && - !(lpht->flags & LVHT_ONITEM)) + if (is_fullrow && !(lpht->flags & LVHT_ONITEM)) { lpht->flags = LVHT_ONITEM | LVHT_ABOVE; } @@ -7639,9 +7642,7 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, lpht->flags &= ~LVHT_NOWHERE; TRACE("lpht->flags=0x%x\n", lpht->flags); - if (select && !(infoPtr->uView == LV_VIEW_DETAILS && - ((infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) || - (infoPtr->dwStyle & LVS_OWNERDRAWFIXED)))) + if (select && !is_fullrow) { if (infoPtr->uView == LV_VIEW_DETAILS) {

1 0

Henri Verbeet : wined3d: Replace the "dirty" field in struct gl_texture with WINED3D_TEXTURE_ flags.
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

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

Nikolay Sivov : kernel32/tests: Added some activation context tests for SearchPath().
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

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

Francois Gouget : winegcc: Solaris uses the same link option detection code as other platforms.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

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

Bruno Jesus : ws2_32: Fix SO_ACCEPTCONN on BSD systems.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: b2170d845dda1570967a0f367e0d2222e985bd70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2170d845dda1570967a0f367… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Sep 6 09:14:00 2013 -0300 ws2_32: Fix SO_ACCEPTCONN on BSD systems. --- dlls/ws2_32/socket.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 38b47fc..d1256c1 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2855,7 +2855,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, { /* Handle common cases. The special cases are below, sorted * alphabetically */ - case WS_SO_ACCEPTCONN: case WS_SO_BROADCAST: case WS_SO_DEBUG: case WS_SO_ERROR: @@ -2875,7 +2874,20 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, } release_sock_fd( s, fd ); return ret; + case WS_SO_ACCEPTCONN: + if ( (fd = get_sock_fd( s, 0, NULL )) == -1) + return SOCKET_ERROR; + if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, optval, (socklen_t *)optlen) != 0 ) + { + SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + ret = SOCKET_ERROR; + } + + /* BSD returns != 0 while Windows return exact == 1 */ + if (*(int *)optval) *(int *)optval = 1; + release_sock_fd( s, fd ); + return ret; case WS_SO_DONTLINGER: { struct linger lingval;

1 0

Andrew Eikum : oleaut32: Correct TRACE statement.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: 52b1adcd6ecfe077207209acd585a0db754db3ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=52b1adcd6ecfe077207209acd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Sep 6 07:13:23 2013 -0500 oleaut32: Correct TRACE statement. --- dlls/oleaut32/typelib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 72d53a0..18c1e19 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5080,8 +5080,8 @@ static HRESULT WINAPI ITypeLib2_fnIsName( *pfName=FALSE; ITypeLib2_fnIsName_exit: - TRACE("(%p)slow! search for %s: %s found!\n", This, - debugstr_w(szNameBuf), *pfName?"NOT":""); + TRACE("(%p)slow! search for %s: %sfound!\n", This, + debugstr_w(szNameBuf), *pfName ? "" : "NOT "); return S_OK; }

1 0

Andrew Eikum : oleaut32: Apply TKIND_DISPATCH changes to FUNCDESC results from ITypeComp::Bind.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: cb1f4c5387c4440460c3a62ff55306e26474ef10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb1f4c5387c4440460c3a62ff… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Sep 6 07:13:17 2013 -0500 oleaut32: Apply TKIND_DISPATCH changes to FUNCDESC results from ITypeComp::Bind. --- dlls/oleaut32/tests/typelib.c | 32 ++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 11 +++++++++-- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index b873ac2..1c398f9 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1539,6 +1539,7 @@ static void test_CreateTypeLib(SYSKIND sys) { static OLECHAR param2W[] = {'p','a','r','a','m','2',0}; static OLECHAR asdfW[] = {'A','s','d','f',0}; static OLECHAR aliasW[] = {'a','l','i','a','s',0}; + static OLECHAR invokeW[] = {'I','n','v','o','k','e',0}; static OLECHAR *names1[] = {func1W, param1W, param2W}; static OLECHAR *names2[] = {func2W, param1W, param2W}; static OLECHAR *propname[] = {prop1W, param1W}; @@ -1555,6 +1556,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ITypeLib *tl, *stdole; ITypeInfo *interface1, *interface2, *dual, *unknown, *dispatch, *ti; ITypeInfo2 *ti2; + ITypeComp *tcomp; FUNCDESC funcdesc, *pfuncdesc; ELEMDESC elemdesc[5], *edesc; PARAMDESCEX paramdescex; @@ -1569,6 +1571,8 @@ static void test_CreateTypeLib(SYSKIND sys) { VARIANT cust_data; HRESULT hres; TYPEKIND kind; + DESCKIND desckind; + BINDPTR bindptr; switch(sys){ case SYS_WIN32: @@ -3443,6 +3447,34 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(typeattr->wMinorVerNum == 0, "wMinorVerNum = %d\n", typeattr->wMinorVerNum); ITypeInfo_ReleaseTypeAttr(ti, typeattr); + hres = ITypeInfo_GetTypeComp(ti, &tcomp); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ITypeComp_Bind(tcomp, invokeW, 0, INVOKE_FUNC, &interface1, &desckind, &bindptr); + ok(hres == S_OK, "got %08x\n", hres); + ok(desckind == DESCKIND_FUNCDESC, "got wrong desckind: 0x%x\n", desckind); + ok(bindptr.lpfuncdesc->memid == 0x60010003, "got %x\n", bindptr.lpfuncdesc->memid); + ok(bindptr.lpfuncdesc->lprgscode == NULL, "got %p\n", bindptr.lpfuncdesc->lprgscode); + ok(bindptr.lpfuncdesc->lprgelemdescParam != NULL, "got %p\n", bindptr.lpfuncdesc->lprgelemdescParam); + ok(bindptr.lpfuncdesc->funckind == FUNC_DISPATCH, "got 0x%x\n", bindptr.lpfuncdesc->funckind); + ok(bindptr.lpfuncdesc->invkind == INVOKE_FUNC, "got 0x%x\n", bindptr.lpfuncdesc->invkind); + ok(bindptr.lpfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", bindptr.lpfuncdesc->callconv); + ok(bindptr.lpfuncdesc->cParams == 8, "got %d\n", bindptr.lpfuncdesc->cParams); + ok(bindptr.lpfuncdesc->cParamsOpt == 0, "got %d\n", bindptr.lpfuncdesc->cParamsOpt); +#ifdef _WIN64 + if(sys == SYS_WIN32) + todo_wine ok(bindptr.lpfuncdesc->oVft == 6 * sizeof(void*), "got %x\n", bindptr.lpfuncdesc->oVft); + else +#endif + ok(bindptr.lpfuncdesc->oVft == 6 * sizeof(void*), "got %x\n", bindptr.lpfuncdesc->oVft); + ok(bindptr.lpfuncdesc->cScodes == 0, "got %d\n", bindptr.lpfuncdesc->cScodes); + ok(bindptr.lpfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", bindptr.lpfuncdesc->elemdescFunc.tdesc.vt); + ok(bindptr.lpfuncdesc->wFuncFlags == FUNCFLAG_FRESTRICTED, "got 0x%x\n", bindptr.lpfuncdesc->wFuncFlags); + + ITypeInfo_ReleaseFuncDesc(interface1, bindptr.lpfuncdesc); + ITypeInfo_Release(interface1); + ITypeComp_Release(tcomp); + hres = ITypeInfo_GetRefTypeOfImplType(ti, -1, &hreftype); ok(hres == S_OK, "got %08x\n", hres); ok(hreftype == -2, "got wrong hreftype: %x\n", hreftype); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 9c1127f..72d53a0 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -8475,7 +8475,7 @@ static HRESULT WINAPI ITypeComp_fnBind( for(fdc = 0; fdc < This->cFuncs; ++fdc){ pFDesc = &This->funcdescs[fdc]; - if (!strcmpiW(TLB_get_bstr(pFDesc->Name), szName)) { + if (!lstrcmpiW(TLB_get_bstr(pFDesc->Name), szName)) { if (!wFlags || (pFDesc->funcdesc.invkind & wFlags)) break; else @@ -8508,7 +8508,7 @@ static HRESULT WINAPI ITypeComp_fnBind( return S_OK; } } - /* FIXME: search each inherited interface, not just the first */ + if (hr == DISP_E_MEMBERNOTFOUND && This->impltypes) { /* recursive search */ ITypeInfo *pTInfo; @@ -8524,6 +8524,13 @@ static HRESULT WINAPI ITypeComp_fnBind( { hr = ITypeComp_Bind(pTComp, szName, lHash, wFlags, ppTInfo, pDescKind, pBindPtr); ITypeComp_Release(pTComp); + if (SUCCEEDED(hr) && *pDescKind == DESCKIND_FUNCDESC && + This->typekind == TKIND_DISPATCH) + { + FUNCDESC *tmp = pBindPtr->lpfuncdesc; + hr = TLB_AllocAndInitFuncDesc(tmp, &pBindPtr->lpfuncdesc, TRUE); + SysFreeString((BSTR)tmp); + } return hr; } WARN("Could not search inherited interface!\n");

1 0