wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Tim Schumacher : dinput: Map wheel, gas, and brake axes as well.
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: 1a6458bad8191a8188d76ba21b38ef457bfe1295 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a6458bad8191a8188d76ba2… Author: Tim Schumacher <timschumi(a)gmx.de> Date: Sun Mar 31 13:09:43 2019 +0200 dinput: Map wheel, gas, and brake axes as well. The axes wheel, gas, and brake are just differently named replacements for X, Y, and Z when using wheel-like joysticks. Make those accessible by remapping them to X, Y, and Z internally. Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linux.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 736a06e..f93fc2f 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -239,6 +239,14 @@ static INT find_joystick_devices(void) joydev.dev_axes_map[j] = j; found_axes++; } + else if (axes_map[j] <= 10) + { + /* Axes 8 through 10 are Wheel, Gas and Brake, + * remap to 0, 1 and 2 + */ + joydev.dev_axes_map[j] = axes_map[j] - 8; + found_axes++; + } else if (axes_map[j] == 16 || axes_map[j] == 17) {

1 0

Tim Schumacher : winejoystick: Add support for wheel axes.
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: 905e7b0e2ef99c7ccfa5a3dda0844d5ea40afc77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=905e7b0e2ef99c7ccfa5a3dd… Author: Tim Schumacher <timschumi(a)gmx.de> Date: Sun Mar 31 13:02:27 2019 +0200 winejoystick: Add support for wheel axes. Wheel, gas, and brake are replacements for X, Y and Z in wheel-like joysticks. Remap them internally to send inputs as X, Y, and Z. Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winejoystick.drv/joystick_linux.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winejoystick.drv/joystick_linux.c b/dlls/winejoystick.drv/joystick_linux.c index 85ad2fe..8d1a7b1 100644 --- a/dlls/winejoystick.drv/joystick_linux.c +++ b/dlls/winejoystick.drv/joystick_linux.c @@ -270,10 +270,13 @@ LRESULT driver_joyGetDevCaps(DWORD_PTR dwDevID, LPJOYCAPSW lpCaps, DWORD dwSize) switch (jstck->axesMap[i]) { case 0: /* X */ case 1: /* Y */ + case 8: /* Wheel */ + case 9: /* Gas */ lpCaps->wNumAxes++; break; case 2: /* Z */ case 6: /* Throttle */ + case 10: /* Brake */ lpCaps->wNumAxes++; lpCaps->wCaps |= JOYCAPS_HASZ; break; @@ -322,13 +325,16 @@ LRESULT driver_joyGetPosEx(DWORD_PTR dwDevID, LPJOYINFOEX lpInfo) if (ev.type == (JS_EVENT_AXIS)) { switch (jstck->axesMap[ev.number]) { case 0: /* X */ + case 8: /* Wheel */ jstck->x = ev.value; break; case 1: /* Y */ + case 9: /* Gas */ jstck->y = ev.value; break; case 2: /* Z */ case 6: /* Throttle */ + case 10: /* Brake */ jstck->z = ev.value; break; case 5: /* Rz */

1 0

Qian Hong : server: Create primary group using DOMAIN_GROUP_RID_USERS.
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: 1058647e14145af4368c6d8e483c28d7740fb15f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1058647e14145af4368c6d8e… Author: Qian Hong <qhong(a)codeweavers.com> Date: Sat Apr 27 11:20:03 2019 +0200 server: Create primary group using DOMAIN_GROUP_RID_USERS. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 2 +- server/token.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a220147..aee4587 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3016,7 +3016,7 @@ static void test_process_security(void) ok(res, "GetTokenInformation failed with error %d\n", GetLastError()); UserSid = user->User.Sid; test_sid_str(UserSid); - todo_wine ok(EqualPrefixSid(UsersSid, UserSid), "TokenPrimaryGroup Sid and TokenUser Sid don't match.\n"); + ok(EqualPrefixSid(UsersSid, UserSid), "TokenPrimaryGroup Sid and TokenUser Sid don't match.\n"); CloseHandle( token ); if (!res) diff --git a/server/token.c b/server/token.c index 895809e..e0f28c6 100644 --- a/server/token.c +++ b/server/token.c @@ -839,6 +839,7 @@ struct token *token_create_admin( void ) { security_local_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, { security_interactive_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, { security_authenticated_user_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, + { security_domain_users_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_OWNER }, { alias_admins_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_OWNER }, { alias_users_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, { logon_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_LOGON_ID },

1 0

Alexandre Julliard : view: Build with msvcrt.
by Alexandre Julliard 01 May '19

01 May '19

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 : uninstaller: Build with msvcrt.
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: 01db71e4e4bf504ad137c3d5dea397088626a3b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01db71e4e4bf504ad137c3d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 1 10:40:32 2019 +0200 uninstaller: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/uninstaller/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in index c6ba39f..146e620 100644 --- a/programs/uninstaller/Makefile.in +++ b/programs/uninstaller/Makefile.in @@ -1,8 +1,9 @@ MODULE = uninstaller.exe -APPMODE = -mconsole -municode IMPORTS = advapi32 DELAYIMPORTS = shlwapi shell32 user32 gdi32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = \ main.c

1 0

Alexandre Julliard : taskkill: Build with msvcrt.
by Alexandre Julliard 01 May '19

01 May '19

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 : svchost: Build with msvcrt.
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: d0d51f98d88d41a25c1dd14487eb29e17aec7af4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0d51f98d88d41a25c1dd144… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 1 10:40:19 2019 +0200 svchost: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/svchost/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/svchost/Makefile.in b/programs/svchost/Makefile.in index 0cbf5be..5232778 100644 --- a/programs/svchost/Makefile.in +++ b/programs/svchost/Makefile.in @@ -1,6 +1,7 @@ MODULE = svchost.exe -APPMODE = -mconsole -municode IMPORTS = advapi32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = \ svchost.c

1 0

Alexandre Julliard : start: Build with msvcrt.
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: dae088939b8150d9f588d3ff9bbd75e24ce2780e URL: https://source.winehq.org/git/wine.git/?a=commit;h=dae088939b8150d9f588d3ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 1 10:40:12 2019 +0200 start: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/start/Makefile.in | 3 ++- programs/start/start.c | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/programs/start/Makefile.in b/programs/start/Makefile.in index 168361d..d1ee667 100644 --- a/programs/start/Makefile.in +++ b/programs/start/Makefile.in @@ -1,7 +1,8 @@ MODULE = start.exe -APPMODE = -mconsole -municode IMPORTS = shell32 user32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = start.c RC_SRCS = start.rc diff --git a/programs/start/start.c b/programs/start/start.c index ccec9bc..18fd5f5 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -26,7 +26,6 @@ #include <shlobj.h> #include <shellapi.h> -#include <wine/unicode.h> #include <wine/debug.h> #include "resources.h" @@ -40,7 +39,7 @@ static void output(const WCHAR *message) { DWORD count; DWORD res; - int wlen = strlenW(message); + int wlen = lstrlenW(message); if (!wlen) return; @@ -131,8 +130,8 @@ static WCHAR *build_args( int argc, WCHAR **argvW ) for (i = 0; i < argc; i++ ) { - wlen += strlenW(argvW[i]) + 1; - if (strchrW(argvW[i], ' ')) + wlen += lstrlenW(argvW[i]) + 1; + if (wcschr(argvW[i], ' ')) wlen += 2; } ret = HeapAlloc( GetProcessHeap(), 0, wlen*sizeof(WCHAR) ); @@ -140,10 +139,10 @@ static WCHAR *build_args( int argc, WCHAR **argvW ) for (i = 0, p = ret; i < argc; i++ ) { - if (strchrW(argvW[i], ' ')) - p += sprintfW(p, FormatQuotesW, argvW[i]); + if (wcschr(argvW[i], ' ')) + p += swprintf(p, wlen - (p - ret), FormatQuotesW, argvW[i]); else - p += sprintfW(p, FormatW, argvW[i]); + p += swprintf(p, wlen - (p - ret), FormatW, argvW[i]); } return ret; } @@ -154,7 +153,7 @@ static WCHAR *get_parent_dir(WCHAR* path) WCHAR *result; int len; - last_slash = strrchrW( path, '\\' ); + last_slash = wcsrchr( path, '\\' ); if (last_slash == NULL) len = 1; else @@ -376,8 +375,9 @@ int wmain (int argc, WCHAR *argv[]) /* explorer on windows always quotes the filename when running a binary on windows (see bug 5224) so we have to use CreateProcessW in this case */ - commandline = HeapAlloc(GetProcessHeap(), 0, (strlenW(sei.lpFile)+3+strlenW(sei.lpParameters))*sizeof(WCHAR)); - sprintfW(commandline, commandlineformat, sei.lpFile, sei.lpParameters); + commandline = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(sei.lpFile)+3+lstrlenW(sei.lpParameters))*sizeof(WCHAR)); + swprintf(commandline, lstrlenW(sei.lpFile) + 3 + lstrlenW(sei.lpParameters), + commandlineformat, sei.lpFile, sei.lpParameters); ZeroMemory(&startup_info, sizeof(startup_info)); startup_info.cb = sizeof(startup_info); @@ -419,14 +419,14 @@ int wmain (int argc, WCHAR *argv[]) fatal_string_error(STRING_EXECFAIL, ERROR_OUTOFMEMORY, sei.lpFile); GetEnvironmentVariableW(pathextW, env, size); - filename_len = strlenW(filename); + filename_len = lstrlenW(filename); name = HeapAlloc(GetProcessHeap(), 0, (filename_len + size) * sizeof(WCHAR)); if (!name) fatal_string_error(STRING_EXECFAIL, ERROR_OUTOFMEMORY, sei.lpFile); sei.lpFile = name; start = env; - while ((ptr = strchrW(start, ';'))) + while ((ptr = wcschr(start, ';'))) { if (start == ptr) { @@ -434,7 +434,7 @@ int wmain (int argc, WCHAR *argv[]) continue; } - strcpyW(name, filename); + lstrcpyW(name, filename); memcpy(&name[filename_len], start, (ptr - start) * sizeof(WCHAR)); name[filename_len + (ptr - start)] = 0;

1 0

Alexandre Julliard : services: Build with msvcrt.
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: 32d7838da73dd9bc3ee999d73a310da7adfb27dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=32d7838da73dd9bc3ee999d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 1 10:40:06 2019 +0200 services: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/Makefile.in | 3 ++- programs/services/rpc.c | 51 +++++++++++++++++------------------ programs/services/services.c | 62 +++++++++++++++++++++---------------------- programs/services/utils.c | 5 ++-- 4 files changed, 60 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=32d7838da73dd9bc3ee9…

1 0

Alexandre Julliard : schtasks: Build with msvcrt.
by Alexandre Julliard 01 May '19

01 May '19

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2019