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

Michael Stefaniuc : Release 4.0.2.
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: stable Commit: acfa1c8c9f891a07491c9d85f06b085fa2ffa85d URL: https://source.winehq.org/git/wine.git/?a=commit;h=acfa1c8c9f891a07491c9d85… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Aug 15 20:44:31 2019 +0200 Release 4.0.2. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 406 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +-- 4 files changed, 232 insertions(+), 198 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=acfa1c8c9f891a07491c…

1 0

Alistair Leslie-Hughes : dinput: Ensure Cursor is visible on config dialog.
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: stable Commit: b09a3bd621ef475d53aabb3d11a61e695dd4ae5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b09a3bd621ef475d53aabb3d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 8 07:02:50 2019 +0000 dinput: Ensure Cursor is visible on config dialog. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9bcaf9769c5ae834f0f6e8fe2b28a85b286833b0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/config.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index db5878b..bf44898 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -375,9 +375,15 @@ static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM w SendDlgItemMessageW(dialog, IDC_CONTROLLERCOMBO, CB_SETCURSEL, 0, 0); fill_device_object_list(dialog); + ShowCursor(TRUE); + break; } + case WM_DESTROY: + ShowCursor(FALSE); + break; + case WM_NOTIFY: switch (((LPNMHDR)lParam)->code)

1 0

