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

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 27 Mar '19

27 Mar '19

Module: wine Branch: master Commit: 8236c7a8c50b6160ce0863a98f27fb78e0580e6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8236c7a8c50b6160ce0863a9… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Mar 27 10:41:38 2019 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 56 +------------------------------------------------------- 1 file changed, 1 insertion(+), 55 deletions(-) diff --git a/po/lt.po b/po/lt.po index 2485a8f..dedbf52 100644 --- a/po/lt.po +++ b/po/lt.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: 2019-03-19 21:12+0300\n" +"PO-Revision-Date: 2019-03-27 10:40+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -10897,10 +10897,6 @@ msgstr "" "kartu." #: winmm.rc:128 -#, fuzzy -#| msgid "" -#| "The specified MIDI port is already in use. Wait until it is free; then " -#| "try again." msgid "" "The specified MIDI port is already in use. Wait until it is free, and then " "try again." @@ -10921,10 +10917,6 @@ msgid "An error occurred with the specified port." msgstr "Įvyko klaida su nurodytu prievadu." #: winmm.rc:133 -#, fuzzy -#| msgid "" -#| "All multimedia timers are being used by other applications. Quit one of " -#| "these applications; then, try again." msgid "" "All multimedia timers are being used by other applications. Quit one of " "these applications, and then try again." @@ -15245,10 +15237,6 @@ msgid "Drive configuration" msgstr "Diskų konfigūravimas" #: winecfg.rc:233 -#, fuzzy -#| msgid "" -#| "Failed to connect to the mount manager, the drive configuration cannot be " -#| "edited." msgid "" "Failed to connect to the mount manager; the drive configuration cannot be " "edited." @@ -15540,12 +15528,6 @@ msgid "System drive" msgstr "Sisteminis diskas" #: winecfg.rc:76 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete drive C?\n" -#| "\n" -#| "Most Windows applications expect drive C to exist, and will die messily " -#| "if it doesn't. If you proceed remember to recreate it!" msgid "" "Are you sure you want to delete drive C?\n" "\n" @@ -16832,42 +16814,6 @@ msgid "D" msgstr "K" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/K] Copy file attributes, without this attributes are not preserved.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n"

1 0

Vijay Kiran Kamuju : imagehlp/tests: Add initial tests for CheckSumMappedFile.
by Alexandre Julliard 27 Mar '19

27 Mar '19

Module: wine Branch: master Commit: 602ff38cdd41f42b0d1f4a2cecf2043b2a30f037 URL: https://source.winehq.org/git/wine.git/?a=commit;h=602ff38cdd41f42b0d1f4a2c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Mar 24 12:25:47 2019 +0100 imagehlp/tests: Add initial tests for CheckSumMappedFile. Based on a patch by Michael Müller. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imagehlp/modify.c | 36 ++------- dlls/imagehlp/tests/integrity.c | 164 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 170 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=602ff38cdd41f42b0d1f…

1 0

Isira Seneviratne : kernel32/nls: Change Sinhala sublang identifier to SUBLANG_SINHALESE_SRI_LANKA.
by Alexandre Julliard 27 Mar '19

27 Mar '19

Module: wine Branch: master Commit: eb3988f080b85dce5dae66c5e667724683945c6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb3988f080b85dce5dae66c5… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Tue Mar 26 19:56:27 2019 +0530 kernel32/nls: Change Sinhala sublang identifier to SUBLANG_SINHALESE_SRI_LANKA. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/sin.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/sin.nls b/dlls/kernel32/nls/sin.nls index 36dd281..033dbc0 100644 --- a/dlls/kernel32/nls/sin.nls +++ b/dlls/kernel32/nls/sin.nls @@ -20,7 +20,7 @@ #pragma code_page(65001) /* UTF-8 */ -STRINGTABLE LANGUAGE LANG_SINHALESE, SUBLANG_DEFAULT +STRINGTABLE LANGUAGE LANG_SINHALESE, SUBLANG_SINHALESE_SRI_LANKA { LOCALE_FONTSIGNATURE L"\x002f\x8010\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0003\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1"

1 0

Mark Jansen : wintrust/tests: Add tests for WinVerifyTrust.
by Alexandre Julliard 27 Mar '19

27 Mar '19

