November 2018 - Wine-commits

Zebediah Figura : setupapi: Avoid unnecessary buffer allocation in SETUPDI_EnumerateMatchingDeviceInstances ().
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: 0c0aa90a907f8cfeca47c2dc965f1642f05f502e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c0aa90a907f8cfeca47c2dc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 27 19:55:38 2018 -0600 setupapi: Avoid unnecessary buffer allocation in SETUPDI_EnumerateMatchingDeviceInstances(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index ff7aca0..55fca89 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2083,6 +2083,7 @@ static void SETUPDI_EnumerateMatchingDeviceInstances(struct DeviceInfoSet *set, LPCWSTR enumerator, LPCWSTR deviceName, HKEY deviceKey, const GUID *class, DWORD flags) { + WCHAR id[MAX_DEVICE_ID_LEN]; DWORD i, len; WCHAR deviceInstance[MAX_PATH]; LONG l = ERROR_SUCCESS; @@ -2120,18 +2121,11 @@ static void SETUPDI_EnumerateMatchingDeviceInstances(struct DeviceInfoSet *set, { static const WCHAR fmt[] = {'%','s','\\','%','s','\\','%','s',0}; - LPWSTR instanceId; - instanceId = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(enumerator) + lstrlenW(deviceName) + - lstrlenW(deviceInstance) + 3) * sizeof(WCHAR)); - if (instanceId) + if (snprintfW(id, ARRAY_SIZE(id), fmt, enumerator, + deviceName, deviceInstance) != -1) { - sprintfW(instanceId, fmt, enumerator, - deviceName, deviceInstance); - SETUPDI_CreateDeviceInfo(set, &deviceClass, - instanceId, FALSE); - HeapFree(GetProcessHeap(), 0, instanceId); + SETUPDI_CreateDeviceInfo(set, &deviceClass, id, FALSE); } } }

1 0

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

28 Nov '18

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

Dmitry Timoshkov : user32: If there is no dialog controls to set focus to then set focus to dialog itself.
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: 44f89322ba8825a8e4851aaaf7de89910701ca75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44f89322ba8825a8e4851aaa… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Nov 28 09:03:15 2018 +0300 user32: If there is no dialog controls to set focus to then set focus to dialog itself. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 2 ++ dlls/user32/tests/msg.c | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index c47bd57..0b33a57 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -691,6 +691,8 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, SendMessageW( focus, EM_SETSEL, 0, MAXLONG ); SetFocus( focus ); } + else + SetFocus( hwnd ); } } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2fdb118..366a138 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13574,10 +13574,12 @@ static const struct message WmCreateDialogParamSeq_1[] = { { WM_MOVE, sent }, { WM_SETFONT, sent }, { WM_INITDIALOG, sent }, - { WM_GETDLGCODE, sent|wparam|lparam, 0, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|optional, 0, 0 }, /* FIXME: Wine doesn't send it */ { HCBT_SETFOCUS, hook }, { HCBT_ACTIVATE, hook }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_QUERYNEWPALETTE, sent|optional }, + { WM_PALETTEISCHANGING, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_ACTIVATEAPP, sent|wparam, 1 }, { WM_NCACTIVATE, sent }, { WM_ACTIVATE, sent|wparam, 1 }, @@ -13760,9 +13762,8 @@ static void test_dialog_messages(void) 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); + ok_sequence(WmCreateDialogParamSeq_1, "CreateDialogParam_1", FALSE); hfocus = GetFocus(); -todo_wine ok(hfocus == hdlg, "wrong focus %p\n", hfocus); EndDialog(hdlg, 0); DestroyWindow(hdlg);

1 0

