September 2018 - Wine-Commits

Zebediah Figura : quartz/filtergraph: Pass an IFilterGraphImpl to create_enum_filters().
by Alexandre Julliard Sept. 18, 2018

Sept. 18, 2018

Module: wine Branch: master Commit: 84255df7201308273a02564da3f90ff6df3bafce URL: https://source.winehq.org/git/wine.git/?a=commit;h=84255df7201308273a02564d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 18 09:40:44 2018 -0500 quartz/filtergraph: Pass an IFilterGraphImpl to create_enum_filters(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 43 ++++++++++++++----------------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index f0e91cb..76cc0c7 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -211,15 +211,12 @@ struct enum_filters { IEnumFilters IEnumFilters_iface; LONG ref; - IGraphVersion *version_source; + IFilterGraphImpl *graph; LONG version; - IBaseFilter ***filters; - ULONG *count; ULONG index; }; -static HRESULT create_enum_filters(IGraphVersion *version_source, - IBaseFilter ***filters, ULONG *count, IEnumFilters **out); +static HRESULT create_enum_filters(IFilterGraphImpl *graph, IEnumFilters **out); static inline struct enum_filters *impl_from_IEnumFilters(IEnumFilters *iface) { @@ -261,7 +258,7 @@ static ULONG WINAPI EnumFilters_Release(IEnumFilters *iface) if (!ref) { - IGraphVersion_Release(enum_filters->version_source); + IUnknown_Release(enum_filters->graph->outer_unk); heap_free(enum_filters); } @@ -273,16 +270,13 @@ static HRESULT WINAPI EnumFilters_Next(IEnumFilters *iface, ULONG count, { struct enum_filters *enum_filters = impl_from_IEnumFilters(iface); unsigned int i, cFetched; - LONG version; - HRESULT hr; TRACE("enum_filters %p, count %u, filters %p, fetched %p.\n", enum_filters, count, filters, fetched); - cFetched = min(*enum_filters->count, enum_filters->index + count) - enum_filters->index; + cFetched = min(enum_filters->graph->nFilters, enum_filters->index + count) - enum_filters->index; - hr = IGraphVersion_QueryVersion(enum_filters->version_source, &version); - if (hr == S_OK && enum_filters->version != version) + if (enum_filters->version != enum_filters->graph->version) return VFW_E_ENUM_OUT_OF_SYNC; if (!filters) @@ -290,7 +284,7 @@ static HRESULT WINAPI EnumFilters_Next(IEnumFilters *iface, ULONG count, for (i = 0; i < cFetched; i++) { - filters[i] = (*enum_filters->filters)[enum_filters->index + i]; + filters[i] = enum_filters->graph->ppFiltersInGraph[enum_filters->index + i]; IBaseFilter_AddRef(filters[i]); } @@ -310,7 +304,7 @@ static HRESULT WINAPI EnumFilters_Skip(IEnumFilters *iface, ULONG count) TRACE("enum_filters %p, count %u.\n", enum_filters, count); - if (enum_filters->index + count < *enum_filters->count) + if (enum_filters->index + count < enum_filters->graph->nFilters) { enum_filters->index += count; return S_OK; @@ -321,15 +315,11 @@ static HRESULT WINAPI EnumFilters_Skip(IEnumFilters *iface, ULONG count) static HRESULT WINAPI EnumFilters_Reset(IEnumFilters *iface) { struct enum_filters *enum_filters = impl_from_IEnumFilters(iface); - LONG version; - HRESULT hr; TRACE("enum_filters %p.\n", enum_filters); enum_filters->index = 0; - hr = IGraphVersion_QueryVersion(enum_filters->version_source, &version); - if (hr == S_OK) - enum_filters->version = version; + enum_filters->version = enum_filters->graph->version; return S_OK; } @@ -340,7 +330,7 @@ static HRESULT WINAPI EnumFilters_Clone(IEnumFilters *iface, IEnumFilters **out) TRACE("enum_filters %p, out %p.\n", enum_filters, out); - hr = create_enum_filters(enum_filters->version_source, enum_filters->filters, enum_filters->count, out); + hr = create_enum_filters(enum_filters->graph, out); if (FAILED(hr)) return hr; return IEnumFilters_Skip(*out, enum_filters->index); @@ -357,12 +347,9 @@ static const IEnumFiltersVtbl EnumFilters_vtbl = EnumFilters_Clone, }; -static HRESULT create_enum_filters(IGraphVersion *version_source, - IBaseFilter ***filters, ULONG *count, IEnumFilters **out) +static HRESULT create_enum_filters(IFilterGraphImpl *graph, IEnumFilters **out) { struct enum_filters *enum_filters; - LONG version; - HRESULT hr; if (!(enum_filters = heap_alloc(sizeof(*enum_filters)))) return E_OUTOFMEMORY; @@ -370,11 +357,9 @@ static HRESULT create_enum_filters(IGraphVersion *version_source, enum_filters->IEnumFilters_iface.lpVtbl = &EnumFilters_vtbl; enum_filters->ref = 1; enum_filters->index = 0; - enum_filters->filters = filters; - enum_filters->count = count; - IGraphVersion_AddRef(enum_filters->version_source = version_source); - hr = IGraphVersion_QueryVersion(version_source, &version); - enum_filters->version = (hr == S_OK) ? version : 0; + enum_filters->graph = graph; + IUnknown_AddRef(graph->outer_unk); + enum_filters->version = graph->version; *out = &enum_filters->IEnumFilters_iface; return S_OK; @@ -738,7 +723,7 @@ static HRESULT WINAPI FilterGraph2_EnumFilters(IFilterGraph2 *iface, IEnumFilter TRACE("graph %p, out %p.\n", graph, out); - return create_enum_filters(&graph->IGraphVersion_iface, &graph->ppFiltersInGraph, &graph->nFilters, out); + return create_enum_filters(graph, out); } static HRESULT WINAPI FilterGraph2_FindFilterByName(IFilterGraph2 *iface,

