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

Francois Gouget : mfplat/tests: Fix an event queue refcounting test on Vista.
by Alexandre Julliard 23 Apr '21

23 Apr '21

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

Damjan Jovanovic : comctl32: Send DTN_DATETIMECHANGE when the checkbox changes too.
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: wine Branch: master Commit: 9b61a646012afe7e1b63fc8970a473d2a12ea111 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b61a646012afe7e1b63fc89… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Apr 23 15:41:20 2021 +0200 comctl32: Send DTN_DATETIMECHANGE when the checkbox changes too. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=19756 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/datetime.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index f44b52c3b65..93bca8c2f5c 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -1060,6 +1060,7 @@ DATETIME_Button_Command (DATETIME_INFO *infoPtr, WPARAM wParam, LPARAM lParam) DWORD state = SendMessageW((HWND)lParam, BM_GETCHECK, 0, 0); infoPtr->dateValid = (state == BST_CHECKED); InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); + DATETIME_SendDateTimeChangeNotify(infoPtr); } return 0; }

1 0

Francois Gouget : winetest/gather: Show skipped dlls on the index pages.
by Alexandre Julliard 23 Apr '21

23 Apr '21

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 22 Apr '21

22 Apr '21

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

Nikolay Sivov : evr/tests: Simplify d3d9 device creation helper.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: 53b1b034063fa5056952630e7c61413e381700d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53b1b034063fa5056952630e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 22 11:08:06 2021 +0300 evr/tests: Simplify d3d9 device creation helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 38 ++++++++++++-------------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index bcea437db4c..2643f6ee92a 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -49,10 +49,14 @@ static HWND create_window(void) 0, 0, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL); } -static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window) +static IDirect3DDevice9 *create_device(HWND focus_window) { D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DDevice9 *device = NULL; + IDirect3D9 *d3d9; + + d3d9 = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d9, "Failed to create a D3D object.\n"); present_parameters.BackBufferWidth = 640; present_parameters.BackBufferHeight = 480; @@ -66,6 +70,8 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window) IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); + IDirect3D9_Release(d3d9); + return device; } @@ -719,16 +725,13 @@ static void test_surface_sample(void) DWORD flags, count, length; IDirect3DDevice9 *device; IMFSample *sample; - IDirect3D9 *d3d; IUnknown *unk; HWND window; HRESULT hr; BYTE *data; window = create_window(); - d3d = Direct3DCreate9(D3D_SDK_VERSION); - ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d, window))) + if (!(device = create_device(window))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; @@ -930,7 +933,6 @@ static void test_surface_sample(void) done: if (backbuffer) IDirect3DSurface9_Release(backbuffer); - IDirect3D9_Release(d3d); DestroyWindow(window); } @@ -945,7 +947,6 @@ static void test_default_mixer_type_negotiation(void) IMFTransform *transform; DWORD index, count; GUID guid, *guids; - IDirect3D9 *d3d; IUnknown *unk; HWND window; HRESULT hr; @@ -981,9 +982,7 @@ static void test_default_mixer_type_negotiation(void) /* Now try with device manager. */ window = create_window(); - d3d = Direct3DCreate9(D3D_SDK_VERSION); - ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d, window))) + if (!(device = create_device(window))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; @@ -1118,7 +1117,6 @@ todo_wine done: IMFTransform_Release(transform); - IDirect3D9_Release(d3d); DestroyWindow(window); } @@ -1341,7 +1339,6 @@ static void test_MFCreateVideoSampleAllocator(void) LONG refcount, count; unsigned int token; IMFGetService *gs; - IDirect3D9 *d3d; IUnknown *unk; HWND window; HRESULT hr; @@ -1456,9 +1453,7 @@ static void test_MFCreateVideoSampleAllocator(void) /* Using device manager */ window = create_window(); - d3d = Direct3DCreate9(D3D_SDK_VERSION); - ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d, window))) + if (!(device = create_device(window))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; @@ -1507,7 +1502,6 @@ static void test_MFCreateVideoSampleAllocator(void) IDirect3DDeviceManager9_Release(manager); IDirect3DDevice9_Release(device); done: - IDirect3D9_Release(d3d); DestroyWindow(window); } @@ -2102,7 +2096,6 @@ static void test_presenter_media_type(void) IDirect3DDeviceManager9 *manager; HRESULT hr; IMFTransform *mixer; - IDirect3D9 *d3d; IDirect3DDevice9 *device; unsigned int token; SIZE frame_size; @@ -2112,9 +2105,7 @@ static void test_presenter_media_type(void) RECT dst; window = create_window(); - d3d = Direct3DCreate9(D3D_SDK_VERSION); - ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d, window))) + if (!(device = create_device(window))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; @@ -2196,7 +2187,6 @@ todo_wine { IMFTransform_Release(mixer); done: - IDirect3D9_Release(d3d); DestroyWindow(window); } @@ -2439,16 +2429,13 @@ static void test_mixer_samples(void) DWORD count, flags, color, status; IMFTransform *mixer; IMFSample *sample, *sample2; - IDirect3D9 *d3d; HWND window; UINT token; HRESULT hr; LONGLONG pts, duration; window = create_window(); - d3d = Direct3DCreate9(D3D_SDK_VERSION); - ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d, window))) + if (!(device = create_device(window))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; @@ -2678,7 +2665,6 @@ static void test_mixer_samples(void) IDirect3DDeviceManager9_Release(manager); done: - IDirect3D9_Release(d3d); DestroyWindow(window); }

