wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Alexandre Julliard : make_unicode: Use codepage 949 to add default mappings to codepage 20949.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 6f68543692a7588daa581d00c475715395036b15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f68543692a7588daa581d00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 11 12:46:04 2021 +0100 make_unicode: Use codepage 949 to add default mappings to codepage 20949. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.rgs | 74 ++++++++++++++++++++--------------------- nls/c_20949.nls | Bin 177698 -> 177698 bytes tools/make_unicode | 28 +++++++++++++--- 3 files changed, 60 insertions(+), 42 deletions(-) diff --git a/dlls/kernelbase/kernelbase.rgs b/dlls/kernelbase/kernelbase.rgs index d35eb0a71a8..0d9dbd29c43 100644 --- a/dlls/kernelbase/kernelbase.rgs +++ b/dlls/kernelbase/kernelbase.rgs @@ -10,41 +10,6 @@ HKLM { Codepage { - val '37' = s 'c_037.nls' - val '437' = s 'c_437.nls' - val '500' = s 'c_500.nls' - val '708' = s 'c_708.nls' - val '737' = s 'c_737.nls' - val '775' = s 'c_775.nls' - val '850' = s 'c_850.nls' - val '852' = s 'c_852.nls' - val '855' = s 'c_855.nls' - val '857' = s 'c_857.nls' - val '860' = s 'c_860.nls' - val '861' = s 'c_861.nls' - val '862' = s 'c_862.nls' - val '863' = s 'c_863.nls' - val '864' = s 'c_864.nls' - val '865' = s 'c_865.nls' - val '866' = s 'c_866.nls' - val '869' = s 'c_869.nls' - val '874' = s 'c_874.nls' - val '875' = s 'c_875.nls' - val '932' = s 'c_932.nls' - val '936' = s 'c_936.nls' - val '949' = s 'c_949.nls' - val '950' = s 'c_950.nls' - val '1026' = s 'c_1026.nls' - val '1250' = s 'c_1250.nls' - val '1251' = s 'c_1251.nls' - val '1252' = s 'c_1252.nls' - val '1253' = s 'c_1253.nls' - val '1254' = s 'c_1254.nls' - val '1255' = s 'c_1255.nls' - val '1256' = s 'c_1256.nls' - val '1257' = s 'c_1257.nls' - val '1258' = s 'c_1258.nls' - val '1361' = s 'c_1361.nls' val '10000' = s 'c_10000.nls' val '10001' = s 'c_10001.nls' val '10002' = s 'c_10002.nls' @@ -61,8 +26,21 @@ HKLM val '10079' = s 'c_10079.nls' val '10081' = s 'c_10081.nls' val '10082' = s 'c_10082.nls' + val '1026' = s 'c_1026.nls' + val '1250' = s 'c_1250.nls' + val '1251' = s 'c_1251.nls' + val '1252' = s 'c_1252.nls' + val '1253' = s 'c_1253.nls' + val '1254' = s 'c_1254.nls' + val '1255' = s 'c_1255.nls' + val '1256' = s 'c_1256.nls' + val '1257' = s 'c_1257.nls' + val '1258' = s 'c_1258.nls' + val '1361' = s 'c_1361.nls' val '20127' = s 'c_20127.nls' val '20866' = s 'c_20866.nls' + val '20932' = s 'c_20932.nls' + val '20949' = s 'c_20949.nls' val '21866' = s 'c_21866.nls' val '28591' = s 'c_28591.nls' val '28592' = s 'c_28592.nls' @@ -75,8 +53,30 @@ HKLM val '28599' = s 'c_28599.nls' val '28603' = s 'c_28603.nls' val '28605' = s 'c_28605.nls' - val '20932' = s 'c_20932.nls' - val '20949' = s 'c_20949.nls' + val '37' = s 'c_037.nls' + val '437' = s 'c_437.nls' + val '500' = s 'c_500.nls' + val '708' = s 'c_708.nls' + val '737' = s 'c_737.nls' + val '775' = s 'c_775.nls' + val '850' = s 'c_850.nls' + val '852' = s 'c_852.nls' + val '855' = s 'c_855.nls' + val '857' = s 'c_857.nls' + val '860' = s 'c_860.nls' + val '861' = s 'c_861.nls' + val '862' = s 'c_862.nls' + val '863' = s 'c_863.nls' + val '864' = s 'c_864.nls' + val '865' = s 'c_865.nls' + val '866' = s 'c_866.nls' + val '869' = s 'c_869.nls' + val '874' = s 'c_874.nls' + val '875' = s 'c_875.nls' + val '932' = s 'c_932.nls' + val '936' = s 'c_936.nls' + val '949' = s 'c_949.nls' + val '950' = s 'c_950.nls' } Normalization { diff --git a/nls/c_20949.nls b/nls/c_20949.nls index 1ee157af003..2ff92aec922 100644 Binary files a/nls/c_20949.nls and b/nls/c_20949.nls differ diff --git a/tools/make_unicode b/tools/make_unicode index 053adb92602..1e0dbe419e1 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -945,10 +945,9 @@ sub dump_eucjp_codepage() ################################################################ # build Korean Wansung table from the KSX1001 file -# FIXME: compare to Windows we should add extra mappings for -# characters added from Unicode 1.1 to enhance the completeness. -sub dump_krwansung_codepage() +sub dump_krwansung_codepage(@) { + my @cp949 = @_; @cp2uni = (); @glyph2uni = (); @lead_bytes = (); @@ -980,6 +979,24 @@ sub dump_krwansung_codepage() } close $INPUT; + # get some extra mappings from cp 949 + my @defined_lb; + map { $defined_lb[$_] = 1; } @lead_bytes; + foreach my $i (0x0000 .. 0xffff) + { + next if ($i >= 0x1100 && $i <= 0x11ff); # range not used in 20949 + next unless defined $cp949[$i]; + if ($cp949[$i] >= 0xff) + { + # only add chars for lead bytes that exist in 20949 + my $hi = $cp949[$i] >> 8; + my $lo = $cp949[$i] & 0xff; + next unless $defined_lb[$hi]; + next unless $lo >= 0xa1 && $lo <= 0xfe; + } + add_mapping( $cp949[$i], $i ); + } + output_codepage_file( 20949 ); } @@ -2341,6 +2358,8 @@ sub dump_msdata_codepage($) close $INPUT; output_codepage_file( $codepage ); + + if ($codepage == 949) { dump_krwansung_codepage( @uni2cp ); } } ################################################################ @@ -2758,7 +2777,7 @@ sub dump_registry_script($%) $i == $#subkeys && $def ? " = s '$def'" : "", 4 * $indent, ""; $indent++; } - foreach my $v (@vals) { printf OUTPUT "%*sval $v\n", 4 * $indent, ""; } + foreach my $v (sort @vals) { printf OUTPUT "%*sval $v\n", 4 * $indent, ""; } for (my $i = 0; $i < @subkeys; $i++) { printf OUTPUT "%*s}\n", 4 * --$indent, ""; } } while ($indent) { printf OUTPUT "%*s}\n", 4 * --$indent, ""; } @@ -2813,7 +2832,6 @@ dump_norm_table( "nls/normidna.nls" ); dump_sortkey_table( "nls/sortdefault.nls", "Windows 10 Sorting Weight Table.txt" ); foreach my $file (@allfiles) { dump_msdata_codepage( $file ); } dump_eucjp_codepage(); -dump_krwansung_codepage(); dump_registry_script( "dlls/kernelbase/kernelbase.rgs", %registry_keys ); exit 0;

1 0

Sanghoon Park : make_unicode: Add support for codepage 20949 (Korean Wansung).
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: fd3a6402065a057e189d44905f62774bb6a381c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd3a6402065a057e189d4490… Author: Sanghoon Park <esifea1908(a)gmail.com> Date: Thu Mar 11 14:02:09 2021 +0900 make_unicode: Add support for codepage 20949 (Korean Wansung). Signed-off-by: Sanghoon Park <esifea1908(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.rgs | 1 + dlls/kernelbase/locale.c | 1 + loader/wine.inf.in | 1 + nls/Makefile.in | 1 + nls/c_20949.nls | Bin 0 -> 177698 bytes tools/make_unicode | 41 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 45 insertions(+) diff --git a/dlls/kernelbase/kernelbase.rgs b/dlls/kernelbase/kernelbase.rgs index 629f98ebafa..d35eb0a71a8 100644 --- a/dlls/kernelbase/kernelbase.rgs +++ b/dlls/kernelbase/kernelbase.rgs @@ -76,6 +76,7 @@ HKLM val '28603' = s 'c_28603.nls' val '28605' = s 'c_28605.nls' val '20932' = s 'c_20932.nls' + val '20949' = s 'c_20949.nls' } Normalization { diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 951a8a54a86..9e77ca8dd37 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -159,6 +159,7 @@ static const struct { UINT cp; const WCHAR *name; } codepage_names[] = { 20127, L"US-ASCII (7bit)" }, { 20866, L"Russian KOI8" }, { 20932, L"EUC-JP" }, + { 20949, L"Korean Wansung" }, { 21866, L"Ukrainian KOI8" }, { 28591, L"ISO 8859-1 Latin 1" }, { 28592, L"ISO 8859-2 Latin 2 (East European)" }, diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 627d98a9e66..4cef944fb88 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -4101,6 +4101,7 @@ c_1361.nls c_20127.nls c_20866.nls c_20932.nls +c_20949.nls c_21866.nls c_28591.nls c_28592.nls diff --git a/nls/Makefile.in b/nls/Makefile.in index a3c3b69b029..4352becac5f 100644 --- a/nls/Makefile.in +++ b/nls/Makefile.in @@ -30,6 +30,7 @@ SOURCES = \ c_20127.nls \ c_20866.nls \ c_20932.nls \ + c_20949.nls \ c_21866.nls \ c_28591.nls \ c_28592.nls \ diff --git a/nls/c_20949.nls b/nls/c_20949.nls new file mode 100644 index 00000000000..1ee157af003 Binary files /dev/null and b/nls/c_20949.nls differ diff --git a/tools/make_unicode b/tools/make_unicode index 93d6a9346c2..053adb92602 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -26,6 +26,7 @@ my $UNIVERSION = "13.0.0"; my $UNIDATA = "https://www.unicode.org/Public/$UNIVERSION/ucd/UCD.zip"; my $IDNADATA = "https://www.unicode.org/Public/idna/$UNIVERSION"; my $JISDATA = "https://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS"; +my $KSCDATA = "https://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/KSC"; my $REPORTS = "http://www.unicode.org/reports"; my $MSDATA = "https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F6…"; my $MSCODEPAGES = "$MSDATA/Windows Supported Code Page Data Files.zip"; @@ -942,6 +943,45 @@ sub dump_eucjp_codepage() output_codepage_file( 20932 ); } +################################################################ +# build Korean Wansung table from the KSX1001 file +# FIXME: compare to Windows we should add extra mappings for +# characters added from Unicode 1.1 to enhance the completeness. +sub dump_krwansung_codepage() +{ + @cp2uni = (); + @glyph2uni = (); + @lead_bytes = (); + @uni2cp = (); + $default_char = 0x3f; + $default_wchar = 0x003f; + + # ASCII and undefined chars + foreach my $i (0x00 .. 0x9f) { add_mapping( $i, $i ); } + add_mapping( 0xa0, 0xf8e6 ); + add_mapping( 0xad, 0xf8e7 ); + add_mapping( 0xae, 0xf8e8 ); + add_mapping( 0xaf, 0xf8e9 ); + add_mapping( 0xfe, 0xf8ea ); + add_mapping( 0xff, 0xf8eb ); + + my $INPUT = open_data_file( $KSCDATA, "KSX1001.TXT" ); + while (<$INPUT>) + { + next if /^\#/; # skip comments + next if /^$/; # skip empty lines + next if /\x1a/; # skip ^Z + if (/^0x([0-9a-fA-F]+)\s+0x([0-9a-fA-F]+)\s+(\#.*)?/) + { + add_mapping( 0x8080 + hex $1, hex $2 ); + next; + } + die "Unrecognized line $_\n"; + } + close $INPUT; + + output_codepage_file( 20949 ); +} ################################################################ # build the sort keys table @@ -2773,6 +2813,7 @@ dump_norm_table( "nls/normidna.nls" ); dump_sortkey_table( "nls/sortdefault.nls", "Windows 10 Sorting Weight Table.txt" ); foreach my $file (@allfiles) { dump_msdata_codepage( $file ); } dump_eucjp_codepage(); +dump_krwansung_codepage(); dump_registry_script( "dlls/kernelbase/kernelbase.rgs", %registry_keys ); exit 0;

1 0

Gabriel Ivăncescu : jscript: Check for null instance prototype.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: 580413032c61bc142078d08efb1d1167fe385a97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=580413032c61bc142078d08e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Mar 5 18:59:41 2021 +0200 jscript: Check for null instance prototype. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 2 +- dlls/jscript/tests/lang.js | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index efe8741f3c1..f3eba68b9a4 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1853,7 +1853,7 @@ HRESULT init_dispex_from_constr(jsdisp_t *dispex, script_ctx_t *ctx, const built return hres; } - if(is_object_instance(val)) + if(is_object_instance(val) && get_object(val)) prot = iface_to_jsdisp(get_object(val)); jsval_release(val); } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 753b4ee595e..211ae2f0373 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1864,6 +1864,21 @@ ok(tmp === "VT_DISPATCH", "getVT(Object(nullDisp) = " + tmp); tmp = Object(nullDisp).toString(); ok(tmp === "[object Object]", "Object(nullDisp).toString() = " + tmp); +function testNullPrototype() { + this.x = 13; +} +tmp = new testNullPrototype(); +ok(tmp.x === 13, "tmp.x !== 13"); +ok(!("y" in tmp), "tmp has 'y' property"); +testNullPrototype.prototype.y = 10; +ok("y" in tmp, "tmp does not have 'y' property"); +tmp = new testNullPrototype(); +ok(tmp.y === 10, "tmp.y !== 10"); +testNullPrototype.prototype = nullDisp; +tmp = new testNullPrototype(); +ok(tmp.x === 13, "tmp.x !== 13"); +ok(!("y" in tmp), "tmp has 'y' property"); + function do_test() {} function nosemicolon() {} nosemicolon(); function () {} nosemicolon();

1 0

Alexandre Julliard : user32/tests: Remove todo from a test that seems to succeed reliably now.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: 0d017b12cf27d86607d25a114ab044601434b1cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d017b12cf27d86607d25a11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 10 20:44:47 2021 +0100 user32/tests: Remove todo from a test that seems to succeed reliably now. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index eecccb70001..dbb5f4ce5b5 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3075,7 +3075,6 @@ todo_wine old_wnd_proc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)set_focus_on_activate_proc); ShowWindow(hwnd, SW_RESTORE); ok( GetActiveWindow() == hwnd, "parent window %p should be active\n", hwnd); -todo_wine ok( GetFocus() == child, "Focus should be on child %p, not %p\n", child, GetFocus() ); SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)old_wnd_proc);

