March 2022 - Wine-commits - list.winehq.org

Giovanni Mascellani : mfplat: Fix buffer reading with IMF2DBuffer::Lock().
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: 135bdc21e8f8f2a3513f9bce6390f5f386bdc861 URL: https://source.winehq.org/git/wine.git/?a=commit;h=135bdc21e8f8f2a3513f9bce… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Mar 15 14:29:18 2022 +0100 mfplat: Fix buffer reading with IMF2DBuffer::Lock(). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 4 ++++ dlls/mfplat/tests/mfplat.c | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 2ec714c1419..133af2af470 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -311,6 +311,10 @@ static HRESULT WINAPI memory_1d_2d_buffer_Lock(IMFMediaBuffer *iface, BYTE **dat { if (!(buffer->_2d.linear_buffer = malloc(ALIGN_SIZE(buffer->_2d.plane_size, MF_64_BYTE_ALIGNMENT)))) hr = E_OUTOFMEMORY; + + if (SUCCEEDED(hr)) + copy_image(buffer, buffer->_2d.linear_buffer, buffer->_2d.width, buffer->data, buffer->_2d.pitch, + buffer->_2d.width, buffer->_2d.height); } if (SUCCEEDED(hr)) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 7e72abbde22..16d24bbff51 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5872,7 +5872,6 @@ static void test_MFCreate2DMediaBuffer(void) hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr); - todo_wine ok(memcmp(data, eight_bbs, sizeof(eight_bbs)) == 0, "Invalid data instead of 0xbb.\n"); hr = IMFMediaBuffer_Unlock(buffer);

1 0

