April 2021 - Wine-Commits - list.winehq.org

Connor McAdams : include: Don't pack XACT_RUNTIME_PARAMETERS structure.
by Alexandre Julliard April 23, 2021

April 23, 2021

Module: wine Branch: master Commit: a1069854cfb2de481c6be2eef16952dd48ac56e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1069854cfb2de481c6be2ee… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Apr 22 16:10:10 2021 -0400 include: Don't pack XACT_RUNTIME_PARAMETERS structure. Move the XACT_RUNTIME_PARAMETERS structure definition outside of the packing directive that the other structures are placed within. It isn't packed in Windows, and was included with the others by mistake. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/xact3.h | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/include/xact3.h b/include/xact3.h index 9b8f480829e..a1df1a51330 100644 --- a/include/xact3.h +++ b/include/xact3.h @@ -354,23 +354,6 @@ typedef struct XACT_NOTIFICATION_CUE } XACT_NOTIFICATION_CUE, *LPXACT_NOTIFICATION_CUE; typedef const XACT_NOTIFICATION_CUE *LPCXACT_NOTIFICATION_CUE; -typedef struct XACT_WAVE_PROPERTIES -{ - char friendlyName[WAVEBANK_ENTRYNAME_LENGTH]; - WAVEBANKMINIWAVEFORMAT format; - DWORD durationInSamples; - WAVEBANKSAMPLEREGION loopRegion; - BOOL streaming; -} XACT_WAVE_PROPERTIES, *LPXACT_WAVE_PROPERTIES; -typedef const XACT_WAVE_PROPERTIES *LPCXACT_WAVE_PROPERTIES; - -typedef struct XACT_WAVE_INSTANCE_PROPERTIES -{ - XACT_WAVE_PROPERTIES properties; - BOOL backgroundMusic; -} XACT_WAVE_INSTANCE_PROPERTIES, *LPXACT_WAVE_INSTANCE_PROPERTIES; -typedef const XACT_WAVE_INSTANCE_PROPERTIES *LPCXACT_WAVE_INSTANCE_PROPERTIES; - typedef struct XACT_NOTIFICATION_MARKER { XACTINDEX cueIndex; @@ -442,6 +425,25 @@ typedef void (__stdcall *XACT_NOTIFICATION_CALLBACK)( const XACT_NOTIFICATION *pNotification ); +#include <poppack.h> + +typedef struct XACT_WAVE_PROPERTIES +{ + char friendlyName[WAVEBANK_ENTRYNAME_LENGTH]; + WAVEBANKMINIWAVEFORMAT format; + DWORD durationInSamples; + WAVEBANKSAMPLEREGION loopRegion; + BOOL streaming; +} XACT_WAVE_PROPERTIES, *LPXACT_WAVE_PROPERTIES; +typedef const XACT_WAVE_PROPERTIES *LPCXACT_WAVE_PROPERTIES; + +typedef struct XACT_WAVE_INSTANCE_PROPERTIES +{ + XACT_WAVE_PROPERTIES properties; + BOOL backgroundMusic; +} XACT_WAVE_INSTANCE_PROPERTIES, *LPXACT_WAVE_INSTANCE_PROPERTIES; +typedef const XACT_WAVE_INSTANCE_PROPERTIES *LPCXACT_WAVE_INSTANCE_PROPERTIES; + typedef struct XACT_RUNTIME_PARAMETERS { DWORD lookAheadTime; @@ -457,8 +459,6 @@ typedef struct XACT_RUNTIME_PARAMETERS } XACT_RUNTIME_PARAMETERS, *LPXACT_RUNTIME_PARAMETERS; typedef const XACT_RUNTIME_PARAMETERS *LPCXACT_RUNTIME_PARAMETERS; -#include <poppack.h> - #define XACT_FLAG_CUE_STOP_RELEASE XACT_FLAG_STOP_RELEASE #define XACT_FLAG_CUE_STOP_IMMEDIATE XACT_FLAG_STOP_IMMEDIATE

1 0

Francois Gouget : mfplat/tests: Fix an event queue refcounting test on Vista.
by Alexandre Julliard April 23, 2021

April 23, 2021

Module: wine Branch: master Commit: 730b30aacfc170850acd8f4acb8d9d552f10cf7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=730b30aacfc170850acd8f4a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 21 20:20:48 2021 +0200 mfplat/tests: Fix an event queue refcounting test on Vista. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index b6468b5da9b..89547be0a4f 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3129,7 +3129,9 @@ static void test_event_queue(void) EXPECT_REF(&callback.IMFAsyncCallback_iface, 2); IMFMediaEventQueue_Release(queue); - EXPECT_REF(&callback.IMFAsyncCallback_iface, 1); + ret = get_refcount(&callback.IMFAsyncCallback_iface); + ok(ret == 1 || broken(ret == 2) /* Vista */, + "Unexpected refcount %d, expected 1.\n", ret); hr = MFShutdown(); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr);

