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

Zebediah Figura : d3d11: Turn MultisampleEnable into a stub.
by Alexandre Julliard May 5, 2021

May 5, 2021

Module: wine Branch: master Commit: ca1e2f5ccefd577bfede4b0350bba4fa185e723f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca1e2f5ccefd577bfede4b03… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 4 22:56:51 2021 -0500 d3d11: Turn MultisampleEnable into a stub. The actual effect of this is to change the algorithm for line multisampling. 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> --- dlls/d3d11/device.c | 17 +++-------------- dlls/d3d11/state.c | 7 +++++++ 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index ee6ecd2c29c..a2c6c7a75ae 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1142,25 +1142,14 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon ID3D11RasterizerState *rasterizer_state) { struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d_rasterizer_state *rasterizer_state_impl; - const D3D11_RASTERIZER_DESC *desc; TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); wined3d_mutex_lock(); - if (!(rasterizer_state_impl = unsafe_impl_from_ID3D11RasterizerState(rasterizer_state))) - { - wined3d_device_context_set_rasterizer_state(context->wined3d_context, NULL); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, FALSE); - wined3d_mutex_unlock(); - return; - } - - wined3d_device_context_set_rasterizer_state(context->wined3d_context, rasterizer_state_impl->wined3d_state); - - desc = &rasterizer_state_impl->desc; - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, desc->MultisampleEnable); + rasterizer_state_impl = unsafe_impl_from_ID3D11RasterizerState(rasterizer_state); + wined3d_device_context_set_rasterizer_state(context->wined3d_context, + rasterizer_state_impl ? rasterizer_state_impl->wined3d_state : NULL); wined3d_mutex_unlock(); } diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 6b287176536..d31ea16bbe8 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1152,6 +1152,13 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str wined3d_desc.scissor = desc->ScissorEnable; wined3d_desc.line_antialias = desc->AntialiasedLineEnable; + if (desc->MultisampleEnable) + { + static unsigned int once; + if (!once++) + FIXME("Ignoring MultisampleEnable %#x.\n", desc->MultisampleEnable); + } + /* We cannot fail after creating a wined3d_rasterizer_state object. It * would lead to double free. */ if (FAILED(hr = wined3d_rasterizer_state_create(device->wined3d_device, &wined3d_desc,

1 0

Rémi Bernon : user32: Refactor and simplify GetRawInputDeviceInfoW cases.
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: cda4abac9859ed42c29e8cb2746201a578431a5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cda4abac9859ed42c29e8cb2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 4 10:24:56 2021 +0200 user32: Refactor and simplify GetRawInputDeviceInfoW cases. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 48 +++++++++++++----------------------------------- 1 file changed, 13 insertions(+), 35 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 15e909ebd9c..f2d64ccc23b 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -686,8 +686,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT { RID_DEVICE_INFO info; struct device *device; - const void *to_copy; - UINT to_copy_bytes, avail_bytes; + DWORD len, data_len; TRACE("handle %p, command %#x, data %p, data_size %p.\n", handle, command, data, data_size); @@ -703,45 +702,26 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT return ~0U; } - /* each case below must set: - * *data_size: length (meaning defined by command) of data we want to copy - * avail_bytes: number of bytes available in user buffer - * to_copy_bytes: number of bytes we want to copy into user buffer - * to_copy: pointer to data we want to copy into user buffer - */ + data_len = *data_size; switch (command) { case RIDI_DEVICENAME: - /* for RIDI_DEVICENAME, data_size is in characters, not bytes */ - avail_bytes = *data_size * sizeof(WCHAR); - *data_size = wcslen(device->detail->DevicePath) + 1; - to_copy = device->detail->DevicePath; - to_copy_bytes = *data_size * sizeof(WCHAR); + if ((len = wcslen(device->detail->DevicePath) + 1) <= data_len && data) + memcpy(data, device->detail->DevicePath, len * sizeof(WCHAR)); + *data_size = len; break; case RIDI_DEVICEINFO: - avail_bytes = *data_size; - info.cbSize = sizeof(info); - info = device->info; - to_copy_bytes = sizeof(info); - *data_size = to_copy_bytes; - to_copy = &info; + if ((len = sizeof(info)) <= data_len && data) + memcpy(data, &device->info, len); + *data_size = len; break; case RIDI_PREPARSEDDATA: - avail_bytes = *data_size; - if (device->info.dwType != RIM_TYPEHID) - { - to_copy_bytes = 0; - *data_size = 0; - to_copy = NULL; - } - else - { - to_copy_bytes = ((WINE_HIDP_PREPARSED_DATA*)device->data)->dwSize; - *data_size = to_copy_bytes; - to_copy = device->data; - } + len = device->data ? ((WINE_HIDP_PREPARSED_DATA*)device->data)->dwSize : 0; + if (device->data && len <= data_len && data) + memcpy(data, device->data, len); + *data_size = len; break; default: @@ -753,14 +733,12 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT if (!data) return 0; - if (avail_bytes < to_copy_bytes) + if (data_len < len) { SetLastError(ERROR_INSUFFICIENT_BUFFER); return ~0U; } - memcpy(data, to_copy, to_copy_bytes); - return *data_size; }

1 0

Rémi Bernon : user32: Remove unnecessary MOUSE / KEYBOARD special cases.
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: 82211cd478fdf5ab2bf97704b7fd6a32545ad65d URL: https://source.winehq.org/git/wine.git/?a=commit;h=82211cd478fdf5ab2bf97704… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 4 10:24:55 2021 +0200 user32: Remove unnecessary MOUSE / KEYBOARD special cases. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 39 ++++----------------------------------- dlls/user32/tests/input.c | 3 +-- 2 files changed, 5 insertions(+), 37 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 9a72a9a323e..15e909ebd9c 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -684,10 +684,6 @@ UINT WINAPI GetRawInputDeviceInfoA(HANDLE device, UINT command, void *data, UINT */ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT *data_size) { - /* FIXME: Most of this is made up. */ - static const RID_DEVICE_INFO_KEYBOARD keyboard_info = {0, 0, 1, 12, 3, 101}; - static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE}; - RID_DEVICE_INFO info; struct device *device; const void *to_copy; @@ -718,41 +714,15 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT case RIDI_DEVICENAME: /* for RIDI_DEVICENAME, data_size is in characters, not bytes */ avail_bytes = *data_size * sizeof(WCHAR); - if (handle == WINE_MOUSE_HANDLE) - { - *data_size = ARRAY_SIZE(L"\\\\?\\WINE_MOUSE"); - to_copy = L"\\\\?\\WINE_MOUSE"; - } - else if (handle == WINE_KEYBOARD_HANDLE) - { - *data_size = ARRAY_SIZE(L"\\\\?\\WINE_KEYBOARD"); - to_copy = L"\\\\?\\WINE_KEYBOARD"; - } - else - { - *data_size = wcslen(device->detail->DevicePath) + 1; - to_copy = device->detail->DevicePath; - } + *data_size = wcslen(device->detail->DevicePath) + 1; + to_copy = device->detail->DevicePath; to_copy_bytes = *data_size * sizeof(WCHAR); break; case RIDI_DEVICEINFO: avail_bytes = *data_size; info.cbSize = sizeof(info); - if (handle == WINE_MOUSE_HANDLE) - { - info.dwType = RIM_TYPEMOUSE; - info.u.mouse = mouse_info; - } - else if (handle == WINE_KEYBOARD_HANDLE) - { - info.dwType = RIM_TYPEKEYBOARD; - info.u.keyboard = keyboard_info; - } - else - { - info = device->info; - } + info = device->info; to_copy_bytes = sizeof(info); *data_size = to_copy_bytes; to_copy = &info; @@ -760,8 +730,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT case RIDI_PREPARSEDDATA: avail_bytes = *data_size; - if (handle == WINE_MOUSE_HANDLE || handle == WINE_KEYBOARD_HANDLE || - device->info.dwType != RIM_TYPEHID) + if (device->info.dwType != RIM_TYPEHID) { to_copy_bytes = 0; *data_size = 0; diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 4ce2c5643cd..b45adeb3cae 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1923,8 +1923,7 @@ static void test_GetRawInputDeviceList(void) * understand that; so use the \\?\ prefix instead */ name[1] = '\\'; file = CreateFileW(name, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); - todo_wine_if(info.dwType == RIM_TYPEMOUSE || info.dwType == RIM_TYPEKEYBOARD) - ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u\n", wine_dbgstr_w(name), GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u\n", wine_dbgstr_w(name), GetLastError()); sz = 0; ret = pGetRawInputDeviceInfoW(devices[i].hDevice, RIDI_PREPARSEDDATA, NULL, &sz);

1 0

Rémi Bernon : user32: Set last error codes on GetRawInputDeviceInfoW failure.
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: 6a0eb7a5f2929f96f986803bcc58600e0bfcf774 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a0eb7a5f2929f96f986803b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 4 10:24:54 2021 +0200 user32: Set last error codes on GetRawInputDeviceInfoW failure. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 16 ++++++++++++++-- dlls/user32/tests/input.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 1e66b394cb5..9a72a9a323e 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -696,8 +696,16 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT TRACE("handle %p, command %#x, data %p, data_size %p.\n", handle, command, data, data_size); - if (!data_size) return ~0U; - if (!(device = find_device_from_handle(handle))) return ~0U; + if (!data_size) + { + SetLastError(ERROR_NOACCESS); + return ~0U; + } + if (!(device = find_device_from_handle(handle))) + { + SetLastError(ERROR_INVALID_HANDLE); + return ~0U; + } /* each case below must set: * *data_size: length (meaning defined by command) of data we want to copy @@ -769,6 +777,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT default: FIXME("command %#x not supported\n", command); + SetLastError(ERROR_INVALID_PARAMETER); return ~0U; } @@ -776,7 +785,10 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT return 0; if (avail_bytes < to_copy_bytes) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); return ~0U; + } memcpy(data, to_copy, to_copy_bytes); diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 382e124e1f4..4ce2c5643cd 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1834,6 +1834,43 @@ static void test_GetRawInputDeviceList(void) ret = pGetRawInputDeviceList(devices, &devcount, sizeof(devices[0])); ok(ret > 0, "expected non-zero\n"); + if (devcount) + { + RID_DEVICE_INFO info; + UINT size; + + SetLastError( 0xdeadbeef ); + ret = pGetRawInputDeviceInfoW( UlongToHandle( 0xdeadbeef ), RIDI_DEVICEINFO, NULL, NULL ); + ok( ret == ~0U, "GetRawInputDeviceInfoW returned %#x, expected ~0.\n", ret ); + ok( GetLastError() == ERROR_NOACCESS, "GetRawInputDeviceInfoW last error %#x, expected 0xdeadbeef.\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + size = 0xdeadbeef; + ret = pGetRawInputDeviceInfoW( UlongToHandle( 0xdeadbeef ), RIDI_DEVICEINFO, NULL, &size ); + ok( ret == ~0U, "GetRawInputDeviceInfoW returned %#x, expected ~0.\n", ret ); + ok( size == 0xdeadbeef, "GetRawInputDeviceInfoW returned size %#x, expected 0.\n", size ); + ok( GetLastError() == ERROR_INVALID_HANDLE, "GetRawInputDeviceInfoW last error %#x, expected 0xdeadbeef.\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + size = 0xdeadbeef; + ret = pGetRawInputDeviceInfoW( devices[0].hDevice, 0xdeadbeef, NULL, &size ); + ok( ret == ~0U, "GetRawInputDeviceInfoW returned %#x, expected ~0.\n", ret ); + ok( size == 0xdeadbeef, "GetRawInputDeviceInfoW returned size %#x, expected 0.\n", size ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "GetRawInputDeviceInfoW last error %#x, expected 0xdeadbeef.\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pGetRawInputDeviceInfoW( devices[0].hDevice, RIDI_DEVICEINFO, &info, NULL ); + ok( ret == ~0U, "GetRawInputDeviceInfoW returned %#x, expected ~0.\n", ret ); + ok( GetLastError() == ERROR_NOACCESS, "GetRawInputDeviceInfoW last error %#x, expected 0xdeadbeef.\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + size = 0; + ret = pGetRawInputDeviceInfoW( devices[0].hDevice, RIDI_DEVICEINFO, &info, &size ); + ok( ret == ~0U, "GetRawInputDeviceInfoW returned %#x, expected ~0.\n", ret ); + ok( size == sizeof(info), "GetRawInputDeviceInfoW returned size %#x, expected %#x.\n", size, sizeof(info) ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetRawInputDeviceInfoW last error %#x, expected 0xdeadbeef.\n", GetLastError() ); + } + for(i = 0; i < devcount; ++i) { WCHAR name[128];

1 0

Rémi Bernon : user32: Free rawinput device preparsed data for mouse and keyboard.
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: 964bf9687baa29da081d3eb6e18f7cdfa1c9ded7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=964bf9687baa29da081d3eb6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 4 10:24:53 2021 +0200 user32: Free rawinput device preparsed data for mouse and keyboard. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 6172c500839..1e66b394cb5 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -226,6 +226,8 @@ static void find_devices(void) device->info.dwType = RIM_TYPEMOUSE; device->info.u.mouse = mouse_info; + HidD_FreePreparsedData(device->data); + device->data = NULL; } SetupDiDestroyDeviceInfoList(set); @@ -241,6 +243,8 @@ static void find_devices(void) device->info.dwType = RIM_TYPEKEYBOARD; device->info.u.keyboard = keyboard_info; + HidD_FreePreparsedData(device->data); + device->data = NULL; } SetupDiDestroyDeviceInfoList(set);

1 0

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: 44924f34df303dc013e927c1296920d872a08cbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=44924f34df303dc013e927c1… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Tue May 4 16:15:34 2021 +0200 po: Update Polish translation. Signed-off-by: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pl.po | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/po/pl.po b/po/pl.po index 823c8a5a0fb..3e0a701904a 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-04-16 09:37+0200\n" +"PO-Revision-Date: 2021-05-04 16:13+0200\n" "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: pl\n" @@ -3988,10 +3988,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "Nie można zmienić niezapisywalnej własności '|'" #: dlls/jscript/jscript.rc:77 -#, fuzzy -#| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "'[obiekt]' nie jest obiektem daty" +msgstr "'this' nie jest obiektem Map" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value" @@ -14732,10 +14730,8 @@ msgstr "" "\n" #: programs/reg/reg.rc:172 -#, fuzzy -#| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" -msgstr "reg: Nieprawidłowy klucz systemowy [%1]\n" +msgstr "reg: Nieprawidłowy klucz systemowy\n" #: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" @@ -14766,10 +14762,8 @@ msgstr "" "\n" #: programs/reg/reg.rc:180 -#, fuzzy -#| msgid "reg: Unable to find the specified registry key\n" msgid "reg: Unable to access or create the specified registry key\n" -msgstr "reg: Nie można znaleźć danej klucza rejestru\n" +msgstr "reg: Nie można otworzyć, ani stworzyć danego klucza rejestru\n" #: programs/regedit/regedit.rc:34 msgid "&Registry" @@ -16590,9 +16584,9 @@ msgid "" "(provided by Wine) or native (taken from Windows or provided by the " "application)." msgstr "" -"Tutaj, dla każdej biblioteki DLL osobno, można ustawićczy będzie używana jej " -"wersja wbudowana (dostarczona z Wine), czy zewnętrzna(wzięta z Windowsa lub " -"dostarczona wraz z aplikacją)" +"Tutaj, dla każdej biblioteki DLL osobno, można ustawić czy będzie używana " +"jej wersja wbudowana (dostarczona z Wine), czy zewnętrzna(wzięta z Windowsa " +"lub dostarczona wraz z aplikacją)" #: programs/winecfg/winecfg.rc:193 msgid "&New override for library:" @@ -16612,7 +16606,7 @@ msgstr "Zmi&eń..." #: programs/winecfg/winecfg.rc:204 msgid "Edit Override" -msgstr "Zmień zasadę" +msgstr "Zmiana zasady" #: programs/winecfg/winecfg.rc:207 msgid "Load order" @@ -17735,7 +17729,7 @@ msgstr "Zawijanie wierszy" #: programs/wordpad/wordpad.rc:268 msgid "&No line wrapping" -msgstr "Bez zawijania wierszy" +msgstr "Bez zawija&nia wierszy" #: programs/wordpad/wordpad.rc:269 msgid "Wrap text by the &window border"

1 0

Jan Sikorski : d3d11/tests: Test combined scissors and viewport with negative offsets.
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: 945e4f1d054ca2e8fb8dfec907bf2ba55c1d9c11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=945e4f1d054ca2e8fb8dfec9… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue May 4 12:43:57 2021 +0200 d3d11/tests: Test combined scissors and viewport with negative offsets. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 191df67a41d..95d7c847720 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11550,6 +11550,23 @@ static void test_scissor(void) color = get_texture_color(test_context.backbuffer, 320, 420); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); + set_viewport(immediate_context, -1.0f, 0.0f, 641, 480, 0.0f, 1.0f); + SetRect(&scissor_rect, -1, 0, 640, 480); + ID3D11DeviceContext_RSSetScissorRects(immediate_context, 1, &scissor_rect); + ID3D11DeviceContext_ClearRenderTargetView(immediate_context, test_context.backbuffer_rtv, red); + check_texture_color(test_context.backbuffer, 0xff0000ff, 1); + draw_color_quad(&test_context, &green); + color = get_texture_color(test_context.backbuffer, 320, 60); + ok(compare_color(color, 0xff00ff00, 1), "Got unexpected color 0x%08x.\n", color); + color = get_texture_color(test_context.backbuffer, 80, 240); + ok(compare_color(color, 0xff00ff00, 1), "Got unexpected color 0x%08x.\n", color); + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(compare_color(color, 0xff00ff00, 1), "Got unexpected color 0x%08x.\n", color); + color = get_texture_color(test_context.backbuffer, 560, 240); + ok(compare_color(color, 0xff00ff00, 1), "Got unexpected color 0x%08x.\n", color); + color = get_texture_color(test_context.backbuffer, 320, 420); + ok(compare_color(color, 0xff00ff00, 1), "Got unexpected color 0x%08x.\n", color); + ID3D11RasterizerState_Release(rs); release_test_context(&test_context); }

1 0

Alexandre Julliard : include: Disallow wcsncpy() in Wine, similarly to strncpy().
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: b35404aa61bf9d5c95ba9b51adb57df7cec1827b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b35404aa61bf9d5c95ba9b51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 4 21:23:01 2021 +0200 include: Disallow wcsncpy() in Wine, similarly to strncpy(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/tests/string.c | 1 + dlls/ntdll/wcstring.c | 1 + include/winbase.h | 4 +++- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 8f6ee08ef2a..669d8c29a98 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -31,6 +31,7 @@ #include "windef.h" #include "winbase.h" #undef strncpy +#undef wcsncpy extern BOOL sse2_supported DECLSPEC_HIDDEN; diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index b236301218f..6bf3b6e775d 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -33,6 +33,7 @@ /* make it use a definition from string.h */ #undef strncpy +#undef wcsncpy #include "winbase.h" #include "winnls.h" #include "winuser.h" diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index eee856b21d0..a727e4defac 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -241,6 +241,7 @@ int __cdecl wcsncmp( LPCWSTR str1, LPCWSTR str2, size_t n ) /********************************************************************* * wcsncpy (NTDLL.@) */ +#undef wcsncpy LPWSTR __cdecl wcsncpy( LPWSTR s1, LPCWSTR s2, size_t n ) { WCHAR *ret = s1; diff --git a/include/winbase.h b/include/winbase.h index 5e35c31a3b7..2928385bde6 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2888,9 +2888,11 @@ static inline LPSTR WINAPI lstrcatA( LPSTR dst, LPCSTR src ) return strcat( dst, src ); } -/* strncpy doesn't do what you think, don't use it */ +/* strncpy/wcsncpy don't do what you think, don't use them */ #undef strncpy +#undef wcsncpy #define strncpy(d,s,n) error do_not_use_strncpy_use_lstrcpynA_or_memcpy_instead +#define wcsncpy(d,s,n) error do_not_use_wcsncpy_use_lstrcpynW_or_memcpy_instead #endif /* !defined(__WINESRC__) || defined(WINE_NO_INLINE_STRING) */

1 0

Alexandre Julliard : taskmgr: Avoid wcsncpy().
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: 85846bfbf4152e7c89ef3415366d70fc44a2265d URL: https://source.winehq.org/git/wine.git/?a=commit;h=85846bfbf4152e7c89ef3415… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 4 21:22:20 2021 +0200 taskmgr: Avoid wcsncpy(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/perfdata.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index 2cbd6b01669..4498a2fe1f1 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -328,7 +328,7 @@ BOOL PerfDataGetImageName(ULONG Index, LPWSTR lpImageName, int nMaxCount) EnterCriticalSection(&PerfDataCriticalSection); if (Index < ProcessCount) { - wcsncpy(lpImageName, pPerfData[Index].ImageName, nMaxCount); + lstrcpynW(lpImageName, pPerfData[Index].ImageName, nMaxCount); if (pPerfData[Index].Wow64Process && nMaxCount - lstrlenW(lpImageName) > 4 /* =lstrlenW(proc32W) */) lstrcatW(lpImageName, proc32W); @@ -363,7 +363,7 @@ BOOL PerfDataGetUserName(ULONG Index, LPWSTR lpUserName, int nMaxCount) EnterCriticalSection(&PerfDataCriticalSection); if (Index < ProcessCount) { - wcsncpy(lpUserName, pPerfData[Index].UserName, nMaxCount); + lstrcpynW(lpUserName, pPerfData[Index].UserName, nMaxCount); bSuccessful = TRUE; } else { bSuccessful = FALSE;

1 0

Alexandre Julliard : dwrite: Avoid wcsncpy().
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: 4da6dc6384b717b1cc146f38b18b3e9ca4ec3270 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4da6dc6384b717b1cc146f38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 4 21:18:55 2021 +0200 dwrite: Avoid wcsncpy(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 717550acf38..d7f8701fbbe 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -2649,8 +2649,7 @@ HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, WCHAR * { *nameW = 0; IDWriteLocalizedStrings_GetString(lfnames, index, nameW, length + 1); - wcsncpy(lfname, nameW, LF_FACESIZE); - lfname[LF_FACESIZE-1] = 0; + lstrcpynW(lfname, nameW, LF_FACESIZE); heap_free(nameW); } }

1 0