1 0

Arkadiusz Hiler : dinput: Implement DIPROP_APPDATA.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: 8d206333fd50347cb45a8db72ecb191aa787ddb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d206333fd50347cb45a8db7… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Mar 8 14:36:11 2021 +0200 dinput: Implement DIPROP_APPDATA. This fixes not working analog inputs on game controllers in Slay the Spire. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 73 ++++++++++++++++++++++ dlls/dinput8/tests/device.c | 147 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 220 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8d206333fd50347cb45a…

1 0

Arkadiusz Hiler : include: Add DIPROPPOINTER definition.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: fb56afae15c99fdb6735021aca3a8bd706e88612 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb56afae15c99fdb6735021a… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Mar 8 14:36:10 2021 +0200 include: Add DIPROPPOINTER definition. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dinput.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/dinput.h b/include/dinput.h index 92c6255cf37..2d183bbc944 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -876,6 +876,12 @@ typedef struct DIPROPSTRING { } DIPROPSTRING, *LPDIPROPSTRING; typedef const DIPROPSTRING *LPCDIPROPSTRING; +typedef struct DIPROPPOINTER { + DIPROPHEADER diph; + UINT_PTR uData; +} DIPROPPOINTER, *LPDIPROPPOINTER; +typedef const DIPROPPOINTER *LPCDIPROPPOINTER; + /* special property GUIDs */ #ifdef __cplusplus #define MAKEDIPROP(prop) (*(const GUID *)(prop))

