October 2021 - Wine-Commits

Alexandre Julliard : sfnt2fon: Avoid using getopt_long().
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: wine Branch: master Commit: e0ef12241be91b25aefd66e9c6979dca404357c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0ef12241be91b25aefd66e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 11:52:53 2021 +0200 sfnt2fon: Avoid using getopt_long(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/sfnt2fon/sfnt2fon.c | 85 ++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 46 deletions(-) diff --git a/tools/sfnt2fon/sfnt2fon.c b/tools/sfnt2fon/sfnt2fon.c index fe8f33103c7..303293c18e5 100644 --- a/tools/sfnt2fon/sfnt2fon.c +++ b/tools/sfnt2fon/sfnt2fon.c @@ -27,9 +27,6 @@ #include <signal.h> #include <stdio.h> #include <stdlib.h> -#ifdef HAVE_GETOPT_H -# include <getopt.h> -#endif #ifdef HAVE_FREETYPE @@ -438,9 +435,11 @@ static const char *output_name; static FT_Library ft_library; -static void usage(char **argv) +static const char *argv0; + +static void usage(void) { - fprintf(stderr, "%s [options] input.ttf ppem,enc,avg_width ...\n", argv[0]); + fprintf(stderr, "%s [options] input.ttf ppem,enc,avg_width ...\n", argv0); fprintf(stderr, "Options:\n"); fprintf(stderr, " -h Display help\n" ); fprintf(stderr, " -d char Set the font default char\n" ); @@ -825,41 +824,36 @@ static void write_fontinfo( const struct fontinfo *info, FILE *fp ) fwrite( info->data, info->hdr.dfSize - info->hdr.fi.dfBitsOffset, 1, fp ); } -/* parse options from the argv array and remove all the recognized ones */ -static char **parse_options( int argc, char **argv ) +static void option_callback( int optc, char *optarg ) { - int optc; - - while ((optc = getopt_long( argc, argv, "d:ho:qr:s", NULL, NULL )) != -1) + switch(optc) { - switch(optc) - { - case 'd': - option_defchar = atoi( optarg ); - break; - case 'o': - option_output = xstrdup( optarg ); - break; - case 'q': - option_quiet = 1; - break; - case 'r': - option_dpi = atoi( optarg ); - break; - case 's': - option_fnt_mode = 1; - break; - case 'h': - usage(argv); - exit(0); - case '?': - usage(argv); - exit(1); - } + case 'd': + option_defchar = atoi( optarg ); + break; + case 'o': + option_output = xstrdup( optarg ); + break; + case 'q': + option_quiet = 1; + break; + case 'r': + option_dpi = atoi( optarg ); + break; + case 's': + option_fnt_mode = 1; + break; + case 'h': + usage(); + exit(0); + case '?': + fprintf( stderr, "%s: %s\n\n", argv0, optarg ); + usage(); + exit(1); } - return &argv[optind]; } + int main(int argc, char **argv) { int i, j; @@ -875,18 +869,19 @@ int main(int argc, char **argv) NE_TYPEINFO rc_type; NE_NAMEINFO rc_name; struct fontinfo **info; - char *input_file; - char **args; + const char *input_file; + struct strarray args; short tmp16; - args = parse_options( argc, argv ); + argv0 = argv[0]; + args = parse_options( argc, argv, "d:ho:qr:s", NULL, 0, option_callback ); - input_file = *args++; - if (!input_file || !*args) + if (!args.count) { - usage(argv); + usage(); exit(1); } + input_file = args.str[0]; if(FT_Init_FreeType(&ft_library)) error("ft init failure\n"); @@ -894,9 +889,7 @@ int main(int argc, char **argv) FT_Version.major=FT_Version.minor=FT_Version.patch=-1; FT_Library_Version(ft_library,&FT_Version.major,&FT_Version.minor,&FT_Version.patch); - num_files = 0; - while (args[num_files]) num_files++; - + num_files = args.count - 1; if (option_fnt_mode && num_files > 1) error( "can only specify one font in .fnt mode\n" ); @@ -906,9 +899,9 @@ int main(int argc, char **argv) int ppem, enc, avg_width; const char *name; - if (sscanf( args[i], "%d,%d,%d", &ppem, &enc, &avg_width ) != 3) + if (sscanf( args.str[i + 1], "%d,%d,%d", &ppem, &enc, &avg_width ) != 3) { - usage(argv); + usage(); exit(1); } if (!(info[i] = fill_fontinfo( input_file, ppem, enc, option_dpi, option_defchar, avg_width )))

1 0

Alexandre Julliard : wmc: Avoid using getopt_long().
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: wine Branch: master Commit: 7420715b99c1414f8d252c4e20dc76dfe08c72ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=7420715b99c1414f8d252c4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 11:52:21 2021 +0200 wmc: Avoid using getopt_long(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/wmc.c | 200 ++++++++++++++++++++++++++------------------------------ tools/wmc/wmc.h | 2 +- 2 files changed, 93 insertions(+), 109 deletions(-) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index d76468c8bb5..618a6ab2472 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -25,9 +25,6 @@ #include <stdlib.h> #include <string.h> #include <signal.h> -#ifdef HAVE_GETOPT_H -# include <getopt.h> -#endif #include "wmc.h" #include "utils.h" @@ -107,7 +104,7 @@ static int dodebug = 0; static char *po_dir; char *output_name = NULL; /* The name given by the -o option */ -char *input_name = NULL; /* The name given on the command-line */ +const char *input_name = NULL; /* The name given on the command-line */ char *header_name = NULL; /* The name given by the -H option */ const char *nlsdirs[3] = { NULL, NLSDIR, NULL }; @@ -136,15 +133,16 @@ enum long_options_values }; static const char short_options[] = "B:cdDhH:io:O:P:uUvVW"; -static const struct option long_options[] = +static const struct long_option long_options[] = { - { "help", 0, NULL, 'h' }, - { "nls-dir", 1, NULL, LONG_OPT_NLS_DIR }, - { "output", 1, NULL, 'o' }, - { "output-format", 1, NULL, 'O' }, - { "pedantic", 0, NULL, 'W' }, - { "po-dir", 1, NULL, 'P' }, - { "version", 0, NULL, 'v' } + { "help", 0, 'h' }, + { "nls-dir", 1, LONG_OPT_NLS_DIR }, + { "output", 1, 'o' }, + { "output-format", 1, 'O' }, + { "pedantic", 0, 'W' }, + { "po-dir", 1, 'P' }, + { "version", 0, 'v' }, + { NULL } }; static void segvhandler(int sig); @@ -179,14 +177,91 @@ static void init_argv0_dir( const char *argv0 ) #endif } +static void option_callback( int optc, char *optarg ) +{ + switch(optc) + { + case 'B': + switch(optarg[0]) + { + case 'n': + case 'N': + byteorder = WMC_BO_NATIVE; + break; + case 'l': + case 'L': + byteorder = WMC_BO_LITTLE; + break; + case 'b': + case 'B': + byteorder = WMC_BO_BIG; + break; + default: + error("Byteordering must be n[ative], l[ittle] or b[ig]\n"); + } + break; + case 'c': + custombit = 1; + break; + case 'd': + decimal = 1; + break; + case 'D': + dodebug = 1; + break; + case 'h': + printf("%s", usage); + exit(0); + /* No return */ + case 'H': + header_name = xstrdup(optarg); + break; + case 'i': + rcinline = 1; + break; + case 'o': + output_name = xstrdup(optarg); + break; + case 'O': + if (!strcmp( optarg, "rc" )) output_format = FORMAT_RC; + else if (!strcmp( optarg, "res" )) output_format = FORMAT_RES; + else if (!strcmp( optarg, "pot" )) output_format = FORMAT_POT; + else error("Output format must be rc or res\n" ); + break; + case 'P': + po_dir = xstrdup( optarg ); + break; + case 'u': + unicodein = 1; + break; + case 'U': /* ignored for backwards compatibility */ + break; + case 'v': + show_languages(); + exit(0); + /* No return */ + case 'V': + printf(version_string); + exit(0); + /* No return */ + case 'W': + pedantic = 1; + break; + case LONG_OPT_NLS_DIR: + nlsdirs[0] = xstrdup( optarg ); + break; + case '?': + fprintf(stderr, "wmc: %s\n\n%s", optarg, usage); + exit(1); + } +} + int main(int argc,char *argv[]) { - int optc; - int opti = 0; - int lose = 0; int ret; int i; int cmdlen; + struct strarray files; atexit( cleanup_files ); signal(SIGSEGV, segvhandler); @@ -211,95 +286,7 @@ int main(int argc,char *argv[]) strcat(cmdline, " "); } - while((optc = getopt_long(argc, argv, short_options, long_options, &opti)) != EOF) - { - switch(optc) - { - case 'B': - switch(optarg[0]) - { - case 'n': - case 'N': - byteorder = WMC_BO_NATIVE; - break; - case 'l': - case 'L': - byteorder = WMC_BO_LITTLE; - break; - case 'b': - case 'B': - byteorder = WMC_BO_BIG; - break; - default: - fprintf(stderr, "Byteordering must be n[ative], l[ittle] or b[ig]\n"); - lose++; - } - break; - case 'c': - custombit = 1; - break; - case 'd': - decimal = 1; - break; - case 'D': - dodebug = 1; - break; - case 'h': - printf("%s", usage); - exit(0); - /* No return */ - case 'H': - header_name = xstrdup(optarg); - break; - case 'i': - rcinline = 1; - break; - case 'o': - output_name = xstrdup(optarg); - break; - case 'O': - if (!strcmp( optarg, "rc" )) output_format = FORMAT_RC; - else if (!strcmp( optarg, "res" )) output_format = FORMAT_RES; - else if (!strcmp( optarg, "pot" )) output_format = FORMAT_POT; - else - { - fprintf(stderr, "Output format must be rc or res\n" ); - lose++; - } - break; - case 'P': - po_dir = xstrdup( optarg ); - break; - case 'u': - unicodein = 1; - break; - case 'U': /* ignored for backwards compatibility */ - break; - case 'v': - show_languages(); - exit(0); - /* No return */ - case 'V': - printf(version_string); - exit(0); - /* No return */ - case 'W': - pedantic = 1; - break; - case LONG_OPT_NLS_DIR: - nlsdirs[0] = xstrdup( optarg ); - break; - default: - lose++; - break; - } - } - - if(lose) - { - fprintf(stderr, "%s", usage); - return 1; - } + files = parse_options( argc, argv, short_options, long_options, 0, option_callback ); mcy_debug = dodebug; if(dodebug) @@ -309,10 +296,7 @@ int main(int argc,char *argv[]) } /* Check for input file on command-line */ - if(optind < argc) - { - input_name = argv[optind]; - } + if (files.count) input_name = files.str[0]; /* Guess output format */ if (output_format == FORMAT_UNKNOWN) diff --git a/tools/wmc/wmc.h b/tools/wmc/wmc.h index ae3a1dc1d3a..438a645ebfc 100644 --- a/tools/wmc/wmc.h +++ b/tools/wmc/wmc.h @@ -45,7 +45,7 @@ extern int unicodein; extern int rcinline; extern char *output_name; -extern char *input_name; +extern const char *input_name; extern char *header_name; extern char *cmdline;

1 0

Alexandre Julliard : make_xftmpl: Avoid using getopt().
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: wine Branch: master Commit: 5f921c7f1bbe8ebab5193e42cca06eb1536a91be URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f921c7f1bbe8ebab5193e42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 11:52:57 2021 +0200 make_xftmpl: Avoid using getopt(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_xftmpl.c | 58 +++++++++++++++++++++++------------------------------ 1 file changed, 25 insertions(+), 33 deletions(-) diff --git a/tools/make_xftmpl.c b/tools/make_xftmpl.c index 45204b62643..686beeb449c 100644 --- a/tools/make_xftmpl.c +++ b/tools/make_xftmpl.c @@ -25,9 +25,6 @@ #include <stdarg.h> #include <stdio.h> #include <stdlib.h> -#ifdef HAVE_GETOPT_H -# include <getopt.h> -#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -91,8 +88,6 @@ static const struct keyword reserved_words[] = { {"WORD", TOKEN_WORD} }; -extern int getopt(int argc, char *const *argv, const char *optstring); - static BOOL option_header; static char *option_inc_var_name = NULL; static char *option_inc_size_name = NULL; @@ -419,50 +414,47 @@ static void usage(void) program_name); } -static char **parse_options(int argc, char **argv) +static void option_callback( int optc, char *optarg ) { - int optc; - - while ((optc = getopt(argc, argv, "hHi:o:s:")) != -1) + switch (optc) { - switch (optc) - { - case 'h': - usage(); - exit(0); - case 'H': - option_header = TRUE; - break; - case 'i': - option_header = TRUE; - option_inc_var_name = xstrdup(optarg); - break; - case 'o': - option_outfile_name = xstrdup(optarg); - break; - case 's': - option_inc_size_name = xstrdup(optarg); - break; - } + case 'h': + usage(); + exit(0); + case 'H': + option_header = TRUE; + break; + case 'i': + option_header = TRUE; + option_inc_var_name = xstrdup(optarg); + break; + case 'o': + option_outfile_name = xstrdup(optarg); + break; + case 's': + option_inc_size_name = xstrdup(optarg); + break; + case '?': + fprintf( stderr, "%s: %s\n", program_name, optarg ); + exit(1); } - return &argv[optind]; } int main(int argc, char **argv) { char header[16]; - char **args; + struct strarray args; char *header_name = NULL; program_name = argv[0]; - args = parse_options(argc, argv); - infile_name = *args++; - if (!infile_name || *args) + args = parse_options(argc, argv, "hHi:o:s:", NULL, 0, option_callback ); + if (!args.count) { usage(); return 1; } + infile_name = args.str[0]; infile = stdin; outfile = NULL;

1 0

Rémi Bernon : hidclass.sys: Pass output buffer directly in handle_minidriver_string.
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: wine Branch: master Commit: db3e59227039c5208d975962a6eab110f9d57be0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db3e59227039c5208d975962… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 5 09:11:53 2021 +0200 hidclass.sys: Pass output buffer directly in handle_minidriver_string. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index cebdc3e1e65..2e618df2927 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -404,25 +404,14 @@ static void handle_IOCTL_HID_GET_COLLECTION_DESCRIPTOR( IRP *irp, BASE_DEVICE_EX } } -static void handle_minidriver_string( BASE_DEVICE_EXTENSION *ext, IRP *irp, SHORT index ) +static void handle_minidriver_string( BASE_DEVICE_EXTENSION *ext, IRP *irp, ULONG index ) { - IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); - WCHAR buffer[127]; - ULONG InputBuffer; - - InputBuffer = MAKELONG(index, 0); - - call_minidriver( IOCTL_HID_GET_STRING, ext->u.pdo.parent_fdo, ULongToPtr( InputBuffer ), - sizeof(InputBuffer), buffer, sizeof(buffer), &irp->IoStatus ); + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); + WCHAR *output_buf = MmGetSystemAddressForMdlSafe( irp->MdlAddress, NormalPagePriority ); + ULONG output_len = stack->Parameters.DeviceIoControl.OutputBufferLength; - if (irp->IoStatus.Status == STATUS_SUCCESS) - { - WCHAR *out_buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority); - int length = irpsp->Parameters.DeviceIoControl.OutputBufferLength/sizeof(WCHAR); - TRACE("got string %s from minidriver\n",debugstr_w(buffer)); - lstrcpynW(out_buffer, buffer, length); - irp->IoStatus.Information = (lstrlenW(buffer)+1) * sizeof(WCHAR); - } + call_minidriver( IOCTL_HID_GET_STRING, ext->u.pdo.parent_fdo, ULongToPtr( index ), + sizeof(index), output_buf, output_len, &irp->IoStatus ); } static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP *irp )