1 0

Zebediah Figura : quartz: Merge enumfilters.c into filtergraph.c.
by Alexandre Julliard Sept. 18, 2018

Sept. 18, 2018

Module: wine Branch: master Commit: 0ac31b8a62f2dc7ae4a5a8b1e28ee209ee532cd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ac31b8a62f2dc7ae4a5a8b1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 18 09:40:43 2018 -0500 quartz: Merge enumfilters.c into filtergraph.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/Makefile.in | 1 - dlls/quartz/enumfilters.c | 215 ------------------------------------------- dlls/quartz/filtergraph.c | 182 +++++++++++++++++++++++++++++++++++- dlls/quartz/quartz_private.h | 1 - 4 files changed, 178 insertions(+), 221 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0ac31b8a62f2dc7ae4a5…

1 0

Zebediah Figura : quartz/filtergraph: Factor out find_filter_by_name().
by Alexandre Julliard Sept. 18, 2018

Sept. 18, 2018

Module: wine Branch: master Commit: f371176eb7bda2c9203720daa9577eb856f79594 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f371176eb7bda2c9203720da… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 18 09:40:42 2018 -0500 quartz/filtergraph: Factor out find_filter_by_name(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 60 +++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 59b7124..983e2c0 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -365,13 +365,26 @@ static ULONG WINAPI FilterGraph2_Release(IFilterGraph2 *iface) return IUnknown_Release(This->outer_unk); } +static IBaseFilter *find_filter_by_name(IFilterGraphImpl *graph, const WCHAR *name) +{ + unsigned int i; + + for (i = 0; i < graph->nFilters; ++i) + { + if (!strcmpW(graph->pFilterNames[i], name)) + return graph->ppFiltersInGraph[i]; + } + + return NULL; +} + /*** IFilterGraph methods ***/ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, IBaseFilter *pFilter, LPCWSTR pName) { IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); HRESULT hr; - int i,j; + int j; WCHAR* wszFilterName = NULL; BOOL duplicate_name = FALSE; @@ -382,16 +395,8 @@ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, IBaseFilter * wszFilterName = CoTaskMemAlloc( (pName ? strlenW(pName) + 6 : 5) * sizeof(WCHAR) ); - if (pName) - { - /* Check if name already exists */ - for(i = 0; i < This->nFilters; i++) - if (!strcmpW(This->pFilterNames[i], pName)) - { - duplicate_name = TRUE; - break; - } - } + if (pName && find_filter_by_name(This, pName)) + duplicate_name = TRUE; /* If no name given or name already existing, generate one */ if (!pName || duplicate_name) @@ -408,16 +413,11 @@ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, IBaseFilter * sprintfW(wszFilterName, wszFmt2, This->nameIndex); TRACE("Generated name %s\n", debugstr_w(wszFilterName)); - /* Check if the generated name already exists */ - for(i = 0; i < This->nFilters; i++) - if (!strcmpW(This->pFilterNames[i], wszFilterName)) - break; - - /* Compute next index and exit if generated name is suitable */ if (This->nameIndex++ == 10000) This->nameIndex = 1; - if (i == This->nFilters) - break; + + if (!find_filter_by_name(This, wszFilterName)) + break; } /* Unable to find a suitable name */ if (j == 10000) @@ -567,28 +567,22 @@ static HRESULT WINAPI FilterGraph2_EnumFilters(IFilterGraph2 *iface, IEnumFilter return IEnumFiltersImpl_Construct(&This->IGraphVersion_iface, &This->ppFiltersInGraph, &This->nFilters, ppEnum); } -static HRESULT WINAPI FilterGraph2_FindFilterByName(IFilterGraph2 *iface, LPCWSTR pName, - IBaseFilter **ppFilter) +static HRESULT WINAPI FilterGraph2_FindFilterByName(IFilterGraph2 *iface, + const WCHAR *name, IBaseFilter **filter) { - IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); - int i; + IFilterGraphImpl *graph = impl_from_IFilterGraph2(iface); - TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_w(pName), pName, ppFilter); + TRACE("graph %p, name %s, filter %p.\n", graph, debugstr_w(name), filter); - if (!ppFilter) + if (!filter) return E_POINTER; - for (i = 0; i < This->nFilters; i++) + if ((*filter = find_filter_by_name(graph, name))) { - if (!strcmpW(pName, This->pFilterNames[i])) - { - *ppFilter = This->ppFiltersInGraph[i]; - IBaseFilter_AddRef(*ppFilter); - return S_OK; - } + IBaseFilter_AddRef(*filter); + return S_OK; } - *ppFilter = NULL; return VFW_E_NOT_FOUND; }

