November 2018 - Wine-Commits

Zebediah Figura : setupapi: Avoid unnecessary buffer allocation in SetupDiGetDeviceInstanceIdA().
by Alexandre Julliard Nov. 28, 2018

Nov. 28, 2018

Module: wine Branch: master Commit: 81d2b419b87214ead8e0b2d8dd696536b45d82aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=81d2b419b87214ead8e0b2d8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 27 19:55:36 2018 -0600 setupapi: Avoid unnecessary buffer allocation in SetupDiGetDeviceInstanceIdA(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 64 +++++++++++++------------------------------------ 1 file changed, 16 insertions(+), 48 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index a9145ad..be7ce64 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1607,57 +1607,25 @@ BOOL WINAPI SetupDiEnumDeviceInfo(HDEVINFO devinfo, DWORD index, SP_DEVINFO_DATA /*********************************************************************** * SetupDiGetDeviceInstanceIdA (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetDeviceInstanceIdA( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSTR DeviceInstanceId, - DWORD DeviceInstanceIdSize, - PDWORD RequiredSize) +BOOL WINAPI SetupDiGetDeviceInstanceIdA(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, + char *id, DWORD size, DWORD *needed) { - BOOL ret = FALSE; - DWORD size; - PWSTR instanceId; - - TRACE("%p %p %p %d %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstanceId, - DeviceInstanceIdSize, RequiredSize); - - SetupDiGetDeviceInstanceIdW(DeviceInfoSet, - DeviceInfoData, - NULL, - 0, - &size); - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + WCHAR idW[MAX_DEVICE_ID_LEN]; + + TRACE("devinfo %p, device_data %p, id %p, size %d, needed %p.\n", + devinfo, device_data, id, size, needed); + + if (!SetupDiGetDeviceInstanceIdW(devinfo, device_data, idW, ARRAY_SIZE(idW), NULL)) return FALSE; - instanceId = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); - if (instanceId) - { - ret = SetupDiGetDeviceInstanceIdW(DeviceInfoSet, - DeviceInfoData, - instanceId, - size, - &size); - if (ret) - { - int len = WideCharToMultiByte(CP_ACP, 0, instanceId, -1, - DeviceInstanceId, - DeviceInstanceIdSize, NULL, NULL); - if (!len) - ret = FALSE; - else - { - if (len > DeviceInstanceIdSize) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - ret = FALSE; - } - if (RequiredSize) - *RequiredSize = len; - } - } - HeapFree(GetProcessHeap(), 0, instanceId); - } - return ret; + if (needed) + *needed = WideCharToMultiByte(CP_ACP, 0, idW, -1, NULL, 0, NULL, NULL); + + if (size && WideCharToMultiByte(CP_ACP, 0, idW, -1, id, size, NULL, NULL)) + return TRUE; + + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; } /***********************************************************************

1 0

Dmitry Timoshkov : user32/tests: Add a focus test for an empty dialog that returns TRUE in WM_INITDIALOG.
by Alexandre Julliard Nov. 28, 2018

Nov. 28, 2018

Module: wine Branch: master Commit: 87d194dd1de7ab1473a805a8d4c5602a8d2d2f53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87d194dd1de7ab1473a805a8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Nov 28 09:03:11 2018 +0300 user32/tests: Add a focus test for an empty dialog that returns TRUE in WM_INITDIALOG. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f78858f..2fdb118 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13440,6 +13440,8 @@ static INT_PTR WINAPI test_dlg_proc(HWND hwnd, UINT message, WPARAM wParam, LPAR switch (message) { case WM_INITDIALOG: + return lParam; + case WM_GETDLGCODE: return 0; } @@ -13548,6 +13550,20 @@ static const struct message WmDefDlgSetFocus_2[] = { { 0 } }; /* Creation of a dialog */ +static const struct message WmCreateDialogParamSeq_0[] = { + { HCBT_CREATEWND, hook }, + { WM_NCCREATE, sent }, + { WM_NCCALCSIZE, sent|wparam, 0 }, + { WM_CREATE, sent }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SIZE, sent|wparam, SIZE_RESTORED }, + { WM_MOVE, sent }, + { WM_SETFONT, sent }, + { WM_INITDIALOG, sent }, + { WM_CHANGEUISTATE, sent|optional }, + { 0 } +}; +/* Creation of a dialog */ static const struct message WmCreateDialogParamSeq_1[] = { { HCBT_CREATEWND, hook }, { WM_NCCREATE, sent }, @@ -13558,6 +13574,14 @@ static const struct message WmCreateDialogParamSeq_1[] = { { WM_MOVE, sent }, { WM_SETFONT, sent }, { WM_INITDIALOG, sent }, + { WM_GETDLGCODE, sent|wparam|lparam, 0, 0 }, + { HCBT_SETFOCUS, hook }, + { HCBT_ACTIVATE, hook }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_ACTIVATEAPP, sent|wparam, 1 }, + { WM_NCACTIVATE, sent }, + { WM_ACTIVATE, sent|wparam, 1 }, + { WM_SETFOCUS, sent }, { WM_CHANGEUISTATE, sent|optional }, { 0 } }; @@ -13721,9 +13745,25 @@ static void test_dialog_messages(void) cls.lpfnWndProc = test_dlg_proc; if (!RegisterClassA(&cls)) assert(0); + SetFocus(0); + flush_sequence(); hdlg = CreateDialogParamA(0, "CLASS_TEST_DIALOG_2", 0, test_dlg_proc, 0); ok(IsWindow(hdlg), "CreateDialogParam failed\n"); - ok_sequence(WmCreateDialogParamSeq_1, "CreateDialogParam_1", FALSE); + ok_sequence(WmCreateDialogParamSeq_0, "CreateDialogParam_0", FALSE); + hfocus = GetFocus(); + ok(hfocus == 0, "wrong focus %p\n", hfocus); + EndDialog(hdlg, 0); + DestroyWindow(hdlg); + flush_sequence(); + + SetFocus(0); + flush_sequence(); + hdlg = CreateDialogParamA(0, "CLASS_TEST_DIALOG_2", 0, test_dlg_proc, 1); + ok(IsWindow(hdlg), "CreateDialogParam failed\n"); + ok_sequence(WmCreateDialogParamSeq_1, "CreateDialogParam_1", TRUE); + hfocus = GetFocus(); +todo_wine + ok(hfocus == hdlg, "wrong focus %p\n", hfocus); EndDialog(hdlg, 0); DestroyWindow(hdlg); flush_sequence();

1 0

Zebediah Figura : ntoskrnl.exe/tests: Add tests for waiting on timers.
by Alexandre Julliard Nov. 28, 2018

Nov. 28, 2018

Module: wine Branch: master Commit: 49e580122a1d280b920210ef2d47b1fbacbd1b16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49e580122a1d280b920210ef… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 27 19:43:08 2018 -0600 ntoskrnl.exe/tests: Add tests for waiting on timers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 51 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 8294882..17e54cd 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -260,6 +260,8 @@ static void test_sync(void) { KSEMAPHORE semaphore, semaphore2; KEVENT manual_event, auto_event; + KTIMER timer; + LARGE_INTEGER timeout; void *objs[2]; NTSTATUS ret; int i; @@ -444,6 +446,55 @@ static void test_sync(void) ok(ret == 0, "got %#x\n", ret); run_thread(mutex_thread, (void *)0); + + /* test timers */ + KeInitializeTimerEx(&timer, NotificationTimer); + + timeout.QuadPart = -100; + KeSetTimerEx(&timer, timeout, 0, NULL); + + ret = wait_single(&timer, 0); + ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + + ret = wait_single(&timer, -200); + ok(ret == 0, "got %#x\n", ret); + + ret = wait_single(&timer, 0); + ok(ret == 0, "got %#x\n", ret); + + KeCancelTimer(&timer); + KeInitializeTimerEx(&timer, SynchronizationTimer); + + KeSetTimerEx(&timer, timeout, 0, NULL); + + ret = wait_single(&timer, 0); + ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + + ret = wait_single(&timer, -200); + ok(ret == 0, "got %#x\n", ret); + + ret = wait_single(&timer, 0); + ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + + KeCancelTimer(&timer); + KeSetTimerEx(&timer, timeout, 10, NULL); + + ret = wait_single(&timer, 0); + ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + + ret = wait_single(&timer, -200); + ok(ret == 0, "got %#x\n", ret); + + ret = wait_single(&timer, 0); + ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + + ret = wait_single(&timer, -20 * 10000); + ok(ret == 0, "got %#x\n", ret); + + ret = wait_single(&timer, -20 * 10000); + ok(ret == 0, "got %#x\n", ret); + + KeCancelTimer(&timer); } static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info)

