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

Alexandre Julliard : dwrite: Avoid wcsncpy().
by Alexandre Julliard 04 May '21

04 May '21

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

Alexandre Julliard : taskmgr: Avoid wcsncpy().
by Alexandre Julliard 04 May '21

04 May '21

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 : include: Disallow wcsncpy() in Wine, similarly to strncpy().
by Alexandre Julliard 04 May '21

04 May '21

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

Jan Sikorski : wined3d: Make sure scissor offsets are not negative.
by Alexandre Julliard 04 May '21

04 May '21

Module: wine Branch: master Commit: ef7b2180cf55651035a8251abb2e5669346a7e53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef7b2180cf55651035a8251a… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue May 4 12:43:56 2021 +0200 wined3d: Make sure scissor offsets are not negative. 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/wined3d/context_vk.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index fbc1e294fcd..83b1d081514 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2204,6 +2204,11 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte key->scissor.extent.width = key->viewport.width; key->scissor.extent.height = key->viewport.height; } + /* Scissor offsets need to be non-negative (VUID-VkPipelineViewportStateCreateInfo-x-02821) */ + if (key->scissor.offset.x < 0) + key->scissor.offset.x = 0; + if (key->scissor.offset.y < 0) + key->scissor.offset.y = 0; key->viewport.y += key->viewport.height; key->viewport.height = -key->viewport.height;

1 0

Jan Sikorski : d3d11/tests: Test combined scissors and viewport with negative offsets.
by Alexandre Julliard 04 May '21

04 May '21

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

Jan Sikorski : d3d10core/tests: Test combined scissors and viewport with negative offsets.
by Alexandre Julliard 04 May '21

04 May '21

Module: wine Branch: master Commit: 115808d1db71c7246d79185f0a7c119367aa02eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=115808d1db71c7246d79185f… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue May 4 12:43:58 2021 +0200 d3d10core/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/d3d10core/tests/d3d10core.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index ccddb401aed..d23857a14bf 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -5067,6 +5067,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(device, -1.0f, 0.0f, 641, 480, 0.0f, 1.0f); + SetRect(&scissor_rect, -1, 0, 640, 480); + ID3D10Device_RSSetScissorRects(device, 1, &scissor_rect); + ID3D10Device_ClearRenderTargetView(device, 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); + ID3D10RasterizerState_Release(rs); release_test_context(&test_context); }

1 0

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard 04 May '21

04 May '21

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

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 04 May '21

04 May '21

Module: wine Branch: master Commit: 64041e3e03660e6ed4f33410172678c32b8838a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64041e3e03660e6ed4f33410… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Tue May 4 17:04:00 2021 +0200 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/po/nl.po b/po/nl.po index 74dd20a4afe..6347c615a8f 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,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-21 09:20+0200\n" +"PO-Revision-Date: 2021-05-04 16:50+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -571,7 +571,7 @@ msgstr "Opslaan als..." #: dlls/comdlg32/comdlg32.rc:193 dlls/comdlg32/comdlg32.rc:146 msgid "Save As" -msgstr "&Opslaan als" +msgstr "Opslaan als" #: dlls/comdlg32/comdlg32.rc:202 dlls/comdlg32/comdlg32.rc:211 #: dlls/comdlg32/comdlg32.rc:358 dlls/comdlg32/comdlg32.rc:55 @@ -3985,10 +3985,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "Kan onschrijfbare eigenschap '|' niet veranderen" #: dlls/jscript/jscript.rc:77 -#, fuzzy -#| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "'[object]' is geen datum object" +msgstr "'this' is geen Map object" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value" @@ -14799,10 +14797,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: Kan de gegeven registersleutel niet vinden\n" +msgstr "reg: Kan de gegeven registersleutel niet openen of aanmaken\n" #: programs/regedit/regedit.rc:34 msgid "&Registry"

1 0

Nikolay Sivov : mfplat: Trace I8 propvariant values.
by Alexandre Julliard 04 May '21

04 May '21

Module: wine Branch: master Commit: f4aae6255b26899cbf443c18391eec5e5808c63c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4aae6255b26899cbf443c18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 4 13:22:03 2021 +0300 mfplat: Trace I8 propvariant values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat_private.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index 8c968fe6fba..117907bb1a9 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -132,6 +132,8 @@ static inline const char *debugstr_propvar(const PROPVARIANT *v) return wine_dbg_sprintf("%p {VT_UI4: %d}", v, v->ulVal); case VT_UI8: return wine_dbg_sprintf("%p {VT_UI8: %s}", v, wine_dbgstr_longlong(v->uhVal.QuadPart)); + case VT_I8: + return wine_dbg_sprintf("%p {VT_I8: %s}", v, wine_dbgstr_longlong(v->hVal.QuadPart)); case VT_R8: return wine_dbg_sprintf("%p {VT_R8: %lf}", v, v->dblVal); case VT_CLSID:

1 0

Arkadiusz Hiler : msvcrt: Remove return after _endthread().
by Alexandre Julliard 04 May '21

04 May '21

Module: wine Branch: master Commit: a4af8bb0506e679bcf215af6905784f917881c93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4af8bb0506e679bcf215af6… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue May 4 14:49:35 2021 +0300 msvcrt: Remove return after _endthread(). Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/thread.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index 650afdc08af..c2fc863dd33 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -103,7 +103,6 @@ static DWORD CALLBACK _beginthread_trampoline(LPVOID arg) local_trampoline.start_address(local_trampoline.arglist); _endthread(); - return 0; } /*********************************************************************

1 0