November 2018 - Wine-Commits

Kai Krakow : winebus.sys: Do not print HID report read errors.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 91da7132e929d24e14c9cc5e4279b36699debf1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=91da7132e929d24e14c9cc5e… Author: Kai Krakow <kai(a)kaishome.de> Date: Wed Aug 15 20:29:05 2018 +0200 winebus.sys: Do not print HID report read errors. Device reports may come in faster than our consumers could possibly read them, this is especially true for multi-axis events: When you move a stick across its range, it will always generate at least two events, one for the x axis, and one for the y axis. This is not really an error situation, so let's just discard the error message. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43125 Signed-off-by: Kai Krakow <kai(a)kaishome.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d744f367d263a131feee96e103fb8220e8400b53) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winebus.sys/main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 978540b..6008a7b 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -603,9 +603,6 @@ void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) ext->buffer_size = length; } - if (!ext->last_report_read) - ERR_(hid_report)("Device reports coming in too fast, last report not read yet!\n"); - memcpy(ext->last_report, report, length); ext->last_report_size = length; ext->last_report_read = FALSE;

1 0

Gijs Vermeulen : wine.inf: Add "Sources" key.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 454666ea414803d1d86ed4b643a30ed7d0089497 URL: https://source.winehq.org/git/wine.git/?a=commit;h=454666ea414803d1d86ed4b6… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Jul 25 01:52:06 2018 +0200 wine.inf: Add "Sources" key. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44981 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f407828f9713f834712507c98ce8f11a1a2ec902) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 3117296..7418aa0 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3393,7 +3393,7 @@ HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"Schedule" [Services] HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,"System\CurrentControlSet\Services\Eventlog\Application",,16 -HKLM,"System\CurrentControlSet\Services\Eventlog\System",,16 +HKLM,"System\CurrentControlSet\Services\Eventlog\System","Sources",0x10000,"" HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters",,16 HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16

1 0