1 0

Zebediah Figura : ntoskrnl.exe: Implement KeDelayExecutionThread().
by Alexandre Julliard Nov. 28, 2018

Nov. 28, 2018

Module: wine Branch: master Commit: c00a322d97cd092e0bd06cfa9a7de129fccffce7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c00a322d97cd092e0bd06cfa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 27 19:43:09 2018 -0600 ntoskrnl.exe: Implement KeDelayExecutionThread(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 --------- dlls/ntoskrnl.exe/sync.c | 9 +++++++++ include/ddk/wdm.h | 1 + 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c7b1f43..81731ce 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3198,15 +3198,6 @@ NTSTATUS WINAPI CmUnRegisterCallback(LARGE_INTEGER cookie) } /*********************************************************************** - * KeDelayExecutionThread (NTOSKRNL.EXE.@) - */ -NTSTATUS WINAPI KeDelayExecutionThread(KPROCESSOR_MODE waitmode, BOOLEAN alertable, PLARGE_INTEGER interval) -{ - FIXME("(%u, %u, %p): stub\n", waitmode, alertable, interval); - return STATUS_NOT_IMPLEMENTED; -} - -/*********************************************************************** * IoAttachDevice (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoAttachDevice(DEVICE_OBJECT *source, UNICODE_STRING *target, DEVICE_OBJECT *attached) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 1cd0e52..da51ca0 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -364,3 +364,12 @@ BOOLEAN WINAPI KeCancelTimer( KTIMER *timer ) return ret; } + +/*********************************************************************** + * KeDelayExecutionThread (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI KeDelayExecutionThread( KPROCESSOR_MODE mode, BOOLEAN alertable, LARGE_INTEGER *timeout ) +{ + TRACE("mode %d, alertable %u, timeout %p.\n", mode, alertable, timeout); + return NtDelayExecution( alertable, timeout ); +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 56e1d84..077fec1 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1421,6 +1421,7 @@ NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG); BOOLEAN WINAPI KeCancelTimer(KTIMER*); void WINAPI KeClearEvent(PRKEVENT); +NTSTATUS WINAPI KeDelayExecutionThread(KPROCESSOR_MODE,BOOLEAN,LARGE_INTEGER*); PKTHREAD WINAPI KeGetCurrentThread(void); void WINAPI KeInitializeEvent(PRKEVENT,EVENT_TYPE,BOOLEAN); void WINAPI KeInitializeMutex(PRKMUTEX,ULONG);

1 0

Francois Gouget : testbot: Show more specific mission descriptions.
by Alexandre Julliard Nov. 28, 2018

Nov. 28, 2018

Module: tools Branch: master Commit: 7c5249abfbcf98ebd8eb8b2119b18367b8d25020 URL: https://source.winehq.org/git/tools.git/?a=commit;h=7c5249abfbcf98ebd8eb8b2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 28 00:27:33 2018 +0100 testbot: Show more specific mission descriptions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Missions.pm | 37 ++++++++++++++++++++++------------- testbot/lib/WineTestBot/StepsTasks.pm | 2 +- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm index 869f699..18d4f5e 100644 --- a/testbot/lib/WineTestBot/Missions.pm +++ b/testbot/lib/WineTestBot/Missions.pm @@ -102,33 +102,42 @@ sub GetMissionBaseName($) return $BaseName; } -sub GetTaskMissionDescription($) +sub GetTaskMissionDescription($$) { - my ($TaskMission) = @_; + my ($TaskMission, $VMType) = @_; my $Builds = $TaskMission->{Builds}; my $Description = - ($Builds->{exe32} and $Builds->{exe64}) ? "32 & 64 bit executable" : - $Builds->{exe32} ? "32 bit executable" : - $Builds->{exe64} ? "64 bit executable" : + ($Builds->{exe32} and $Builds->{exe64}) ? "32 & 64 bit" : + $Builds->{exe32} ? "32 bit" : + $Builds->{exe64} ? "64 bit" : ($Builds->{wow64} and ($Builds->{win32} or $Builds->{wow32})) ? "32 & 64 bit" : $Builds->{win32} ? "32 bit" : $Builds->{wow32} ? "32 bit WoW" : "64 bit WoW"; - my $Lang; - foreach my $Mission (@{$TaskMission->{Missions}}) + if ($Builds->{exe32} or $Builds->{exe64}) { - next if (!$Mission->{lang}); - if (defined $Lang) + $Description .= ($VMType eq "build") ? " build" : " executable"; + } + else + { + my $Lang; + foreach my $Mission (@{$TaskMission->{Missions}}) { - $Description .= " + Locales"; - $Lang = undef; - last; + next if (!$Mission->{lang}); + if (defined $Lang) + { + $Description .= " + Locales"; + $Lang = undef; + last; + } + $Lang = $Mission->{lang}; } - $Lang = $Mission->{lang}; + $Description .= " ". LocaleName($Lang) if ($Lang); + $Description .= " tests"; } - $Description .= " ". LocaleName($Lang) if ($Lang); + return $Description; } diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 4a803e7..19bedaa 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -91,7 +91,7 @@ sub GetTitle($) my ($ErrMessage, $Missions) = ParseMissionStatement($self->Missions); if (!defined $ErrMessage and @$Missions == 1) { - push @TitleParts, GetTaskMissionDescription($Missions->[0]); + push @TitleParts, GetTaskMissionDescription($Missions->[0], $self->VM->Type); } } if ($self->Type ne "suite" and $self->CmdLineArg)

1 0

Zebediah Figura : testbot: Use autoreconf instead of autoconf.
by Alexandre Julliard Nov. 28, 2018

Nov. 28, 2018

Module: tools Branch: master Commit: 3cc59b5a4a6085efc1995d89b59597fb93c4a9d1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3cc59b5a4a6085efc1995d8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 26 23:00:09 2018 -0600 testbot: Use autoreconf instead of autoconf. autoconf doesn't regenerate config.h.in. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 0f1ddb0..c53f609 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -139,11 +139,11 @@ sub ApplyPatch($$) if ($Impacts->{Autoconf}) { - InfoMsg "\nRunning autoconf\n"; - system("cd '$DataDir/$Dir' && set -x && autoconf"); + InfoMsg "\nRunning autoreconf\n"; + system("cd '$DataDir/$Dir' && set -x && autoreconf"); if ($? != 0) { - LogMsg "Autoconf failed\n"; + LogMsg "autoreconf failed\n"; return undef; } }

1 0

Francois Gouget : testbot: Allow running Windows executables on the Wine VMs.
by Alexandre Julliard Nov. 28, 2018

Nov. 28, 2018

Module: tools Branch: master Commit: fae4c1ddc0f15d9cae187e02e1ad5cf8d9b6de0a URL: https://source.winehq.org/git/tools.git/?a=commit;h=fae4c1ddc0f15d9cae187e0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 28 00:27:29 2018 +0100 testbot: Allow running Windows executables on the Wine VMs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunWineTest.pl | 17 +++++--- testbot/bin/build/WineReconfig.pl | 19 +++++++-- testbot/bin/build/WineTest.pl | 59 +++++++++++++++++++++++--- testbot/web/Submit.pl | 87 ++++++++++++++++++++------------------- 4 files changed, 124 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=fae4c1ddc0f15d9cae1…

1 0

Zebediah Figura : ntdll: Avoid inline assembly in do_cpuid().
by Alexandre Julliard Nov. 27, 2018

Nov. 27, 2018

Module: wine Branch: master Commit: b4595729105e5e5f11b8ea28ce96a7856e5eda74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4595729105e5e5f11b8ea28… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 26 10:00:05 2018 -0600 ntdll: Avoid inline assembly in do_cpuid(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 5c711ef..a0ea037 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -944,27 +944,34 @@ static SYSTEM_CPU_INFORMATION cached_sci; #define INEI 0x49656e69 /* "ineI" */ #define NTEL 0x6c65746e /* "ntel" */ -/* Calls cpuid with an eax of 'ax' and returns the 16 bytes in *p - * We are compiled with -fPIC, so we can't clobber ebx. - */ -static inline void do_cpuid(unsigned int ax, unsigned int *p) -{ +extern void do_cpuid(unsigned int ax, unsigned int *p); + #ifdef __i386__ - __asm__("pushl %%ebx\n\t" - "cpuid\n\t" - "movl %%ebx, %%esi\n\t" - "popl %%ebx" - : "=a" (p[0]), "=S" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax)); -#elif defined(__x86_64__) - __asm__("push %%rbx\n\t" - "cpuid\n\t" - "movq %%rbx, %%rsi\n\t" - "pop %%rbx" - : "=a" (p[0]), "=S" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax)); +__ASM_GLOBAL_FUNC( do_cpuid, + "pushl %esi\n\t" + "pushl %ebx\n\t" + "movl 12(%esp),%eax\n\t" + "movl 16(%esp),%esi\n\t" + "cpuid\n\t" + "movl %eax,(%esi)\n\t" + "movl %ebx,4(%esi)\n\t" + "movl %ecx,8(%esi)\n\t" + "movl %edx,12(%esi)\n\t" + "popl %ebx\n\t" + "popl %esi\n\t" + "ret" ) +#else +__ASM_GLOBAL_FUNC( do_cpuid, + "pushq %rbx\n\t" + "movl %edi,%eax\n\t" + "cpuid\n\t" + "movl %eax,(%rsi)\n\t" + "movl %ebx,4(%rsi)\n\t" + "movl %ecx,8(%rsi)\n\t" + "movl %edx,12(%rsi)\n\t" + "popq %rbx\n\t" + "ret" ) #endif -} /* From xf86info havecpuid.c 1.11 */ static inline BOOL have_cpuid(void)

