diff --git a/debian/changelog b/debian/changelog index f41f2665..c7524275 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ wine-staging (1.7.45) UNRELEASED; urgency=low * Added additional tests for behaviour of opening readonly files. * Added patch to fix opening a readonly file with FILE_WRITE_ATTRIBUTES access (fixes Wine Staging Bug #298). + * Added patch to silence test failures in ntdll/directory tests. * Removed patch to fix NULL pointer dereference in get_frame_by_name (identical patch accepted upstream). -- Sebastian Lackner Sun, 31 May 2015 14:46:37 +0200 diff --git a/patches/ntdll-Directory_Test/0001-ntdll-tests-Properly-mark-test-failures-with-todo_wi.patch b/patches/ntdll-Directory_Test/0001-ntdll-tests-Properly-mark-test-failures-with-todo_wi.patch new file mode 100644 index 00000000..f9596002 --- /dev/null +++ b/patches/ntdll-Directory_Test/0001-ntdll-tests-Properly-mark-test-failures-with-todo_wi.patch @@ -0,0 +1,37 @@ +From 944a22dea9d1ea64e7872e9fd71df1c0dde0c3cc Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +Date: Wed, 3 Jun 2015 07:20:59 +0200 +Subject: ntdll/tests: Properly mark test failures with todo_wine. + +Note: Those test failures are not Wine Staging specific and also +present in upstream Wine. +--- + dlls/ntdll/tests/directory.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c +index 21aa31f..5e1cf73 100644 +--- a/dlls/ntdll/tests/directory.c ++++ b/dlls/ntdll/tests/directory.c +@@ -353,14 +353,18 @@ static void test_NtQueryDirectoryFile_case(void) + mask.Length = mask.MaximumLength = lstrlenW(testmask) * sizeof(WCHAR); + pNtQueryDirectoryFile(dirh, NULL, NULL, NULL, &io, data, data_size, + FileBothDirectoryInformation, TRUE, &mask, FALSE); ++ todo_wine + ok(U(io).Status == STATUS_SUCCESS, "failed to query directory; status %x\n", U(io).Status); + data_len = io.Information; ++ todo_wine + ok(data_len >= sizeof(FILE_BOTH_DIRECTORY_INFORMATION), "not enough data in directory\n"); + + name = dir_info->FileName; + name_len = dir_info->FileNameLength / sizeof(WCHAR); + ++ todo_wine + ok(name_len == testfile_len, "unexpected filename length %u\n", name_len); ++ todo_wine + ok(!memcmp(name, testfile_w, testfile_len * sizeof(WCHAR)), "unexpected filename %s\n", + wine_dbgstr_wn(name, name_len)); + +-- +2.4.2 + diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 37396d61..9c749fc5 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -163,6 +163,7 @@ patch_enable_all () enable_ntdll_DOS_Attributes="$1" enable_ntdll_DVD_Read_Size="$1" enable_ntdll_DeviceType_Systemroot="$1" + enable_ntdll_Directory_Test="$1" enable_ntdll_DllRedirects="$1" enable_ntdll_Exception="$1" enable_ntdll_FileDispositionInformation="$1" @@ -559,6 +560,9 @@ patch_enable () ntdll-DeviceType_Systemroot) enable_ntdll_DeviceType_Systemroot="$2" ;; + ntdll-Directory_Test) + enable_ntdll_Directory_Test="$2" + ;; ntdll-DllRedirects) enable_ntdll_DllRedirects="$2" ;; @@ -1825,13 +1829,6 @@ if test "$enable_kernel32_CopyFileEx" -eq 1; then enable_ntdll_FileDispositionInformation=1 fi -if test "$enable_kernel32_SetFileInformationByHandle" -eq 1; then - if test "$enable_kernel32_SetFileCompletionNotificationMode" -gt 1; then - abort "Patchset kernel32-SetFileCompletionNotificationMode disabled, but kernel32-SetFileInformationByHandle depends on that." - fi - enable_kernel32_SetFileCompletionNotificationMode=1 -fi - if test "$enable_ntdll_FileDispositionInformation" -eq 1; then if test "$enable_server_File_Permissions" -gt 1; then abort "Patchset server-File_Permissions disabled, but ntdll-FileDispositionInformation depends on that." @@ -1839,6 +1836,13 @@ if test "$enable_ntdll_FileDispositionInformation" -eq 1; then enable_server_File_Permissions=1 fi +if test "$enable_kernel32_SetFileInformationByHandle" -eq 1; then + if test "$enable_kernel32_SetFileCompletionNotificationMode" -gt 1; then + abort "Patchset kernel32-SetFileCompletionNotificationMode disabled, but kernel32-SetFileInformationByHandle depends on that." + fi + enable_kernel32_SetFileCompletionNotificationMode=1 +fi + if test "$enable_dxva2_Video_Decoder" -eq 1; then if test "$enable_winecfg_Staging" -gt 1; then abort "Patchset winecfg-Staging disabled, but dxva2-Video_Decoder depends on that." @@ -2962,6 +2966,36 @@ if test "$enable_kernel32_CompareStringEx" -eq 1; then ) >> "$patchlist" fi +# Patchset kernel32-SetFileCompletionNotificationMode +# | +# | This patchset fixes the following Wine bugs: +# | * [#38493] Add stub for kernel32.SetFileCompletionNotificationModes (for Steam in Win7 mode) +# | +# | Modified files: +# | * dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec, dlls/kernel32/file.c, +# | dlls/kernel32/kernel32.spec, include/winbase.h +# | +if test "$enable_kernel32_SetFileCompletionNotificationMode" -eq 1; then + patch_apply kernel32-SetFileCompletionNotificationMode/0001-kernel32-Implement-SetFileCompletionNotificationMode.patch + ( + echo '+ { "Olivier F. R. Dierick", "kernel32: Implement SetFileCompletionNotificationModes as a stub.", 1 },'; + ) >> "$patchlist" +fi + +# Patchset kernel32-SetFileInformationByHandle +# | +# | Modified files: +# | * dlls/kernel32/file.c, include/winbase.h +# | +if test "$enable_kernel32_SetFileInformationByHandle" -eq 1; then + patch_apply kernel32-SetFileInformationByHandle/0001-include-Declare-a-couple-more-file-information-class.patch + patch_apply kernel32-SetFileInformationByHandle/0002-kernel32-Implement-SetFileInformationByHandle.patch + ( + echo '+ { "Michael Müller", "include: Declare a couple more file information class structures.", 1 },'; + echo '+ { "Michael Müller", "kernel32: Implement SetFileInformationByHandle.", 1 },'; + ) >> "$patchlist" +fi + # Patchset server-File_Permissions # | # | Modified files: @@ -3026,36 +3060,6 @@ if test "$enable_ntdll_FileDispositionInformation" -eq 1; then ) >> "$patchlist" fi -# Patchset kernel32-SetFileCompletionNotificationMode -# | -# | This patchset fixes the following Wine bugs: -# | * [#38493] Add stub for kernel32.SetFileCompletionNotificationModes (for Steam in Win7 mode) -# | -# | Modified files: -# | * dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec, dlls/kernel32/file.c, -# | dlls/kernel32/kernel32.spec, include/winbase.h -# | -if test "$enable_kernel32_SetFileCompletionNotificationMode" -eq 1; then - patch_apply kernel32-SetFileCompletionNotificationMode/0001-kernel32-Implement-SetFileCompletionNotificationMode.patch - ( - echo '+ { "Olivier F. R. Dierick", "kernel32: Implement SetFileCompletionNotificationModes as a stub.", 1 },'; - ) >> "$patchlist" -fi - -# Patchset kernel32-SetFileInformationByHandle -# | -# | Modified files: -# | * dlls/kernel32/file.c, include/winbase.h -# | -if test "$enable_kernel32_SetFileInformationByHandle" -eq 1; then - patch_apply kernel32-SetFileInformationByHandle/0001-include-Declare-a-couple-more-file-information-class.patch - patch_apply kernel32-SetFileInformationByHandle/0002-kernel32-Implement-SetFileInformationByHandle.patch - ( - echo '+ { "Michael Müller", "include: Declare a couple more file information class structures.", 1 },'; - echo '+ { "Michael Müller", "kernel32: Implement SetFileInformationByHandle.", 1 },'; - ) >> "$patchlist" -fi - # Patchset kernel32-CopyFileEx # | # | This patchset fixes the following Wine bugs: @@ -3531,6 +3535,18 @@ if test "$enable_ntdll_DeviceType_Systemroot" -eq 1; then ) >> "$patchlist" fi +# Patchset ntdll-Directory_Test +# | +# | Modified files: +# | * dlls/ntdll/tests/directory.c +# | +if test "$enable_ntdll_Directory_Test" -eq 1; then + patch_apply ntdll-Directory_Test/0001-ntdll-tests-Properly-mark-test-failures-with-todo_wi.patch + ( + echo '+ { "Sebastian Lackner", "ntdll/tests: Properly mark test failures with todo_wine.", 1 },'; + ) >> "$patchlist" +fi + # Patchset ntdll-DllRedirects # | # | Modified files: @@ -5062,15 +5078,15 @@ if test "$enable_wined3d_CSMT_Helper" -eq 1; then ) >> "$patchlist" fi -# Patchset wined3d-resource_check_usage +# Patchset wined3d-UnhandledBlendFactor # | # | Modified files: -# | * dlls/wined3d/resource.c +# | * dlls/wined3d/state.c # | -if test "$enable_wined3d_resource_check_usage" -eq 1; then - patch_apply wined3d-resource_check_usage/0001-wined3d-Silence-repeated-resource_check_usage-FIXME.patch +if test "$enable_wined3d_UnhandledBlendFactor" -eq 1; then + patch_apply wined3d-UnhandledBlendFactor/0001-wined3d-Silence-repeated-Unhandled-blend-factor-0-me.patch ( - echo '+ { "Erich E. Hoover", "wined3d: Silence repeated resource_check_usage FIXME.", 2 },'; + echo '+ { "Sebastian Lackner", "wined3d: Silence repeated '\''Unhandled blend factor 0'\'' messages.", 1 },'; ) >> "$patchlist" fi @@ -5086,6 +5102,18 @@ if test "$enable_wined3d_wined3d_swapchain_present" -eq 1; then ) >> "$patchlist" fi +# Patchset wined3d-resource_check_usage +# | +# | Modified files: +# | * dlls/wined3d/resource.c +# | +if test "$enable_wined3d_resource_check_usage" -eq 1; then + patch_apply wined3d-resource_check_usage/0001-wined3d-Silence-repeated-resource_check_usage-FIXME.patch + ( + echo '+ { "Erich E. Hoover", "wined3d: Silence repeated resource_check_usage FIXME.", 2 },'; + ) >> "$patchlist" +fi + # Patchset wined3d-Multisampling # | # | This patchset fixes the following Wine bugs: @@ -5135,18 +5163,6 @@ if test "$enable_wined3d_Revert_PixelFormat" -eq 1; then ) >> "$patchlist" fi -# Patchset wined3d-UnhandledBlendFactor -# | -# | Modified files: -# | * dlls/wined3d/state.c -# | -if test "$enable_wined3d_UnhandledBlendFactor" -eq 1; then - patch_apply wined3d-UnhandledBlendFactor/0001-wined3d-Silence-repeated-Unhandled-blend-factor-0-me.patch - ( - echo '+ { "Sebastian Lackner", "wined3d: Silence repeated '\''Unhandled blend factor 0'\'' messages.", 1 },'; - ) >> "$patchlist" -fi - # Patchset wined3d-CSMT_Main # | # | This patchset fixes the following Wine bugs: