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

Alexandre Julliard : crypt32: Fix comparison of domain name components.
by Alexandre Julliard May 1, 2019

May 1, 2019

Module: wine Branch: master Commit: 9e9b28a1797fdb0b221c8c0ee2e6d0ca949f589a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e9b28a1797fdb0b221c8c0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 1 22:19:18 2019 +0200 crypt32: Fix comparison of domain name components. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/chain.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 41c87b7..396a563 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -3214,12 +3214,11 @@ static BOOL match_dns_to_subject_alt_name(const CERT_EXTENSION *ext, } static BOOL find_matching_domain_component(const CERT_NAME_INFO *name, - LPCWSTR component) + const WCHAR *component, size_t len) { - BOOL matches = FALSE; DWORD i, j; - for (i = 0; !matches && i < name->cRDN; i++) + for (i = 0; i < name->cRDN; i++) for (j = 0; j < name->rgRDN[i].cRDNAttr; j++) if (!strcmp(szOID_DOMAIN_COMPONENT, name->rgRDN[i].rgRDNAttr[j].pszObjId)) @@ -3227,15 +3226,16 @@ static BOOL find_matching_domain_component(const CERT_NAME_INFO *name, const CERT_RDN_ATTR *attr; attr = &name->rgRDN[i].rgRDNAttr[j]; - /* Compare with memicmpW rather than strcmpiW in order to avoid + /* Compare with strncmpiW rather than strcmpiW in order to avoid * a match with a string with an embedded NULL. The component * must match one domain component attribute's entire string * value with a case-insensitive match. */ - matches = !memicmpW(component, (LPCWSTR)attr->Value.pbData, - attr->Value.cbData / sizeof(WCHAR)); + if ((len == attr->Value.cbData / sizeof(WCHAR)) && + !strncmpiW(component, (LPCWSTR)attr->Value.pbData, len)) + return TRUE; } - return matches; + return FALSE; } static BOOL match_domain_component(LPCWSTR allowed_component, DWORD allowed_len, @@ -3397,23 +3397,18 @@ static BOOL match_dns_to_subject_dn(PCCERT_CONTEXT cert, LPCWSTR server_name) do { LPCWSTR dot = strchrW(ptr, '.'), end; /* 254 is the maximum DNS label length, see RFC 1035 */ - WCHAR component[255]; - DWORD len; + size_t len; end = dot ? dot : ptr + strlenW(ptr); len = end - ptr; - if (len >= ARRAY_SIZE(component)) + if (len >= 255) { WARN_(chain)("domain component %s too long\n", debugstr_wn(ptr, len)); matches = FALSE; } - else - { - memcpy(component, ptr, len * sizeof(WCHAR)); - component[len] = 0; - matches = find_matching_domain_component(name, component); - } + else matches = find_matching_domain_component(name, ptr, len); + ptr = dot ? dot + 1 : end; } while (matches && ptr && *ptr); }

1 0

Zebediah Figura : setupapi: Extract individual files from cabinets.
by Alexandre Julliard May 1, 2019

May 1, 2019

Module: wine Branch: master Commit: fccb7552ebe81ea2c0c17bc747a920f90e2537a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fccb7552ebe81ea2c0c17bc7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 1 09:52:02 2019 -0500 setupapi: Extract individual files from cabinets. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 88 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 54 insertions(+), 34 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index cc17966..f033ef7 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -353,8 +353,52 @@ static WCHAR *get_destination_dir( HINF hinf, const WCHAR *section ) return strdupW( systemdir ); } +struct extract_cab_ctx +{ + const WCHAR *src; + const WCHAR *dst; +}; + +static UINT WINAPI extract_cab_cb( void *arg, UINT message, UINT_PTR param1, UINT_PTR param2 ) +{ + struct extract_cab_ctx *ctx = arg; + + switch (message) + { + case SPFILENOTIFY_FILEINCABINET: + { + FILE_IN_CABINET_INFO_W *info = (FILE_IN_CABINET_INFO_W *)param1; + const WCHAR *filename; + + if ((filename = strrchrW( info->NameInCabinet, '\\' ))) + filename++; + else + filename = info->NameInCabinet; + + if (lstrcmpiW( filename, ctx->src )) + return FILEOP_SKIP; -static void (WINAPI *pExtractFiles)( LPSTR, LPSTR, DWORD, DWORD, DWORD, DWORD ); + strcpyW( info->FullTargetName, ctx->dst ); + return FILEOP_DOIT; + } + case SPFILENOTIFY_FILEEXTRACTED: + { + const FILEPATHS_W *paths = (const FILEPATHS_W *)param1; + return paths->Win32Error; + } + case SPFILENOTIFY_NEEDNEWCABINET: + { + const CABINET_INFO_W *info = (const CABINET_INFO_W *)param1; + strcpyW( (WCHAR *)param2, info->CabinetPath ); + return ERROR_SUCCESS; + } + case SPFILENOTIFY_CABINETINFO: + return 0; + default: + FIXME("Unexpected message %#x.\n", message); + return 0; + } +} /*********************************************************************** * extract_cabinet_file @@ -365,44 +409,20 @@ static BOOL extract_cabinet_file( const WCHAR *cabinet, const WCHAR *root, const WCHAR *src, const WCHAR *dst ) { static const WCHAR extW[] = {'.','c','a','b',0}; - static HMODULE advpack; - - char *cab_path, *cab_file; + static const WCHAR backslashW[] = {'\\',0}; + struct extract_cab_ctx ctx = {src, dst}; int len = strlenW( cabinet ); + WCHAR path[MAX_PATH]; /* make sure the cabinet file has a .cab extension */ if (len <= 4 || strcmpiW( cabinet + len - 4, extW )) return FALSE; - if (!pExtractFiles) - { - if (!advpack && !(advpack = LoadLibraryA( "advpack.dll" ))) - { - ERR( "could not load advpack.dll\n" ); - return FALSE; - } - if (!(pExtractFiles = (void *)GetProcAddress( advpack, "ExtractFiles" ))) - { - ERR( "could not find ExtractFiles in advpack.dll\n" ); - return FALSE; - } - } - if (!(cab_path = strdupWtoA( root ))) return FALSE; - len = WideCharToMultiByte( CP_ACP, 0, cabinet, -1, NULL, 0, NULL, NULL ); - if (!(cab_file = HeapAlloc( GetProcessHeap(), 0, strlen(cab_path) + len + 1 ))) - { - HeapFree( GetProcessHeap(), 0, cab_path ); - return FALSE; - } - strcpy( cab_file, cab_path ); - if (cab_file[0] && cab_file[strlen(cab_file)-1] != '\\') strcat( cab_file, "\\" ); - WideCharToMultiByte( CP_ACP, 0, cabinet, -1, cab_file + strlen(cab_file), len, NULL, NULL ); - FIXME( "awful hack: extracting cabinet %s\n", debugstr_a(cab_file) ); - pExtractFiles( cab_file, cab_path, 0, 0, 0, 0 ); - HeapFree( GetProcessHeap(), 0, cab_file ); - HeapFree( GetProcessHeap(), 0, cab_path ); - return CopyFileW( src, dst, FALSE /*FIXME*/ ); -} + strcpyW(path, root); + strcatW(path, backslashW); + strcatW(path, cabinet); + return SetupIterateCabinetW( path, 0, extract_cab_cb, &ctx ); +} /*********************************************************************** * SetupOpenFileQueue (SETUPAPI.@) @@ -1309,7 +1329,7 @@ BOOL WINAPI SetupCommitFileQueueW( HWND owner, HSPFILEQ handle, PSP_FILE_CALLBAC if (op->src_tag) { if (extract_cabinet_file( op->src_tag, op->src_root, - paths.Source, paths.Target )) break; + op->src_file, paths.Target )) break; } paths.Win32Error = GetLastError(); op_result = handler( context, SPFILENOTIFY_COPYERROR,

1 0

Zebediah Figura : setupapi/tests: Avoid assert().
by Alexandre Julliard May 1, 2019

May 1, 2019

Module: wine Branch: master Commit: 2d13b6b74cfa4a21f2b575081331619fb6cebfed URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d13b6b74cfa4a21f2b57508… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 1 09:52:03 2019 -0500 setupapi/tests: Avoid assert(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/install.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 4232212..cee4b55 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -21,7 +21,6 @@ #include <stdarg.h> #include <stdio.h> #include <string.h> -#include <assert.h> #include "windef.h" #include "winbase.h" @@ -59,9 +58,9 @@ static void create_inf_file(LPCSTR filename, const char *data) BOOL ret; HANDLE handle = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - assert(handle != INVALID_HANDLE_VALUE); + ok(handle != INVALID_HANDLE_VALUE, "Failed to create %s, error %u.\n", filename, GetLastError()); ret = WriteFile(handle, data, strlen(data), &res, NULL); - assert(ret != 0); + ok(ret, "Failed to write file, error %u.\n", GetLastError()); CloseHandle(handle); } @@ -777,7 +776,7 @@ START_TEST(install) /* Set CBT hook to disallow MessageBox creation in current thread */ hhook = SetWindowsHookExA(WH_CBT, cbt_hook_proc, 0, GetCurrentThreadId()); - assert(hhook != 0); + ok(!!hhook, "Failed to set hook, error %u.\n", GetLastError()); test_cmdline(); test_registry();

1 0

Zebediah Figura : setupapi/tests: Add some tests for SetupInstallFilesFromInfSection().
by Alexandre Julliard May 1, 2019

May 1, 2019

Module: wine Branch: master Commit: 02df7eeb5bbed4f94840cec4cd8c3d0ad3da9eda URL: https://source.winehq.org/git/wine.git/?a=commit;h=02df7eeb5bbed4f94840cec4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 1 09:52:04 2019 -0500 setupapi/tests: Add some tests for SetupInstallFilesFromInfSection(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/Makefile.in | 2 +- dlls/setupapi/tests/install.c | 329 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 330 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02df7eeb5bbed4f94840…

1 0

Jacek Caban : ntoskrnl.exe: Use ObGetObjectType in kernel_object_from_handle.
by Alexandre Julliard May 1, 2019

May 1, 2019

Module: wine Branch: master Commit: 73b99d296c5c981e0afe614b72e339b41eb250d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73b99d296c5c981e0afe614b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 1 17:54:05 2019 +0200 ntoskrnl.exe: Use ObGetObjectType in kernel_object_from_handle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 0bb83cb..1a2a6d1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -366,6 +366,15 @@ static void ObReferenceObject( void *obj ) LeaveCriticalSection( &obref_cs ); } +/*********************************************************************** + * ObGetObjectType (NTOSKRNL.EXE.@) + */ +POBJECT_TYPE WINAPI ObGetObjectType( void *object ) +{ + struct object_header *header = (struct object_header *)object - 1; + return header->type; +} + static const POBJECT_TYPE *known_types[] = { &ExEventObjectType, @@ -389,7 +398,6 @@ static CRITICAL_SECTION handle_map_cs = { &handle_map_critsect_debug, -1, 0, 0, NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret ) { - struct object_header *header; void *obj; NTSTATUS status; @@ -409,12 +417,7 @@ NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret return status; } - if (obj) - { - header = (struct object_header *)obj - 1; - if (type && header->type != type) status = STATUS_OBJECT_TYPE_MISMATCH; - } - else + if (!obj) { char buf[256]; OBJECT_TYPE_INFORMATION *type_info = (OBJECT_TYPE_INFORMATION *)buf; @@ -459,6 +462,7 @@ NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret } if (!obj) status = STATUS_NO_MEMORY; } + else if (type && ObGetObjectType( obj ) != type) status = STATUS_OBJECT_TYPE_MISMATCH; LeaveCriticalSection( &handle_map_cs ); if (!status) *ret = obj; @@ -489,15 +493,6 @@ NTSTATUS WINAPI ObReferenceObjectByHandle( HANDLE handle, ACCESS_MASK access, } /*********************************************************************** - * ObGetObjectType (NTOSKRNL.EXE.@) - */ -POBJECT_TYPE WINAPI ObGetObjectType( void *object ) -{ - struct object_header *header = (struct object_header *)object - 1; - return header->type; -} - -/*********************************************************************** * ObOpenObjectByPointer (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI ObOpenObjectByPointer( void *obj, ULONG attr, ACCESS_STATE *access_state,

1 0

Nikolay Sivov : dbgeng/tests: Fix event handle leak (Coverity).
by Alexandre Julliard May 1, 2019

May 1, 2019

Module: wine Branch: master Commit: ee7efd76f226d9e2809d03832e039b7b7f7134c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee7efd76f226d9e2809d0383… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 1 10:01:20 2019 +0300 dbgeng/tests: Fix event handle leak (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/tests/dbgeng.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dbgeng/tests/dbgeng.c b/dlls/dbgeng/tests/dbgeng.c index 715649b..498ecd4 100644 --- a/dlls/dbgeng/tests/dbgeng.c +++ b/dlls/dbgeng/tests/dbgeng.c @@ -448,7 +448,7 @@ static void test_module_information(void) hr = symbols->lpVtbl->GetModuleNameString(symbols, DEBUG_MODNAME_IMAGE, 0, 0, buffer, length - 1, &length); ok(hr == S_FALSE, "Failed to get image name, hr %#x.\n", hr); - ok(strlen(buffer) + 2 == length, "Unexpected length %u, %u.\n", length, strlen(buffer)); + ok(strlen(buffer) + 2 == length, "Unexpected length %u.\n", length); hr = symbols->lpVtbl->GetModuleNameString(symbols, DEBUG_MODNAME_IMAGE, 0, 0, NULL, length - 1, NULL); ok(hr == S_FALSE, "Failed to get image name, hr %#x.\n", hr); @@ -477,6 +477,7 @@ static void test_module_information(void) CloseHandle(info.hProcess); CloseHandle(info.hThread); + CloseHandle(event); client->lpVtbl->Release(client); control->lpVtbl->Release(control);

1 0

Alistair Leslie-Hughes : authz: Add AuthzFreeResourceManager stub.
by Alexandre Julliard May 1, 2019

May 1, 2019

Module: wine Branch: master Commit: d425d519ff5582beae8eaa93164daf75979e82b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d425d519ff5582beae8eaa93… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 29 04:54:08 2019 +0000 authz: Add AuthzFreeResourceManager stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47082 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/authz/authz.c | 9 +++++++++ dlls/authz/authz.spec | 2 +- .../ext-ms-win-authz-context-l1-1-0.spec | 2 +- include/authz.h | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/authz/authz.c b/dlls/authz/authz.c index 5502e79..72d462d 100644 --- a/dlls/authz/authz.c +++ b/dlls/authz/authz.c @@ -59,6 +59,15 @@ BOOL WINAPI AuthzInitializeResourceManager(DWORD flags, PFN_AUTHZ_DYNAMIC_ACCESS return FALSE; } +/*********************************************************************** + * AuthzFreeResourceManager (AUTHZ.@) + */ +BOOL WINAPI AuthzFreeResourceManager(AUTHZ_RESOURCE_MANAGER_HANDLE handle) +{ + FIXME("%p\n", handle); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} /*********************************************************************** * AuthzInstallSecurityEventSource (AUTHZ.@) diff --git a/dlls/authz/authz.spec b/dlls/authz/authz.spec index eb9e044..933e3d5 100644 --- a/dlls/authz/authz.spec +++ b/dlls/authz/authz.spec @@ -6,7 +6,7 @@ @ stub AuthzFreeAuditEvent @ stdcall AuthzFreeContext(long) @ stub AuthzFreeHandle -@ stub AuthzFreeResourceManager +@ stdcall AuthzFreeResourceManager(ptr) @ stub AuthzGetInformationFromContext @ stub AuthzInitializeContextFromAuthzContext @ stdcall AuthzInitializeContextFromSid(long ptr long ptr int64 ptr ptr) diff --git a/dlls/ext-ms-win-authz-context-l1-1-0/ext-ms-win-authz-context-l1-1-0.spec b/dlls/ext-ms-win-authz-context-l1-1-0/ext-ms-win-authz-context-l1-1-0.spec index 1bce6d3..2aa56d6 100644 --- a/dlls/ext-ms-win-authz-context-l1-1-0/ext-ms-win-authz-context-l1-1-0.spec +++ b/dlls/ext-ms-win-authz-context-l1-1-0/ext-ms-win-authz-context-l1-1-0.spec @@ -1,6 +1,6 @@ @ stub AuthzFreeAuditEvent @ stdcall AuthzFreeContext(long) authz.AuthzFreeContext -@ stub AuthzFreeResourceManager +@ stdcall AuthzFreeResourceManager(ptr) authz.AuthzFreeResourceManager @ stub AuthziFreeAuditEventType @ stub AuthziInitializeAuditEvent @ stub AuthziInitializeAuditEventType diff --git a/include/authz.h b/include/authz.h index 42edc8c..d93372a 100644 --- a/include/authz.h +++ b/include/authz.h @@ -103,6 +103,7 @@ BOOL WINAPI AuthzAccessCheck(DWORD flags, AUTHZ_CLIENT_CONTEXT_HANDLE client_con AUTHZ_ACCESS_CHECK_RESULTS_HANDLE *access_check_result); BOOL WINAPI AuthzFreeContext(AUTHZ_CLIENT_CONTEXT_HANDLE client_context); +BOOL WINAPI AuthzFreeResourceManager(AUTHZ_RESOURCE_MANAGER_HANDLE handle); BOOL WINAPI AuthzInitializeContextFromSid(DWORD flags, PSID sid, AUTHZ_RESOURCE_MANAGER_HANDLE resource_manager, LARGE_INTEGER *expire_time,

1 0

Alexandre Julliard : view: Build with msvcrt.
by Alexandre Julliard May 1, 2019

May 1, 2019

Module: wine Branch: master Commit: 422ab96bcd7a7a99a708382f637456d4edb0f50d URL: https://source.winehq.org/git/wine.git/?a=commit;h=422ab96bcd7a7a99a708382f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 1 10:40:40 2019 +0200 view: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/view/Makefile.in | 3 ++- programs/view/view.c | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/view/Makefile.in b/programs/view/Makefile.in index ad956da..7e9ff33 100644 --- a/programs/view/Makefile.in +++ b/programs/view/Makefile.in @@ -1,7 +1,8 @@ MODULE = view.exe -APPMODE = -mwindows -municode IMPORTS = comdlg32 user32 gdi32 +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + C_SRCS = \ view.c diff --git a/programs/view/view.c b/programs/view/view.c index b944237..2664eeb 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -21,7 +21,6 @@ #include <stdio.h> #include "resource.h" -#include "wine/unicode.h" static HINSTANCE hInst; static HWND hMainWnd; @@ -60,7 +59,7 @@ static BOOL FileOpen(HWND hWnd, WCHAR *fn, int fnsz) OFN_SHOWHELP, 0, 0, NULL, 0, NULL }; LoadStringW( hInst, IDS_OPEN_META_STRING, metafileFilter, ARRAY_SIZE(metafileFilter) ); - snprintfW( filter, ARRAY_SIZE(filter), filterW, metafileFilter, 0, 0 ); + swprintf( filter, ARRAY_SIZE(filter), filterW, metafileFilter, 0, 0 ); ofn.lpstrFilter = filter; ofn.hwndOwner = hWnd;

1 0

Alexandre Julliard : taskkill: Build with msvcrt.
by Alexandre Julliard May 1, 2019

May 1, 2019

Module: wine Branch: master Commit: fb80c1b554eaf07bf2f89fcf2960e39bd0d4787a URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb80c1b554eaf07bf2f89fcf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 1 10:40:25 2019 +0200 taskkill: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskkill/Makefile.in | 3 ++- programs/taskkill/taskkill.c | 23 +++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/programs/taskkill/Makefile.in b/programs/taskkill/Makefile.in index ec53cdb..45a4639 100644 --- a/programs/taskkill/Makefile.in +++ b/programs/taskkill/Makefile.in @@ -1,7 +1,8 @@ MODULE = taskkill.exe -APPMODE = -mconsole -municode IMPORTS = user32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = taskkill.c RC_SRCS = taskkill.rc diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 59ce98d..5f1993b 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -23,7 +23,6 @@ #include <windows.h> #include <psapi.h> #include <wine/debug.h> -#include <wine/unicode.h> #include "taskkill.h" @@ -230,7 +229,7 @@ static int send_close_messages(void) /* Determine whether the string is not numeric. */ while (*p) { - if (!isdigitW(*p++)) + if (!iswdigit(*p++)) { is_numeric = FALSE; break; @@ -239,7 +238,7 @@ static int send_close_messages(void) if (is_numeric) { - DWORD pid = atoiW(task_list[i]); + DWORD pid = wcstol(task_list[i], NULL, 10); struct pid_close_info info = { pid }; if (pid == self_pid) @@ -268,7 +267,7 @@ static int send_close_messages(void) WCHAR process_name[MAX_PATH]; if (get_process_name_from_pid(pid_list[index], process_name, MAX_PATH) && - !strcmpiW(process_name, task_list[i])) + !wcsicmp(process_name, task_list[i])) { struct pid_close_info info = { pid_list[index] }; @@ -319,7 +318,7 @@ static int terminate_processes(void) /* Determine whether the string is not numeric. */ while (*p) { - if (!isdigitW(*p++)) + if (!iswdigit(*p++)) { is_numeric = FALSE; break; @@ -328,7 +327,7 @@ static int terminate_processes(void) if (is_numeric) { - DWORD pid = atoiW(task_list[i]); + DWORD pid = wcstol(task_list[i], NULL, 10); HANDLE process; if (pid == self_pid) @@ -367,7 +366,7 @@ static int terminate_processes(void) WCHAR process_name[MAX_PATH]; if (get_process_name_from_pid(pid_list[index], process_name, MAX_PATH) && - !strcmpiW(process_name, task_list[i])) + !wcsicmp(process_name, task_list[i])) { HANDLE process; @@ -461,7 +460,7 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) if (argc == 2) { argdata = argv[1]; - if ((*argdata == '/' || *argdata == '-') && !strcmpW(opHelp, argdata + 1)) + if ((*argdata == '/' || *argdata == '-') && !lstrcmpW(opHelp, argdata + 1)) { taskkill_message(STRING_USAGE); exit(0); @@ -477,14 +476,14 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) goto invalid; argdata++; - if (!strcmpiW(opTerminateChildren, argdata)) + if (!wcsicmp(opTerminateChildren, argdata)) WINE_FIXME("argument T not supported\n"); - if (!strcmpiW(opForceTerminate, argdata)) + if (!wcsicmp(opForceTerminate, argdata)) force_termination = TRUE; /* Options /IM and /PID appear to behave identically, except for * the fact that they cannot be specified at the same time. */ - else if ((got_im = !strcmpiW(opImage, argdata)) || - (got_pid = !strcmpiW(opPID, argdata))) + else if ((got_im = !wcsicmp(opImage, argdata)) || + (got_pid = !wcsicmp(opPID, argdata))) { if (!argv[i + 1]) {

1 0

Alexandre Julliard : schtasks: Build with msvcrt.
by Alexandre Julliard May 1, 2019

May 1, 2019

Module: wine Branch: master Commit: 13eac40939abefbe1b49cc6ab2663966e38d0561 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13eac40939abefbe1b49cc6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 1 10:40:00 2019 +0200 schtasks: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/schtasks/Makefile.in | 3 ++- programs/schtasks/schtasks.c | 25 ++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/programs/schtasks/Makefile.in b/programs/schtasks/Makefile.in index 8c3b790..af0d58d 100644 --- a/programs/schtasks/Makefile.in +++ b/programs/schtasks/Makefile.in @@ -1,6 +1,7 @@ MODULE = schtasks.exe -APPMODE = -mconsole -municode IMPORTS = oleaut32 ole32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = \ schtasks.c diff --git a/programs/schtasks/schtasks.c b/programs/schtasks/schtasks.c index 2ac7544..980093e 100644 --- a/programs/schtasks/schtasks.c +++ b/programs/schtasks/schtasks.c @@ -22,7 +22,6 @@ #include "taskschd.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(schtasks); @@ -141,7 +140,7 @@ static int change_command(int argc, WCHAR *argv[]) HRESULT hres; while (argc) { - if(!strcmpiW(argv[0], tn_optW)) { + if(!wcsicmp(argv[0], tn_optW)) { if (argc < 2) { FIXME("Missing /tn value\n"); return 1; @@ -155,12 +154,12 @@ static int change_command(int argc, WCHAR *argv[]) task_name = argv[1]; argc -= 2; argv += 2; - }else if (!strcmpiW(argv[0], enable_optW)) { + }else if (!wcsicmp(argv[0], enable_optW)) { enable = TRUE; have_option = TRUE; argc--; argv++; - }else if (!strcmpiW(argv[0], tr_optW)) { + }else if (!wcsicmp(argv[0], tr_optW)) { if (argc < 2) { FIXME("Missing /tr value\n"); return 1; @@ -214,7 +213,7 @@ static int create_command(int argc, WCHAR *argv[]) HRESULT hres; while (argc) { - if (!strcmpiW(argv[0], xml_optW)) { + if (!wcsicmp(argv[0], xml_optW)) { if (argc < 2) { FIXME("Missing /xml value\n"); return 1; @@ -228,7 +227,7 @@ static int create_command(int argc, WCHAR *argv[]) xml_file = argv[1]; argc -= 2; argv += 2; - }else if(!strcmpiW(argv[0], tn_optW)) { + }else if(!wcsicmp(argv[0], tn_optW)) { if (argc < 2) { FIXME("Missing /tn value\n"); return 1; @@ -242,11 +241,11 @@ static int create_command(int argc, WCHAR *argv[]) task_name = argv[1]; argc -= 2; argv += 2; - }else if(!strcmpiW(argv[0], f_optW)) { + }else if(!wcsicmp(argv[0], f_optW)) { flags = TASK_CREATE_OR_UPDATE; argc--; argv++; - }else if (!strcmpiW(argv[0], ru_optW)) { + }else if (!wcsicmp(argv[0], ru_optW)) { if (argc < 2) { FIXME("Missing /ru value\n"); return 1; @@ -303,11 +302,11 @@ static int delete_command(int argc, WCHAR *argv[]) HRESULT hres; while (argc) { - if (!strcmpiW(argv[0], f_optW)) { + if (!wcsicmp(argv[0], f_optW)) { TRACE("force opt\n"); argc--; argv++; - }else if(!strcmpiW(argv[0], tn_optW)) { + }else if(!wcsicmp(argv[0], tn_optW)) { if (argc < 2) { FIXME("Missing /tn value\n"); return 1; @@ -358,11 +357,11 @@ int wmain(int argc, WCHAR *argv[]) if (argc < 2) FIXME("Print current tasks state\n"); - else if (!strcmpiW(argv[1], change_optW)) + else if (!wcsicmp(argv[1], change_optW)) ret = change_command(argc - 2, argv + 2); - else if (!strcmpiW(argv[1], create_optW)) + else if (!wcsicmp(argv[1], create_optW)) ret = create_command(argc - 2, argv + 2); - else if (!strcmpiW(argv[1], delete_optW)) + else if (!wcsicmp(argv[1], delete_optW)) ret = delete_command(argc - 2, argv + 2); else FIXME("Unsupported command %s\n", debugstr_w(argv[1]));

1 0