1 0

Rémi Bernon : winebus.sys: Add more Xbox controllers product ids.
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: wine Branch: master Commit: 0fc31aaf21aafb60e5864ff556c2f5a7e12539c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fc31aaf21aafb60e5864ff5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 5 09:11:52 2021 +0200 winebus.sys: Add more Xbox controllers product ids. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/unixlib.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index c9d5fa5fd43..790becf4bc3 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -53,6 +53,10 @@ BOOL is_xbox_gamepad(WORD vid, WORD pid) if (pid == 0x02e6) return TRUE; /* Wireless XBox Controller Dongle */ if (pid == 0x02ea) return TRUE; /* Xbox One S Controller */ if (pid == 0x02fd) return TRUE; /* Xbox One S Controller (Firmware 2017) */ + if (pid == 0x0b00) return TRUE; /* Xbox Elite 2 */ + if (pid == 0x0b05) return TRUE; /* Xbox Elite 2 Wireless */ + if (pid == 0x0b12) return TRUE; /* Xbox Series */ + if (pid == 0x0b13) return TRUE; /* Xbox Series Wireless */ if (pid == 0x0719) return TRUE; /* Xbox 360 Wireless Adapter */ return FALSE; }

1 0

Rémi Bernon : winexinput.sys: Add more Xbox One product string overrides.
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: wine Branch: master Commit: 4adc0f1e2af4893ffdadce5bd6ea5de502296203 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4adc0f1e2af4893ffdadce5b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 5 09:11:51 2021 +0200 winexinput.sys: Add more Xbox One product string overrides. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winexinput.sys/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index 56d60f55570..8ea9e160fc9 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -331,6 +331,10 @@ static const struct device_strings device_strings[] = { .id = L"VID_045E&PID_02EA", .product = L"Controller (Xbox One For Windows)" }, { .id = L"VID_045E&PID_02FD", .product = L"Controller (Xbox One For Windows)" }, { .id = L"VID_045E&PID_0719", .product = L"Controller (XBOX 360 For Windows)" }, + { .id = L"VID_045E&PID_0B00", .product = L"Controller (Xbox One For Windows)" }, + { .id = L"VID_045E&PID_0B05", .product = L"Controller (Xbox One For Windows)" }, + { .id = L"VID_045E&PID_0B12", .product = L"Controller (Xbox One For Windows)" }, + { .id = L"VID_045E&PID_0B13", .product = L"Controller (Xbox One For Windows)" }, }; static const WCHAR *find_product_string(const WCHAR *device_id)