1 0

Francois Gouget : winetest/gather: Show skipped dlls on the index pages.
by Alexandre Julliard April 23, 2021

April 23, 2021

Module: tools Branch: master Commit: 1c54a9c253cf9efc9cf00bd0076076a34ddbe58b URL: https://source.winehq.org/git/tools.git/?a=commit;h=1c54a9c253cf9efc9cf00bd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 23 11:22:48 2021 +0200 winetest/gather: Show skipped dlls on the index pages. Sucessful tests are omitted from the index pages except if they skipped some checks. So it makes sense to also show test units that were skipped entirely. Note also that their label (skipped instead of 0) makes it possible to distinguish the two cases. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/gather b/winetest/gather index 2a23f0a..fa5525b 100755 --- a/winetest/gather +++ b/winetest/gather @@ -505,7 +505,7 @@ foreach my $group (@groups) { merge_status( $test_results{$testname}->{$group->{name}}, $report->{$testname} ); } $group->{$testname} = $group_result; - if ($group_result->{status} =~ /^(?:missing(?:dll|sxs)|skipped|stub)$/ or + if ($group_result->{status} =~ /^(?:missing(?:dll|sxs)|stub)$/ or ($group_result->{status} eq "run" and $group_result->{errors}->[1] == 0 and $group_result->{todos}->[1] == 0 and

1 0

Nikolay Sivov : mfplat: Reduce duplication in MFCreateMFVideoFormatFromMFMediaType() for ratio attributes.
by Alexandre Julliard April 22, 2021

April 22, 2021