1 0

Józef Kucia : dxgi/tests: Add test for swapchain formats.
by Alexandre Julliard Sept. 18, 2018

Sept. 18, 2018

Module: wine Branch: master Commit: d89ca410edba2fa765390fad528c64d0b39b2395 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d89ca410edba2fa765390fad… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 18 16:06:04 2018 +0200 dxgi/tests: Add test for swapchain formats. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 99 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 376c1ec..9ab2472 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -3804,7 +3804,7 @@ static void test_swapchain_backbuffer_index(IUnknown *device, BOOL is_d3d12) { swapchain_desc.SwapEffect = tests[i].swap_effect; expected_hr = is_d3d12 && !tests[i].supported_in_d3d12 ? DXGI_ERROR_INVALID_CALL : S_OK; - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); if (FAILED(hr)) continue; @@ -3837,6 +3837,102 @@ done: ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); } +static void test_swapchain_formats(IUnknown *device, BOOL is_d3d12) +{ + DXGI_SWAP_CHAIN_DESC swapchain_desc; + IDXGISwapChain *swapchain; + HRESULT hr, expected_hr; + IDXGIFactory *factory; + unsigned int i; + ULONG refcount; + BOOL is_flip; + RECT rect; + BOOL ret; + + static const struct + { + DXGI_FORMAT format; + DXGI_SWAP_EFFECT swap_effect; + BOOL supported; + } + tests[] = + { + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_SWAP_EFFECT_DISCARD, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_SWAP_EFFECT_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_SWAP_EFFECT_FLIP_DISCARD, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_SWAP_EFFECT_DISCARD, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_SWAP_EFFECT_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_SWAP_EFFECT_FLIP_DISCARD, FALSE}, + {DXGI_FORMAT_B8G8R8A8_UNORM, DXGI_SWAP_EFFECT_DISCARD, TRUE}, + {DXGI_FORMAT_B8G8R8A8_UNORM, DXGI_SWAP_EFFECT_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_B8G8R8A8_UNORM, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_B8G8R8A8_UNORM, DXGI_SWAP_EFFECT_FLIP_DISCARD, TRUE}, + {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, DXGI_SWAP_EFFECT_DISCARD, TRUE}, + {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, DXGI_SWAP_EFFECT_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, FALSE}, + {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, DXGI_SWAP_EFFECT_FLIP_DISCARD, FALSE}, + {DXGI_FORMAT_R10G10B10A2_UNORM, DXGI_SWAP_EFFECT_DISCARD, TRUE}, + {DXGI_FORMAT_R10G10B10A2_UNORM, DXGI_SWAP_EFFECT_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_R10G10B10A2_UNORM, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_R10G10B10A2_UNORM, DXGI_SWAP_EFFECT_FLIP_DISCARD, TRUE}, + {DXGI_FORMAT_R16G16B16A16_FLOAT, DXGI_SWAP_EFFECT_DISCARD, TRUE}, + {DXGI_FORMAT_R16G16B16A16_FLOAT, DXGI_SWAP_EFFECT_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_R16G16B16A16_FLOAT, DXGI_SWAP_EFFECT_FLIP_DISCARD, TRUE}, + {DXGI_FORMAT_R16G16B16A16_FLOAT, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM, DXGI_SWAP_EFFECT_FLIP_DISCARD, FALSE}, + {DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, FALSE}, + }; + + get_factory(device, is_d3d12, &factory); + + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 4; + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + swapchain_desc.Windowed = TRUE; + swapchain_desc.Flags = 0; + + ret = GetClientRect(swapchain_desc.OutputWindow, &rect); + ok(ret, "Failed to get client rect.\n"); + swapchain_desc.BufferDesc.Width = rect.right; + swapchain_desc.BufferDesc.Height = rect.bottom; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + is_flip = tests[i].swap_effect == DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL + || tests[i].swap_effect == DXGI_SWAP_EFFECT_FLIP_DISCARD; + + if (is_d3d12 && !is_flip) + continue; + + swapchain_desc.BufferDesc.Format = tests[i].format; + swapchain_desc.SwapEffect = tests[i].swap_effect; + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); + expected_hr = tests[i].supported ? S_OK : DXGI_ERROR_INVALID_CALL; + ok(hr == expected_hr + /* Flip presentation model not supported. */ + || broken(is_flip && hr == DXGI_ERROR_INVALID_CALL), + "Test %u: Got hr %#x, expected %#x.\n", i, hr, expected_hr); + + if (SUCCEEDED(hr)) + { + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "Swapchain has %u references left.\n", refcount); + } + } + + DestroyWindow(swapchain_desc.OutputWindow); + refcount = IDXGIFactory_Release(factory); + ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); +} + static void test_maximum_frame_latency(void) { IDXGIDevice1 *device1; @@ -4210,6 +4306,7 @@ START_TEST(dxgi) test_swapchain_parameters(); run_on_d3d10(test_swapchain_resize); run_on_d3d10(test_swapchain_backbuffer_index); + run_on_d3d10(test_swapchain_formats); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) { @@ -4228,6 +4325,7 @@ START_TEST(dxgi) run_on_d3d12(test_swapchain_resize); run_on_d3d12(test_swapchain_backbuffer_index); + run_on_d3d12(test_swapchain_formats); FreeLibrary(d3d12_module); }