1 0

Rémi Bernon : winebus.sys: Implement PID effect update for UDEV lnxev devices.
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: wine Branch: master Commit: 9132162266a1dd0accb30aaa204aba56090a9055 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9132162266a1dd0accb30aaa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 5 08:43:25 2021 +0200 winebus.sys: Implement PID effect update for UDEV lnxev devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 103 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 101 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index d63c9aab589..08ca8435d31 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -924,12 +924,111 @@ static NTSTATUS lnxev_device_physical_effect_control(struct unix_device *iface, return STATUS_SUCCESS; } +static NTSTATUS set_effect_type_from_usage(struct ff_effect *effect, USAGE type) +{ + switch (type) + { + case PID_USAGE_ET_SINE: + effect->type = FF_PERIODIC; + effect->u.periodic.waveform = FF_SINE; + return STATUS_SUCCESS; + case PID_USAGE_ET_SQUARE: + effect->type = FF_PERIODIC; + effect->u.periodic.waveform = FF_SQUARE; + return STATUS_SUCCESS; + case PID_USAGE_ET_TRIANGLE: + effect->type = FF_PERIODIC; + effect->u.periodic.waveform = FF_TRIANGLE; + return STATUS_SUCCESS; + case PID_USAGE_ET_SAWTOOTH_UP: + effect->type = FF_PERIODIC; + effect->u.periodic.waveform = FF_SAW_UP; + return STATUS_SUCCESS; + case PID_USAGE_ET_SAWTOOTH_DOWN: + effect->type = FF_PERIODIC; + effect->u.periodic.waveform = FF_SAW_DOWN; + return STATUS_SUCCESS; + case PID_USAGE_ET_SPRING: + effect->type = FF_SPRING; + return STATUS_SUCCESS; + case PID_USAGE_ET_DAMPER: + effect->type = FF_DAMPER; + return STATUS_SUCCESS; + case PID_USAGE_ET_INERTIA: + effect->type = FF_INERTIA; + return STATUS_SUCCESS; + case PID_USAGE_ET_FRICTION: + effect->type = FF_FRICTION; + return STATUS_SUCCESS; + case PID_USAGE_ET_CONSTANT_FORCE: + effect->type = FF_CONSTANT; + return STATUS_SUCCESS; + case PID_USAGE_ET_RAMP: + effect->type = FF_RAMP; + return STATUS_SUCCESS; + case PID_USAGE_ET_CUSTOM_FORCE_DATA: + effect->type = FF_CUSTOM; + return STATUS_SUCCESS; + default: + return STATUS_NOT_SUPPORTED; + } +} + static NTSTATUS lnxev_device_physical_effect_update(struct unix_device *iface, BYTE index, struct effect_params *params) { - FIXME("iface %p, index %u, params %p stub!\n", iface, index, params); + struct lnxev_device *impl = lnxev_impl_from_unix_device(iface); + struct ff_effect effect = {.id = impl->effect_ids[index]}; + NTSTATUS status; - return STATUS_NOT_IMPLEMENTED; + TRACE("iface %p, index %u, params %p.\n", iface, index, params); + + if ((status = set_effect_type_from_usage(&effect, params->effect_type))) return status; + + effect.replay.length = params->duration; + effect.replay.delay = params->start_delay; + effect.trigger.button = params->trigger_button; + effect.trigger.interval = params->trigger_repeat_interval; + /* only supports polar with one direction angle */ + effect.direction = params->direction[0] * 256; + + switch (params->effect_type) + { + case PID_USAGE_ET_SINE: + case PID_USAGE_ET_SQUARE: + case PID_USAGE_ET_TRIANGLE: + case PID_USAGE_ET_SAWTOOTH_UP: + case PID_USAGE_ET_SAWTOOTH_DOWN: + FIXME("periodic effect semi-stub!"); + break; + + case PID_USAGE_ET_SPRING: + case PID_USAGE_ET_DAMPER: + case PID_USAGE_ET_INERTIA: + case PID_USAGE_ET_FRICTION: + FIXME("not implemented!"); + break; + + case PID_USAGE_ET_CONSTANT_FORCE: + FIXME("not implemented!"); + break; + case PID_USAGE_ET_RAMP: + FIXME("not implemented!"); + break; + case PID_USAGE_ET_CUSTOM_FORCE_DATA: + FIXME("not implemented!"); + break; + } + + if (ioctl(impl->base.device_fd, EVIOCSFF, &effect) != -1) + impl->effect_ids[index] = effect.id; + else + { + WARN("couldn't create effect, EVIOCSFF ioctl failed: %d %s\n", errno, strerror(errno)); + return STATUS_UNSUCCESSFUL; + } + + return STATUS_SUCCESS; } static const struct hid_device_vtbl lnxev_device_vtbl =