Module: wine Branch: master Commit: 895bb6f260e5c73cf49d417ac7fafe1a4d4cb769 URL: https://source.winehq.org/git/wine.git/?a=commit;h=895bb6f260e5c73cf49d417a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 22 09:25:34 2021 +0300 mfplat: Reduce duplication in MFCreateMFVideoFormatFromMFMediaType() for ratio attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index e0dbb6a1a78..fb90053c605 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -3063,10 +3063,16 @@ HRESULT WINAPI MFCreateVideoMediaTypeFromSubtype(const GUID *subtype, IMFVideoMe return S_OK; } -static void media_type_get_ratio(UINT64 value, UINT32 *numerator, UINT32 *denominator) +static void media_type_get_ratio(IMFMediaType *media_type, const GUID *attr, UINT32 *numerator, + UINT32 *denominator) { - *numerator = value >> 32; - *denominator = value; + UINT64 value; + + if (SUCCEEDED(IMFMediaType_GetUINT64(media_type, attr, &value))) + { + *numerator = value >> 32; + *denominator = value; + } } /*********************************************************************** @@ -3076,7 +3082,6 @@ HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MF { UINT32 flags, palette_size = 0, avgrate; MFVIDEOFORMAT *format; - UINT64 value; INT32 stride; GUID guid; @@ -3101,14 +3106,11 @@ HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MF format->surfaceInfo.Format = guid.Data1; } - if (SUCCEEDED(IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &value))) - media_type_get_ratio(value, &format->videoInfo.dwWidth, &format->videoInfo.dwHeight); - - if (SUCCEEDED(IMFMediaType_GetUINT64(media_type, &MF_MT_PIXEL_ASPECT_RATIO, &value))) - { - media_type_get_ratio(value, &format->videoInfo.PixelAspectRatio.Numerator, - &format->videoInfo.PixelAspectRatio.Denominator); - } + media_type_get_ratio(media_type, &MF_MT_FRAME_SIZE, &format->videoInfo.dwWidth, &format->videoInfo.dwHeight); + media_type_get_ratio(media_type, &MF_MT_PIXEL_ASPECT_RATIO, &format->videoInfo.PixelAspectRatio.Numerator, + &format->videoInfo.PixelAspectRatio.Denominator); + media_type_get_ratio(media_type, &MF_MT_FRAME_RATE, &format->videoInfo.FramesPerSecond.Numerator, + &format->videoInfo.FramesPerSecond.Denominator); IMFMediaType_GetUINT32(media_type, &MF_MT_VIDEO_CHROMA_SITING, &format->videoInfo.SourceChromaSubsampling); IMFMediaType_GetUINT32(media_type, &MF_MT_INTERLACE_MODE, &format->videoInfo.InterlaceMode); @@ -3116,13 +3118,6 @@ HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MF IMFMediaType_GetUINT32(media_type, &MF_MT_VIDEO_PRIMARIES, &format->videoInfo.ColorPrimaries); IMFMediaType_GetUINT32(media_type, &MF_MT_YUV_MATRIX, &format->videoInfo.TransferMatrix); IMFMediaType_GetUINT32(media_type, &MF_MT_VIDEO_LIGHTING, &format->videoInfo.SourceLighting); - - if (SUCCEEDED(IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_RATE, &value))) - { - media_type_get_ratio(value, &format->videoInfo.FramesPerSecond.Numerator, - &format->videoInfo.FramesPerSecond.Denominator); - } - IMFMediaType_GetUINT32(media_type, &MF_MT_VIDEO_NOMINAL_RANGE, &format->videoInfo.NominalRange); IMFMediaType_GetBlob(media_type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)&format->videoInfo.GeometricAperture, sizeof(format->videoInfo.GeometricAperture), NULL);

1 0

Paul Gofman : mmdevapi: Return success from SAORS_GetAvailableDynamicObjectCount().
by Alexandre Julliard April 22, 2021

April 22, 2021

Module: wine Branch: master Commit: 11daf1869078a60ed2588ff5a61a4d9b27985beb URL: https://source.winehq.org/git/wine.git/?a=commit;h=11daf1869078a60ed2588ff5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Apr 21 19:00:23 2021 +0300 mmdevapi: Return success from SAORS_GetAvailableDynamicObjectCount(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Arkadiusz Hiler <arek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/spatialaudio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/spatialaudio.c b/dlls/mmdevapi/spatialaudio.c index 597c2d29933..12ddd5e790a 100644 --- a/dlls/mmdevapi/spatialaudio.c +++ b/dlls/mmdevapi/spatialaudio.c @@ -303,7 +303,9 @@ static HRESULT WINAPI SAORS_GetAvailableDynamicObjectCount( { SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); FIXME("(%p)->(%p)\n", This, count); - return E_NOTIMPL; + + *count = 0; + return S_OK; } static HRESULT WINAPI SAORS_GetService(ISpatialAudioObjectRenderStream *iface,

1 0

Jacek Caban : winegcc: Use -idirafter for system include paths.
by Alexandre Julliard April 22, 2021

April 22, 2021

