February 2022 - Wine-commits

Eric Pouech : reg/tests: Enable compilation with long types.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 72ca5d732aace208a98712c9f562d394dec67843 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72ca5d732aace208a98712c9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 12:04:28 2022 +0100 reg/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> --- programs/reg/tests/Makefile.in | 1 - programs/reg/tests/add.c | 302 +++++++-------- programs/reg/tests/copy.c | 192 +++++----- programs/reg/tests/delete.c | 114 +++--- programs/reg/tests/export.c | 98 ++--- programs/reg/tests/import.c | 816 ++++++++++++++++++++--------------------- programs/reg/tests/query.c | 94 ++--- 7 files changed, 808 insertions(+), 809 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=72ca5d732aace208a987…

1 0

Eric Pouech : schtasks/tests: Enable compilation with long types.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 6e41b512ec95def0f479f671cf6874218cdac74b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e41b512ec95def0f479f671… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 12:04:34 2022 +0100 schtasks/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> --- programs/schtasks/tests/Makefile.in | 1 - programs/schtasks/tests/schtasks.c | 42 ++++++++++++++++++------------------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/programs/schtasks/tests/Makefile.in b/programs/schtasks/tests/Makefile.in index 23cb744ff15..dcf641c4b13 100644 --- a/programs/schtasks/tests/Makefile.in +++ b/programs/schtasks/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = schtasks.exe IMPORTS = ole32 diff --git a/programs/schtasks/tests/schtasks.c b/programs/schtasks/tests/schtasks.c index c0f4ce78365..c1168d4b209 100644 --- a/programs/schtasks/tests/schtasks.c +++ b/programs/schtasks/tests/schtasks.c @@ -74,7 +74,7 @@ static DWORD _run_command(unsigned line, const char *cmd) strcpy(command, cmd); r = CreateProcessA(NULL, command, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi); - ok_(__FILE__,line)(r, "CreateProcess failed: %u\n", GetLastError()); + ok_(__FILE__,line)(r, "CreateProcess failed: %lu\n", GetLastError()); if(!r) return -1; ret = WaitForSingleObject(pi.hProcess, 10000); @@ -83,7 +83,7 @@ static DWORD _run_command(unsigned line, const char *cmd) TerminateProcess(pi.hProcess, -1); r = GetExitCodeProcess(pi.hProcess, &ret); - ok_(__FILE__,line)(r, "GetExitCodeProcess failed: %u\n", GetLastError()); + ok_(__FILE__,line)(r, "GetExitCodeProcess failed: %lu\n", GetLastError()); CloseHandle(pi.hThread); CloseHandle(pi.hProcess); @@ -107,7 +107,7 @@ static void _register_task(unsigned line, const char *task_name_a) hres = ITaskFolder_RegisterTask(root, task_name, xml, TASK_CREATE, empty, empty, TASK_LOGON_NONE, empty, &task); - ok_(__FILE__,line)(hres == S_OK, "RegisterTask failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "RegisterTask failed: %08lx\n", hres); HeapFree(GetProcessHeap(), 0, task_name); HeapFree(GetProcessHeap(), 0, xml); @@ -123,7 +123,7 @@ static void _unregister_task(unsigned line, const char *task_name_a) task_name = a2w(task_name_a); hres = ITaskFolder_DeleteTask(root, task_name, 0); - ok_(__FILE__,line)(hres == S_OK, "DeleteTask failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "DeleteTask failed: %08lx\n", hres); HeapFree(GetProcessHeap(), 0, task_name); } @@ -141,7 +141,7 @@ static void create_file(const char *file_name, const char *data) return; r = WriteFile(file, data, strlen(data), &size, NULL); - ok(r, "WriteFile failed: %u\n", GetLastError()); + ok(r, "WriteFile failed: %lu\n", GetLastError()); CloseHandle(file); } @@ -153,17 +153,17 @@ static BOOL initialize_task_service(void) hres = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskService, (void **)&service); if(hres != S_OK) { - ok(hres == REGDB_E_CLASSNOTREG, "Could not create task service: %08x\n", hres); + ok(hres == REGDB_E_CLASSNOTREG, "Could not create task service: %08lx\n", hres); win_skip("Task service not available\n"); return FALSE; } V_VT(&empty) = VT_EMPTY; hres = ITaskService_Connect(service, empty, empty, empty, empty); - ok(hres == S_OK, "Connect failed: %08x\n", hres); + ok(hres == S_OK, "Connect failed: %08lx\n", hres); hres = ITaskService_GetFolder(service, NULL, &root); - ok(hres == S_OK, "GetFolder error %08x\n", hres); + ok(hres == S_OK, "GetFolder error %08lx\n", hres); return TRUE; } @@ -180,51 +180,51 @@ START_TEST(schtasks) } r = run_command("schtasks"); - ok(r == 0, "r = %u\n", r); + ok(r == 0, "r = %lu\n", r); register_task("winetest"); r = run_command("schtasks /change /tn winetest /enable"); - ok(r == 0, "r = %u\n", r); + ok(r == 0, "r = %lu\n", r); unregister_task("winetest"); r = run_command("schtasks /change /tn winetest /enable"); - ok(r == 1, "r = %u\n", r); + ok(r == 1, "r = %lu\n", r); register_task("wine\\test\\winetest"); r = run_command("schtasks /CHANGE /tn wine\\test\\winetest /enable"); - ok(r == 0, "r = %u\n", r); + ok(r == 0, "r = %lu\n", r); r = run_command("schtasks /delete /f /tn wine\\test\\winetest"); - ok(r == 0, "r = %u\n", r); + ok(r == 0, "r = %lu\n", r); r = run_command("schtasks /Change /tn wine\\test\\winetest /enable"); - ok(r == 1, "r = %u\n", r); + ok(r == 1, "r = %lu\n", r); create_file("test.xml", xml_a); r = run_command("schtasks /create /xml test.xml /tn wine\\winetest"); - ok(r == 0, "r = %u\n", r); + ok(r == 0, "r = %lu\n", r); r = run_command("schtasks /change /tn wine\\winetest /enable"); - ok(r == 0, "r = %u\n", r); + ok(r == 0, "r = %lu\n", r); r = run_command("schtasks /create /xml test.xml /f /tn wine\\winetest"); - ok(r == 0, "r = %u\n", r); /* task already exists, but /f argument provided */ + ok(r == 0, "r = %lu\n", r); /* task already exists, but /f argument provided */ r = run_command("schtasks /create /xml test.xml /tn wine\\winetest"); - ok(r == 1, "r = %u\n", r); /* task already exists */ + ok(r == 1, "r = %lu\n", r); /* task already exists */ r = run_command("schtasks /create /tn wine\\winetest"); - ok(r == E_FAIL, "r = %x\n", r); /* missing arguments */ + ok(r == E_FAIL, "r = %lx\n", r); /* missing arguments */ r = run_command("schtasks /Delete /f /tn wine\\winetest"); - ok(r == 0, "r = %u\n", r); + ok(r == 0, "r = %lu\n", r); r = DeleteFileA("test.xml"); - ok(r, "DeleteFileA failed: %u\n", GetLastError()); + ok(r, "DeleteFileA failed: %lu\n", GetLastError()); ITaskFolder_DeleteFolder(root, wine_testW, 0); ITaskFolder_DeleteFolder(root, wineW, 0);