1 0

Rémi Bernon : winexinput.sys: Fix casing of "Xbox One for Windows" product string.
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: wine Branch: master Commit: 90640da51fb8610a8f2dbe187bfef7b6524ee5b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90640da51fb8610a8f2dbe18… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 5 09:11:50 2021 +0200 winexinput.sys: Fix casing of "Xbox One for Windows" product string. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winexinput.sys/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index 79c566e7cc8..56d60f55570 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -325,11 +325,11 @@ static const struct device_strings device_strings[] = { { .id = L"VID_045E&PID_028E", .product = L"Controller (XBOX 360 For Windows)" }, { .id = L"VID_045E&PID_028F", .product = L"Controller (XBOX 360 For Windows)" }, - { .id = L"VID_045E&PID_02D1", .product = L"Controller (XBOX One For Windows)" }, - { .id = L"VID_045E&PID_02DD", .product = L"Controller (XBOX One For Windows)" }, - { .id = L"VID_045E&PID_02E3", .product = L"Controller (XBOX One For Windows)" }, - { .id = L"VID_045E&PID_02EA", .product = L"Controller (XBOX One For Windows)" }, - { .id = L"VID_045E&PID_02FD", .product = L"Controller (XBOX One For Windows)" }, + { .id = L"VID_045E&PID_02D1", .product = L"Controller (Xbox One For Windows)" }, + { .id = L"VID_045E&PID_02DD", .product = L"Controller (Xbox One For Windows)" }, + { .id = L"VID_045E&PID_02E3", .product = L"Controller (Xbox One For Windows)" }, + { .id = L"VID_045E&PID_02EA", .product = L"Controller (Xbox One For Windows)" }, + { .id = L"VID_045E&PID_02FD", .product = L"Controller (Xbox One For Windows)" }, { .id = L"VID_045E&PID_0719", .product = L"Controller (XBOX 360 For Windows)" }, };