Piotr Caban : msvcp140: Add _Last_write_time implementation.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 65e6059b2149180f9becb2844512724850a7acb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65e6059b2149180f9becb284… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 12:43:34 2018 +0200 msvcp140: Add _Last_write_time implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a9c5ab9da6a94d56516548ead274dd5bd145a78c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcp90/ios.c | 38 +++++++++++++++++++++++++++----------- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index f4bdbd1..0efd785 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3666,7 +3666,7 @@ @ extern _LNan _LNan @ stub _LSinh @ extern _LSnan _LSnan -@ stub _Last_write_time +@ cdecl _Last_write_time(int64) @ cdecl _Link(wstr wstr) tr2_sys__Link_wchar @ cdecl _Lock_shared_ptr_spin_lock() @ cdecl _Lstat(wstr ptr) @@ -3696,7 +3696,7 @@ @ cdecl _Remove_dir(wstr) tr2_sys__Remove_dir_wchar @ stub _Rename @ stub _Resize -@ stub _Set_last_write_time +@ cdecl _Set_last_write_time(wstr int64) @ stub _Sinh @ extern _Snan _Snan @ cdecl _Stat(wstr ptr) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index d7de542..cafc85d 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14851,7 +14851,7 @@ static __int64 get_last_write_time(HANDLE h) __int64 ret; if(!GetFileTime(h, 0, 0, &wt)) - return 0; + return -1; ret = (((__int64)wt.dwHighDateTime)<< 32) + wt.dwLowDateTime; ret -= TICKS_1601_TO_1970; @@ -14877,9 +14877,8 @@ __int64 __cdecl tr2_sys__Last_write_time(char const* path) return ret / TICKSPERSEC; } -/* ?_Last_write_time(a)sys@tr2(a)std@@YA_JPB_W(a)Z */ -/* ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEB_W(a)Z */ -__int64 __cdecl tr2_sys__Last_write_time_wchar(const wchar_t *path) +/* _Last_write_time */ +__int64 __cdecl _Last_write_time(const wchar_t *path) { HANDLE handle; __int64 ret; @@ -14889,11 +14888,19 @@ __int64 __cdecl tr2_sys__Last_write_time_wchar(const wchar_t *path) handle = CreateFileW(path, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); if(handle == INVALID_HANDLE_VALUE) - return 0; + return -1; ret = get_last_write_time(handle); CloseHandle(handle); - return ret / TICKSPERSEC; + return ret; +} + +/* ?_Last_write_time(a)sys@tr2(a)std@@YA_JPB_W(a)Z */ +/* ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEB_W(a)Z */ +__int64 __cdecl tr2_sys__Last_write_time_wchar(const wchar_t *path) +{ + TRACE("(%s)\n", debugstr_w(path)); + return _Last_write_time(path) / TICKSPERSEC; } static int set_last_write_time(HANDLE h, __int64 time) @@ -14928,11 +14935,11 @@ void __cdecl tr2_sys__Last_write_time_set(char const* path, __int64 newtime) CloseHandle(handle); } -/* ?_Last_write_time(a)sys@tr2(a)std@@YAXPB_W_J(a)Z */ -/* ?_Last_write_time(a)sys@tr2(a)std@@YAXPEB_W_J(a)Z */ -void __cdecl tr2_sys__Last_write_time_set_wchar(const wchar_t *path, __int64 time) +/* _Set_last_write_time */ +int __cdecl _Set_last_write_time(const wchar_t *path, __int64 time) { HANDLE handle; + int ret; TRACE("(%s)\n", debugstr_w(path)); @@ -14940,10 +14947,19 @@ void __cdecl tr2_sys__Last_write_time_set_wchar(const wchar_t *path, __int64 tim FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); if(handle == INVALID_HANDLE_VALUE) - return; + return 0; - set_last_write_time(handle, time * TICKSPERSEC); + ret = set_last_write_time(handle, time); CloseHandle(handle); + return ret; +} + +/* ?_Last_write_time(a)sys@tr2(a)std@@YAXPB_W_J(a)Z */ +/* ?_Last_write_time(a)sys@tr2(a)std@@YAXPEB_W_J(a)Z */ +void __cdecl tr2_sys__Last_write_time_set_wchar(const wchar_t *path, __int64 time) +{ + TRACE("(%s)\n", debugstr_w(path)); + _Set_last_write_time(path, time * TICKSPERSEC); } /* ??_Open_dir(a)sys@tr2(a)std@@YAPAXPA_WPB_WAAHAAW4file_type(a)123@@Z */

1 0