Vijay Kiran Kamuju : ntdll: Report system information SystemPerformanceInformation info class.
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: stable Commit: 95f94568158caaf4fefe2e14f21bb3f0701577c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95f94568158caaf4fefe2e14… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Apr 16 11:27:16 2019 +0200 ntdll: Report system information SystemPerformanceInformation info class. Based on patch from Michael Müller. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 99ba65a1ea2c1546a61c3ed40996cbfee9d25f69) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/nt.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index dcf9123..12f1ab5 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2312,6 +2312,37 @@ NTSTATUS WINAPI NtQuerySystemInformation( spi.IdleTime.QuadPart = ++idle; } + if ((fp = fopen("/proc/meminfo", "r"))) + { + ULONG64 totalram, freeram, totalswap, freeswap; + char line[64]; + while (fgets(line, sizeof(line), fp)) + { + if(sscanf(line, "MemTotal: %llu kB", &totalram) == 1) + { + totalram *= 1024; + } + else if(sscanf(line, "MemFree: %llu kB", &freeram) == 1) + { + freeram *= 1024; + } + else if(sscanf(line, "SwapTotal: %llu kB", &totalswap) == 1) + { + totalswap *= 1024; + } + else if(sscanf(line, "SwapFree: %llu kB", &freeswap) == 1) + { + freeswap *= 1024; + break; + } + } + fclose(fp); + + spi.AvailablePages = freeram / page_size; + spi.TotalCommittedPages = (totalram + totalswap - freeram - freeswap) / page_size; + spi.TotalCommitLimit = (totalram + totalswap) / page_size; + } + if (Length >= len) { if (!SystemInformation) ret = STATUS_ACCESS_VIOLATION;

1 0

Louis Lenders : kernel32: Add DECLSPEC_HOTPATCH to CreateActCtx.
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: stable Commit: 6c8534b5e997485f3c877b4aad4927b5cc7daec5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c8534b5e997485f3c877b4a… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Apr 23 20:11:14 2019 +0200 kernel32: Add DECLSPEC_HOTPATCH to CreateActCtx. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47051 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d4421f9c0bf42d45154a4a9d037ce51f264756c8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/actctx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/actctx.c b/dlls/kernel32/actctx.c index 17067ed..bd2345d 100644 --- a/dlls/kernel32/actctx.c +++ b/dlls/kernel32/actctx.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(actctx); * * Create an activation context. */ -HANDLE WINAPI CreateActCtxA(PCACTCTXA pActCtx) +HANDLE WINAPI DECLSPEC_HOTPATCH CreateActCtxA(PCACTCTXA pActCtx) { ACTCTXW actw; SIZE_T len; @@ -114,7 +114,7 @@ done: * * Create an activation context. */ -HANDLE WINAPI CreateActCtxW(PCACTCTXW pActCtx) +HANDLE WINAPI DECLSPEC_HOTPATCH CreateActCtxW(PCACTCTXW pActCtx) { NTSTATUS status; HANDLE hActCtx;

1 0

Vijay Kiran Kamuju : wpcap: Fix compile warnings for redefinition of PCAP_OPENFLAG_PROMISCUOUS.
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: stable Commit: 551cba7c313e062e74a75293b51651b0b6f9cfda URL: https://source.winehq.org/git/wine.git/?a=commit;h=551cba7c313e062e74a75293… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri May 3 18:49:48 2019 +0200 wpcap: Fix compile warnings for redefinition of PCAP_OPENFLAG_PROMISCUOUS. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 660399b8fd905a208f192781723f7fe881b132fe) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wpcap/wpcap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index f163235..6450a0e 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -254,7 +254,9 @@ int CDECL wine_pcap_next_ex(pcap_t *p, struct pcap_pkthdr **pkt_header, const un return pcap_next_ex(p, pkt_header, pkt_data); } +#ifndef PCAP_OPENFLAG_PROMISCUOUS #define PCAP_OPENFLAG_PROMISCUOUS 1 +#endif pcap_t* CDECL wine_pcap_open(const char *source, int snaplen, int flags, int read_timeout, void *auth, char *errbuf)

1 0

Alexandre Julliard : ntdll: Check for time conversion error to silence a compiler warning.
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: stable Commit: 963ec4699fec9abf9f7e3fd15e6c2aabe6f1fd5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=963ec4699fec9abf9f7e3fd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 20:24:52 2019 +0200 ntdll: Check for time conversion error to silence a compiler warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7c0385bdb49f28472b63b3dab823732fabda6707) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/time.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index a4762fa..443d8b2 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -1006,9 +1006,8 @@ NTSTATUS WINAPI NtSetSystemTime(const LARGE_INTEGER *NewTime, LARGE_INTEGER *Old if (!OldTime) OldTime = &tm; NtQuerySystemTime( OldTime ); - RtlTimeToSecondsSince1970( OldTime, &oldsec ); - - RtlTimeToSecondsSince1970( NewTime, &sec ); + if (!RtlTimeToSecondsSince1970( OldTime, &oldsec )) return STATUS_INVALID_PARAMETER; + if (!RtlTimeToSecondsSince1970( NewTime, &sec )) return STATUS_INVALID_PARAMETER; /* fake success if time didn't change */ if (oldsec == sec)

1 0

Paul Gofman : xaudio2_7: Also preserve %ebx in call_on_voice_processing_pass_start().
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: stable Commit: f7e395df3248c18546176efd4641c3b194f922fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7e395df3248c18546176efd… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 11 11:30:50 2019 +0300 xaudio2_7: Also preserve %ebx in call_on_voice_processing_pass_start(). It is tested that EBX register is not preserved by IXAudio2VoiceCallback_OnVoiceProcessingPassStart callback in League of Legends. It doesn't lead to crash in the present xaudio, while it might still be a potential issue. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46870 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a5b22c86b4d46fa8443cc2bee8b91d237eb8996b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 0bbe943..6dc0d8f 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -52,7 +52,8 @@ static HINSTANCE instance; #endif #if XAUDIO2_VER != 0 && defined(__i386__) -/* EVE Online uses an OnVoiceProcessingPassStart callback which corrupts %esi. */ +/* EVE Online uses an OnVoiceProcessingPassStart callback which corrupts %esi; + * League of Legends uses a callback which corrupts %ebx. */ #define IXAudio2VoiceCallback_OnVoiceProcessingPassStart(a, b) call_on_voice_processing_pass_start(a, b) extern void call_on_voice_processing_pass_start(IXAudio2VoiceCallback *This, UINT32 BytesRequired); __ASM_GLOBAL_FUNC( call_on_voice_processing_pass_start, @@ -65,13 +66,17 @@ __ASM_GLOBAL_FUNC( call_on_voice_processing_pass_start, __ASM_CFI(".cfi_rel_offset %esi,-4\n\t") "pushl %edi\n\t" __ASM_CFI(".cfi_rel_offset %edi,-8\n\t") - "subl $8,%esp\n\t" + "pushl %ebx\n\t" + __ASM_CFI(".cfi_rel_offset %ebx,-12\n\t") + "subl $4,%esp\n\t" "pushl 12(%ebp)\n\t" /* BytesRequired */ "pushl 8(%ebp)\n\t" /* This */ "movl 8(%ebp),%eax\n\t" "movl 0(%eax),%eax\n\t" "call *0(%eax)\n\t" /* This->lpVtbl->OnVoiceProcessingPassStart */ - "leal -8(%ebp),%esp\n\t" + "leal -12(%ebp),%esp\n\t" + "popl %ebx\n\t" + __ASM_CFI(".cfi_same_value %ebx\n\t") "popl %edi\n\t" __ASM_CFI(".cfi_same_value %edi\n\t") "popl %esi\n\t"

1 0

Tim Schumacher : dinput: Map wheel, gas, and brake axes as well.
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: stable Commit: 313dc20036b7a957af278ccc0ddbcd0a2a8d2680 URL: https://source.winehq.org/git/wine.git/?a=commit;h=313dc20036b7a957af278ccc… Author: Tim Schumacher <timschumi(a)gmx.de> Date: Sun Mar 31 13:09:43 2019 +0200 dinput: Map wheel, gas, and brake axes as well. The axes wheel, gas, and brake are just differently named replacements for X, Y, and Z when using wheel-like joysticks. Make those accessible by remapping them to X, Y, and Z internally. Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1a6458bad8191a8188d76ba21b38ef457bfe1295) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/joystick_linux.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 963e62f..c4efc93 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -239,6 +239,14 @@ static INT find_joystick_devices(void) joydev.dev_axes_map[j] = j; found_axes++; } + else if (axes_map[j] <= 10) + { + /* Axes 8 through 10 are Wheel, Gas and Brake, + * remap to 0, 1 and 2 + */ + joydev.dev_axes_map[j] = axes_map[j] - 8; + found_axes++; + } else if (axes_map[j] == 16 || axes_map[j] == 17) {

1 0

Tag wine-4.0.2 : Alexandre Julliard : Release 4.0.2
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: refs/tags/wine-4.0.2 Tag: 6839b4f960f5b50ea96b10bc69fbeefe33ad51ee URL: https://source.winehq.org/git/wine.git/?a=tag;h=6839b4f960f5b50ea96b10bc69f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 23 16:29:32 2019 +0200 Release 4.0.2

1 0

Hans Leidekker : wbemprox: Implement Win32_OperatingSystem.SystemDrive.
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: stable Commit: b1f4c5ea0c5788857f1adb8b458147c73a2e883b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1f4c5ea0c5788857f1adb8b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 24 12:58:11 2019 +0200 wbemprox: Implement Win32_OperatingSystem.SystemDrive. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47065 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fb26388b0a8efc05b3e479db837a380759153267) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/builtin.c | 12 ++++++++++++ dlls/wbemprox/tests/query.c | 11 +++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index a7dd23b..67ca289 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -394,6 +394,8 @@ static const WCHAR prop_suitemaskW[] = {'S','u','i','t','e','M','a','s','k',0}; static const WCHAR prop_systemdirectoryW[] = {'S','y','s','t','e','m','D','i','r','e','c','t','o','r','y',0}; +static const WCHAR prop_systemdriveW[] = + {'S','y','s','t','e','m','D','r','i','v','e',0}; static const WCHAR prop_systemnameW[] = {'S','y','s','t','e','m','N','a','m','e',0}; static const WCHAR prop_tagW[] = @@ -597,6 +599,7 @@ static const struct column col_os[] = { prop_servicepackminorW, CIM_UINT16, VT_I4 }, { prop_suitemaskW, CIM_UINT32, VT_I4 }, { prop_systemdirectoryW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_systemdriveW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_totalvirtualmemorysizeW, CIM_UINT64 }, { prop_totalvisiblememorysizeW, CIM_UINT64 }, { prop_versionW, CIM_STRING|COL_FLAG_DYNAMIC } @@ -1023,6 +1026,7 @@ struct record_operatingsystem UINT16 servicepackminor; UINT32 suitemask; const WCHAR *systemdirectory; + const WCHAR *systemdrive; UINT64 totalvirtualmemorysize; UINT64 totalvisiblememorysize; const WCHAR *version; @@ -3021,6 +3025,13 @@ static WCHAR *get_systemdirectory(void) Wow64RevertWow64FsRedirection( redir ); return ret; } +static WCHAR *get_systemdrive(void) +{ + WCHAR *ret = heap_alloc( 3 * sizeof(WCHAR) ); /* "c:" */ + if (ret && GetEnvironmentVariableW( prop_systemdriveW, ret, 3 )) return ret; + heap_free( ret ); + return NULL; +} static WCHAR *get_codeset(void) { static const WCHAR fmtW[] = {'%','u',0}; @@ -3162,6 +3173,7 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond ) rec->servicepackminor = ver.wServicePackMinor; rec->suitemask = 272; /* Single User + Terminal */ rec->systemdirectory = get_systemdirectory(); + rec->systemdrive = get_systemdrive(); rec->totalvirtualmemorysize = get_total_physical_memory() / 1024; rec->totalvisiblememorysize = rec->totalvirtualmemorysize; rec->version = get_osversion( &ver ); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 7819f85..945fb15 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1192,6 +1192,8 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) {'S','e','r','v','i','c','e','P','a','c','k','M','a','j','o','r','V','e','r','s','i','o','n',0}; static const WCHAR servicepackminorW[] = {'S','e','r','v','i','c','e','P','a','c','k','M','i','n','o','r','V','e','r','s','i','o','n',0}; + static const WCHAR systemdriveW[] = + {'S','y','s','t','e','m','D','r','i','v','e',0}; static const WCHAR totalvisiblememorysizeW[] = {'T','o','t','a','l','V','i','s','i','b','l','e','M','e','m','o','r','y','S','i','z','e',0}; static const WCHAR totalvirtualmemorysizeW[] = @@ -1347,6 +1349,15 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) trace( "totalvirtualmemorysize %s\n", wine_dbgstr_w(V_BSTR(&val)) ); VariantClear( &val ); + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, systemdriveW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get version %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "systemdrive: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( result ); SysFreeString( query );

1 0