- Wine-devel - list.winehq.org

[PATCH 0/6] MR147: d2d1: Implement bitmap mapping methods.
by Nikolay Sivov (＠nsivov) 29 May '22

29 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/147

4 7

[PATCH 1/2] scrrun: Check for null arguments in MoveFile.
by Robert Wilhelm 28 May '22

28 May '22

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/scrrun/filesystem.c | 3 +++ dlls/scrrun/tests/filesystem.c | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index d7ad255e517..35b43e2f124 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3758,6 +3758,9 @@ static HRESULT WINAPI filesys_MoveFile(IFileSystem3 *iface, BSTR source, BSTR de { TRACE("%p %s %s\n", iface, debugstr_w(source), debugstr_w(destination)); + if(!source || !destination) + return E_INVALIDARG; + return MoveFileW(source, destination) ? S_OK : create_error(GetLastError()); } diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 79af87591ff..1ba0e81a2d1 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -2591,6 +2591,13 @@ static void test_MoveFile(void) hr = IFileSystem3_DeleteFile(fs3, str, VARIANT_TRUE); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); + + str = SysAllocString(L"null.txt"); + hr = IFileSystem3_MoveFile(fs3, str, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + hr = IFileSystem3_MoveFile(fs3, NULL, str); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + SysFreeString(str); } static void test_DoOpenPipeStream(void) -- 2.36.1

2 1

[PATCH 1/4] tapi32: Add lineGetCallInfoW stub.
by Roman Pišl 28 May '22

28 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53061 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/tapi32/line.c | 9 +++++++++ dlls/tapi32/tapi32.spec | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 75bfe837f3d..2dbca2aba3e 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -296,6 +296,15 @@ DWORD WINAPI lineGetCallInfoA(HCALL hCall, LPLINECALLINFO lpCallInfo) return 0; } +/*********************************************************************** + * lineGetCallInfoW (TAPI32.@) + */ +DWORD WINAPI lineGetCallInfoW(HCALL hCall, LPLINECALLINFO lpCallInfo) +{ + FIXME("(%p, %p): stub.\n", hCall, lpCallInfo); + return 0; +} + /*********************************************************************** * lineGetCallStatus (TAPI32.@) */ diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index 6c01a870479..757e387c8d2 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -39,6 +39,7 @@ @ stdcall lineGetAppPriorityA(str long ptr long ptr ptr) @ stdcall lineGetCallInfo(long ptr) lineGetCallInfoA @ stdcall lineGetCallInfoA(long ptr) +@ stdcall lineGetCallInfoW(long ptr) @ stdcall lineGetCallStatus(long ptr) @ stdcall lineGetConfRelatedCalls(long ptr) @ stdcall lineGetCountry(long long ptr) lineGetCountryA -- 2.30.2

1 3

[PATCH 0/1] MR145: kernel32: Unstub MoveFileWithProgress, add test.
by James McDonnell (＠ElementalWarrior) 28 May '22

28 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/145

3 2

[PATCH 0/1] MR144: wininet: Return INTERNET_RAS_INSTALLED flag from InternetGetConnectedStateExW().
by Paul Gofman (＠gofman) 27 May '22

27 May '22

Fixes Split/Second network connection (LAN game, Internet servers are down for the game). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/144

2 1

Re: [PATCH v3 0/7] MR141: d3d11: Initialize output pointers on failure - approved
by Alexandre Julliard (＠julliard) 27 May '22

27 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/141

1 0

Re: [PATCH v2 0/5] MR142: winemac: PE conversion preparation - approved
by Alexandre Julliard (＠julliard) 27 May '22

27 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/142

1 0

Re: [PATCH v2 0/5] MR137: ntdll: More heap code cleanup. - approved
by Alexandre Julliard (＠julliard) 27 May '22

27 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/137

1 0

Re: [PATCH v2 0/1] MR136: kernelbase: Avoid relying on the exception handler to test that handle != NULL. - approved
by Alexandre Julliard (＠julliard) 27 May '22

27 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/136

1 0

[PATCH] win32u: Create a dummy bitmap for display device contexts.
by Zhiyi Zhang 27 May '22

27 May '22

On Windows 7 and older versions of Windows, calling GetCurrentObject(hdc, OBJ_BITMAP) for a display device context will return a valid handle. However, this handle will fail for GetObject(). On newer versions of Windows, GetCurrentObject(hdc, OBJ_BITMAP) for display device contexts returns a bitmap of virtual screen size and its size changes after display mode changes. This behavior is tested in the _check_display_dc() function in user32/tests/monitor.c. The screen shot function of WeChat depends on GetObject() to either return failure or a valid size for the bitmap from display device contexts. Since Wine currently report Windows 7 as default and to save memory, the Windows 7 behavior is implemented. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/tests/bitmap.c | 1 - dlls/win32u/dc.c | 13 +++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 18d1e8f6c28..d3074286ee6 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2789,7 +2789,6 @@ static void test_CreateBitmap(void) "0: %p, 1: %p, 4: %p, 5: %p, curObj1 %p, old1 %p\n", bm, bm1, bm4, bm5, curObj1, old1); ok(bm != bm2 && bm != bm3, "0: %p, 2: %p, 3: %p\n", bm, bm2, bm3); - todo_wine ok(bm != curObj2, "0: %p, curObj2 %p\n", bm, curObj2); ok(old2 == 0, "old2 %p\n", old2); diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index b684e198c05..95dd2651929 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -274,7 +274,13 @@ void free_dc_ptr( DC *dc ) GDI_dec_ref_count( dc->hPen ); GDI_dec_ref_count( dc->hBrush ); GDI_dec_ref_count( dc->hFont ); - if (dc->hBitmap) GDI_dec_ref_count( dc->hBitmap ); + if (dc->hBitmap) + { + if (dc->is_display) + NtGdiDeleteClientObj( dc->hBitmap ); + else + GDI_dec_ref_count( dc->hBitmap ); + } free_gdi_handle( dc->hSelf ); free_dc_state( dc ); } @@ -724,7 +730,10 @@ HDC WINAPI NtGdiOpenDCW( UNICODE_STRING *device, const DEVMODEW *devmode, UNICOD if (!(dc = alloc_dc_ptr( NTGDI_OBJ_DC ))) return 0; hdc = dc->hSelf; - dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); + if (is_display) + dc->hBitmap = NtGdiCreateClientObj( NTGDI_OBJ_SURF ); + else + dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); TRACE("(device=%s, output=%s): returning %p\n", debugstr_us(device), debugstr_us(output), dc->hSelf ); -- 2.34.1

3 2