November 2021 - Wine-commits

Zhiyi Zhang : comctl32/button: Support BS_PUSHLIKE for themed group boxes.
by Alexandre Julliard 11 Nov '21

11 Nov '21

Module: wine Branch: master Commit: 3a2d2adc4ea771fcfb03fe60dc7afe568e1bfaf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a2d2adc4ea771fcfb03fe60… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 11 15:04:19 2021 +0800 comctl32/button: Support BS_PUSHLIKE for themed group boxes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 74de83b461a..f158a7423b9 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -448,7 +448,7 @@ static int get_draw_state(const BUTTON_INFO *infoPtr) return style & BS_PUSHLIKE ? pushlike_rb_states[check_state][state] : rb_states[check_state][state]; case BS_GROUPBOX: - return gb_states[state]; + return style & BS_PUSHLIKE ? pb_states[state] : gb_states[state]; default: WARN("Unsupported button type 0x%08x\n", type); return PBS_NORMAL; @@ -2883,6 +2883,7 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in HFONT font, hPrevFont = NULL; BOOL created_font = FALSE; TEXTMETRICW textMetric; + int part; HRESULT hr = GetThemeFont(theme, hDC, BP_GROUPBOX, state, TMT_FONT, &lf); if (SUCCEEDED(hr)) { @@ -2914,9 +2915,10 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in ExtSelectClipRgn(hDC, textRegion, RGN_DIFF); } - if (IsThemeBackgroundPartiallyTransparent(theme, BP_GROUPBOX, state)) + part = GetWindowLongW(infoPtr->hwnd, GWL_STYLE) & BS_PUSHLIKE ? BP_PUSHBUTTON : BP_GROUPBOX; + if (IsThemeBackgroundPartiallyTransparent(theme, part, state)) DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); - DrawThemeBackground(theme, hDC, BP_GROUPBOX, state, &bgRect, NULL); + DrawThemeBackground(theme, hDC, part, state, &bgRect, NULL); if (dtFlags != (UINT)-1) { @@ -2928,7 +2930,7 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in SelectClipRgn(hDC, textRegion); DeleteObject(textRegion); } - BUTTON_DrawThemedLabel(infoPtr, hDC, dtFlags, &imageRect, &textRect, theme, BP_GROUPBOX, state); + BUTTON_DrawThemedLabel(infoPtr, hDC, dtFlags, &imageRect, &textRect, theme, part, state); } SelectClipRgn(hDC, region);

1 0

Zhiyi Zhang : comctl32/button: Support BS_PUSHLIKE for themed command links.
by Alexandre Julliard 11 Nov '21

11 Nov '21