Module: wine Branch: master Commit: 5a1d836def24043b4e7afcdc8cf1342223957edf URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a1d836def24043b4e7afcdc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 22 18:30:52 2021 +0200 winegcc: Use -idirafter for system include paths. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50996 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 694e2544a24..bf72b612034 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -904,6 +904,7 @@ no_compat_defines: const char *incl_dirs[] = { INCLUDEDIR, "/usr/include", "/usr/local/include" }; const char *root = opts->isysroot ? opts->isysroot : opts->sysroot ? opts->sysroot : ""; const char *isystem = gcc_defs ? "-isystem" : "-I"; + const char *idirafter = gcc_defs ? "-idirafter" : "-I"; if (opts->use_msvcrt) { @@ -915,17 +916,16 @@ no_compat_defines: } strarray_add(comp_args, "-D__MSVCRT__"); } - if (includedir) strarray_add( comp_args, strmake( "%s%s/wine/windows", isystem, includedir )); - for (j = 0; j < ARRAY_SIZE(incl_dirs); j++) + if (includedir) { - if (j && !strcmp( incl_dirs[0], incl_dirs[j] )) continue; - strarray_add(comp_args, strmake( "%s%s%s/wine/windows", isystem, root, incl_dirs[j] )); + strarray_add( comp_args, strmake( "%s%s/wine/windows", isystem, includedir )); + strarray_add( comp_args, strmake( "%s%s", idirafter, includedir )); } - if (includedir) strarray_add( comp_args, strmake( "%s%s", isystem, includedir )); for (j = 0; j < ARRAY_SIZE(incl_dirs); j++) { if (j && !strcmp( incl_dirs[0], incl_dirs[j] )) continue; - strarray_add(comp_args, strmake( "%s%s%s", isystem, root, incl_dirs[j] )); + strarray_add(comp_args, strmake( "%s%s%s/wine/windows", isystem, root, incl_dirs[j] )); + strarray_add(comp_args, strmake( "%s%s%s", idirafter, root, incl_dirs[j] )); } } else if (opts->wine_objdir)

1 0

Andrey Turkin : ieframe: Implement IWebBrowser2::get_LocationName().
by Alexandre Julliard April 22, 2021

April 22, 2021

Module: wine Branch: master Commit: 92713253ab4662127c5c1e2b7f35b358585cc215 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92713253ab4662127c5c1e2b… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Thu Apr 22 18:48:17 2021 +0200 ieframe: Implement IWebBrowser2::get_LocationName(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12457 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 15 +++++++++++++++ dlls/ieframe/webbrowser.c | 21 +++++++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index ab0345b79b5..864a8baf27f 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -263,6 +263,19 @@ static void _test_LocationURL(unsigned line, IWebBrowser2 *wb, const WCHAR *exur } } +#define test_LocationName(a,b) _test_LocationName(__LINE__,a,b) +static void _test_LocationName(unsigned line, IWebBrowser2 *wb, const WCHAR *exname) +{ + BSTR name = (void*)0xdeadbeef; + HRESULT hres; + + hres = IWebBrowser2_get_LocationName(wb, &name); + ok_(__FILE__,line) (hres == (*exname ? S_OK : S_FALSE), "get_LocationName failed: %08x\n", hres); + ok_(__FILE__,line) (!lstrcmpW(name, exname) || broken(is_http && !lstrcmpW(name, current_url)) /* Win10 2004 */, + "expected %s, got %s\n", wine_dbgstr_w(exname), wine_dbgstr_w(name)); + SysFreeString(name); +} + #define test_ready_state(a,b) _test_ready_state(__LINE__,a,b) static void _test_ready_state(unsigned line, READYSTATE exstate, VARIANT_BOOL expect_busy) { @@ -2800,11 +2813,13 @@ static void test_ConnectionPoint(IWebBrowser2 *unk, BOOL init) static void test_Navigate2(IWebBrowser2 *webbrowser, const WCHAR *nav_url) { + const WCHAR *title = L"WineHQ - Run Windows applications on Linux, BSD, Solaris and Mac OS X"; VARIANT url; BOOL is_file; HRESULT hres; test_LocationURL(webbrowser, is_first_load ? L"" : current_url); + test_LocationName(webbrowser, is_first_load ? L"" : (is_http ? title : current_url)); test_ready_state(is_first_load ? READYSTATE_UNINITIALIZED : READYSTATE_COMPLETE, VARIANT_FALSE); is_http = !memcmp(nav_url, "http:", 5); diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 87b74b8e01f..26ce666b4ba 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -539,8 +539,25 @@ static HRESULT WINAPI WebBrowser_put_Height(IWebBrowser2 *iface, LONG Height) static HRESULT WINAPI WebBrowser_get_LocationName(IWebBrowser2 *iface, BSTR *LocationName) { WebBrowser *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, LocationName); - return E_NOTIMPL; + IHTMLDocument2 *doc; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, LocationName); + + if(This->doc_host.document && + SUCCEEDED(IUnknown_QueryInterface(This->doc_host.document, &IID_IHTMLDocument2, (void **)&doc))) { + hres = IHTMLDocument2_get_title(doc, LocationName); + if(hres == S_OK && !SysStringLen(*LocationName)) { + SysFreeString(*LocationName); + hres = get_location_url(&This->doc_host, LocationName); + } + IHTMLDocument2_Release(doc); + } else { + *LocationName = SysAllocString(L""); + hres = S_FALSE; + } + + return hres; } static HRESULT WINAPI WebBrowser_get_LocationURL(IWebBrowser2 *iface, BSTR *LocationURL)