Giovanni Mascellani : mfplat: Do not allocate more memory than required.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: cc9722e4e03f33ded23ac74acc7756f26b115bce URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc9722e4e03f33ded23ac74a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Mar 15 14:29:19 2022 +0100 mfplat: Do not allocate more memory than required. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 133af2af470..19a7ad33bba 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -309,7 +309,7 @@ static HRESULT WINAPI memory_1d_2d_buffer_Lock(IMFMediaBuffer *iface, BYTE **dat hr = MF_E_INVALIDREQUEST; else if (!buffer->_2d.linear_buffer) { - if (!(buffer->_2d.linear_buffer = malloc(ALIGN_SIZE(buffer->_2d.plane_size, MF_64_BYTE_ALIGNMENT)))) + if (!(buffer->_2d.linear_buffer = malloc(buffer->_2d.plane_size))) hr = E_OUTOFMEMORY; if (SUCCEEDED(hr)) @@ -384,7 +384,7 @@ static HRESULT WINAPI d3d9_surface_buffer_Lock(IMFMediaBuffer *iface, BYTE **dat { D3DLOCKED_RECT rect; - if (!(buffer->_2d.linear_buffer = malloc(ALIGN_SIZE(buffer->_2d.plane_size, MF_64_BYTE_ALIGNMENT)))) + if (!(buffer->_2d.linear_buffer = malloc(buffer->_2d.plane_size))) hr = E_OUTOFMEMORY; if (SUCCEEDED(hr)) @@ -963,7 +963,7 @@ static HRESULT WINAPI dxgi_surface_buffer_Lock(IMFMediaBuffer *iface, BYTE **dat hr = MF_E_INVALIDREQUEST; else if (!buffer->_2d.linear_buffer) { - if (!(buffer->_2d.linear_buffer = malloc(ALIGN_SIZE(buffer->_2d.plane_size, MF_64_BYTE_ALIGNMENT)))) + if (!(buffer->_2d.linear_buffer = malloc(buffer->_2d.plane_size))) hr = E_OUTOFMEMORY; if (SUCCEEDED(hr))

1 0

Giovanni Mascellani : mfplat: Do not mark the buffer as locked if Lock2D() fails.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: 44c9ea50432771258e9eed012967a16c6f132fe9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44c9ea50432771258e9eed01… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Mar 15 14:29:20 2022 +0100 mfplat: Do not mark the buffer as locked if Lock2D() fails. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 19a7ad33bba..e3f863c6345 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -670,13 +670,14 @@ static HRESULT WINAPI d3d9_surface_buffer_Lock2D(IMF2DBuffer2 *iface, BYTE **sca if (buffer->_2d.linear_buffer) hr = MF_E_UNEXPECTED; - else if (!buffer->_2d.locks++) + else if (!buffer->_2d.locks) { hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &buffer->d3d9_surface.rect, NULL, 0); } if (SUCCEEDED(hr)) { + buffer->_2d.locks++; *scanline0 = buffer->d3d9_surface.rect.pBits; *pitch = buffer->d3d9_surface.rect.Pitch; } @@ -755,13 +756,14 @@ static HRESULT WINAPI d3d9_surface_buffer_Lock2DSize(IMF2DBuffer2 *iface, MF2DBu if (buffer->_2d.linear_buffer) hr = MF_E_UNEXPECTED; - else if (!buffer->_2d.locks++) + else if (!buffer->_2d.locks) { hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &buffer->d3d9_surface.rect, NULL, 0); } if (SUCCEEDED(hr)) { + buffer->_2d.locks++; *scanline0 = buffer->d3d9_surface.rect.pBits; *pitch = buffer->d3d9_surface.rect.Pitch; if (buffer_start)

1 0

Giovanni Mascellani : mfplat: Align buffers at no less than 16 bytes boundaries.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: 20c4896b125c7926e57091aa3dbd82a6af1d2be4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20c4896b125c7926e57091aa… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Mar 15 14:29:21 2022 +0100 mfplat: Align buffers at no less than 16 bytes boundaries. This is what seems to be happening on Windows 10. On the other hand, I am not seeing on native the current behavior of interpreting a zero alignment parameter as a request to align to 64 bytes boundaries. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index e3f863c6345..18c77c87ec2 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1264,7 +1264,8 @@ static HRESULT memory_buffer_init(struct buffer *buffer, DWORD max_length, DWORD { size_t size; - if (!alignment) alignment = MF_64_BYTE_ALIGNMENT; + if (alignment < MF_16_BYTE_ALIGNMENT) + alignment = MF_16_BYTE_ALIGNMENT; alignment++; if (alignment & (alignment - 1))

1 0

Giovanni Mascellani : mfplat: Do not allocate more memory than requested.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: 52b5caa48884d4798e02d7cedba596da6a757aec URL: https://source.winehq.org/git/wine.git/?a=commit;h=52b5caa48884d4798e02d7ce… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Mar 15 14:29:22 2022 +0100 mfplat: Do not allocate more memory than requested. It is totally fine (though maybe a little strange) to allocate 10 bytes requesting an alignment to a megabyte boundary or more, and this shouldn't result in wasting an (nearly) entire megabyte of memory. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 18c77c87ec2..8ea2283e24b 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1262,8 +1262,6 @@ static const IMFDXGIBufferVtbl dxgi_buffer_vtbl = static HRESULT memory_buffer_init(struct buffer *buffer, DWORD max_length, DWORD alignment, const IMFMediaBufferVtbl *vtbl) { - size_t size; - if (alignment < MF_16_BYTE_ALIGNMENT) alignment = MF_16_BYTE_ALIGNMENT; alignment++; @@ -1279,10 +1277,9 @@ static HRESULT memory_buffer_init(struct buffer *buffer, DWORD max_length, DWORD alignment++; } - size = ALIGN_SIZE(max_length, alignment - 1); - if (!(buffer->data = _aligned_malloc(size, alignment))) + if (!(buffer->data = _aligned_malloc(max_length, alignment))) return E_OUTOFMEMORY; - memset(buffer->data, 0, size); + memset(buffer->data, 0, max_length); buffer->IMFMediaBuffer_iface.lpVtbl = vtbl; buffer->refcount = 1;

1 0

Eric Pouech : user32/tests: Enable compilation with long types.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: ee022787e5da962a7b6caa2cdc1149857dcbbc7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee022787e5da962a7b6caa2c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 17 08:43:55 2022 +0100 user32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 1499 ++++++++++++++++++++++++----------------------- 1 file changed, 750 insertions(+), 749 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ee022787e5da962a7b6c…

1 0

Eric Pouech : user32/tests: Enable compilation with long types.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: 05e617aee2fd3e833de84e1a8e6e64633b332018 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05e617aee2fd3e833de84e1a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 17 08:43:59 2022 +0100 user32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/winstation.c | 159 +++++++++++++++++++++-------------------- 1 file changed, 80 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=05e617aee2fd3e833de8…

1 0

Eric Pouech : user32/tests: Enable compilation with long types.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: 136ad9a365c0d34fa74c4679cb0cd27efa67b256 URL: https://source.winehq.org/git/wine.git/?a=commit;h=136ad9a365c0d34fa74c4679… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 17 08:44:05 2022 +0100 user32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/wsprintf.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/wsprintf.c b/dlls/user32/tests/wsprintf.c index 567ed2ff10b..7dfe46ed3bc 100644 --- a/dlls/user32/tests/wsprintf.c +++ b/dlls/user32/tests/wsprintf.c @@ -16,6 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <stdarg.h> @@ -79,7 +80,7 @@ static void wsprintfATest(void) int rc; rc=wsprintfA(buf, "%010ld", -1); - ok(rc == 10, "wsprintfA length failure: rc=%d error=%d\n",rc,GetLastError()); + ok(rc == 10, "wsprintfA length failure: rc=%d error=%ld\n",rc,GetLastError()); ok((lstrcmpA(buf, "-000000001") == 0), "wsprintfA zero padded negative value failure: buf=[%s]\n",buf); rc = wsprintfA(buf, "%I64X", (ULONGLONG)0); @@ -157,7 +158,7 @@ static void wsprintfWTest(void) win_skip("wsprintfW is not implemented\n"); return; } - ok(rc == 10, "wsPrintfW length failure: rc=%d error=%d\n",rc,GetLastError()); + ok(rc == 10, "wsPrintfW length failure: rc=%d error=%ld\n",rc,GetLastError()); ok((lstrcmpW(buf, L"-000000001") == 0), "wsprintfW zero padded negative value failure\n"); rc = wsprintfW(buf, L"%I64x", (ULONGLONG)0 ); @@ -246,7 +247,7 @@ static void CharUpperTest(void) break; } } - ok(!failed,"CharUpper failed - 16bit input (0x%0lx) returned 32bit result (0x%0lx)\n",i,out); + ok(!failed,"CharUpper failed - 16bit input (0x%0Ix) returned 32bit result (0x%0Ix)\n",i,out); } static void CharLowerTest(void) @@ -263,7 +264,7 @@ static void CharLowerTest(void) break; } } - ok(!failed,"CharLower failed - 16bit input (0x%0lx) returned 32bit result (0x%0lx)\n",i,out); + ok(!failed,"CharLower failed - 16bit input (0x%0Ix) returned 32bit result (0x%0Ix)\n",i,out); }

1 0

Eric Pouech : kernel32/tests: Add some console tests about creating cui vs gui processes.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: 043a0ddf082cb39a072b3b295c8cad1063adb771 URL: https://source.winehq.org/git/wine.git/?a=commit;h=043a0ddf082cb39a072b3b29… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 17 08:27:10 2022 +0100 kernel32/tests: Add some console tests about creating cui vs gui processes. Adding helper to copy argv[0] into an executable with CUI subsystem. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 85 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index b31febe0d56..3622687c6a4 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4662,6 +4662,85 @@ static void test_pseudo_console(void) pClosePseudoConsole(pseudo_console); } +/* copy an executable, but changing its subsystem */ +static void copy_change_subsystem(const char* in, const char* out, DWORD subsyst) +{ + BOOL ret; + HANDLE hFile, hMap; + void* mapping; + IMAGE_NT_HEADERS *nthdr; + + ret = CopyFileA(in, out, FALSE); + ok(ret, "Failed to copy executable %s in %s (%lu)\n", in, out, GetLastError()); + + hFile = CreateFileA(out, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(hFile != INVALID_HANDLE_VALUE, "Couldn't open file %s (%lu)\n", out, GetLastError()); + hMap = CreateFileMappingW(hFile, NULL, PAGE_READWRITE, 0, 0, NULL); + ok(hMap != NULL, "Couldn't create map (%lu)\n", GetLastError()); + mapping = MapViewOfFile(hMap, FILE_MAP_ALL_ACCESS, 0, 0, 0); + ok(mapping != NULL, "Couldn't map (%lu)\n", GetLastError()); + nthdr = RtlImageNtHeader(mapping); + ok(nthdr != NULL, "Cannot get NT headers out of %s\n", out); + if (nthdr) nthdr->OptionalHeader.Subsystem = subsyst; + ret = UnmapViewOfFile(mapping); + ok(ret, "Couldn't unmap (%lu)\n", GetLastError()); + CloseHandle(hMap); + CloseHandle(hFile); +} + +static BOOL check_whether_child_attached(const char* exec, DWORD flags) +{ + STARTUPINFOA si = { sizeof(si) }; + PROCESS_INFORMATION info; + char buf[MAX_PATH]; + DWORD exit_code; + BOOL res; + DWORD ret; + + sprintf(buf, "\"%s\" console check_console", exec); + res = CreateProcessA(NULL, buf, NULL, NULL, FALSE, flags, NULL, NULL, &si, &info); + ok(res, "CreateProcess failed: %lu %s\n", GetLastError(), buf); + CloseHandle(info.hThread); + ret = WaitForSingleObject(info.hProcess, 30000); + ok(ret == WAIT_OBJECT_0, "Could not wait for the child process: %ld le=%lu\n", + ret, GetLastError()); + ret = GetExitCodeProcess(info.hProcess, &exit_code); + ok(ret && exit_code <= 255, "Couldn't get exit_code\n"); + CloseHandle(info.hProcess); + return exit_code != 0; +} + +static void test_CreateProcessCUI(void) +{ + char guiexec[MAX_PATH]; + char cuiexec[MAX_PATH]; + char **argv; + BOOL res; + + winetest_get_mainargs(&argv); + GetTempPathA(ARRAY_SIZE(guiexec), guiexec); + strcat(guiexec, "console_gui.exe"); + copy_change_subsystem(argv[0], guiexec, IMAGE_SUBSYSTEM_WINDOWS_GUI); + GetTempPathA(ARRAY_SIZE(cuiexec), cuiexec); + strcat(cuiexec, "console_cui.exe"); + copy_change_subsystem(argv[0], cuiexec, IMAGE_SUBSYSTEM_WINDOWS_CUI); + + FreeConsole(); + + res = check_whether_child_attached(guiexec, DETACHED_PROCESS); + ok(!res, "Don't expecting child to be attached to a console\n"); + res = check_whether_child_attached(guiexec, 0); + ok(!res, "Don't expecting child to be attached to a console\n"); + res = check_whether_child_attached(cuiexec, DETACHED_PROCESS); + ok(!res, "Don't expecting child to be attached to a console\n"); + res = check_whether_child_attached(cuiexec, 0); + todo_wine ok(res, "Expecting child to be attached to a console\n"); + + DeleteFileA(guiexec); + DeleteFileA(cuiexec); +} + START_TEST(console) { HANDLE hConIn, hConOut, revert_output = NULL, unbound_output; @@ -4690,6 +4769,11 @@ START_TEST(console) return; } + if (argc == 3 && !strcmp(argv[2], "check_console")) + { + ExitProcess(GetConsoleCP() != 0); + } + test_current = argc >= 3 && !strcmp(argv[2], "--current"); using_pseudo_console = argc >= 3 && !strcmp(argv[2], "--pseudo-console"); @@ -4880,6 +4964,7 @@ START_TEST(console) test_AttachConsole(hConOut); test_AllocConsole(); test_FreeConsole(); + test_CreateProcessCUI(); } else if (revert_output) SetConsoleActiveScreenBuffer(revert_output);

1 0

Eric Pouech : services: Start services detached from console.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: 7b65ef3afbe880b82e8965643526105f4ea38a3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b65ef3afbe880b82e896564… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 17 08:27:16 2022 +0100 services: Start services detached from console. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/services/services.c b/programs/services/services.c index 87ab319367b..2edc02d300c 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -1094,7 +1094,7 @@ found: process->use_count++; service_unlock(service_entry); - r = CreateProcessW(NULL, path, NULL, NULL, FALSE, CREATE_UNICODE_ENVIRONMENT, environment, NULL, &si, &pi); + r = CreateProcessW(NULL, path, NULL, NULL, FALSE, CREATE_UNICODE_ENVIRONMENT | DETACHED_PROCESS, environment, NULL, &si, &pi); HeapFree(GetProcessHeap(), 0, path); if (!r) {

1 0