Module: wine Branch: master Commit: eaf68e99ba70c5bd144e66118e2751dca4433a75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eaf68e99ba70c5bd144e6611… Author: Mark Jansen <learn0more+wine(a)gmail.com> Date: Fri Mar 22 10:27:16 2019 +0100 wintrust/tests: Add tests for WinVerifyTrust. Includes various improvements by Sebastian Lackner <sebastian(a)fds-team.de>. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/tests/softpub.c | 352 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 352 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eaf68e99ba70c5bd144e…

1 0

Sebastian Lackner : wintrust/tests: Add some additional tests.
by Alexandre Julliard 27 Mar '19

27 Mar '19

Module: wine Branch: master Commit: 0e8401076679f337655e72fa1726f05fcd89e069 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e8401076679f337655e72fa… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Mar 22 10:27:17 2019 +0100 wintrust/tests: Add some additional tests. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/tests/softpub.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index c1cb959..5d6d62c 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -1150,6 +1150,16 @@ static void test_wintrust_digest(void) { CERT_E_CHAINING, TRUE }, { S_OK, FALSE } }, { + {{ SelfSignedFile32, sizeof(SelfSignedFile32) }, + { Dummy, sizeof(Dummy) }}, + { TRUST_E_NOSIGNATURE, TRUE }, { TRUST_E_NOSIGNATURE, TRUE } + }, + { + {{ Dummy, sizeof(Dummy) }, + { SelfSignedFile32 + sizeof(Dummy), sizeof(SelfSignedFile32) - sizeof(Dummy) }}, + { TRUST_E_SUBJECT_FORM_UNKNOWN, FALSE }, { TRUST_E_NOSIGNATURE, TRUE } + }, + { {{ SelfSignedFile32, 19 }, { Dummy, sizeof(Dummy) }, { SelfSignedFile32 + 19 + sizeof(Dummy), sizeof(SelfSignedFile32) - 19 - sizeof(Dummy) }}, @@ -1170,6 +1180,16 @@ static void test_wintrust_digest(void) { CERT_E_CHAINING, TRUE }, { S_OK, FALSE } }, { + {{ SelfSignedFile64, sizeof(SelfSignedFile64) }, + { Dummy, sizeof(Dummy) }}, + { TRUST_E_NOSIGNATURE, TRUE }, { TRUST_E_NOSIGNATURE, TRUE } + }, + { + {{ Dummy, sizeof(Dummy) }, + { SelfSignedFile64 + sizeof(Dummy), sizeof(SelfSignedFile64) - sizeof(Dummy) }}, + { TRUST_E_SUBJECT_FORM_UNKNOWN, FALSE }, { TRUST_E_NOSIGNATURE, TRUE } + }, + { {{ SelfSignedFile64, 19 }, { Dummy, sizeof(Dummy) }, { SelfSignedFile64 + 19 + sizeof(Dummy), sizeof(SelfSignedFile64) - 19 - sizeof(Dummy) }},

1 0

Alexandre Julliard : user32: Add a dummy _wassert implementation to avoid a Mingw build issue.
by Alexandre Julliard 27 Mar '19

27 Mar '19

Module: wine Branch: master Commit: 5aa83bee08e4049a5738c47c83b14dd7fa8a0e73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5aa83bee08e4049a5738c47c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 16:50:21 2019 +0100 user32: Add a dummy _wassert implementation to avoid a Mingw build issue. _wassert references __imp__MessageBoxW(a)16 which causes a duplicate definition of MessageBoxW. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 007cb68..8300975 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -55,6 +55,10 @@ static DWORD exiting_thread_id; extern void WDML_NotifyThreadDetach(void); +#ifdef __MINGW32__ +/* work around a Mingw build issue where _wassert causes a duplicate reference to MessageBoxW */ +void __cdecl _wassert( const WCHAR *msg, const WCHAR *file, unsigned line) { abort(); } +#endif /*********************************************************************** * USER_Lock

1 0

Alexandre Julliard : libwine: Move string functions to libwine_port.
by Alexandre Julliard 27 Mar '19

27 Mar '19

Module: wine Branch: master Commit: 47242d25f5b2964c9a61956345d1fe0ad39b96d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47242d25f5b2964c9a619563… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 10:03:38 2019 +0100 libwine: Move string functions to libwine_port. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 1 + libs/{wine => port}/string.c | 3 +-- libs/wine/Makefile.in | 3 +-- libs/wine/port.c | 3 +++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index ef3b23f..18cbf79 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -101,6 +101,7 @@ C_SRCS = \ sortkey.c \ spawn.c \ statvfs.c \ + string.c \ strnlen.c \ symlink.c \ usleep.c \ diff --git a/libs/wine/string.c b/libs/port/string.c similarity index 99% rename from libs/wine/string.c rename to libs/port/string.c index 7aa981f..c3388bc 100644 --- a/libs/wine/string.c +++ b/libs/port/string.c @@ -23,7 +23,6 @@ #include <limits.h> #include <stdio.h> -#define WINE_UNICODE_INLINE /* nothing */ #include "wine/unicode.h" int strcmpiW( const WCHAR *str1, const WCHAR *str2 ) @@ -473,7 +472,7 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist) *fmta = '\0'; if (*iter == 'a' || *iter == 'A' || *iter == 'e' || *iter == 'E' || - *iter == 'f' || *iter == 'F' || + *iter == 'f' || *iter == 'F' || *iter == 'g' || *iter == 'G') sprintf(bufaiter, fmtbufa, va_arg(valist, double)); else diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index bd8a937..6525a53 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -6,8 +6,7 @@ C_SRCS = \ ldt.c \ loader.c \ mmap.c \ - port.c \ - string.c + port.c EXTRA_OBJS = version.o diff --git a/libs/wine/port.c b/libs/wine/port.c index 666c4ca..e954e5b 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -25,6 +25,7 @@ #include <string.h> #include <sys/types.h> +#define WINE_UNICODE_INLINE /* nothing */ #include "wine/unicode.h" #include "wine/library.h" @@ -33,6 +34,8 @@ #ifndef __ANDROID__ const void *libwine_port_functions[] = { + strtolW, + vsnprintfW, wine_compare_string, wine_cp_enum_table, wine_cp_get_table,

1 0

Michael Stefaniuc : d3d8: Actually test two return values.
by Alexandre Julliard 27 Mar '19

27 Mar '19

Module: wine Branch: master Commit: 9936d9ec829c5a2d34dc20338ec3ecd89891263b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9936d9ec829c5a2d34dc2033… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 26 20:41:36 2019 +0100 d3d8: Actually test two return values. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 90b90e9..c5ec9aa 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9655,7 +9655,7 @@ static void test_get_display_mode(void) hr = IDirect3DDevice8_GetDisplayMode(device, &mode); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); - IDirect3D8_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); + hr = IDirect3D8_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); @@ -9679,7 +9679,7 @@ static void test_get_display_mode(void) ok(mode.Width == 640, "Unexpected width %u.\n", mode.Width); ok(mode.Height == 480, "Unexpected width %u.\n", mode.Height); ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); - IDirect3D8_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); + hr = IDirect3D8_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(mode.Width == 640, "Unexpected width %u.\n", mode.Width); ok(mode.Height == 480, "Unexpected width %u.\n", mode.Height);