Module: wine Branch: master Commit: ce9d006a4511f36aeab4c0205c23725d0e03e730 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce9d006a4511f36aeab4c020… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 11 15:04:26 2021 +0800 comctl32/button: Support BS_PUSHLIKE for themed command links. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index f158a7423b9..2e3d8912a66 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -3040,6 +3040,7 @@ static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; + int part; RECT rc; if (infoPtr->font) SelectObject(hDC, infoPtr->font); @@ -3054,9 +3055,10 @@ static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); if (cdrf & CDRF_SKIPDEFAULT) return; - if (IsThemeBackgroundPartiallyTransparent(theme, BP_COMMANDLINK, state)) + part = GetWindowLongW(infoPtr->hwnd, GWL_STYLE) & BS_PUSHLIKE ? BP_PUSHBUTTON : BP_COMMANDLINK; + if (IsThemeBackgroundPartiallyTransparent(theme, part, state)) DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); - DrawThemeBackground(theme, hDC, BP_COMMANDLINK, state, &rc, NULL); + DrawThemeBackground(theme, hDC, part, state, &rc, NULL); if (cdrf & CDRF_NOTIFYPOSTERASE) { @@ -3076,7 +3078,7 @@ static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in SIZE img_size; WCHAR *text; - GetThemeBackgroundContentRect(theme, hDC, BP_COMMANDLINK, state, &rc, &r); + GetThemeBackgroundContentRect(theme, hDC, part, state, &rc, &r); /* The text alignment and styles are fixed and don't depend on button styles */ dtFlags = DT_TOP | DT_LEFT | DT_WORDBREAK; @@ -3096,10 +3098,9 @@ static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in UINT len = lstrlenW(text); RECT text_rect; - GetThemeTextExtent(theme, hDC, BP_COMMANDLINK, state, text, len, - dtFlags | DT_END_ELLIPSIS, &r, &text_rect); - DrawThemeText(theme, hDC, BP_COMMANDLINK, state, text, len, - dtFlags | DT_END_ELLIPSIS, 0, &r); + GetThemeTextExtent(theme, hDC, part, state, text, len, dtFlags | DT_END_ELLIPSIS, &r, + &text_rect); + DrawThemeText(theme, hDC, part, state, text, len, dtFlags | DT_END_ELLIPSIS, 0, &r); txt_h = text_rect.bottom - text_rect.top; heap_free(text); @@ -3114,8 +3115,7 @@ static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in opts.dwSize = sizeof(opts); opts.dwFlags = DTT_FONTPROP; opts.iFontPropId = TMT_BODYFONT; - DrawThemeTextEx(theme, hDC, BP_COMMANDLINK, state, - infoPtr->note, infoPtr->note_length, + DrawThemeTextEx(theme, hDC, part, state, infoPtr->note, infoPtr->note_length, dtFlags | DT_NOPREFIX, &r, &opts); }

1 0

Alexandre Julliard : makefiles: Explicitly import all the needed libraries.
by Alexandre Julliard 11 Nov '21

11 Nov '21

Module: wine Branch: master Commit: 6ebcc54a5c2c4b5724571f37ab41e99ee9e49acb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ebcc54a5c2c4b5724571f37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 11 11:38:31 2021 +0100 makefiles: Explicitly import all the needed libraries. Don't rely on winegcc adding any default libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/Makefile.in | 3 +- tools/makedep.c | 162 +++++++++++++++++++++-------------------- tools/winegcc/winegcc.c | 4 - 3 files changed, 85 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6ebcc54a5c2c4b572457…

1 0

Alexandre Julliard : wrc: Ignore the target option.
by Alexandre Julliard 11 Nov '21

11 Nov '21

Module: wine Branch: master Commit: 7c5761ed40f0b8cead7fa837b745b687d5df67d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c5761ed40f0b8cead7fa837… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 11 16:21:00 2021 +0100 wrc: Ignore the target option. Nothing in resource files depends on the pointer size. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 1 - tools/wrc/wrc.c | 33 ++++----------------------------- tools/wrc/wrc.man.in | 5 ----- 3 files changed, 4 insertions(+), 35 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 8d682e763fb..2a52ecd09c0 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2697,7 +2697,6 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c output( "\n" ); output( "\t%s%s -u -o $@", cmd_prefix( "WRC" ), tools_path( make, "wrc" ) ); if (make->is_win16) output_filename( "-m16" ); - else output_filenames( target_flags ); output_filename( "--nostdinc" ); if (po_dir) output_filename( strmake( "--po-dir=%s", po_dir )); output_filenames( defines ); diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index b44ae6fd0e5..e3dc2d3f2b1 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -50,20 +50,19 @@ static const char usage[] = "Usage: wrc [options...] [infile[.rc|.res]]\n" - " -b, --target=TARGET Specify target CPU and platform when cross-compiling\n" " -D, --define id[=val] Define preprocessor identifier id=val\n" " --debug=nn Set debug level to 'nn'\n" " -E Preprocess only\n" " --endianness=e Set output byte-order e={n[ative], l[ittle], b[ig]}\n" " (win32 only; default is " ENDIAN "-endian)\n" - " -F TARGET Synonym for -b for compatibility with windres\n" + " -F TARGET Ignored, for compatibility with windres\n" " -fo FILE Synonym for -o for compatibility with windres\n" " -h, --help Prints this summary\n" " -i, --input=FILE The name of the input file\n" " -I, --include-dir=PATH Set include search dir to path (multiple -I allowed)\n" " -J, --input-format=FORMAT The input format (either `rc' or `rc16')\n" " -l, --language=LANG Set default language to LANG (default is neutral {0, 0})\n" - " -m16, -m32, -m64 Build for 16-bit, 32-bit resp. 64-bit platforms\n" + " -m16 Build a 16-bit resource file\n" " --nls-dir=DIR Directory containing the NLS codepage mappings\n" " --no-use-temp-file Ignored for compatibility with windres\n" " --nostdinc Disables searching the standard include path\n" @@ -147,8 +146,6 @@ int utf8_input = 0; int check_utf8 = 1; /* whether to check for valid utf8 */ -static int pointer_size = sizeof(void *); - static int verify_translations_mode; static char *output_name; /* The name given by the -o option */ @@ -317,22 +314,6 @@ static int load_file( const char *input_name, const char *output_name ) return ret; } -static void set_target( const char *target ) -{ - char *p, *cpu = xstrdup( target ); - - /* target specification is in the form CPU-MANUFACTURER-OS or CPU-MANUFACTURER-KERNEL-OS */ - if (!(p = strchr( cpu, '-' ))) error( "Invalid target specification '%s'\n", target ); - *p = 0; - if (!strcmp( cpu, "amd64" ) || !strcmp( cpu, "x86_64" ) || - !strcmp( cpu, "ia64" ) || !strcmp( cpu, "aarch64" ) || - !strcmp( cpu, "powerpc64" ) || !strcmp( cpu, "powerpc64le" )) - pointer_size = 8; - else - pointer_size = 4; - free( cpu ); -} - static void init_argv0_dir( const char *argv0 ) { #ifndef _WIN32 @@ -424,7 +405,6 @@ static void option_callback( int optc, char *optarg ) break; case 'b': case 'F': - set_target( optarg ); break; case 'h': printf(usage); @@ -450,8 +430,7 @@ static void option_callback( int optc, char *optarg ) break; case 'm': if (!strcmp( optarg, "16" )) win32 = 0; - else if (!strcmp( optarg, "32" )) { win32 = 1; pointer_size = 4; } - else if (!strcmp( optarg, "64" )) { win32 = 1; pointer_size = 8; } + else win32 = 1; break; case 'f': if (*optarg != 'o') error("Unknown option: -f%s\n", optarg); @@ -506,11 +485,7 @@ int main(int argc,char *argv[]) strarray_addall( &input_files, parse_options( argc, argv, short_options, long_options, 0, option_callback )); - if (win32) - { - wpp_add_cmdline_define("_WIN32=1"); - if (pointer_size == 8) wpp_add_cmdline_define("_WIN64=1"); - } + if (win32) wpp_add_cmdline_define("_WIN32=1"); /* If we do need to search standard includes, add them to the path */ if (stdinc) diff --git a/tools/wrc/wrc.man.in b/tools/wrc/wrc.man.in index e3ad8fca4d9..275a6b609f4 100644 --- a/tools/wrc/wrc.man.in +++ b/tools/wrc/wrc.man.in @@ -21,11 +21,6 @@ specified with \fB-o\fR, then \fBwrc\fR will write the output to no inputfile was given. .SH OPTIONS .TP -.BI \-b,\ --target= cpu-manufacturer\fR[\fI\fB-\fIkernel\fR]\fB-\fIos -Specify the target CPU and platform on which the generated code will -be built. The target specification is in the standard autoconf format -as returned by \fBconfig.sub\fR. -.TP .I \fB\-D\fR, \fB\-\-define\fR=\fIid\fR[\fB=\fIval\fR] Define preprocessor identifier \fIid\fR to (optionally) value \fIval\fR. See also

1 0

Alexandre Julliard : wrc: Windows file formats are always little-endian.
by Alexandre Julliard 11 Nov '21

11 Nov '21

Module: wine Branch: master Commit: 923461f3d81b14a1645334331403892015a5b482 URL: https://source.winehq.org/git/wine.git/?a=commit;h=923461f3d81b14a164533433… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 11 17:36:17 2021 +0100 wrc: Windows file formats are always little-endian. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 116 ++------- tools/wrc/newstruc.c | 670 +++------------------------------------------------ tools/wrc/parser.y | 95 +------- tools/wrc/wrc.c | 34 --- tools/wrc/wrc.h | 2 +- tools/wrc/wrc.man.in | 6 - tools/wrc/wrctypes.h | 13 +- 7 files changed, 61 insertions(+), 875 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=923461f3d81b14a16453…

1 0

Alexandre Julliard : wmc: Windows file formats are always little-endian.
by Alexandre Julliard 11 Nov '21

11 Nov '21

Module: wine Branch: master Commit: af046fe6361e414a7ed8917656540c0ee014815a URL: https://source.winehq.org/git/wine.git/?a=commit;h=af046fe6361e414a7ed89176… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 11 17:36:56 2021 +0100 wmc: Windows file formats are always little-endian. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/mcl.c | 2 +- tools/wmc/utils.c | 21 ++++++++------------- tools/wmc/utils.h | 2 -- tools/wmc/wmc.c | 40 +--------------------------------------- tools/wmc/wmc.h | 1 - tools/wmc/wmc.man.in | 3 --- tools/wmc/wmctypes.h | 12 ------------ 7 files changed, 10 insertions(+), 71 deletions(-) diff --git a/tools/wmc/mcl.c b/tools/wmc/mcl.c index 0d7b50027c5..df058476129 100644 --- a/tools/wmc/mcl.c +++ b/tools/wmc/mcl.c @@ -239,7 +239,7 @@ static int fill_inputbuffer(void) case INPUT_UNICODE: len += fread( inputbuffer + len, sizeof(WCHAR), INPUTBUFFER_SIZE - len, yyin ); if (!len) break; - if (swapped) for (i = 0; i < len; i++) inputbuffer[i] = BYTESWAP_WORD( inputbuffer[i] ); + if (swapped) for (i = 0; i < len; i++) inputbuffer[i] = (inputbuffer[i] << 8) | (inputbuffer[i] >> 8); ninputbuffer = len; return 1; case INPUT_UNKNOWN: diff --git a/tools/wmc/utils.c b/tools/wmc/utils.c index d9d803413da..80e9cf0c96b 100644 --- a/tools/wmc/utils.c +++ b/tools/wmc/utils.c @@ -439,7 +439,6 @@ WCHAR *codepage_to_unicode( int codepage, const char *src, int srclen, int *dstl * Function for writing to a memory buffer. */ -int byte_swapped = 0; unsigned char *output_buffer; size_t output_buffer_pos; size_t output_buffer_size; @@ -470,13 +469,6 @@ void flush_output_buffer( const char *name ) free( output_buffer ); } -void put_data( const void *data, size_t size ) -{ - check_output_buffer_space( size ); - memcpy( output_buffer + output_buffer_pos, data, size ); - output_buffer_pos += size; -} - void put_byte( unsigned char val ) { check_output_buffer_space( 1 ); @@ -485,15 +477,18 @@ void put_byte( unsigned char val ) void put_word( unsigned short val ) { - if (byte_swapped) val = (val << 8) | (val >> 8); - put_data( &val, sizeof(val) ); + check_output_buffer_space( 2 ); + output_buffer[output_buffer_pos++] = val; + output_buffer[output_buffer_pos++] = val >> 8; } void put_dword( unsigned int val ) { - if (byte_swapped) - val = ((val << 24) | ((val << 8) & 0x00ff0000) | ((val >> 8) & 0x0000ff00) | (val >> 24)); - put_data( &val, sizeof(val) ); + check_output_buffer_space( 4 ); + output_buffer[output_buffer_pos++] = val; + output_buffer[output_buffer_pos++] = val >> 8; + output_buffer[output_buffer_pos++] = val >> 16; + output_buffer[output_buffer_pos++] = val >> 24; } void align_output( unsigned int align ) diff --git a/tools/wmc/utils.h b/tools/wmc/utils.h index 3a8010d77cc..4a4bef37ee8 100644 --- a/tools/wmc/utils.h +++ b/tools/wmc/utils.h @@ -43,14 +43,12 @@ WCHAR *codepage_to_unicode( int codepage, const char *src, int srclen, int *dstl /* buffer management */ -extern int byte_swapped; extern unsigned char *output_buffer; extern size_t output_buffer_pos; extern size_t output_buffer_size; extern void init_output_buffer(void); extern void flush_output_buffer( const char *name ); -extern void put_data( const void *data, size_t size ); extern void put_byte( unsigned char val ); extern void put_word( unsigned short val ); extern void put_dword( unsigned int val ); diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index 2993d3c5ef7..2d3dcaf328c 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -37,14 +37,6 @@ static const char usage[] = "Usage: wmc [options...] [inputfile.mc]\n" - " -B x Set output byte-order x={n[ative], l[ittle], b[ig]}\n" - " (default is n[ative] which equals " -#ifdef WORDS_BIGENDIAN - "big" -#else - "little" -#endif - "-endian)\n" " -c Set 'custom-bit' in values\n" " -d Use decimal values in output\n" " -D Set debug flag\n" @@ -70,11 +62,6 @@ static const char version_string[] = "Copyright 2000 Bertho A. Stultiens\n" ; -/* - * The output byte-order of resources (set with -B) - */ -int byteorder = WMC_BO_NATIVE; - /* * Custom bit (bit 29) in output values must be set (-c option) */ @@ -136,7 +123,7 @@ enum long_options_values LONG_OPT_NLS_DIR = 1, }; -static const char short_options[] = "B:cdDhH:io:O:P:uUvVW"; +static const char short_options[] = "cdDhH:io:O:P:uUvVW"; static const struct long_option long_options[] = { { "help", 0, 'h' }, @@ -190,25 +177,6 @@ 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; @@ -347,12 +315,6 @@ int main(int argc,char *argv[]) exit(1); } -#ifdef WORDS_BIGENDIAN - byte_swapped = (byteorder == WMC_BO_LITTLE); -#else - byte_swapped = (byteorder == WMC_BO_BIG); -#endif - switch (output_format) { case FORMAT_RC: diff --git a/tools/wmc/wmc.h b/tools/wmc/wmc.h index e9736103fe3..1939cb8c084 100644 --- a/tools/wmc/wmc.h +++ b/tools/wmc/wmc.h @@ -39,7 +39,6 @@ extern int pedantic; extern int leave_case; -extern int byteorder; extern int decimal; extern int custombit; extern int unicodein; diff --git a/tools/wmc/wmc.man.in b/tools/wmc/wmc.man.in index 123af446a5e..bfa0a19a314 100644 --- a/tools/wmc/wmc.man.in +++ b/tools/wmc/wmc.man.in @@ -22,9 +22,6 @@ with \fB-o\fR, then \fBwmc\fR will write the output to \fIinputfile.{rc,h}\fR. The outputfile is named \fIwmc.tab.{rc,h}\fR if no inputfile was given. .SH OPTIONS .TP -.BI \-B\ x -Set output byte-order x={n[ative], l[ittle], b[ig]}. Default is n[ative]. -.TP .B \-c Set 'custom-bit' in message-code values. .TP diff --git a/tools/wmc/wmctypes.h b/tools/wmc/wmctypes.h index 116ace20545..12227f2d7aa 100644 --- a/tools/wmc/wmctypes.h +++ b/tools/wmc/wmctypes.h @@ -25,18 +25,6 @@ #include "windef.h" #include "winbase.h" -/* Byteordering defines */ -#define WMC_BO_NATIVE 0x00 -#define WMC_BO_LITTLE 0x01 -#define WMC_BO_BIG 0x02 - -#define WMC_LOBYTE(w) ((WORD)(w) & 0xff) -#define WMC_HIBYTE(w) (((WORD)(w) >> 8) & 0xff) -#define WMC_LOWORD(d) ((DWORD)(d) & 0xffff) -#define WMC_HIWORD(d) (((DWORD)(d) >> 16) & 0xffff) -#define BYTESWAP_WORD(w) ((WORD)(((WORD)WMC_LOBYTE(w) << 8) + (WORD)WMC_HIBYTE(w))) -#define BYTESWAP_DWORD(d) ((DWORD)(((DWORD)BYTESWAP_WORD(WMC_LOWORD(d)) << 16) + ((DWORD)BYTESWAP_WORD(WMC_HIWORD(d))))) - /* * Tokenizer types */

1 0

Rémi Bernon : dinput8/tests: Add more force-feedback effect direction tests.
by Alexandre Julliard 10 Nov '21

10 Nov '21

Module: wine Branch: master Commit: 204763198d5a2d7957e5ba359d26b2d40f38b2c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=204763198d5a2d7957e5ba35… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 10 10:52:24 2021 +0100 dinput8/tests: Add more force-feedback effect direction tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51922 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 131 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 130 insertions(+), 1 deletion(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 59111db7f3a..4c1d73112cd 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -5476,7 +5476,7 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO LONG directions[4] = {0}; DIEFFECT desc = {0}; DWORD axes[4] = {0}; - ULONG ref, flags; + ULONG i, ref, flags; HRESULT hr; GUID guid; @@ -6037,6 +6037,135 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO ref = IDirectInputEffect_Release( effect ); ok( ref == 0, "Release returned %d\n", ref ); + + for (i = 1; i < 4; i++) + { + winetest_push_context( "%u axes", i ); + hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, NULL, &effect, NULL ); + ok( hr == DI_OK, "CreateEffect returned %#x\n", hr ); + + desc.dwFlags = DIEFF_OBJECTIDS; + desc.cAxes = i; + desc.rgdwAxes[0] = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 2 ) | DIDFT_FFACTUATOR; + desc.rgdwAxes[1] = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 0 ) | DIDFT_FFACTUATOR; + desc.rgdwAxes[2] = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 1 ) | DIDFT_FFACTUATOR; + desc.rglDirection[0] = 0; + desc.rglDirection[1] = 0; + desc.rglDirection[2] = 0; + hr = IDirectInputEffect_SetParameters( effect, &desc, DIEP_AXES | DIEP_NODOWNLOAD ); + ok( hr == DI_DOWNLOADSKIPPED, "SetParameters returned %#x\n", hr ); + + desc.dwFlags = DIEFF_CARTESIAN; + desc.cAxes = i == 3 ? 2 : 3; + desc.rglDirection[0] = 1000; + desc.rglDirection[1] = 2000; + desc.rglDirection[2] = 3000; + hr = IDirectInputEffect_SetParameters( effect, &desc, DIEP_DIRECTION | DIEP_NODOWNLOAD ); + todo_wine_if( i == 2 ) + ok( hr == DIERR_INVALIDPARAM, "SetParameters returned %#x\n", hr ); + desc.cAxes = i; + hr = IDirectInputEffect_SetParameters( effect, &desc, DIEP_DIRECTION | DIEP_NODOWNLOAD ); + todo_wine_if( i == 1 ) + ok( hr == DI_DOWNLOADSKIPPED, "SetParameters returned %#x\n", hr ); + + desc.dwFlags = DIEFF_SPHERICAL; + desc.cAxes = i; + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_DIRECTION ); + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + desc.cAxes = 3; + memset( desc.rglDirection, 0xcd, 3 * sizeof(LONG) ); + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_DIRECTION ); + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + ok( desc.cAxes == i, "got cAxes %u expected 2\n", desc.cAxes ); + if (i == 1) + { + ok( desc.rglDirection[0] == 0, "got rglDirection[0] %d expected %d\n", desc.rglDirection[0], 0 ); + ok( desc.rglDirection[1] == 0xcdcdcdcd, "got rglDirection[1] %d expected %d\n", + desc.rglDirection[1], 0xcdcdcdcd ); + ok( desc.rglDirection[2] == 0xcdcdcdcd, "got rglDirection[2] %d expected %d\n", + desc.rglDirection[2], 0xcdcdcdcd ); + } + else + { + todo_wine + ok( desc.rglDirection[0] == 6343, "got rglDirection[0] %d expected %d\n", + desc.rglDirection[0], 6343 ); + if (i == 2) + { + ok( desc.rglDirection[1] == 0, "got rglDirection[1] %d expected %d\n", + desc.rglDirection[1], 0 ); + ok( desc.rglDirection[2] == 0xcdcdcdcd, "got rglDirection[2] %d expected %d\n", + desc.rglDirection[2], 0xcdcdcdcd ); + } + else + { + todo_wine + ok( desc.rglDirection[1] == 5330, "got rglDirection[1] %d expected %d\n", + desc.rglDirection[1], 5330 ); + ok( desc.rglDirection[2] == 0, "got rglDirection[2] %d expected %d\n", + desc.rglDirection[2], 0 ); + } + } + + desc.dwFlags = DIEFF_CARTESIAN; + desc.cAxes = i; + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_DIRECTION ); + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + desc.cAxes = 3; + memset( desc.rglDirection, 0xcd, 3 * sizeof(LONG) ); + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_DIRECTION ); + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + ok( desc.cAxes == i, "got cAxes %u expected 2\n", desc.cAxes ); + todo_wine + ok( desc.rglDirection[0] == 1000, "got rglDirection[0] %d expected %d\n", desc.rglDirection[0], 1000 ); + if (i == 1) + ok( desc.rglDirection[1] == 0xcdcdcdcd, "got rglDirection[1] %d expected %d\n", + desc.rglDirection[1], 0xcdcdcdcd ); + else + { + todo_wine + ok( desc.rglDirection[1] == 2000, "got rglDirection[1] %d expected %d\n", + desc.rglDirection[1], 2000 ); + } + if (i <= 2) + ok( desc.rglDirection[2] == 0xcdcdcdcd, "got rglDirection[2] %d expected %d\n", + desc.rglDirection[2], 0xcdcdcdcd ); + else + { + todo_wine + ok( desc.rglDirection[2] == 3000, "got rglDirection[2] %d expected %d\n", + desc.rglDirection[2], 3000 ); + } + + desc.dwFlags = DIEFF_POLAR; + desc.cAxes = 1; + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_DIRECTION ); + if (i != 2) + { + todo_wine_if( i == 3 ) + ok( hr == DIERR_INVALIDPARAM, "GetParameters returned %#x\n", hr ); + } + else ok( hr == DIERR_MOREDATA, "GetParameters returned %#x\n", hr ); + desc.cAxes = 3; + memset( desc.rglDirection, 0xcd, 3 * sizeof(LONG) ); + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_DIRECTION ); + if (i != 2) ok( hr == DIERR_INVALIDPARAM, "GetParameters returned %#x\n", hr ); + else + { + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + ok( desc.cAxes == i, "got cAxes %u expected 2\n", desc.cAxes ); + todo_wine + ok( desc.rglDirection[0] == 15343, "got rglDirection[0] %d expected %d\n", + desc.rglDirection[0], 15343 ); + ok( desc.rglDirection[1] == 0, "got rglDirection[1] %d expected %d\n", desc.rglDirection[1], 0 ); + ok( desc.rglDirection[2] == 0xcdcdcdcd, "got rglDirection[2] %d expected %d\n", + desc.rglDirection[2], 0xcdcdcdcd ); + } + + ref = IDirectInputEffect_Release( effect ); + ok( ref == 0, "Release returned %d\n", ref ); + winetest_pop_context(); + } } static void test_condition_effect( IDirectInputDevice8W *device, HANDLE file, DWORD version )