1 0

Gijs Vermeulen : dbghelp: Implement SymFromNameW().
by Alexandre Julliard April 22, 2021

April 22, 2021

Module: wine Branch: master Commit: 8d260b40fca92a3423b7764a8b6b803e8c74b46d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d260b40fca92a3423b7764a… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Apr 22 12:20:18 2021 +0200 dbghelp: Implement SymFromNameW(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50829 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/symbol.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index b17c7b18655..73455c547e8 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -75,7 +75,7 @@ @ stdcall SymFromIndex(long int64 long ptr) @ stdcall SymFromIndexW(long int64 long ptr) @ stdcall SymFromName(long str ptr) -@ stub SymFromNameW +@ stdcall SymFromNameW(long wstr ptr) @ stub SymFromToken @ stub SymFromTokenW @ stdcall SymFunctionTableAccess(long long) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 2ca85a6d6e8..b2b4d578910 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1404,6 +1404,39 @@ BOOL WINAPI SymFromName(HANDLE hProcess, PCSTR Name, PSYMBOL_INFO Symbol) return FALSE; } +/*********************************************************************** + * SymFromNameW (DBGHELP.@) + */ +BOOL WINAPI SymFromNameW(HANDLE process, const WCHAR *name, SYMBOL_INFOW *symbol) +{ + SYMBOL_INFO *si; + DWORD len; + char *tmp; + BOOL ret; + + TRACE("(%p, %s, %p)\n", process, debugstr_w(name), symbol); + + len = sizeof(*si) + symbol->MaxNameLen * sizeof(WCHAR); + if (!(si = HeapAlloc(GetProcessHeap(), 0, len))) return FALSE; + + len = WideCharToMultiByte(CP_ACP, 0, name, -1, NULL, 0, NULL, NULL); + if (!(tmp = HeapAlloc(GetProcessHeap(), 0, len))) + { + HeapFree(GetProcessHeap(), 0, si); + return FALSE; + } + WideCharToMultiByte(CP_ACP, 0, name, -1, tmp, len, NULL, NULL); + + si->SizeOfStruct = sizeof(*si); + si->MaxNameLen = symbol->MaxNameLen; + if ((ret = SymFromName(process, tmp, si))) + copy_symbolW(symbol, si); + + HeapFree(GetProcessHeap(), 0, tmp); + HeapFree(GetProcessHeap(), 0, si); + return ret; +} + /*********************************************************************** * SymGetSymFromName64 (DBGHELP.@) */

1 0

Zebediah Figura : wined3d: Move the wined3d_device_context_get_depth_stencil_view() declaration to the correct place alphabetically.
by Alexandre Julliard April 22, 2021

April 22, 2021