1 0

Michael Stefaniuc : d3d9: Actually test two return values.
by Alexandre Julliard 27 Mar '19

27 Mar '19

Module: wine Branch: master Commit: bb99ba7447208b6e602c47ed43fab252da61a80a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb99ba7447208b6e602c47ed… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 26 20:41:37 2019 +0100 d3d9: Actually test two return values. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index ffeb6b4..f79f261 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -13341,7 +13341,7 @@ static void test_get_display_mode(void) hr = IDirect3DDevice9_GetDisplayMode(device, 0, &mode); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); - IDirect3D9_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); + hr = IDirect3D9_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); @@ -13371,7 +13371,7 @@ static void test_get_display_mode(void) ok(mode.Width == 640, "Unexpected width %u.\n", mode.Width); ok(mode.Height == 480, "Unexpected width %u.\n", mode.Height); ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); - IDirect3D9_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); + hr = IDirect3D9_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(mode.Width == 640, "Unexpected width %u.\n", mode.Width); ok(mode.Height == 480, "Unexpected width %u.\n", mode.Height);

1 0

Piotr Caban : ntdll: Use RtlUpperChar in _strupr implementation.
by Alexandre Julliard 27 Mar '19

27 Mar '19

Module: wine Branch: master Commit: 09e6aa4b889eb8c157dc8f4ef3f789ed9ce3bd50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09e6aa4b889eb8c157dc8f4e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 14:08:02 2019 +0100 ntdll: Use RtlUpperChar in _strupr implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 853bed6..1d6af85 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -306,7 +306,7 @@ int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 ) LPSTR __cdecl _strupr( LPSTR str ) { LPSTR ret = str; - for ( ; *str; str++) *str = toupper(*str); + for ( ; *str; str++) *str = RtlUpperChar(*str); return ret; }

1 0