1 0

Eric Pouech : services/tests: Enable compilation with long types.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 0f6184bf03534dab1280dac921530a96af42eaa2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f6184bf03534dab1280dac9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 12:04:40 2022 +0100 services/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> --- programs/services/tests/Makefile.in | 1 - programs/services/tests/service.c | 150 ++++++++++++++++++------------------ 2 files changed, 75 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0f6184bf03534dab1280…

1 0

Eric Pouech : wscript/tests: Enable compilation with long types.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 63a9879aef5fee88779d271f5626f971bcc25542 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63a9879aef5fee88779d271f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 12:04:46 2022 +0100 wscript/tests: Enable compilation with long types. 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/wscript/tests/Makefile.in | 1 - programs/wscript/tests/run.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/wscript/tests/Makefile.in b/programs/wscript/tests/Makefile.in index bdb231353b7..1f038b04588 100644 --- a/programs/wscript/tests/Makefile.in +++ b/programs/wscript/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wscript.exe IMPORTS = ole32 oleaut32 psapi advapi32 diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index dbd10f537a7..7bccf097f87 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -260,7 +260,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF break; } default: - ok(0, "unexpected dispIdMember %d\n", dispIdMember); + ok(0, "unexpected dispIdMember %ld\n", dispIdMember); return E_NOTIMPL; } @@ -345,8 +345,8 @@ static void run_script_file(const char *file_name, DWORD expected_exit_code) WaitForSingleObject(pi.hProcess, INFINITE); bres = GetExitCodeProcess(pi.hProcess, &exit_code); - ok(bres, "GetExitCodeProcess failed: %u\n", GetLastError()); - ok(exit_code == expected_exit_code, "exit_code = %u, expected %u\n", exit_code, expected_exit_code); + ok(bres, "GetExitCodeProcess failed: %lu\n", GetLastError()); + ok(exit_code == expected_exit_code, "exit_code = %lu, expected %lu\n", exit_code, expected_exit_code); CloseHandle(pi.hThread); CloseHandle(pi.hProcess); @@ -371,13 +371,13 @@ static void run_script(const char *name, const char *script_data, size_t script_ file = CreateFileA(file_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %lu\n", GetLastError()); if(file == INVALID_HANDLE_VALUE) return; res = WriteFile(file, script_data, script_size, &size, NULL); CloseHandle(file); - ok(res, "Could not write to file: %u\n", GetLastError()); + ok(res, "Could not write to file: %lu\n", GetLastError()); if(!res) return; @@ -400,7 +400,7 @@ static BOOL WINAPI test_enum_proc(HMODULE module, LPCSTR type, LPSTR name, LONG_ trace("running %s test...\n", name); src = FindResourceA(NULL, name, type); - ok(src != NULL, "Could not find resource %s: %u\n", name, GetLastError()); + ok(src != NULL, "Could not find resource %s: %lu\n", name, GetLastError()); if(!src) return TRUE; @@ -451,7 +451,7 @@ static BOOL register_activex(void) hres = CoRegisterClassObject(&CLSID_TestObj, (IUnknown *)&testobj_cf, CLSCTX_SERVER, REGCLS_MULTIPLEUSE, &regid); - ok(hres == S_OK, "Could not register script engine: %08x\n", hres); + ok(hres == S_OK, "Could not register script engine: %08lx\n", hres); return TRUE; }

1 0

Eric Pouech : xcopy/tests: Enable compilation with long types.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: a07882ecaca45e5aaed83f0c941aa76812d01c7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a07882ecaca45e5aaed83f0c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 12:04:52 2022 +0100 xcopy/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> --- programs/xcopy/tests/Makefile.in | 1 - programs/xcopy/tests/xcopy.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/xcopy/tests/Makefile.in b/programs/xcopy/tests/Makefile.in index 5fb76fe2d20..3b3d5d5bdc5 100644 --- a/programs/xcopy/tests/Makefile.in +++ b/programs/xcopy/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = xcopy.exe C_SRCS = \ diff --git a/programs/xcopy/tests/xcopy.c b/programs/xcopy/tests/xcopy.c index 17b4406b74c..fa3d5328a1b 100644 --- a/programs/xcopy/tests/xcopy.c +++ b/programs/xcopy/tests/xcopy.c @@ -56,18 +56,18 @@ static void test_date_format(void) DWORD rc; rc = runcmd("xcopy /D:20-01-2000 xcopy1 xcopytest"); - ok(rc == 4, "xcopy /D:d-m-y test returned rc=%u\n", rc); + ok(rc == 4, "xcopy /D:d-m-y test returned rc=%lu\n", rc); ok(GetFileAttributesA("xcopytest\\xcopy1") == INVALID_FILE_ATTRIBUTES, "xcopy should not have created xcopytest\\xcopy1\n"); rc = runcmd("xcopy /D:01-20-2000 xcopy1 xcopytest"); - ok(rc == 0, "xcopy /D:m-d-y test failed rc=%u\n", rc); + ok(rc == 0, "xcopy /D:m-d-y test failed rc=%lu\n", rc); ok(GetFileAttributesA("xcopytest\\xcopy1") != INVALID_FILE_ATTRIBUTES, "xcopy did not create xcopytest\\xcopy1\n"); DeleteFileA("xcopytest\\xcopy1"); rc = runcmd("xcopy /D:1-20-2000 xcopy1 xcopytest"); - ok(rc == 0, "xcopy /D:m-d-y test failed rc=%u\n", rc); + ok(rc == 0, "xcopy /D:m-d-y test failed rc=%lu\n", rc); ok(GetFileAttributesA("xcopytest\\xcopy1") != INVALID_FILE_ATTRIBUTES, "xcopy did not create xcopytest\\xcopy1\n"); DeleteFileA("xcopytest\\xcopy1"); @@ -78,12 +78,12 @@ static void test_parms_syntax(void) DWORD rc; rc = runcmd("xcopy /H/D:20-01-2000 xcopy1 xcopytest"); - ok(rc == 4, "xcopy /H/D:d-m-y test returned rc=%u\n", rc); + ok(rc == 4, "xcopy /H/D:d-m-y test returned rc=%lu\n", rc); ok(GetFileAttributesA("xcopytest\\xcopy1") == INVALID_FILE_ATTRIBUTES, "xcopy should not have created xcopytest\\xcopy1\n"); rc = runcmd("xcopy /D:01-20-2000/H xcopy1 xcopytest"); - ok(rc == 0, "xcopy /H/D:m-d-y test failed rc=%u\n", rc); + ok(rc == 0, "xcopy /H/D:m-d-y test failed rc=%lu\n", rc); ok(GetFileAttributesA("xcopytest\\xcopy1") != INVALID_FILE_ATTRIBUTES, "xcopy did not create xcopytest\\xcopy1\n"); DeleteFileA("xcopytest\\xcopy1"); @@ -97,12 +97,12 @@ static void test_parms_syntax(void) DeleteFileA("xcopytest\\xcopy1"); */ rc = runcmd("xcopy /D/S xcopytest xcopytest2\\"); - ok(rc == 0, "xcopy /D/S test failed rc=%u\n", rc); + ok(rc == 0, "xcopy /D/S test failed rc=%lu\n", rc); ok(GetFileAttributesA("xcopytest2") == INVALID_FILE_ATTRIBUTES, "xcopy copied empty directory incorrectly\n"); rc = runcmd("xcopy /D/S/E xcopytest xcopytest2\\"); - ok(rc == 0, "xcopy /D/S/E test failed rc=%u\n", rc); + ok(rc == 0, "xcopy /D/S/E test failed rc=%lu\n", rc); ok(GetFileAttributesA("xcopytest2") != INVALID_FILE_ATTRIBUTES, "xcopy failed to copy empty directory\n"); RemoveDirectoryA("xcopytest2");

1 0

Paul Gofman : hnetcfg: Don't use _GetValue() if text element is missing in get_xml_elements().
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: d907c8959c9b638962e387ab651bdc21b572aff3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d907c8959c9b638962e387ab… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 3 14:28:31 2022 +0300 hnetcfg: Don't use _GetValue() if text element is missing in get_xml_elements(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/port.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index def77621764..611a652ce5e 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -265,7 +265,10 @@ static BOOL get_xml_elements( const char *desc_xml, struct xml_value_desc *value if (node_type == XmlNodeType_EndElement) value = L""; else goto done; } - if (FAILED(IXmlReader_GetValue( reader, &value, NULL ))) goto done; + else + { + if (FAILED(IXmlReader_GetValue( reader, &value, NULL ))) goto done; + } if (values[i].value) { WARN( "Duplicate value %s.\n", debugstr_w(values[i].name) );

1 0

Nikolay Sivov : kernel32: Add messages for some of the WSA error codes.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: ed5126de1120fbcdcb9896da5f1a342e71fc297d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed5126de1120fbcdcb9896da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 3 00:13:51 2022 +0300 kernel32: Add messages for some of the WSA error codes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/winerror.mc | 50 ++++++++++++++++++++++++++++++++++++++ po/ar.po | 62 +++++++++++++++++++++++++++++++++++++++++------ po/ast.po | 62 +++++++++++++++++++++++++++++++++++++++++------ po/bg.po | 56 ++++++++++++++++++++++++++++++++++++------ po/ca.po | 62 +++++++++++++++++++++++++++++++++++++++++------ po/cs.po | 62 +++++++++++++++++++++++++++++++++++++++++------ po/da.po | 62 +++++++++++++++++++++++++++++++++++++++++------ po/de.po | 62 +++++++++++++++++++++++++++++++++++++++++------ po/el.po | 56 ++++++++++++++++++++++++++++++++++++------ po/en.po | 48 ++++++++++++++++++++++++++++++------ po/en_US.po | 48 ++++++++++++++++++++++++++++++------ po/eo.po | 62 +++++++++++++++++++++++++++++++++++++++++------ po/es.po | 62 +++++++++++++++++++++++++++++++++++++++++------ po/fa.po | 51 ++++++++++++++++++++++++++++++++------ po/fi.po | 62 +++++++++++++++++++++++++++++++++++++++++------ po/fr.po | 62 +++++++++++++++++++++++++++++++++++++++++------ po/he.po | 56 ++++++++++++++++++++++++++++++++++++------ po/hi.po | 49 +++++++++++++++++++++++++++++++------ po/hr.po | 62 +++++++++++++++++++++++++++++++++++++++++------ po/hu.po | 62 +++++++++++++++++++++++++++++++++++++++++------ po/it.po | 62 +++++++++++++++++++++++++++++++++++++++++------ po/ja.po | 62 +++++++++++++++++++++++++++++++++++++++++------ po/ko.po | 62 +++++++++++++++++++++++++++++++++++++++++------ po/lt.po | 62 +++++++++++++++++++++++++++++++++++++++++------ po/ml.po | 49 +++++++++++++++++++++++++++++++------ po/nb_NO.po | 62 +++++++++++++++++++++++++++++++++++++++++------ po/nl.po | 62 +++++++++++++++++++++++++++++++++++++++++------ po/or.po | 49 +++++++++++++++++++++++++++++++------ po/pa.po | 49 +++++++++++++++++++++++++++++++------ po/pl.po | 62 +++++++++++++++++++++++++++++++++++++++++------ po/pt_BR.po | 62 +++++++++++++++++++++++++++++++++++++++++------ po/pt_PT.po | 62 +++++++++++++++++++++++++++++++++++++++++------ po/rm.po | 49 +++++++++++++++++++++++++++++++------ po/ro.po | 61 ++++++++++++++++++++++++++++++++++++++++------ po/ru.po | 62 +++++++++++++++++++++++++++++++++++++++++------ po/si.po | 61 ++++++++++++++++++++++++++++++++++++++++------ po/sk.po | 61 ++++++++++++++++++++++++++++++++++++++++------ po/sl.po | 62 +++++++++++++++++++++++++++++++++++++++++------ po/sr_RS(a)cyrillic.po | 56 ++++++++++++++++++++++++++++++++++++------ po/sr_RS(a)latin.po | 56 ++++++++++++++++++++++++++++++++++++------ po/sv.po | 62 +++++++++++++++++++++++++++++++++++++++++------ po/ta.po | 48 ++++++++++++++++++++++++++++++------ po/te.po | 49 +++++++++++++++++++++++++++++++------ po/th.po | 53 ++++++++++++++++++++++++++++++++++------ po/tr.po | 62 +++++++++++++++++++++++++++++++++++++++++------ po/uk.po | 62 +++++++++++++++++++++++++++++++++++++++++------ po/wa.po | 51 ++++++++++++++++++++++++++++++++------ po/wine.pot | 48 ++++++++++++++++++++++++++++++------ po/zh_CN.po | 62 +++++++++++++++++++++++++++++++++++++++++------ po/zh_TW.po | 62 +++++++++++++++++++++++++++++++++++++++++------ 50 files changed, 2498 insertions(+), 392 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ed5126de1120fbcdcb98…

1 0

Alexandre Julliard : configure: Only define _TIME_BITS together with _FILE_OFFSET_BITS.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 8db1662d749991a77b8945c752ab024d2d6b1244 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8db1662d749991a77b8945c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 3 10:23:22 2022 +0100 configure: Only define _TIME_BITS together with _FILE_OFFSET_BITS. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 548a07d01bb..2d4aed06f6f 100755 --- a/configure +++ b/configure @@ -10579,7 +10579,7 @@ fi printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h - + test "$ac_cv_sys_file_offset_bits" = 64 && printf "%s\n" "#define _TIME_BITS 64" >>confdefs.h case $host_cpu in diff --git a/configure.ac b/configure.ac index f4a5ff03de4..63e7aa7f5dd 100644 --- a/configure.ac +++ b/configure.ac @@ -812,7 +812,7 @@ case $host_os in *) AC_DEFINE(_GNU_SOURCE,1,[Define to 1 to enable GNU extensions on Linux]) - AC_DEFINE(_TIME_BITS,64,[Define to 64 to enable 64-bit time_t on Linux]) + test "$ac_cv_sys_file_offset_bits" = 64 && AC_DEFINE(_TIME_BITS,64,[Define to 64 to enable 64-bit time_t on Linux]) case $host_cpu in *i[[3456789]]86*) DLLFLAGS="$DLLFLAGS -fno-PIC"