Nikolay Sivov : shcore: Add SHCreateThread().
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: e44a4173cd3ce2ec8034635caa2a0c2f31d5e988 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e44a4173cd3ce2ec8034635c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 28 09:59:02 2018 +0300 shcore: Add SHCreateThread(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/main.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/shcore/shcore.spec | 2 +- 2 files changed, 120 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 488e78e..93effef 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -28,6 +28,7 @@ #include "initguid.h" #include "ocidl.h" #include "shellscalingapi.h" +#include "shlwapi.h" #include "wine/debug.h" #include "wine/heap.h" @@ -1290,3 +1291,121 @@ void WINAPI SetProcessReference(IUnknown *obj) process_ref = obj; } + +struct thread_data +{ + LPTHREAD_START_ROUTINE thread_proc; + LPTHREAD_START_ROUTINE callback; + void *data; + DWORD flags; + HANDLE hEvent; + IUnknown *thread_ref; + IUnknown *process_ref; +}; + +static DWORD WINAPI shcore_thread_wrapper(void *data) +{ + struct thread_data thread_data; + HRESULT hr = E_FAIL; + DWORD retval; + + TRACE("(%p)\n", data); + + /* We are now executing in the context of the newly created thread. + * So we copy the data passed to us (it is on the stack of the function + * that called us, which is waiting for us to signal an event before + * returning). */ + thread_data = *(struct thread_data *)data; + + if (thread_data.flags & CTF_COINIT) + { + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE); + if (FAILED(hr)) + hr = CoInitializeEx(NULL, COINIT_DISABLE_OLE1DDE); + } + + if (thread_data.callback) + thread_data.callback(thread_data.data); + + /* Signal the thread that created us; it can return now. */ + SetEvent(thread_data.hEvent); + + /* Execute the callers start code. */ + retval = thread_data.thread_proc(thread_data.data); + + /* Release thread and process references. */ + if (thread_data.thread_ref) + IUnknown_Release(thread_data.thread_ref); + + if (thread_data.process_ref) + IUnknown_Release(thread_data.process_ref); + + if (SUCCEEDED(hr)) + CoUninitialize(); + + return retval; +} + +/************************************************************************* + * SHCreateThread [SHCORE.@] + */ +BOOL WINAPI SHCreateThread(LPTHREAD_START_ROUTINE thread_proc, void *data, DWORD flags, LPTHREAD_START_ROUTINE callback) +{ + struct thread_data thread_data; + BOOL called = FALSE; + + TRACE("(%p, %p, %#x, %p)\n", thread_proc, data, flags, callback); + + thread_data.thread_proc = thread_proc; + thread_data.callback = callback; + thread_data.data = data; + thread_data.flags = flags; + thread_data.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + + if (flags & CTF_THREAD_REF) + SHGetThreadRef(&thread_data.thread_ref); + else + thread_data.thread_ref = NULL; + + if (flags & CTF_PROCESS_REF) + GetProcessReference(&thread_data.process_ref); + else + thread_data.process_ref = NULL; + + /* Create the thread */ + if (thread_data.hEvent) + { + HANDLE hThread; + DWORD retval; + + hThread = CreateThread(NULL, 0, shcore_thread_wrapper, &thread_data, 0, &retval); + if (hThread) + { + /* Wait for the thread to signal us to continue */ + WaitForSingleObject(thread_data.hEvent, INFINITE); + CloseHandle(hThread); + called = TRUE; + } + CloseHandle(thread_data.hEvent); + } + + if (!called) + { + if (!thread_data.callback && flags & CTF_INSIST) + { + /* Couldn't call, call synchronously */ + thread_data.thread_proc(data); + called = TRUE; + } + else + { + if (thread_data.thread_ref) + IUnknown_Release(thread_data.thread_ref); + + if (thread_data.process_ref) + IUnknown_Release(thread_data.process_ref); + } + } + + return called; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index c98f2db..a08c2da 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -37,7 +37,7 @@ @ stdcall SHCreateStreamOnFileA(str long ptr) @ stdcall SHCreateStreamOnFileEx(wstr long long long ptr ptr) @ stdcall SHCreateStreamOnFileW(wstr long ptr) -@ stdcall SHCreateThread(ptr ptr long ptr) shlwapi.SHCreateThread +@ stdcall SHCreateThread(ptr ptr long ptr) @ stdcall SHCreateThreadRef(ptr ptr) @ stub SHCreateThreadWithHandle @ stdcall SHDeleteEmptyKeyA(long ptr) shlwapi.SHDeleteEmptyKeyA

1 0

Zebediah Figura : testbot: Use autoreconf instead of autoconf.
by Alexandre Julliard 28 Nov '18

28 Nov '18

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: Show more specific mission descriptions.
by Alexandre Julliard 28 Nov '18

28 Nov '18

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

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

28 Nov '18

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

Hans Leidekker : webservices: Add support for stream input.
by Alexandre Julliard 27 Nov '18

27 Nov '18

Module: wine Branch: master Commit: 68504ab00c718d532eb3e82fd243e60c679718d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68504ab00c718d532eb3e82f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 27 14:13:11 2018 +0100 webservices: Add support for stream input. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 202 ++++++++++++++++++++++++++++------------ dlls/webservices/tests/reader.c | 106 +++++++++++++++++++++ 2 files changed, 249 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=68504ab00c718d532eb3…

1 0

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

27 Nov '18

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

Zebediah Figura : ntdll: Avoid inline assembly in have_cpuid().
by Alexandre Julliard 27 Nov '18

27 Nov '18

Module: wine Branch: master Commit: e6f00d69439b205bed8cfc3861497de8c197d2fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6f00d69439b205bed8cfc38… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 26 10:00:06 2018 -0600 ntdll: Avoid inline assembly in have_cpuid(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index a0ea037..aa6f846 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -973,30 +973,26 @@ __ASM_GLOBAL_FUNC( do_cpuid, "ret" ) #endif -/* From xf86info havecpuid.c 1.11 */ -static inline BOOL have_cpuid(void) -{ #ifdef __i386__ - unsigned int f1, f2; - __asm__("pushfl\n\t" - "pushfl\n\t" - "popl %0\n\t" - "movl %0,%1\n\t" - "xorl %2,%0\n\t" - "pushl %0\n\t" - "popfl\n\t" - "pushfl\n\t" - "popl %0\n\t" - "popfl" - : "=&r" (f1), "=&r" (f2) - : "ir" (0x00200000)); - return ((f1^f2) & 0x00200000) != 0; -#elif defined(__x86_64__) - return TRUE; +extern int have_cpuid(void); +__ASM_GLOBAL_FUNC( have_cpuid, + "pushfl\n\t" + "pushfl\n\t" + "movl (%esp),%ecx\n\t" + "xorl $0x00200000,(%esp)\n\t" + "popfl\n\t" + "pushfl\n\t" + "popl %eax\n\t" + "popfl\n\t" + "xorl %ecx,%eax\n\t" + "andl $0x00200000,%eax\n\t" + "ret" ) #else - return FALSE; -#endif +static int have_cpuid(void) +{ + return 1; } +#endif /* Detect if a SSE2 processor is capable of Denormals Are Zero (DAZ) mode. *

1 0