1 0

Alexandre Julliard : ntdll: Remove no longer used defines from the makefile.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: 9f2751ca3ff92e5eb9cf1dd6c8eac5aa01f4642f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f2751ca3ff92e5eb9cf1dd6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 22 15:32:30 2021 +0200 ntdll: Remove no longer used defines from the makefile. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 179d00b29ef..0fdfb83df15 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -70,11 +70,6 @@ RC_SRCS = version.rc EXTRA_OBJS = unix/version.o -server_EXTRADEFS = \ - -DBINDIR=\"${bindir}\" \ - -DBIN_TO_DLLDIR=\"`${MAKEDEP} -R ${bindir} ${dlldir}`\" \ - -DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${dlldir} ${bindir}`\" - unix_loader_EXTRADEFS = \ -DBINDIR=\"${bindir}\" \ -DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${dlldir} ${bindir}`\" \

1 0

Alexandre Julliard : configure: Stop building libwine on Android.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: a639db3e8c18f58d28c3e76bc4f9bc90a48ad93a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a639db3e8c18f58d28c3e76b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 22 15:33:30 2021 +0200 configure: Stop building libwine on Android. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 6 ------ configure.ac | 4 ---- dlls/ntdll/unix/loader.c | 2 -- 3 files changed, 12 deletions(-) diff --git a/configure b/configure index 39639235469..762c0b8e2e2 100755 --- a/configure +++ b/configure @@ -9164,12 +9164,6 @@ if test "x$ac_cv_cflags__fPIC__Wl___export_dynamic" = xyes; then : fi WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" - LIBWINE_SHAREDLIB="libwine.so" - - LIBWINE_LDFLAGS="-shared -Wl,-soname,libwine.so" - - TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.so" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lEGL" >&5 $as_echo_n "checking for -lEGL... " >&6; } if ${ac_cv_lib_soname_EGL+:} false; then : diff --git a/configure.ac b/configure.ac index 797f8cfbbbf..68366339ea2 100644 --- a/configure.ac +++ b/configure.ac @@ -893,10 +893,6 @@ case $host_os in [WINELOADER_LDFLAGS="-Wl,--export-dynamic"]) WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" - AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so") - AC_SUBST(LIBWINE_LDFLAGS,["-shared -Wl,-soname,libwine.so"]) - TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.so" - WINE_CHECK_SONAME(EGL,eglGetProcAddress) WINE_CHECK_SONAME(GLESv2,glFlush) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 16bba12b571..9947ff2f447 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -935,8 +935,6 @@ static void load_libwine(void) { #ifdef __APPLE__ #define LIBWINE "libwine.1.dylib" -#elif defined(__ANDROID__) -#define LIBWINE "libwine.so" #else #define LIBWINE "libwine.so.1" #endif

1 0

Paul Gofman : mmdevapi: Return success from SAORS_GetAvailableDynamicObjectCount().
by Alexandre Julliard 22 Apr '21

22 Apr '21

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

Zebediah Figura : advapi32/tests: Add a test for setting the SD owner of a directory to a group.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: b3dc0c16a76676e5d456f93cb3ea0f82f17b55ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3dc0c16a76676e5d456f93c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 20 14:34:59 2021 -0500 advapi32/tests: Add a test for setting the SD owner of a directory to a group. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 69 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index ce9c26d238e..08b73495aaa 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -8306,6 +8306,74 @@ static void test_elevation(void) CloseHandle(token); } +static void test_group_as_file_owner(void) +{ + char sd_buffer[200], sid_buffer[100]; + SECURITY_DESCRIPTOR *sd = (SECURITY_DESCRIPTOR *)sd_buffer; + char temp_path[MAX_PATH], path[MAX_PATH]; + SID *admin_sid = (SID *)sid_buffer; + BOOL ret, present, defaulted; + SECURITY_DESCRIPTOR new_sd; + HANDLE file; + DWORD size; + ACL *dacl; + + /* The EA Origin client sets the SD owner of a directory to Administrators, + * while using the default DACL, and subsequently tries to create + * subdirectories. */ + + size = sizeof(sid_buffer); + CreateWellKnownSid(WinBuiltinAdministratorsSid, NULL, admin_sid, &size); + + ret = CheckTokenMembership(NULL, admin_sid, &present); + ok(ret, "got error %u\n", GetLastError()); + if (!present) + { + skip("user is not an administrator\n"); + return; + } + + GetTempPathA(ARRAY_SIZE(temp_path), temp_path); + sprintf(path, "%s\\testdir", temp_path); + + ret = CreateDirectoryA(path, NULL); + ok(ret, "got error %u\n", GetLastError()); + + file = CreateFileA(path, FILE_ALL_ACCESS, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + ret = GetKernelObjectSecurity(file, DACL_SECURITY_INFORMATION, sd_buffer, sizeof(sd_buffer), &size); + ok(ret, "got error %u\n", GetLastError()); + ret = GetSecurityDescriptorDacl(sd, &present, &dacl, &defaulted); + ok(ret, "got error %u\n", GetLastError()); + + InitializeSecurityDescriptor(&new_sd, SECURITY_DESCRIPTOR_REVISION); + + ret = SetSecurityDescriptorOwner(&new_sd, admin_sid, FALSE); + ok(ret, "got error %u\n", GetLastError()); + + ret = GetSecurityDescriptorDacl(sd, &present, &dacl, &defaulted); + ok(ret, "got error %u\n", GetLastError()); + + ret = SetSecurityDescriptorDacl(&new_sd, present, dacl, defaulted); + ok(ret, "got error %u\n", GetLastError()); + + ret = SetKernelObjectSecurity(file, OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, &new_sd); + ok(ret, "got error %u\n", GetLastError()); + + CloseHandle(file); + + sprintf(path, "%s\\testdir\\subdir", temp_path); + ret = CreateDirectoryA(path, NULL); + todo_wine ok(ret, "got error %u\n", GetLastError()); + + ret = RemoveDirectoryA(path); + todo_wine ok(ret, "got error %u\n", GetLastError()); + sprintf(path, "%s\\testdir", temp_path); + ret = RemoveDirectoryA(path); + ok(ret, "got error %u\n", GetLastError()); +} + START_TEST(security) { init(); @@ -8374,6 +8442,7 @@ START_TEST(security) test_duplicate_token(); test_GetKernelObjectSecurity(); test_elevation(); + test_group_as_file_owner(); /* Must be the last test, modifies process token */ test_token_security_descriptor();

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 22 Apr '21

22 Apr '21

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