1 0

Gabriel Ivăncescu : shell32/autocomplete: Move the autocomplete processing and WM_KEYUP to separate functions.
by Alexandre Julliard Sept. 18, 2018

Sept. 18, 2018

Module: wine Branch: master Commit: 779c5134626141dbfc2f2827651c80f7e0774566 URL: https://source.winehq.org/git/wine.git/?a=commit;h=779c5134626141dbfc2f2827… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 17 22:23:09 2018 +0300 shell32/autocomplete: Move the autocomplete processing and WM_KEYUP to separate functions. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 336 ++++++++++++++++++++++++-------------------- 1 file changed, 182 insertions(+), 154 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=779c5134626141dbfc2f…

1 0

Zhiyi Zhang : comdlg32/tests: Fix crashes.
by Alexandre Julliard Sept. 18, 2018

Sept. 18, 2018

Module: wine Branch: master Commit: b89e0e70e03fa842ceab6a2138ddf36175a9662d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b89e0e70e03fa842ceab6a21… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Sep 13 17:54:12 2018 +0800 comdlg32/tests: Fix crashes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/tests/itemdlg.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index d28e682..96c375a 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -1032,10 +1032,14 @@ static void test_advise_helper(IFileDialog *pfd) pfde = IFileDialogEvents_Constructor(); pfdeimpl = impl_from_IFileDialogEvents(pfde); - hr = IFileDialog_Advise(pfd, NULL, NULL); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - hr = IFileDialog_Advise(pfd, pfde, NULL); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + /* Null pointer tests crash on Windows 10 16299 or newer */ + if (0) + { + hr = IFileDialog_Advise(pfd, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IFileDialog_Advise(pfd, pfde, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + } hr = IFileDialog_Advise(pfd, NULL, &cookie[0]); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(pfdeimpl->ref == 1, "got ref %d\n", pfdeimpl->ref);

1 0

Zhiyi Zhang : wineboot: Create user folders if they don't exist.
by Alexandre Julliard Sept. 18, 2018

Sept. 18, 2018

Module: wine Branch: master Commit: 193fc956287bd2e2d611a44e4b36a3e5e9021432 URL: https://source.winehq.org/git/wine.git/?a=commit;h=193fc956287bd2e2d611a44e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Sep 17 23:32:10 2018 +0800 wineboot: Create user folders if they don't exist. When creating volatile environment registry keys during first wineprefix creation, none of the user folders are existent. Create them before setting registry keys so that volatile environment gets initialized and corresponding environment variables such as %USERPROFILE% can be set. Otherwise, such environment variables are set only after another wineboot, causing applications to fail if they need them after first boot. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 17ef9cb..075b4c8 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -385,14 +385,14 @@ static void create_volatile_environment_registry_key(void) KEY_ALL_ACCESS, NULL, &hkey, NULL )) return; - hr = SHGetFolderPathW( NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, path ); + hr = SHGetFolderPathW( NULL, CSIDL_APPDATA | CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, path ); if (SUCCEEDED(hr)) set_reg_value( hkey, AppDataW, path ); set_reg_value( hkey, ClientNameW, ConsoleW ); /* Write the profile path's drive letter and directory components into * HOMEDRIVE and HOMEPATH respectively. */ - hr = SHGetFolderPathW( NULL, CSIDL_PROFILE, NULL, SHGFP_TYPE_CURRENT, path ); + hr = SHGetFolderPathW( NULL, CSIDL_PROFILE | CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, path ); if (SUCCEEDED(hr)) { set_reg_value( hkey, UserProfileW, path ); @@ -406,7 +406,7 @@ static void create_volatile_environment_registry_key(void) set_reg_value( hkey, HomeShareW, EmptyW ); - hr = SHGetFolderPathW( NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, path ); + hr = SHGetFolderPathW( NULL, CSIDL_LOCAL_APPDATA | CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, path ); if (SUCCEEDED(hr)) set_reg_value( hkey, LocalAppDataW, path );

1 0

Zebediah Figura : quartz/tests: Rewrite test_render_filter_priority().
by Alexandre Julliard Sept. 18, 2018

Sept. 18, 2018

Module: wine Branch: master Commit: f2a8d53580f6d01c6d8943cae36e662b1bd44053 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2a8d53580f6d01c6d8943ca… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 18 09:40:46 2018 -0500 quartz/tests: Rewrite test_render_filter_priority(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 1722 ++++++++++++--------------------------- 1 file changed, 527 insertions(+), 1195 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f2a8d53580f6d01c6d89…

1 0

Michael Stefaniuc : uxtheme: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Sept. 18, 2018

Sept. 18, 2018

Module: wine Branch: master Commit: 93994dfc0b99789e3a9c1490b4d93082f34b8dcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=93994dfc0b99789e3a9c1490… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Sep 18 20:38:19 2018 +0200 uxtheme: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 5 ++--- dlls/uxtheme/metric.c | 2 +- dlls/uxtheme/msstyles.c | 22 +++++++++++----------- dlls/uxtheme/property.c | 4 ++-- dlls/uxtheme/stylemap.c | 2 +- dlls/uxtheme/system.c | 46 +++++++++++++++++++++------------------------- 6 files changed, 38 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=93994dfc0b99789e3a9c…

1 0

Joris van der Wel : advapi32/tests: Add additional tests for passing a thread sd to CreateProcess.
by Alexandre Julliard Sept. 18, 2018

Sept. 18, 2018

Module: wine Branch: master Commit: adede14dc248b7ec1bd1420270c55e8503b331f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adede14dc248b7ec1bd14202… Author: Joris van der Wel <joris(a)jorisvanderwel.com> Date: Tue Sep 18 21:07:17 2018 +0200 advapi32/tests: Add additional tests for passing a thread sd to CreateProcess. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 45 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 41b1fe0..6424d4b 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2862,12 +2862,12 @@ static void test_process_security(void) PTOKEN_OWNER owner; PTOKEN_PRIMARY_GROUP group; PSID AdminSid = NULL, UsersSid = NULL; - PACL Acl = NULL; - SECURITY_DESCRIPTOR *SecurityDescriptor = NULL; + PACL Acl = NULL, ThreadAcl = NULL; + SECURITY_DESCRIPTOR *SecurityDescriptor = NULL, *ThreadSecurityDescriptor = NULL; char buffer[MAX_PATH]; PROCESS_INFORMATION info; STARTUPINFOA startup; - SECURITY_ATTRIBUTES psa; + SECURITY_ATTRIBUTES psa, tsa; HANDLE token, event; DWORD size; SID_IDENTIFIER_AUTHORITY SIDAuthWorld = { SECURITY_WORLD_SID_AUTHORITY }; @@ -2988,11 +2988,36 @@ static void test_process_security(void) psa.lpSecurityDescriptor = SecurityDescriptor; psa.bInheritHandle = TRUE; + ThreadSecurityDescriptor = HeapAlloc( GetProcessHeap(), 0, SECURITY_DESCRIPTOR_MIN_LENGTH ); + res = InitializeSecurityDescriptor( ThreadSecurityDescriptor, SECURITY_DESCRIPTOR_REVISION ); + ok(res, "InitializeSecurityDescriptor failed with error %d\n", GetLastError()); + + ThreadAcl = HeapAlloc( GetProcessHeap(), 0, 256 ); + res = InitializeAcl( ThreadAcl, 256, ACL_REVISION ); + ok(res, "InitializeAcl failed with error %d\n", GetLastError()); + res = AddAccessDeniedAce( ThreadAcl, ACL_REVISION, THREAD_SET_THREAD_TOKEN, AdminSid ); + ok(res, "AddAccessDeniedAce failed with error %d\n", GetLastError() ); + res = AddAccessAllowedAce( ThreadAcl, ACL_REVISION, THREAD_ALL_ACCESS, AdminSid ); + ok(res, "AddAccessAllowedAce failed with error %d\n", GetLastError()); + + res = SetSecurityDescriptorOwner( ThreadSecurityDescriptor, AdminSid, FALSE ); + ok(res, "SetSecurityDescriptorOwner failed with error %d\n", GetLastError()); + res = SetSecurityDescriptorGroup( ThreadSecurityDescriptor, UsersSid, FALSE ); + ok(res, "SetSecurityDescriptorGroup failed with error %d\n", GetLastError()); + res = SetSecurityDescriptorDacl( ThreadSecurityDescriptor, TRUE, ThreadAcl, FALSE ); + ok(res, "SetSecurityDescriptorDacl failed with error %d\n", GetLastError()); + + tsa.nLength = sizeof(tsa); + tsa.lpSecurityDescriptor = ThreadSecurityDescriptor; + tsa.bInheritHandle = TRUE; + /* Doesn't matter what ACL say we should get full access for ourselves */ - res = CreateProcessA( NULL, buffer, &psa, NULL, FALSE, 0, NULL, NULL, &startup, &info ); + res = CreateProcessA( NULL, buffer, &psa, &tsa, FALSE, 0, NULL, NULL, &startup, &info ); ok(res, "CreateProcess with err:%d\n", GetLastError()); TEST_GRANTED_ACCESS2( info.hProcess, PROCESS_ALL_ACCESS_NT4, STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL ); + TEST_GRANTED_ACCESS2( info.hThread, THREAD_ALL_ACCESS_NT4, + STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL ); winetest_wait_child_process( info.hProcess ); FreeSid(EveryoneSid); @@ -3003,6 +3028,8 @@ static void test_process_security(void) HeapFree(GetProcessHeap(), 0, owner); HeapFree(GetProcessHeap(), 0, Acl); HeapFree(GetProcessHeap(), 0, SecurityDescriptor); + HeapFree(GetProcessHeap(), 0, ThreadAcl); + HeapFree(GetProcessHeap(), 0, ThreadSecurityDescriptor); } static void test_process_security_child(void) @@ -3061,6 +3088,16 @@ static void test_process_security_child(void) TEST_GRANTED_ACCESS( handle1, PROCESS_VM_READ ); CloseHandle( handle1 ); CloseHandle( handle ); + + /* Test thread security */ + handle = OpenThread( THREAD_TERMINATE, FALSE, GetCurrentThreadId() ); + ok(handle != NULL, "OpenThread(THREAD_TERMINATE) with err:%d\n", GetLastError()); + TEST_GRANTED_ACCESS( handle, PROCESS_TERMINATE ); + CloseHandle( handle ); + + handle = OpenThread( THREAD_SET_THREAD_TOKEN, FALSE, GetCurrentThreadId() ); + todo_wine + ok(handle == NULL, "OpenThread(THREAD_SET_THREAD_TOKEN) should have failed\n"); } static void test_impersonation_level(void)

1 0