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

Brendan Shanks : dinput: Add "PIDVID" guidProduct and use for non-keyboards/mice.
by Alexandre Julliard Aug. 20, 2019

Aug. 20, 2019

Module: wine Branch: master Commit: d2d3959d3d29b3da334b53283b34cafde653b3e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2d3959d3d29b3da334b5328… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Aug 13 14:40:38 2019 -0700 dinput: Add "PIDVID" guidProduct and use for non-keyboards/mice. Windows uses an undocumented GUID (ending in ASCII "PIDVID") for non-keyboard/mouse devices. Various games (DiRT Rally 2) and libraries (SDL, GLFW) look for this GUID to match specific devices or know that the PID/VID can be extracted. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device_private.h | 2 ++ dlls/dinput/joystick.c | 8 ++++++++ dlls/dinput/joystick_linux.c | 15 +-------------- dlls/dinput/joystick_linuxinput.c | 15 +-------------- dlls/dinput/joystick_osx.c | 6 +++--- 5 files changed, 15 insertions(+), 31 deletions(-) diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index d9e2997..27e9c26 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -114,6 +114,8 @@ typedef struct LPDIRECTINPUTEFFECT ref; } effect_list_item; +extern const GUID DInput_PIDVID_Product_GUID DECLSPEC_HIDDEN; + /* Various debug tools */ extern void _dump_DIPROPHEADER(LPCDIPROPHEADER diph) DECLSPEC_HIDDEN; extern void _dump_OBJECTINSTANCEA(const DIDEVICEOBJECTINSTANCEA *ddoi) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index a5308b6..2220b5d 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -52,6 +52,14 @@ static const WORD PID_XBOX_CONTROLLERS[] = { 0x0719, /* Xbox 360 Wireless Adapter */ }; +/* Windows uses this GUID for guidProduct on non-keyboard/mouse devices. + * Data1 contains the device VID (low word) and PID (high word). + * Data4 ends with the ASCII bytes "PIDVID". + */ +const GUID DInput_PIDVID_Product_GUID = { /* device_pidvid-0000-0000-0000-504944564944 */ + 0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44} +}; + static inline JoystickGenericImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface) { return CONTAINING_RECORD(CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8A_iface), JoystickGenericImpl, base); diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 7e01f90..4ee7397 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -126,19 +126,6 @@ static const GUID DInput_Wine_Joystick_GUID = { /* 9e573ed9-7734-11d2-8d4a-23903 {0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7} }; -/* - * Construct the GUID in the same way of Windows doing this. - * Data1 is concatenation of productid and vendorid. - * Data2 and Data3 are NULL. - * Data4 seems to be a constant. - */ -static const GUID DInput_Wine_Joystick_Constant_Part_GUID = { - 0x000000000, - 0x0000, - 0x0000, - {0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44} -}; - #define MAX_JOYSTICKS 64 static INT joystick_devices_count = -1; static struct JoyDev *joystick_devices; @@ -327,7 +314,7 @@ static INT find_joystick_devices(void) else { /* Concatenate product_id with vendor_id to mimic Windows behaviour */ - joydev.guid_product = DInput_Wine_Joystick_Constant_Part_GUID; + joydev.guid_product = DInput_PIDVID_Product_GUID; joydev.guid_product.Data1 = MAKELONG(joydev.vendor_id, joydev.product_id); } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 1e8c542..b5418d8 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -165,19 +165,6 @@ static const GUID DInput_Wine_Joystick_Base_GUID = { /* 9e573eda-7734-11d2-8d4a- {0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7} }; -/* - * Construct the GUID in the same way of Windows doing this. - * Data1 is concatenation of productid and vendorid. - * Data2 and Data3 are NULL. - * Data4 seems to be a constant. - */ -static const GUID DInput_Wine_Joystick_Constant_Part_GUID = { - 0x000000000, - 0x0000, - 0x0000, - {0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44} -}; - #define test_bit(arr,bit) (((BYTE*)(arr))[(bit)>>3]&(1<<((bit)&7))) #define MAX_JOYDEV 64 @@ -344,7 +331,7 @@ static void find_joydevs(void) joydev.bus_type = device_id.bustype; /* Concatenate product_id with vendor_id to mimic Windows behaviour */ - joydev.guid_product = DInput_Wine_Joystick_Constant_Part_GUID; + joydev.guid_product = DInput_PIDVID_Product_GUID; joydev.guid_product.Data1 = MAKELONG(joydev.vendor_id, joydev.product_id); } diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 884dd7f..990f5d1 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -985,7 +985,7 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS /* Return joystick */ lpddi->guidInstance = DInput_Wine_OsX_Joystick_GUID; lpddi->guidInstance.Data3 = id; - lpddi->guidProduct = DInput_Wine_OsX_Joystick_GUID; + lpddi->guidProduct = DInput_PIDVID_Product_GUID; lpddi->guidProduct.Data1 = make_vid_pid(device); lpddi->dwDevType = get_device_type(version, is_joystick); lpddi->dwDevType |= DIDEVTYPE_HID; @@ -1033,7 +1033,7 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS /* Return joystick */ lpddi->guidInstance = DInput_Wine_OsX_Joystick_GUID; lpddi->guidInstance.Data3 = id; - lpddi->guidProduct = DInput_Wine_OsX_Joystick_GUID; + lpddi->guidProduct = DInput_PIDVID_Product_GUID; lpddi->guidProduct.Data1 = make_vid_pid(device); lpddi->dwDevType = get_device_type(version, is_joystick); lpddi->dwDevType |= DIDEVTYPE_HID; @@ -1109,7 +1109,7 @@ static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, newDevice->generic.guidInstance = DInput_Wine_OsX_Joystick_GUID; newDevice->generic.guidInstance.Data3 = index; - newDevice->generic.guidProduct = DInput_Wine_OsX_Joystick_GUID; + newDevice->generic.guidProduct = DInput_PIDVID_Product_GUID; newDevice->generic.guidProduct.Data1 = make_vid_pid(device); newDevice->generic.joy_polldev = poll_osx_device_state;

1 0

Fabian Maurer : find/tests: First tests.
by Alexandre Julliard Aug. 20, 2019

Aug. 20, 2019

Module: wine Branch: master Commit: a64b9c93b1eeef151221b5a100547fdae85435f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a64b9c93b1eeef151221b5a1… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Aug 12 23:37:02 2019 +0200 find/tests: First tests. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + programs/find/tests/Makefile.in | 5 + programs/find/tests/find.c | 316 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 323 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a64b9c93b1eeef151221…

1 0

Brendan Shanks : dinput/tests: Test for correct guidProduct.
by Alexandre Julliard Aug. 20, 2019

Aug. 20, 2019

Module: wine Branch: master Commit: 50785992d07b2ef7d1eefe1bf1180535be16b96b URL: https://source.winehq.org/git/wine.git/?a=commit;h=50785992d07b2ef7d1eefe1b… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Aug 13 14:40:37 2019 -0700 dinput/tests: Test for correct guidProduct. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/dinput.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index c570ecf..5947b17 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -386,6 +386,30 @@ static BOOL CALLBACK enum_devices_callback(const DIDEVICEINSTANCEA *instance, vo wine_dbgstr_guid(&instance->guidProduct)); } + if ((instance->dwDevType & 0xff) == DIDEVTYPE_KEYBOARD) + ok(IsEqualGUID(&instance->guidProduct, &GUID_SysKeyboard), + "Keyboard guidProduct (%s) does not match GUID_SysKeyboard (%s)\n", + wine_dbgstr_guid(&instance->guidProduct), + wine_dbgstr_guid(&GUID_SysMouse)); + else if ((instance->dwDevType & 0xff) == DIDEVTYPE_MOUSE) + ok(IsEqualGUID(&instance->guidProduct, &GUID_SysMouse), + "Mouse guidProduct (%s) does not match GUID_SysMouse (%s)\n", + wine_dbgstr_guid(&instance->guidProduct), + wine_dbgstr_guid(&GUID_SysMouse)); + else { + /* Non-keyboard/mouse devices use the "PIDVID" guidProduct */ + static const GUID pidvid_product_guid = { /* device_pidvid-0000-0000-0000-504944564944 "PIDVID" */ + 0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44} + }; + + ok(instance->guidProduct.Data2 == pidvid_product_guid.Data2, + "guidProduct.Data2 is %04x\n", instance->guidProduct.Data2); + ok(instance->guidProduct.Data3 == pidvid_product_guid.Data3, + "guidProduct.Data3 is %04x\n", instance->guidProduct.Data3); + ok(!memcmp(instance->guidProduct.Data4, pidvid_product_guid.Data4, sizeof(pidvid_product_guid.Data4)), + "guidProduct.Data4 does not match: %s\n", wine_dbgstr_guid(&instance->guidProduct)); + } + enum_test->device_count++; return enum_test->return_value; }

1 0

Zebediah Figura : widl: Create exactly one type_t object per named structure type.
by Alexandre Julliard Aug. 20, 2019

Aug. 20, 2019

Module: wine Branch: master Commit: 42321d7a11065d812c3ceaddc4a1d3c821e07c53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42321d7a11065d812c3ceadd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 19 21:17:37 2019 -0500 widl: Create exactly one type_t object per named structure type. Regardless of whether we are writing a typelib. Based on a patch by Richard Pospesel. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 2 +- tools/widl/typetree.c | 30 +++++++++++++----------------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index bdbd440..9db8ebd 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1880,7 +1880,7 @@ type_t *reg_type(type_t *type, const char *name, struct namespace *namespace, in nt->t = t; nt->next = namespace->type_hash[hash]; namespace->type_hash[hash] = nt; - if ((t == tsSTRUCT || t == tsUNION)) + if ((t == tsUNION)) fix_incomplete_types(type); return type; } diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index a066125..05e9684 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -291,31 +291,27 @@ type_t *type_new_enum(const char *name, struct namespace *namespace, int defined type_t *type_new_struct(char *name, struct namespace *namespace, int defined, var_list_t *fields) { - type_t *tag_type = name ? find_type(name, namespace, tsSTRUCT) : NULL; - type_t *t; + type_t *t = NULL; - /* avoid creating duplicate typelib type entries */ - if (tag_type && do_typelib) return tag_type; + if (name) + t = find_type(name, namespace, tsSTRUCT); - t = make_type(TYPE_STRUCT); - t->name = name; - t->namespace = namespace; + if (!t) + { + t = make_type(TYPE_STRUCT); + t->name = name; + t->namespace = namespace; + if (name) + reg_type(t, name, namespace, tsSTRUCT); + } - if (tag_type && tag_type->details.structure) - t->details.structure = tag_type->details.structure; - else if (defined) + if (!t->defined && defined) { t->details.structure = xmalloc(sizeof(*t->details.structure)); t->details.structure->fields = fields; t->defined = TRUE; } - if (name) - { - if (defined) - reg_type(t, name, namespace, tsSTRUCT); - else - add_incomplete(t); - } + return t; }

1 0

Francois Gouget : winetest: Tweak dissect to better match the TestBot WineTest log parser.
by Alexandre Julliard Aug. 20, 2019

Aug. 20, 2019

Module: tools Branch: master Commit: fe8341c87adc6bb18172e0341fc733cccec579a9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fe8341c87adc6bb18172e03… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 20 12:08:59 2019 +0200 winetest: Tweak dissect to better match the TestBot WineTest log parser. This puts exception handling in the same relative spot, making it easier to compare the two codebases. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 2bd95eb..e5b2815 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -609,21 +609,6 @@ while ($line = <IN>) { $rc = 0; } } - elsif ($line =~ /^(?:([0-9a-f]+):)?([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or - ($unit ne "" and - $line =~ /(?:([0-9a-f]+):)?($unit): unhandled exception [0-9a-fA-F]{8} at /)) - { - my ($l_pid, $l_unit) = ($1, $2); - if ($l_unit eq $unit) - { - # This also replaces a test summary line. - $pids{$l_pid || 0} = 1; - $s_failures++; - } - add_test_line("failed", escapeHTML($line)); - check_unit($l_unit, "unhandled exception"); - $failures++; - } elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/ or ($unit ne "" and $line =~ /^(.*?)($unit)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/)) @@ -664,6 +649,21 @@ while ($line = <IN>) { get_source_link($l_unit, $l_num) .": ". escapeHTML($l_text)); } + elsif ($line =~ /^(?:([0-9a-f]+):)?([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or + ($unit ne "" and + $line =~ /(?:([0-9a-f]+):)?($unit): unhandled exception [0-9a-fA-F]{8} at /)) + { + my ($l_pid, $l_unit) = ($1, $2); + if ($l_unit eq $unit) + { + # This also replaces a test summary line. + $pids{$l_pid || 0} = 1; + $s_failures++; + } + add_test_line("failed", escapeHTML($line)); + check_unit($l_unit, "unhandled exception"); + $failures++; + } elsif ($line =~ /^(?:([0-9a-f]+):)?([_a-z0-9]+): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./ or ($unit ne "" and $line =~ /(?:([0-9a-f]+):)?($unit): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./))

1 0

Francois Gouget : winetest: Add test instructions in the dissect and gather scripts.
by Alexandre Julliard Aug. 20, 2019

Aug. 20, 2019

Module: tools Branch: master Commit: 01ac22970306e3593a36c2a8b688bb9ab663d2d7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=01ac22970306e3593a36c2a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 20 12:08:22 2019 +0200 winetest: Add test instructions in the dissect and gather scripts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 6 ++++++ winetest/gather | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/winetest/dissect b/winetest/dissect index a468812..2bd95eb 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -26,6 +26,12 @@ # where DIGIT is for resolving name clashes and data/BUILD/outdated is # created to signal the change in the given build. # +# To test this script: +# - Make sure $workdir is not set in winetest.conf +# - Put a test report in queue/rep1/report +# - Run ./dissect +# - Examine the result in data/ +# # Exit: 0 - successfully processed a report, call again # 1 - failed to process a report, call again # 2 - there was nothing to do diff --git a/winetest/gather b/winetest/gather index a894377..31ba8fa 100755 --- a/winetest/gather +++ b/winetest/gather @@ -25,6 +25,11 @@ # script. Races and concurrency problems must be dealt with on that higher # level. # +# To test this script: +# - Make sure $workdir is not set in winetest.conf +# - After running dissect, run ./gather +# - Examine the result in data/ +# # Exit: 0 - successfully processed a build, call again # 1 - should not happen # 2 - there was nothing to do

1 0

Francois Gouget : testbot: Remove support for TestAgent's old "skipped" lines.
by Alexandre Julliard Aug. 20, 2019

Aug. 20, 2019

Module: tools Branch: master Commit: 3e38ebfe6bfeb32dd1db0f73dfb7964ff4ac4ae5 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3e38ebfe6bfeb32dd1db0f7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 20 12:08:48 2019 +0200 testbot: Remove support for TestAgent's old "skipped" lines. TestAgent was fixed a couple of years ago so the TestBot should not have to deal with such lines anymore. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index b75607a..3dca2e4 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -351,16 +351,14 @@ sub ParseWineTestReport($$$) _CheckUnit($Parser, $Cur, $1, "todo"); $Cur->{LineTodos}++; } - # TestLauncher's skip message is quite broken - elsif ($Line =~ /^([_a-z0-9]+)(?:\.c)?:\d+:? Tests? skipped: / or + elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Tests skipped: / or ($Cur->{Unit} ne "" and - $Line =~ /($Cur->{Unit})(?:\.c)?:\d+:? Tests? skipped: /)) + $Line =~ /($Cur->{Unit})\.c:\d+: Tests skipped: /)) { my $Unit = $1; # Don't complain and don't count misplaced skips. Only complain if they - # are misreported (see _CloseTestUnit). Also TestLauncher uses the wrong - # name in its skip message when skipping tests. - if ($Unit eq $Cur->{Unit} or $Cur->{Unit} eq "" or $Unit eq $Cur->{Dll}) + # are misreported (see _CloseTestUnit). + if ($Unit eq $Cur->{Unit} or $Cur->{Unit} eq "") { $Cur->{LineSkips}++; } @@ -396,9 +394,8 @@ sub ParseWineTestReport($$$) my ($Pid, $Unit, $Todos, $Failures, $Skips) = ($1, $2, $3, $4, $5); # Dlls that have only one test unit will run it even if there is - # no argument. Also TestLauncher uses the wrong name in its test - # summary line when skipping tests. - if ($Unit eq $Cur->{Unit} or $Cur->{Unit} eq "" or $Unit eq $Cur->{Dll}) + # no argument. + if ($Unit eq $Cur->{Unit} or $Cur->{Unit} eq "") { # There may be more than one summary line due to child processes $Cur->{Pids}->{$Pid || 0} = 1;

1 0

Andrey Gusev : twain_32: Add missing debugstr_a.
by Alexandre Julliard Aug. 19, 2019

Aug. 19, 2019

Module: wine Branch: master Commit: 5ea3a044b83c4cd55a3c647f5e80511a85b9f536 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ea3a044b83c4cd55a3c647f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Aug 19 20:36:18 2019 +0300 twain_32: Add missing debugstr_a. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/twain_32/dsm_ctrl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index 3f7ead4..45f227e 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -57,12 +57,12 @@ twain_add_onedriver(const char *dsname) { hmod = LoadLibraryA(dsname); if (!hmod) { - ERR("Failed to load TWAIN Source %s\n", dsname); + ERR("Failed to load TWAIN Source %s\n", debugstr_a(dsname)); return; } dsEntry = (DSENTRYPROC)GetProcAddress(hmod, "DS_Entry"); if (!dsEntry) { - ERR("Failed to find DS_Entry() in TWAIN DS %s\n", dsname); + ERR("Failed to find DS_Entry() in TWAIN DS %s\n", debugstr_a(dsname)); return; } /* Loop to do multiple detects, mostly for sane.ds and gphoto2.ds */ @@ -317,7 +317,7 @@ TW_UINT16 TWAIN_OpenDS (pTW_IDENTITY pOrigin, TW_MEMREF pData) } hmod = LoadLibraryA(devices[i].modname); if (!hmod) { - ERR("Failed to load TWAIN Source %s\n", modname); + ERR("Failed to load TWAIN Source %s\n", debugstr_a(modname)); DSM_twCC = TWCC_OPERATIONERROR; HeapFree(GetProcessHeap(), 0, newSource); return TWRC_FAILURE;

1 0

Damjan Jovanovic : cmd.exe: If there is a title given through STARTUPINFO, use it.
by Alexandre Julliard Aug. 19, 2019

Aug. 19, 2019

Module: wine Branch: master Commit: ada8b1ab9387f0ee2a6b96ce7c468934ef3d86c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ada8b1ab9387f0ee2a6b96ce… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Aug 11 16:28:33 2019 +0200 cmd.exe: If there is a title given through STARTUPINFO, use it. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/wcmdmain.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 29e498a..d7c0ce1 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2417,6 +2417,7 @@ int wmain (int argc, WCHAR *argvW[]) CMD_LIST *toExecute = NULL; /* Commands left to be executed */ OSVERSIONINFOW osv; char osver[50]; + STARTUPINFOW startupInfo; if (!GetEnvironmentVariableW(comspecW, comspec, ARRAY_SIZE(comspec))) { @@ -2676,7 +2677,11 @@ int wmain (int argc, WCHAR *argvW[]) return errorlevel; } - SetConsoleTitleW(WCMD_LoadMessage(WCMD_CONSTITLE)); + GetStartupInfoW(&startupInfo); + if (startupInfo.lpTitle != NULL) + SetConsoleTitleW(startupInfo.lpTitle); + else + SetConsoleTitleW(WCMD_LoadMessage(WCMD_CONSTITLE)); /* Note: cmd.exe /c dir does not get a new color, /k dir does */ if (opt_t) {

1 0

Richard Yao : advapi32: Add EventWriteString stub.
by Alexandre Julliard Aug. 19, 2019

Aug. 19, 2019

Module: wine Branch: master Commit: 8d5554247338acdb3ed94668115f73be667378fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d5554247338acdb3ed94668… Author: Richard Yao <ryao(a)gentoo.org> Date: Sun Aug 18 19:14:30 2019 -0400 advapi32: Add EventWriteString stub. "Are You Ready for Valve Index?" needs this to work. Signed-off-by: Richard Yao <ryao(a)gentoo.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 2 +- .../api-ms-win-eventing-provider-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/ntdll/misc.c | 10 ++++++++++ 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 231ab05..3db5612 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -297,7 +297,7 @@ # @ stub EventWriteEndScenario # @ stub EventWriteEx # @ stub EventWriteStartScenario -# @ stub EventWriteString +@ stdcall EventWriteString(int64 long int64 ptr) ntdll.EtwEventWriteString @ stdcall EventWriteTransfer(int64 ptr ptr ptr long ptr) ntdll.EtwEventWriteTransfer @ stdcall FileEncryptionStatusA(str ptr) @ stdcall FileEncryptionStatusW(wstr ptr) diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index b2dcc17..579811b 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -44,7 +44,7 @@ @ stdcall EventRegister(ptr ptr ptr ptr) advapi32.EventRegister @ stdcall EventUnregister(int64) advapi32.EventUnregister @ stdcall EventWrite(int64 ptr long ptr) advapi32.EventWrite -@ stub EventWriteString +@ stdcall EventWriteString(int64 long int64 ptr) advapi32.EventWriteString @ stdcall EventWriteTransfer(int64 ptr ptr ptr long ptr) advapi32.EventWriteTransfer @ stdcall FindFirstFreeAce(ptr ptr) advapi32.FindFirstFreeAce @ stdcall FreeSid(ptr) advapi32.FreeSid diff --git a/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec b/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec index bd4e7a3..92d495c 100644 --- a/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec +++ b/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec @@ -6,5 +6,5 @@ @ stdcall EventUnregister(int64) advapi32.EventUnregister @ stdcall EventWrite(int64 ptr long ptr) advapi32.EventWrite @ stub EventWriteEx -@ stub EventWriteString +@ stdcall EventWriteString(int64 long int64 ptr) advapi32.EventWriteString @ stdcall EventWriteTransfer(int64 ptr ptr ptr long ptr) advapi32.EventWriteTransfer diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 4bb2b55..7021447 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -335,7 +335,7 @@ @ stdcall EventUnregister(int64) ntdll.EtwEventUnregister @ stdcall EventWrite(int64 ptr long ptr) ntdll.EtwEventWrite # @ stub EventWriteEx -# @ stub EventWriteString +@ stdcall EventWriteString(int64 long int64 ptr) ntdll.EtwEventWriteString @ stdcall EventWriteTransfer(int64 ptr ptr ptr long ptr) ntdll.EtwEventWriteTransfer @ stdcall ExitProcess(long) ntdll.RtlExitUserProcess @ stdcall ExitThread(long) ntdll.RtlExitUserThread diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 152b2cf..2a13551 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -427,6 +427,16 @@ ULONG WINAPI EtwEventSetInformation( REGHANDLE handle, EVENT_INFO_CLASS class, v } /****************************************************************************** + * EtwEventWriteString (NTDLL.@) + */ +ULONG WINAPI EtwEventWriteString( REGHANDLE handle, UCHAR level, ULONGLONG keyword, PCWSTR string ) +{ + FIXME("%s, %u, %s, %s: stub\n", wine_dbgstr_longlong(handle), level, + wine_dbgstr_longlong(keyword), debugstr_w(string)); + return ERROR_SUCCESS; +} + +/****************************************************************************** * EtwEventWriteTransfer (NTDLL.@) */ ULONG WINAPI EtwEventWriteTransfer( REGHANDLE handle, PCEVENT_DESCRIPTOR descriptor, LPCGUID activity,

1 0