Piotr Caban : msvcp110: Add _Last_write_time(wchar_t) implementation.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: c7e65ea2dbeec02b29760f8be8015ea4fa116dc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7e65ea2dbeec02b29760f8b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 12:43:27 2018 +0200 msvcp110: Add _Last_write_time(wchar_t) implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit efb6b3734aac964c7d83a683eb503d9da5be1cc4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 8 ++-- dlls/msvcp120/msvcp120.spec | 8 ++-- dlls/msvcp120_app/msvcp120_app.spec | 8 ++-- dlls/msvcp90/ios.c | 78 ++++++++++++++++++++++++++++++------- 4 files changed, 75 insertions(+), 27 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 32e696a..91051a4 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1561,12 +1561,12 @@ @ cdecl -arch=win64 ?_Iput@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@AEAVios_base(a)2@_WPEAD_K(a)Z(ptr ptr ptr ptr long ptr long) num_put_wchar__Iput @ cdecl -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YAXPBD_J(a)Z(str int64) tr2_sys__Last_write_time_set @ cdecl -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YAXPEBD_J(a)Z(str int64) tr2_sys__Last_write_time_set -@ stub -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YAXPB_W_J(a)Z -@ stub -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YAXPEB_W_J(a)Z +@ cdecl -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YAXPB_W_J(a)Z(wstr int64) tr2_sys__Last_write_time_set_wchar +@ cdecl -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YAXPEB_W_J(a)Z(wstr int64) tr2_sys__Last_write_time_set_wchar @ cdecl -ret64 -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPBD(a)Z(str) tr2_sys__Last_write_time @ cdecl -ret64 -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEBD(a)Z(str) tr2_sys__Last_write_time -@ stub -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPB_W(a)Z -@ stub -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEB_W(a)Z +@ cdecl -ret64 -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPB_W(a)Z(wstr) tr2_sys__Last_write_time_wchar +@ cdecl -ret64 -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEB_W(a)Z(wstr) tr2_sys__Last_write_time_wchar @ cdecl -arch=arm ?_Launch(a)_Pad@std@@QAAXPAU_Thrd_imp_t@@@Z(ptr ptr) _Pad__Launch @ thiscall -arch=i386 ?_Launch(a)_Pad@std@@QAEXPAU_Thrd_imp_t@@@Z(ptr ptr) _Pad__Launch @ cdecl -arch=win64 ?_Launch(a)_Pad@std@@QEAAXPEAU_Thrd_imp_t@@@Z(ptr ptr) _Pad__Launch diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 6aee8d7..dd25c9f 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1522,12 +1522,12 @@ @ cdecl -arch=win64 ?_Iput@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@AEAVios_base(a)2@_WPEAD_K(a)Z(ptr ptr ptr ptr long ptr long) num_put_wchar__Iput @ cdecl -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YAXPBD_J(a)Z(str int64) tr2_sys__Last_write_time_set @ cdecl -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YAXPEBD_J(a)Z(str int64) tr2_sys__Last_write_time_set -@ stub -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YAXPB_W_J(a)Z -@ stub -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YAXPEB_W_J(a)Z +@ cdecl -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YAXPB_W_J(a)Z(wstr int64) tr2_sys__Last_write_time_set_wchar +@ cdecl -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YAXPEB_W_J(a)Z(wstr int64) tr2_sys__Last_write_time_set_wchar @ cdecl -ret64 -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPBD(a)Z(str) tr2_sys__Last_write_time @ cdecl -ret64 -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEBD(a)Z(str) tr2_sys__Last_write_time -@ stub -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPB_W(a)Z -@ stub -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEB_W(a)Z +@ cdecl -ret64 -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPB_W(a)Z(wstr) tr2_sys__Last_write_time_wchar +@ cdecl -ret64 -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEB_W(a)Z(wstr) tr2_sys__Last_write_time_wchar @ cdecl -arch=arm ?_Launch(a)_Pad@std@@QAAXPAU_Thrd_imp_t@@@Z(ptr ptr) _Pad__Launch @ thiscall -arch=i386 ?_Launch(a)_Pad@std@@QAEXPAU_Thrd_imp_t@@@Z(ptr ptr) _Pad__Launch @ cdecl -arch=win64 ?_Launch(a)_Pad@std@@QEAAXPEAU_Thrd_imp_t@@@Z(ptr ptr) _Pad__Launch diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 0963974..6f599b6 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1522,12 +1522,12 @@ @ cdecl -arch=win64 ?_Iput@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@AEAVios_base(a)2@_WPEAD_K(a)Z(ptr ptr ptr ptr long ptr long) msvcp120.?_Iput@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@AEAVios_base(a)2@_WPEAD_K(a)Z @ cdecl -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YAXPBD_J(a)Z(str int64) msvcp120.?_Last_write_time(a)sys@tr2(a)std@@YAXPBD_J(a)Z @ cdecl -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YAXPEBD_J(a)Z(str int64) msvcp120.?_Last_write_time(a)sys@tr2(a)std@@YAXPEBD_J(a)Z -@ stub -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YAXPB_W_J(a)Z -@ stub -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YAXPEB_W_J(a)Z +@ cdecl -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YAXPB_W_J(a)Z(wstr int64) msvcp120.?_Last_write_time(a)sys@tr2(a)std@@YAXPB_W_J(a)Z +@ cdecl -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YAXPEB_W_J(a)Z(wstr int64) msvcp120.?_Last_write_time(a)sys@tr2(a)std@@YAXPEB_W_J(a)Z @ cdecl -ret64 -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPBD(a)Z(str) msvcp120.?_Last_write_time(a)sys@tr2(a)std@@YA_JPBD(a)Z @ cdecl -ret64 -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEBD(a)Z(str) msvcp120.?_Last_write_time(a)sys@tr2(a)std@@YA_JPEBD(a)Z -@ stub -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPB_W(a)Z -@ stub -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEB_W(a)Z +@ cdecl -ret64 -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPB_W(a)Z(wstr) msvcp120.?_Last_write_time(a)sys@tr2(a)std@@YA_JPB_W(a)Z +@ cdecl -ret64 -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEB_W(a)Z(wstr) msvcp120.?_Last_write_time(a)sys@tr2(a)std@@YA_JPEB_W(a)Z @ cdecl -arch=arm ?_Launch(a)_Pad@std@@QAAXPAU_Thrd_imp_t@@@Z(ptr ptr) msvcp120.?_Launch(a)_Pad@std@@QAAXPAU_Thrd_imp_t@@@Z @ thiscall -arch=i386 ?_Launch(a)_Pad@std@@QAEXPAU_Thrd_imp_t@@@Z(ptr ptr) msvcp120.?_Launch(a)_Pad@std@@QAEXPAU_Thrd_imp_t@@@Z @ cdecl -arch=win64 ?_Launch(a)_Pad@std@@QEAAXPEAU_Thrd_imp_t@@@Z(ptr ptr) msvcp120.?_Launch(a)_Pad@std@@QEAAXPEAU_Thrd_imp_t@@@Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index fb9d668..d7de542 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14845,14 +14845,26 @@ enum file_type __cdecl tr2_sys__Lstat(char const* path, int* err_code) return tr2_sys__Stat(path, err_code); } +static __int64 get_last_write_time(HANDLE h) +{ + FILETIME wt; + __int64 ret; + + if(!GetFileTime(h, 0, 0, &wt)) + return 0; + + ret = (((__int64)wt.dwHighDateTime)<< 32) + wt.dwLowDateTime; + ret -= TICKS_1601_TO_1970; + return ret; +} + /* ?_Last_write_time(a)sys@tr2(a)std@@YA_JPBD(a)Z */ /* ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEBD(a)Z */ __int64 __cdecl tr2_sys__Last_write_time(char const* path) { HANDLE handle; - FILETIME lwt; - int ret; - __int64 last_write_time; + __int64 ret; + TRACE("(%s)\n", debugstr_a(path)); handle = CreateFileA(path, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, @@ -14860,15 +14872,38 @@ __int64 __cdecl tr2_sys__Last_write_time(char const* path) if(handle == INVALID_HANDLE_VALUE) return 0; - ret = GetFileTime(handle, 0, 0, &lwt); + ret = get_last_write_time(handle); CloseHandle(handle); - if(!ret) + return ret / TICKSPERSEC; +} + +/* ?_Last_write_time(a)sys@tr2(a)std@@YA_JPB_W(a)Z */ +/* ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEB_W(a)Z */ +__int64 __cdecl tr2_sys__Last_write_time_wchar(const wchar_t *path) +{ + HANDLE handle; + __int64 ret; + + TRACE("(%s)\n", debugstr_w(path)); + + handle = CreateFileW(path, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + if(handle == INVALID_HANDLE_VALUE) return 0; - last_write_time = (((__int64)lwt.dwHighDateTime)<< 32) + lwt.dwLowDateTime; - last_write_time -= TICKS_1601_TO_1970; - last_write_time /= TICKSPERSEC; - return last_write_time; + ret = get_last_write_time(handle); + CloseHandle(handle); + return ret / TICKSPERSEC; +} + +static int set_last_write_time(HANDLE h, __int64 time) +{ + FILETIME wt; + + time += TICKS_1601_TO_1970; + wt.dwLowDateTime = (DWORD)time; + wt.dwHighDateTime = (DWORD)(time >> 32); + return SetFileTime(h, 0, 0, &wt); } /* ?_Last_write_time(a)sys@tr2(a)std@@YAXPBD_J(a)Z */ @@ -14876,7 +14911,7 @@ __int64 __cdecl tr2_sys__Last_write_time(char const* path) void __cdecl tr2_sys__Last_write_time_set(char const* path, __int64 newtime) { HANDLE handle; - FILETIME lwt; + TRACE("(%s)\n", debugstr_a(path)); handle = CreateFileA(path, FILE_WRITE_ATTRIBUTES, @@ -14889,12 +14924,25 @@ void __cdecl tr2_sys__Last_write_time_set(char const* path, __int64 newtime) * According to the test of msvcp120, * msvcp120's implementation does nothing. Obviously, this is a bug of windows. */ + set_last_write_time(handle, newtime * TICKSPERSEC); + CloseHandle(handle); +} + +/* ?_Last_write_time(a)sys@tr2(a)std@@YAXPB_W_J(a)Z */ +/* ?_Last_write_time(a)sys@tr2(a)std@@YAXPEB_W_J(a)Z */ +void __cdecl tr2_sys__Last_write_time_set_wchar(const wchar_t *path, __int64 time) +{ + HANDLE handle; + + TRACE("(%s)\n", debugstr_w(path)); + + handle = CreateFileW(path, FILE_WRITE_ATTRIBUTES, + FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + if(handle == INVALID_HANDLE_VALUE) + return; - newtime *= TICKSPERSEC; - newtime += TICKS_1601_TO_1970; - lwt.dwLowDateTime = (DWORD)(newtime); - lwt.dwHighDateTime = (DWORD)(newtime >> 32); - SetFileTime(handle, 0, 0, &lwt); + set_last_write_time(handle, time * TICKSPERSEC); CloseHandle(handle); }

1 0

Alex Henrie : shell32: Add Jaz drive icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 39162e8df97af2bb2936c65711dd0117cceaaebf URL: https://source.winehq.org/git/wine.git/?a=commit;h=39162e8df97af2bb2936c657… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:23 2018 -0600 shell32: Add Jaz drive icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 17a0c2afa661395871f814eb3f0885b42feb866b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 0c7c0b5..7b253d1 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -936,6 +936,10 @@ IDI_SHELL_INTERNET_PRINTER ICON resources/printer.ico /* FIXME: Following resource is not yet added */ /* @makedep: resources/disk_drive.ico */ +IDI_SHELL_JAZ_DRIVE ICON resources/disk_drive.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/disk_drive.ico */ IDI_SHELL_ZIP_DRIVE2 ICON resources/disk_drive.ico /* FIXME: Following resource is not yet added */ diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 4d6cf7c..7282fbb 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -345,6 +345,7 @@ #define IDI_SHELL_OPTICAL_DISC 302 #define IDI_SHELL_DVD_ROM 304 #define IDI_SHELL_INTERNET_PRINTER 311 +#define IDI_SHELL_JAZ_DRIVE 312 #define IDI_SHELL_ZIP_DRIVE2 313 #define IDI_SHELL_DVD_RW 318 #define IDI_SHELL_NEW_FOLDER 319

1 0

Zebediah Figura : msvfw32: Set fccType in ICInfo().
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 1135dba1ad768bf15dad878e4b931f54fd747a4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1135dba1ad768bf15dad878e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 13 13:00:05 2018 -0600 msvfw32: Set fccType in ICInfo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2068b95abaaac0ee5ddd38fca5dcb259533e4766) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 1 + dlls/msvfw32/tests/msvfw.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index e071d95..5dc99a4 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -303,6 +303,7 @@ static BOOL ICInfo_enum_handler(const char *name, const char *driver, unsigned i if (lpicinfo->fccHandler != nr && compare_fourcc(lpicinfo->fccHandler, fccHandler)) return FALSE; + lpicinfo->fccType = fccType; lpicinfo->fccHandler = fccHandler; lpicinfo->dwFlags = 0; lpicinfo->dwVersion = 0; diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 3fe6702..8e262ff 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -294,6 +294,7 @@ static void test_ICInfo(void) for (i = found = 0; ICInfo(0, i, &info); i++) { trace("Codec name: %s, fccHandler: 0x%08x\n", wine_dbgstr_w(info.szName), info.fccHandler); + ok(info.fccType, "expected nonzero fccType\n"); ok(ICInfo(info.fccType, info.fccHandler, &info2), "ICInfo failed on fcc 0x%08x\n", info.fccHandler); @@ -317,6 +318,11 @@ static void test_ICInfo(void) } } ok(found != 0, "expected at least one codec\n"); + + memset(&info, 0, sizeof(info)); + ok(!ICInfo(ICTYPE_VIDEO, mmioFOURCC('f','a','k','e'), &info), "expected failure\n"); + ok(info.fccType == ICTYPE_VIDEO, "got 0x%08x\n", info.fccType); + ok(info.fccHandler == mmioFOURCC('f','a','k','e'), "got 0x%08x\n", info.fccHandler); } START_TEST(msvfw)

1 0

Nikolay Sivov : comctl32: Fix background and text color for DrawStatusText ().
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: efba3dfa748caf34bc5ca9836b10f3c5f5e6e288 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efba3dfa748caf34bc5ca983… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 12 22:40:00 2018 +0300 comctl32: Fix background and text color for DrawStatusText(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 824837ec2c223d651d4ebb724b418fc4506d6d0b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/commctrl.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index d3ba314..4af2381 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -431,20 +431,24 @@ void WINAPI DrawStatusTextW (HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style) { RECT r = *lprc; UINT border = BDR_SUNKENOUTER; + COLORREF oldbkcolor; if (style & SBT_POPOUT) border = BDR_RAISEDOUTER; else if (style & SBT_NOBORDERS) border = 0; - DrawEdge (hdc, &r, border, BF_RECT|BF_ADJUST); + oldbkcolor = SetBkColor (hdc, comctl32_color.clrBtnFace); + DrawEdge (hdc, &r, border, BF_MIDDLE|BF_RECT|BF_ADJUST); /* now draw text */ if (text) { int oldbkmode = SetBkMode (hdc, TRANSPARENT); + COLORREF oldtextcolor; UINT align = DT_LEFT; int strCnt = 0; + oldtextcolor = SetTextColor (hdc, comctl32_color.clrBtnText); if (style & SBT_RTLREADING) FIXME("Unsupported RTL style!\n"); r.left += 3; @@ -464,8 +468,11 @@ void WINAPI DrawStatusTextW (HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style) } while(*text++); if (strCnt) DrawTextW (hdc, text - strCnt, -1, &r, align|DT_VCENTER|DT_SINGLELINE|DT_NOPREFIX); - SetBkMode(hdc, oldbkmode); + SetBkMode (hdc, oldbkmode); + SetTextColor (hdc, oldtextcolor); } + + SetBkColor (hdc, oldbkcolor); }

1 0

Fabian Maurer : kernel32: Make UpdateProcThreadAttribute handle PROC_THREAD_ATTRIBUTE_CHILD_PROCESS_POLICY.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 6f334fc0def4c1cfa0916b5ac1b17fd4d371bf6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f334fc0def4c1cfa0916b5a… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Aug 16 07:01:12 2018 +0200 kernel32: Make UpdateProcThreadAttribute handle PROC_THREAD_ATTRIBUTE_CHILD_PROCESS_POLICY. This is needed by x64 chromium sandbox for >= win10. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45644 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2a82ddc2b95bb04e9bdab87744435ff1734bc4fe) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/process.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index e23786b..a0817e0 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4242,8 +4242,17 @@ BOOL WINAPI UpdateProcThreadAttribute(struct _PROC_THREAD_ATTRIBUTE_LIST *list, } break; + case PROC_THREAD_ATTRIBUTE_CHILD_PROCESS_POLICY: + if (size != sizeof(DWORD) && size != sizeof(DWORD64)) + { + SetLastError(ERROR_BAD_LENGTH); + return FALSE; + } + break; + default: SetLastError(ERROR_NOT_SUPPORTED); + FIXME("Unhandled attribute number %lu\n", attr & PROC_THREAD_ATTRIBUTE_NUMBER); return FALSE; }