1 0

Arkadiusz Hiler : dinput: Clear action mapping with SetDataFormat().
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: 542f6134563b491030737831f8c6da2aa530c9bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=542f6134563b491030737831… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Mar 8 14:36:09 2021 +0200 dinput: Clear action mapping with SetDataFormat(). Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 18 ++++++++++++------ dlls/dinput8/tests/device.c | 12 ++++++++++++ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 198e903fc2e..14c47dd3c7d 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -833,6 +833,7 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L DWORD username_size = MAX_PATH; int i, action = 0, num_actions = 0; unsigned int offset = 0; + ActionMap *action_map; if (This->acquired) return DIERR_ACQUIRED; @@ -848,15 +849,12 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L if (num_actions == 0) return DI_NOEFFECT; - This->num_actions = num_actions; - /* Construct the dataformat and actionmap */ obj_df = HeapAlloc(GetProcessHeap(), 0, sizeof(DIOBJECTDATAFORMAT)*num_actions); data_format.rgodf = (LPDIOBJECTDATAFORMAT)obj_df; data_format.dwNumObjs = num_actions; - HeapFree(GetProcessHeap(), 0, This->action_map); - This->action_map = HeapAlloc(GetProcessHeap(), 0, sizeof(ActionMap)*num_actions); + action_map = HeapAlloc(GetProcessHeap(), 0, sizeof(ActionMap)*num_actions); for (i = 0; i < lpdiaf->dwNumActions; i++) { @@ -873,8 +871,8 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L memcpy(&obj_df[action], obj, df->dwObjSize); - This->action_map[action].uAppData = lpdiaf->rgoAction[i].uAppData; - This->action_map[action].offset = offset; + action_map[action].uAppData = lpdiaf->rgoAction[i].uAppData; + action_map[action].offset = offset; obj_df[action].dwOfs = offset; offset += (type & DIDFT_BUTTON) ? 1 : 4; @@ -884,6 +882,9 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L IDirectInputDevice8_SetDataFormat(iface, &data_format); + This->action_map = action_map; + This->num_actions = num_actions; + HeapFree(GetProcessHeap(), 0, obj_df); /* Set the device properties according to the action format */ @@ -962,6 +963,7 @@ void queue_event(LPDIRECTINPUTDEVICE8A iface, int inst_id, DWORD data, DWORD tim This->data_queue[This->queue_head].dwData = data; This->data_queue[This->queue_head].dwTimeStamp = time; This->data_queue[This->queue_head].dwSequence = seq; + This->data_queue[This->queue_head].uAppData = -1; /* Set uAppData by means of action mapping */ if (This->num_actions > 0) @@ -1063,6 +1065,10 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetDataFormat(LPDIRECTINPUTDEVICE8W ifac EnterCriticalSection(&This->crit); + HeapFree(GetProcessHeap(), 0, This->action_map); + This->action_map = NULL; + This->num_actions = 0; + release_DataFormat(&This->data_format); res = create_DataFormat(df, &This->data_format); diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 02574961ec1..4a766280982 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -362,6 +362,18 @@ static void test_action_mapping(void) /* Test keyboard input */ test_device_input(data.keyboard, INPUT_KEYBOARD, VK_SPACE, 2); + /* setting format should reset action map */ + hr = IDirectInputDevice8_SetDataFormat(data.keyboard, &c_dfDIKeyboard); + ok (SUCCEEDED(hr), "IDirectInputDevice8_SetDataFormat failed: %08x\n", hr); + + test_device_input(data.keyboard, INPUT_KEYBOARD, VK_SPACE, -1); + + /* back to action map */ + hr = IDirectInputDevice8_SetActionMap(data.keyboard, data.lpdiaf, NULL, 0); + ok (SUCCEEDED(hr), "SetActionMap should succeed hr=%08x\n", hr); + + test_device_input(data.keyboard, INPUT_KEYBOARD, VK_SPACE, 2); + /* Test BuildActionMap with no suitable actions for a device */ IDirectInputDevice_Unacquire(data.keyboard); af.dwDataSize = 4 * DITEST_KEYBOARDSPACE;

1 0

Arkadiusz Hiler : dinput8/tests: Make input helper function more versatile.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: d3e7e0426cf5544b0fcec210304cfa6898c06cda URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3e7e0426cf5544b0fcec210… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Mar 8 14:36:08 2021 +0200 dinput8/tests: Make input helper function more versatile. test_device_input() now takes properly sized appdata expected value and can be used to send any keyboard event. It also drains device's queue so it can be called multiple times on a single device instance. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/device.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 2fc04358cc1..02574961ec1 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -80,7 +80,7 @@ static void flush_events(void) } } -static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWORD event, DWORD expected) +static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWORD event, UINT_PTR expected) { HRESULT hr; DIDEVICEOBJECTDATA obj_data; @@ -91,7 +91,7 @@ static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWO ok (SUCCEEDED(hr), "Failed to acquire device hr=%08x\n", hr); if (event_type == INPUT_KEYBOARD) - keybd_event( event, DIK_SPACE, 0, 0); + keybd_event(event, MapVirtualKeyA(event, MAPVK_VK_TO_VSC), 0, 0); if (event_type == INPUT_MOUSE) mouse_event( event, 0, 0, 0, 0); @@ -107,7 +107,7 @@ static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWO return; } - ok (obj_data.uAppData == expected, "Retrieval of action failed uAppData=%lu expected=%d\n", obj_data.uAppData, expected); + ok (obj_data.uAppData == expected, "Retrieval of action failed uAppData=%lu expected=%lu\n", obj_data.uAppData, expected); /* Check for buffer overflow */ for (i = 0; i < 17; i++) @@ -132,6 +132,14 @@ static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWO hr = IDirectInputDevice8_GetDeviceData(lpdid, sizeof(obj_data), &obj_data, &data_size, 0); ok(hr == DI_OK && data_size == 1, "GetDeviceData() failed: %08x cnt:%d\n", hr, data_size); + /* drain device's queue */ + while (data_size == 1) + { + hr = IDirectInputDevice8_GetDeviceData(lpdid, sizeof(obj_data), &obj_data, &data_size, 0); + ok(hr == DI_OK, "GetDeviceData() failed: %08x cnt:%d\n", hr, data_size); + if (hr != DI_OK) break; + } + IDirectInputDevice_Unacquire(lpdid); }

1 0

Nikolay Sivov : winegstreamer: Remove attributes pointer from static registration data.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: 773329e3bb0a60b6e6d81878cb1e3d66637977ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=773329e3bb0a60b6e6d81878… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 10 14:04:44 2021 +0300 winegstreamer: Remove attributes pointer from static registration data. We should store actual key/value pairs in there, if we ever needed this part of registration information. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/mfplat.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 602fa631a43..68278838458 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -458,7 +458,6 @@ static const struct mft const GUID **input_types; const UINT32 output_types_count; const GUID **output_types; - IMFAttributes *attributes; } mfts[] = { @@ -472,7 +471,6 @@ mfts[] = audio_converter_supported_types, ARRAY_SIZE(audio_converter_supported_types), audio_converter_supported_types, - NULL }, }; @@ -498,7 +496,7 @@ HRESULT mfplat_DllRegisterServer(void) } hr = MFTRegister(*(cur->clsid), *(cur->category), cur->name, cur->flags, cur->input_types_count, - input_types, cur->output_types_count, output_types, cur->attributes); + input_types, cur->output_types_count, output_types, NULL); if (FAILED(hr)) {

1 0

Aaro Altonen : kernelbase: Add 'Bonaire, Sint Eustatius and Saba' to geoinfodata.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: a7d0198418d6a82e460db4d422d65469edb2fc04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7d0198418d6a82e460db4d4… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Wed Mar 10 15:25:09 2021 +0100 kernelbase: Add 'Bonaire, Sint Eustatius and Saba' to geoinfodata. Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 24e8cd3f338..951a8a54a86 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -533,6 +533,7 @@ static const struct geoinfo geoinfodata[] = { 161832015, L"BL", L"BLM", 10039880, 652 }, /* Saint Barthélemy */ { 161832256, L"UM", L"UMI", 27114, 581 }, /* U.S. Minor Outlying Islands */ { 161832257, L"XX", L"XX", 10026358, 419, LOCATION_REGION }, /* Latin America and the Caribbean */ + { 161832258, L"BG", L"BES", 10039880, 535 }, /* Bonaire, Sint Eustatius and Saba */ }; /* NLS normalization file */

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 March 2021