1 0

Alex Henrie : sane: Fix memory leak in create_item (Coverity).
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 746b5bbd50c6041f19c3810b7fb20d762ac9e15f URL: https://source.winehq.org/git/wine.git/?a=commit;h=746b5bbd50c6041f19c3810b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 2 21:35:00 2022 -0700 sane: Fix memory leak in create_item (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sane.ds/ui.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 8be7ed42b70..e66526a088e 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -318,6 +318,7 @@ static int create_item(HDC hdc, const struct option_descriptor *opt, if (trail_edit) *count+=1; + free(trail_edit); return leading_len + local_len + padding + padding2 + trail_len; }

1 0

Alex Henrie : winspool: Fix memory leaks on error path in DeviceCapabilitiesA (Coverity).
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 5a12c6a481c157a299821cb85874819c181081a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a12c6a481c157a299821cb8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 2 21:35:01 2022 -0700 winspool: Fix memory leaks on error path in DeviceCapabilitiesA (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 971eb654e6a..52edd362622 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1775,7 +1775,7 @@ INT WINAPI DeviceCapabilitiesA(const char *device, const char *portA, WORD cap, WCHAR *outputW; ret = DeviceCapabilitiesW(device_name, port, cap, NULL, devmode); - if (ret == -1) return ret; + if (ret == -1) goto cleanup; switch (cap) { case DC_BINNAMES: @@ -1795,6 +1795,7 @@ INT WINAPI DeviceCapabilitiesA(const char *device, const char *portA, WORD cap, } else { ret = DeviceCapabilitiesW(device_name, port, cap, (WCHAR *)output, devmode); } +cleanup: HeapFree(GetProcessHeap(), 0, device_name); HeapFree(GetProcessHeap(), 0, devmode); HeapFree(GetProcessHeap(), 0, port);

1 0