Module: wine Branch: master Commit: 9429d9d38d8121beabdbd2c85fbb7c17b65c058a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9429d9d38d8121beabdbd2c8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 21 21:56:08 2021 -0500 wined3d: Move the wined3d_device_context_get_depth_stencil_view() declaration to the correct place alphabetically. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/wined3d.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index de96ff0601b..89c0d75c1eb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2385,8 +2385,6 @@ struct wined3d_shader_resource_view * __cdecl wined3d_device_get_cs_resource_vie struct wined3d_sampler * __cdecl wined3d_device_get_cs_sampler(const struct wined3d_device *device, unsigned int idx); struct wined3d_unordered_access_view * __cdecl wined3d_device_get_cs_uav(const struct wined3d_device *device, unsigned int idx); -struct wined3d_rendertarget_view * __cdecl wined3d_device_context_get_depth_stencil_view( - const struct wined3d_device_context *context); HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, struct wined3d_caps *caps); HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); @@ -2549,6 +2547,8 @@ struct wined3d_buffer * __cdecl wined3d_device_context_get_constant_buffer(const enum wined3d_shader_type shader_type, unsigned int idx); struct wined3d_depth_stencil_state * __cdecl wined3d_device_context_get_depth_stencil_state( const struct wined3d_device_context *context, unsigned int *stencil_ref); +struct wined3d_rendertarget_view * __cdecl wined3d_device_context_get_depth_stencil_view( + const struct wined3d_device_context *context); struct wined3d_buffer * __cdecl wined3d_device_context_get_index_buffer(const struct wined3d_device_context *context, enum wined3d_format_id *format, unsigned int *offset); struct wined3d_query * __cdecl wined3d_device_context_get_predication(struct wined3d_device_context *context,

1 0

Zebediah Figura : server: Map a SD group to Unix group modes if the SD owner is present anywhere in the current user's token.
by Alexandre Julliard April 22, 2021

April 22, 2021

Module: wine Branch: master Commit: a17cd35d6d69ad771d4c5f7a8cab3570075502be URL: https://source.winehq.org/git/wine.git/?a=commit;h=a17cd35d6d69ad771d4c5f7a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 20 14:35:00 2021 -0500 server: Map a SD group to Unix group modes if the SD owner is present anywhere in the current user's token. Instead of requiring the SD owner to match the token user. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44691 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 4 ++-- server/file.c | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 08b73495aaa..299a340dcf3 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -8365,10 +8365,10 @@ static void test_group_as_file_owner(void) sprintf(path, "%s\\testdir\\subdir", temp_path); ret = CreateDirectoryA(path, NULL); - todo_wine ok(ret, "got error %u\n", GetLastError()); + ok(ret, "got error %u\n", GetLastError()); ret = RemoveDirectoryA(path); - todo_wine ok(ret, "got error %u\n", GetLastError()); + ok(ret, "got error %u\n", GetLastError()); sprintf(path, "%s\\testdir", temp_path); ret = RemoveDirectoryA(path); ok(ret, "got error %u\n", GetLastError()); diff --git a/server/file.c b/server/file.c index 9a072e6c64e..aff4d9e09e1 100644 --- a/server/file.c +++ b/server/file.c @@ -473,7 +473,6 @@ mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ) mode_t mode; int present; const ACL *dacl = sd_get_dacl( sd, &present ); - const SID *user = token_get_user( current->process->token ); if (present && dacl) { const ACE_HEADER *ace = (const ACE_HEADER *)(dacl + 1); @@ -496,8 +495,8 @@ mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ) { bits_to_set &= ~((mode << 6) | (mode << 3) | mode); /* all */ } - else if ((security_equal_sid( user, owner ) && - token_sid_present( current->process->token, sid, TRUE ))) + else if (token_sid_present( current->process->token, owner, TRUE ) && + token_sid_present( current->process->token, sid, TRUE )) { bits_to_set &= ~((mode << 6) | (mode << 3)); /* user + group */ } @@ -516,8 +515,8 @@ mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ) new_mode |= mode & bits_to_set; bits_to_set &= ~mode; } - else if ((security_equal_sid( user, owner ) && - token_sid_present( current->process->token, sid, FALSE ))) + else if (token_sid_present( current->process->token, owner, FALSE ) && + token_sid_present( current->process->token, sid, FALSE )) { mode = (mode << 6) | (mode << 3); /* user + group */ new_mode |= mode & bits_to_set;

1 0