1 0

Nikolay Sivov : d3d10/effect: Make it clear that buffers are always set one by one.
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: wine Branch: master Commit: bd2abd84aac999732423d8d23465034e3e03553d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd2abd84aac999732423d8d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 4 14:48:45 2021 +0300 d3d10/effect: Make it clear that buffers are always set one by one. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index c135c76811d..de236ca2513 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -659,6 +659,12 @@ static HRESULT get_fx10_shader_resources(struct d3d10_effect_variable *v, const { case D3D10_SIT_CBUFFER: case D3D10_SIT_TBUFFER: + if (sr->bind_count != 1) + { + WARN("Unexpected bind count %u for a buffer %s.\n", bind_desc.BindCount, + debugstr_a(bind_desc.Name)); + return E_UNEXPECTED; + } sr->variable = d3d10_effect_get_buffer_by_name(v->effect, bind_desc.Name); break; @@ -4019,17 +4025,17 @@ static void apply_shader_resources(ID3D10Device *device, struct ID3D10EffectShad switch (v->type->basetype) { case D3D10_SVT_VERTEXSHADER: - ID3D10Device_VSSetConstantBuffers(device, sr->bind_point, sr->bind_count, + ID3D10Device_VSSetConstantBuffers(device, sr->bind_point, 1, &rsrc_v->u.buffer.buffer); break; case D3D10_SVT_PIXELSHADER: - ID3D10Device_PSSetConstantBuffers(device, sr->bind_point, sr->bind_count, + ID3D10Device_PSSetConstantBuffers(device, sr->bind_point, 1, &rsrc_v->u.buffer.buffer); break; case D3D10_SVT_GEOMETRYSHADER: - ID3D10Device_GSSetConstantBuffers(device, sr->bind_point, sr->bind_count, + ID3D10Device_GSSetConstantBuffers(device, sr->bind_point, 1, &rsrc_v->u.buffer.buffer); break;

1 0

Zebediah Figura : winegstreamer: Move Unix library definitions into a separate header.
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: wine Branch: master Commit: 84b870bb1fcac27288ed70d28de6a1c2649e9fe6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84b870bb1fcac27288ed70d2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Oct 4 19:20:49 2021 -0500 winegstreamer: Move Unix library definitions into a separate header. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 137 +------------------------------- dlls/winegstreamer/unixlib.h | 165 +++++++++++++++++++++++++++++++++++++++ dlls/winegstreamer/wg_parser.c | 17 ++-- 3 files changed, 179 insertions(+), 140 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=84b870bb1fcac27288ed…

1 0