1 0

Zebediah Figura : msvfw32: Reimplement ICGetDisplayFormat().
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 0f25121a0277eaacb1c768c36ee26090e7c5f602 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f25121a0277eaacb1c768c3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 29 19:42:08 2018 -0500 msvfw32: Reimplement ICGetDisplayFormat(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44490 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=23175 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 37326f2111ea33f763a05a78e6fecb1d60d237df) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 138 ++++++++++++++++-------- dlls/msvfw32/tests/msvfw.c | 248 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 342 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0f25121a0277eaacb1c7…

1 0

Alex Henrie : shell32: Add remaining small icons.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 2a2d0e38c81cf977bac0cd988483f0d800b7f581 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a2d0e38c81cf977bac0cd98… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:26 2018 -0600 shell32: Add remaining small icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4c1a5099f094720a75b6327a6e8488002e2fdbb0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 15 +++++++++++++++ dlls/shell32/shresdef.h | 5 +++++ 2 files changed, 20 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 3e42d46..ae9f2da 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -966,13 +966,28 @@ IDI_SHELL_SEARCH_SMALL ICON resources/search.ico /* @makedep: resources/help.ico */ IDI_SHELL_HELP_SMALL ICON resources/help.ico +/* @makedep: resources/log_off.ico */ +IDI_SHELL_LOG_OFF_SMALL ICON resources/log_off.ico + /* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ IDI_SHELL_APP_FOLDER_SMALL ICON resources/folder.ico +/* @makedep: resources/recent.ico */ +IDI_SHELL_RECENT_SMALL ICON resources/recent.ico + +/* @makedep: resources/window.ico */ +IDI_SHELL_RUN_SMALL ICON resources/window.ico + +/* @makedep: resources/shut_down.ico */ +IDI_SHELL_POWER_OFF_SMALL ICON resources/shut_down.ico + /* @makedep: resources/control.ico */ IDI_SHELL_CONTROL_PANEL_SMALL ICON resources/control.ico +/* @makedep: resources/eject.ico */ +IDI_SHELL_EJECT_SMALL ICON resources/eject.ico + /* FIXME: Following resource is not yet added */ /* @makedep: resources/search.ico */ IDI_SHELL_SEARCH_DIRECTORY ICON resources/search.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index a48dfd4..c1fecc4 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -354,8 +354,13 @@ #define IDI_SHELL_FAVORITES_SMALL 322 #define IDI_SHELL_SEARCH_SMALL 323 #define IDI_SHELL_HELP_SMALL 324 +#define IDI_SHELL_LOG_OFF_SMALL 325 #define IDI_SHELL_APP_FOLDER_SMALL 326 +#define IDI_SHELL_RECENT_SMALL 327 +#define IDI_SHELL_RUN_SMALL 328 +#define IDI_SHELL_POWER_OFF_SMALL 329 #define IDI_SHELL_CONTROL_PANEL_SMALL 330 +#define IDI_SHELL_EJECT_SMALL 331 /* 332 - 336 not used on Windows */ #define IDI_SHELL_SEARCH_DIRECTORY 337 #define IDI_SHELL_RESTRICTED2 338

1 0