1 0

Alistair Leslie-Hughes : comsvcs: Implement IDispenserManager RegisterDispenser.
by Alexandre Julliard Nov. 27, 2018

Nov. 27, 2018

Module: wine Branch: master Commit: a68d7800a03e5f91c609873ada31668e5f9acc41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a68d7800a03e5f91c609873a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 27 03:58:11 2018 +0000 comsvcs: Implement IDispenserManager RegisterDispenser. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/main.c | 181 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 179 insertions(+), 2 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 6b7ec14..21bdd67 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -43,11 +43,180 @@ typedef struct dispensermanager } dispensermanager; +typedef struct holder +{ + IHolder IHolder_iface; + LONG ref; + + IDispenserDriver *driver; +} holder; + static inline dispensermanager *impl_from_IDispenserManager(IDispenserManager *iface) { return CONTAINING_RECORD(iface, dispensermanager, IDispenserManager_iface); } +static inline holder *impl_from_IHolder(IHolder *iface) +{ + return CONTAINING_RECORD(iface, holder, IHolder_iface); +} + +static HRESULT WINAPI holder_QueryInterface(IHolder *iface, REFIID riid, void **object) +{ + holder *This = impl_from_IHolder(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), object); + + *object = NULL; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IHolder)) + { + *object = &This->IHolder_iface; + IUnknown_AddRef( (IUnknown*)*object); + + return S_OK; + } + + WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),object); + return E_NOINTERFACE; +} + +static ULONG WINAPI holder_AddRef(IHolder *iface) +{ + holder *This = impl_from_IHolder(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI holder_Release(IHolder *iface) +{ + holder *This = impl_from_IHolder(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + { + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI holder_AllocResource(IHolder *iface, const RESTYPID typeid, RESID *resid) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%08lx, %p) stub\n", This, typeid, resid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_FreeResource(IHolder *iface, const RESID resid) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%08lx) stub\n", This, resid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_TrackResource(IHolder *iface, const RESID resid) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%08lx) stub\n", This, resid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_TrackResourceS(IHolder *iface, const SRESID resid) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%s) stub\n", This, debugstr_w(resid)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_UntrackResource(IHolder *iface, const RESID resid, const BOOL value) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%08lx, %d) stub\n", This, resid, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_UntrackResourceS(IHolder *iface, const SRESID resid, const BOOL value) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%s, %d) stub\n", This, debugstr_w(resid), value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_Close(IHolder *iface) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p) stub\n", This); + + IDispenserDriver_Release(This->driver); + + return S_OK; +} + +static HRESULT WINAPI holder_RequestDestroyResource(IHolder *iface, const RESID resid) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%08lx) stub\n", This, resid); + + return E_NOTIMPL; +} + +struct IHolderVtbl holder_vtbl = +{ + holder_QueryInterface, + holder_AddRef, + holder_Release, + holder_AllocResource, + holder_FreeResource, + holder_TrackResource, + holder_TrackResourceS, + holder_UntrackResource, + holder_UntrackResourceS, + holder_Close, + holder_RequestDestroyResource +}; + +static HRESULT create_holder(IDispenserDriver *driver, IHolder **object) +{ + holder *hold; + HRESULT ret; + + TRACE("(%p)\n", object); + + hold = heap_alloc(sizeof(*hold)); + if (!hold) + { + *object = NULL; + return E_OUTOFMEMORY; + } + + hold->IHolder_iface.lpVtbl = &holder_vtbl; + hold->ref = 1; + hold->driver = driver; + + ret = holder_QueryInterface(&hold->IHolder_iface, &IID_IHolder, (void**)object); + holder_Release(&hold->IHolder_iface); + + return ret; +} + static HRESULT WINAPI dismanager_QueryInterface(IDispenserManager *iface, REFIID riid, void **object) { dispensermanager *This = impl_from_IDispenserManager(iface); @@ -95,10 +264,18 @@ static HRESULT WINAPI dismanager_RegisterDispenser(IDispenserManager *iface, IDi LPCOLESTR name, IHolder **dispenser) { dispensermanager *This = impl_from_IDispenserManager(iface); + HRESULT hr; - FIXME("(%p)->(%p, %s, %p) stub\n", This, driver, debugstr_w(name), dispenser); + TRACE("(%p)->(%p, %s, %p)\n", This, driver, debugstr_w(name), dispenser); - return E_NOTIMPL; + if(!dispenser) + return E_INVALIDARG; + + hr = create_holder(driver, dispenser); + + TRACE("<-- 0x%08x, %p\n", hr, *dispenser); + + return hr; } static HRESULT WINAPI dismanager_GetContext(IDispenserManager *iface, INSTID *id, TRANSID *transid)

1 0

Aric Stewart : hid: Implement HidP_SetUsageValue.
by Alexandre Julliard Nov. 27, 2018

Nov. 27, 2018

Module: wine Branch: master Commit: a2ab55381843d642582fc9c3ae4fbdfc8a956ee2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2ab55381843d642582fc9c3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Nov 23 15:09:34 2018 -0600 hid: Implement HidP_SetUsageValue. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/ddk/hidpi.h | 1 + 3 files changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index cbae14c..e4d4202 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -36,7 +36,7 @@ @ stdcall HidP_MaxUsageListLength(long long ptr) @ stub HidP_SetData @ stub HidP_SetScaledUsageValue -@ stub HidP_SetUsageValue +@ stdcall HidP_SetUsageValue(long long long long long ptr ptr long) @ stub HidP_SetUsageValueArray @ stub HidP_SetUsages @ stdcall HidP_TranslateUsagesToI8042ScanCodes(ptr long long ptr ptr ptr) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index d6d143e..f997803 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -81,6 +81,49 @@ static NTSTATUS get_report_data(BYTE *report, INT reportLength, INT startBit, IN return HIDP_STATUS_SUCCESS; } +static NTSTATUS set_report_data(BYTE *report, INT reportLength, INT startBit, INT valueSize, ULONG value) +{ + if ((startBit + valueSize) / 8 > reportLength) + return HIDP_STATUS_INVALID_REPORT_LENGTH; + + if (valueSize == 1) + { + ULONG byte_index = startBit / 8; + ULONG bit_index = startBit - (byte_index * 8); + if (value) + report[byte_index] |= (1 << bit_index); + else + report[byte_index] &= ~(1 << bit_index); + } + else + { + ULONG byte_index = (startBit + valueSize - 1) / 8; + ULONG data = value; + ULONG remainingBits = valueSize; + while (remainingBits) + { + BYTE subvalue = data & 0xff; + + data >>= 8; + + if (remainingBits >= 8) + { + report[byte_index] = subvalue; + byte_index --; + remainingBits -= 8; + } + else if (remainingBits > 0) + { + BYTE mask = (0xff << (8-remainingBits)) & subvalue; + report[byte_index] |= mask; + remainingBits = 0; + } + } + } + return HIDP_STATUS_SUCCESS; +} + + NTSTATUS WINAPI HidP_GetButtonCaps(HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAPS ButtonCaps, PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData) { @@ -528,6 +571,28 @@ ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePag return count; } +NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, + USAGE Usage, ULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, + CHAR *Report, ULONG ReportLength) +{ + WINE_HID_ELEMENT *element; + NTSTATUS rc; + + TRACE("(%i, %x, %i, %i, %i, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, + PreparsedData, Report, ReportLength); + + rc = find_value(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, &element); + + if (rc == HIDP_STATUS_SUCCESS) + { + return set_report_data((BYTE*)Report, ReportLength, + element->valueStartBit, element->bitCount, UsageValue); + } + + return rc; +} + + NTSTATUS WINAPI HidP_TranslateUsagesToI8042ScanCodes(USAGE *ChangedUsageList, ULONG UsageListLength, HIDP_KEYBOARD_DIRECTION KeyAction, HIDP_KEYBOARD_MODIFIER_STATE *ModifierState, diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index 0f69a03..1df789f 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -186,6 +186,7 @@ NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS NTSTATUS WINAPI HidP_InitializeReportForID(HIDP_REPORT_TYPE ReportType, UCHAR ReportID, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PLONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); +NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, ULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, CHAR *Report, ULONG ReportLength); NTSTATUS WINAPI HidP_TranslateUsagesToI8042ScanCodes(USAGE *ChangedUsageList, ULONG UsageListLength, HIDP_KEYBOARD_DIRECTION KeyAction, HIDP_KEYBOARD_MODIFIER_STATE *ModifierState, PHIDP_INSERT_SCANCODES InsertCodesProcedure, VOID *InsertCodesContext); NTSTATUS WINAPI HidP_GetSpecificButtonCaps(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, HIDP_BUTTON_CAPS *ButtonCaps, USHORT *ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetSpecificValueCaps(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, HIDP_VALUE_CAPS *ValueCaps, USHORT *ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData);

1 0