1 0

Rémi Bernon : dinput: Allow DIEFF_CARTESIAN directions when cAxes matches.
by Alexandre Julliard 10 Nov '21

10 Nov '21

Module: wine Branch: master Commit: bc2ba90bd88d3a3f690473c9faf27c4ce2bddaa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc2ba90bd88d3a3f690473c9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 10 10:52:25 2021 +0100 dinput: Allow DIEFF_CARTESIAN directions when cAxes matches. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51922 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 2 +- dlls/dinput8/tests/hid.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index dfaf6ae83ff..dd77f557e3e 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2224,7 +2224,7 @@ static HRESULT WINAPI hid_joystick_effect_SetParameters( IDirectInputEffect *ifa count = impl->params.cAxes; if (params->cAxes < count) return DIERR_INVALIDPARAM; if ((direction_flags & DIEFF_POLAR) && count != 2) return DIERR_INVALIDPARAM; - if ((direction_flags & DIEFF_CARTESIAN) && count < 2) return DIERR_INVALIDPARAM; + if ((direction_flags & DIEFF_CARTESIAN) && params->cAxes != count) return DIERR_INVALIDPARAM; if (!count) memset( directions, 0, sizeof(directions) ); else if (direction_flags & DIEFF_POLAR) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 4c1d73112cd..54109593a18 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -6061,11 +6061,9 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO desc.rglDirection[1] = 2000; desc.rglDirection[2] = 3000; hr = IDirectInputEffect_SetParameters( effect, &desc, DIEP_DIRECTION | DIEP_NODOWNLOAD ); - todo_wine_if( i == 2 ) ok( hr == DIERR_INVALIDPARAM, "SetParameters returned %#x\n", hr ); desc.cAxes = i; hr = IDirectInputEffect_SetParameters( effect, &desc, DIEP_DIRECTION | DIEP_NODOWNLOAD ); - todo_wine_if( i == 1 ) ok( hr == DI_DOWNLOADSKIPPED, "SetParameters returned %#x\n", hr ); desc.dwFlags = DIEFF_SPHERICAL;

1 0

Rémi Bernon : dinput: Check for DIEFF_POLAR axes count before capacity.
by Alexandre Julliard 10 Nov '21

10 Nov '21

Module: wine Branch: master Commit: 4289bae3b4be81ea47adc18c60f26b7dae8691a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4289bae3b4be81ea47adc18c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 10 10:52:26 2021 +0100 dinput: Check for DIEFF_POLAR axes count before capacity. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51922 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 4 ++-- dlls/dinput8/tests/hid.c | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index dd77f557e3e..cec02ccd74a 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2063,14 +2063,14 @@ static HRESULT WINAPI hid_joystick_effect_GetParameters( IDirectInputEffect *ifa if (!direction_flags) return DIERR_INVALIDPARAM; count = params->cAxes = impl->params.cAxes; - if (capacity < params->cAxes) return DIERR_MOREDATA; if (!count) params->dwFlags &= ~(DIEFF_CARTESIAN | DIEFF_POLAR | DIEFF_SPHERICAL); + if ((direction_flags & DIEFF_POLAR) && count != 2) return DIERR_INVALIDPARAM; + if (capacity < params->cAxes) return DIERR_MOREDATA; if (direction_flags & DIEFF_SPHERICAL) memcpy( directions, impl->params.rglDirection, count * sizeof(LONG) ); else if (direction_flags & DIEFF_POLAR) { - if (count != 2) return DIERR_INVALIDPARAM; directions[0] = (impl->params.rglDirection[0] + 9000) % 36000; if (directions[0] < 0) directions[0] += 36000; } diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 54109593a18..5b01ea3a68a 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -6138,11 +6138,7 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO desc.dwFlags = DIEFF_POLAR; desc.cAxes = 1; hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_DIRECTION ); - if (i != 2) - { - todo_wine_if( i == 3 ) - ok( hr == DIERR_INVALIDPARAM, "GetParameters returned %#x\n", hr ); - } + if (i != 2) ok( hr == DIERR_INVALIDPARAM, "GetParameters returned %#x\n", hr ); else ok( hr == DIERR_MOREDATA, "GetParameters returned %#x\n", hr ); desc.cAxes = 3; memset( desc.rglDirection, 0xcd, 3 * sizeof(LONG) );

1 0

Rémi Bernon : dinput: Only convert DIEFFECT directions to spherical when needed.
by Alexandre Julliard 10 Nov '21

10 Nov '21

Module: wine Branch: master Commit: bd6d258e33e0eec79b9fd8f1be0ac5836a8a5606 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd6d258e33e0eec79b9fd8f1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 10 10:52:27 2021 +0100 dinput: Only convert DIEFFECT directions to spherical when needed. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 182 +++++++++++++++++++++++++++++++++------------ dlls/dinput8/tests/hid.c | 7 -- 2 files changed, 134 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bd6d258e33e0eec79b9f…

1 0