November 2018 - Wine-commits

Nikolay Sivov : comctl32/header: Fix item text color.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: e35208351299a51a97f3e5a7960f889730953206 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e35208351299a51a97f3e5a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 12 22:39:46 2018 +0300 comctl32/header: Fix item text color. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2225ff4126f82cad0dc6aef00edcf39c48fb73ba) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/header.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index fcba262..bdcf6f1 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -388,7 +388,7 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU state = (phdi->bDown) ? HIS_PRESSED : (bHotTrack ? HIS_HOT : HIS_NORMAL); /* Set the colors before sending NM_CUSTOMDRAW so that it can change them */ - SetTextColor(hdc, (bHotTrack && !theme) ? COLOR_HIGHLIGHT : COLOR_BTNTEXT); + SetTextColor(hdc, (bHotTrack && !theme) ? comctl32_color.clrHighlight : comctl32_color.clrBtnText); SetBkColor(hdc, comctl32_color.clr3dFace); if (lCDFlags & CDRF_NOTIFYITEMDRAW && !(phdi->fmt & HDF_OWNERDRAW))

1 0

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

29 Nov '18

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 : cmd: Handle quotes when parsing the folders in the PATH environment variable.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 11bca0d760a9b61be4441f57cefcc3c300650716 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11bca0d760a9b61be4441f57… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Aug 2 19:48:59 2018 +0200 cmd: Handle quotes when parsing the folders in the PATH environment variable. Semicolons are also allowed inside a path, as long as they are quoted. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45552 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d175419f0b52550d2a8126e6221428fdb9992980) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 17 +++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 3 +++ programs/cmd/wcmdmain.c | 27 ++++++++++++++++++++++----- 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 236238c..03c6cc8 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -507,6 +507,23 @@ rem Only the final quote ends the string set "WINE_FOO=apple"banana"grape"orange echo '%WINE_FOO%' set WINE_FOO= +rem set PATH must work with quotes +set PATH_BACKUP=%PATH% +mkdir folder +mkdir "fol;der" +echo echo I'm here! > "fol;der\sub1.bat" +echo echo I'm here! > folder\sub1.bat +set PATH=nothing;"fol;der" +call sub1 +set PATH="folder +call sub1 +set PATH=folder" +call sub1 +del "fol;der\sub1.bat" +del folder\sub1.bat +rmdir "fol;der" +rmdir folder +PATH=%PATH_BACKUP% echo ------------ Testing variable expansion ------------ call :setError 0 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index eb60620..0431e41 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -475,6 +475,9 @@ foo 'jim fred' 'jim' 'apple"banana"grape' +I'm here!@space@ +I'm here!@space@ +I'm here!@space@ ------------ Testing variable expansion ------------ ~p0 should be path containing batch file @path@ diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 8fe2d57..5135be4 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1099,24 +1099,41 @@ void WCMD_run_program (WCHAR *command, BOOL called) wine_dbgstr_w(stemofsearch)); while (pathposn) { WCHAR thisDir[MAX_PATH] = {'\0'}; + int length = 0; WCHAR *pos = NULL; BOOL found = FALSE; + BOOL inside_quotes = FALSE; /* Work on the first directory on the search path */ - pos = strchrW(pathposn, ';'); - if (pos) { + pos = pathposn; + while ((inside_quotes || *pos != ';') && *pos != 0) + { + if (*pos == '"') + inside_quotes = !inside_quotes; + pos++; + } + + if (*pos) { /* Reached semicolon */ memcpy(thisDir, pathposn, (pos-pathposn) * sizeof(WCHAR)); thisDir[(pos-pathposn)] = 0x00; pathposn = pos+1; - - } else { + } else { /* Reached string end */ strcpyW(thisDir, pathposn); pathposn = NULL; } + /* Remove quotes */ + length = strlenW(thisDir); + if (thisDir[length - 1] == '"') + thisDir[length - 1] = 0; + + if (*thisDir != '"') + strcpyW(temp, thisDir); + else + strcpyW(temp, thisDir + 1); + /* Since you can have eg. ..\.. on the path, need to expand to full information */ - strcpyW(temp, thisDir); GetFullPathNameW(temp, MAX_PATH, thisDir, NULL); /* 1. If extension supplied, see if that file exists */

1 0

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

29 Nov '18

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 remaining optical disc icons.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: e9fd796122ed679e8d15780c2de923041acdb6b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9fd796122ed679e8d15780c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:37 2018 -0600 shell32: Add remaining optical disc icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 12a6a58cca74ef35dd1ff06e75de74dc78ff74fd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 68 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shresdef.h | 17 +++++++++++++ 2 files changed, 85 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 0f71d69..0f126e7 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -730,6 +730,14 @@ IDI_SHELL_USERS ICON resources/security.ico /* @makedep: resources/shut_down.ico */ IDI_SHELL_POWER_OFF ICON resources/shut_down.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_DVD ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_MUSIC_CD_95 ICON resources/optical_disc.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico @@ -759,10 +767,26 @@ IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico IDI_SHELL_NEW_NETWORK_FOLDER ICON resources/folder.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_WRITE_DISC ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/delete.ico */ +IDI_SHELL_DELETE_FILE ICON resources/delete.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/delete.ico */ +IDI_SHELL_ERASE_DISC ICON resources/delete.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ IDI_SHELL_TO_FOLDER ICON resources/folder.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_BURN_DISC ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ IDI_SHELL_SHARED_FOLDER ICON resources/folder.ico @@ -774,13 +798,57 @@ IDI_SHELL_USERS_XP ICON resources/security.ico /* @makedep: resources/security.ico */ IDI_SHELL_USERS_XP2 ICON resources/security.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_drive.ico */ +IDI_SHELL_DVD_DRIVE ICON resources/optical_drive.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_HYBRID_CD ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_UNKNOWN_DISC ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_CD_ROM ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_CD_R ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_CD_RW ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_DVD_RAM ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_DVD_R ICON resources/optical_disc.ico + /* @makedep: resources/optical_disc.ico */ IDI_SHELL_OPTICAL_DISC ICON resources/optical_disc.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_DVD_ROM ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_DVD_RW ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ IDI_SHELL_NEW_FOLDER ICON resources/folder.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_BURN_DISC2 ICON resources/optical_disc.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_SMALL ICON resources/favorites.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index d8d2f13..4d0690d 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -287,6 +287,8 @@ /* 211 - 219 not used on Windows */ #define IDI_SHELL_USERS 220 #define IDI_SHELL_POWER_OFF 221 +#define IDI_SHELL_DVD 222 +#define IDI_SHELL_MUSIC_CD_95 228 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236 #define IDI_SHELL_MY_MUSIC 237 @@ -295,12 +297,27 @@ #define IDI_SHELL_COPY 243 #define IDI_SHELL_EMPTY_RECYCLE_BIN2 254 #define IDI_SHELL_NEW_NETWORK_FOLDER 258 +#define IDI_SHELL_WRITE_DISC 260 +#define IDI_SHELL_DELETE_FILE 261 +#define IDI_SHELL_ERASE_DISC 262 #define IDI_SHELL_TO_FOLDER 264 +#define IDI_SHELL_BURN_DISC 266 #define IDI_SHELL_SHARED_FOLDER 267 #define IDI_SHELL_USERS_XP 269 #define IDI_SHELL_USERS_XP2 279 +#define IDI_SHELL_DVD_DRIVE 291 +#define IDI_SHELL_HYBRID_CD 292 +#define IDI_SHELL_UNKNOWN_DISC 293 +#define IDI_SHELL_CD_ROM 294 +#define IDI_SHELL_CD_R 295 +#define IDI_SHELL_CD_RW 296 +#define IDI_SHELL_DVD_RAM 297 +#define IDI_SHELL_DVD_R 298 #define IDI_SHELL_OPTICAL_DISC 302 +#define IDI_SHELL_DVD_ROM 304 +#define IDI_SHELL_DVD_RW 318 #define IDI_SHELL_NEW_FOLDER 319 +#define IDI_SHELL_BURN_DISC2 320 #define IDI_SHELL_FAVORITES_SMALL 322 #define IDI_SHELL_APP_FOLDER_SMALL 326 #define IDI_SHELL_RESTRICTED2 338

1 0

Alex Henrie : shell32: Add documents icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 9d39d656ce4d830c9ce6d34a031e17b4d0df8c2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d39d656ce4d830c9ce6d34a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:38 2018 -0600 shell32: Add documents icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5d66862e5aa37ea8c6982a5783acd85ff1f2ec28) 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 0f126e7..b3c914e 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -735,6 +735,10 @@ IDI_SHELL_POWER_OFF ICON resources/shut_down.ico IDI_SHELL_DVD ICON resources/optical_disc.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/document.ico */ +IDI_SHELL_DOCUMENTS ICON resources/document.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/optical_disc.ico */ IDI_SHELL_MUSIC_CD_95 ICON resources/optical_disc.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 4d0690d..4e49a7c 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -288,6 +288,7 @@ #define IDI_SHELL_USERS 220 #define IDI_SHELL_POWER_OFF 221 #define IDI_SHELL_DVD 222 +#define IDI_SHELL_DOCUMENTS 223 #define IDI_SHELL_MUSIC_CD_95 228 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236

1 0

Alex Henrie : shell32: Add video file icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: b02bd22fe8d39785b59db497b0ef90eddb3cf21c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b02bd22fe8d39785b59db497… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:40 2018 -0600 shell32: Add video file icon. Adapted from video-x-generic in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 627c34fff765abfb055b0c8fd8a3c3f21d8835c0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/video.ico | Bin 0 -> 64272 bytes dlls/shell32/resources/video.svg | 783 +++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 788 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b02bd22fe8d39785b59d…

1 0

Alex Henrie : shell32: Add audio file icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: e231dcc0350ab2e06cebe633ba29be6c290f5ab5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e231dcc0350ab2e06cebe633… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:41 2018 -0600 shell32: Add audio file icon. Adapted from audio-x-generic in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 47c35b2ef1d450361e388ec855a2927d7648ef2c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/audio.ico | Bin 0 -> 48131 bytes dlls/shell32/resources/audio.svg | 679 +++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 684 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e231dcc0350ab2e06ceb…

1 0

Alex Henrie : shell32: Rename floppy.svg to disk_drive.svg.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 958d40b4a2ad9783c8f65fe7eff1d8f1bc2c3fd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=958d40b4a2ad9783c8f65fe7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:44 2018 -0600 shell32: Rename floppy.svg to disk_drive.svg. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 336ced48faa3122a80a5225ac02582d5a7285e05) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 2 +- dlls/shell32/resources/{floppy.ico => disk_drive.ico} | Bin dlls/shell32/resources/{floppy.svg => disk_drive.svg} | 0 dlls/shell32/shell32.rc | 12 ++++++------ 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 7f549ca..a61775e 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -68,11 +68,11 @@ SVG_SRCS = \ resources/copy.svg \ resources/delete.svg \ resources/desktop.svg \ + resources/disk_drive.svg \ resources/document.svg \ resources/drive.svg \ resources/eject.svg \ resources/favorites.svg \ - resources/floppy.svg \ resources/folder.svg \ resources/folder_open.svg \ resources/help.svg \ diff --git a/dlls/shell32/resources/floppy.ico b/dlls/shell32/resources/disk_drive.ico similarity index 100% rename from dlls/shell32/resources/floppy.ico rename to dlls/shell32/resources/disk_drive.ico diff --git a/dlls/shell32/resources/floppy.svg b/dlls/shell32/resources/disk_drive.svg similarity index 100% rename from dlls/shell32/resources/floppy.svg rename to dlls/shell32/resources/disk_drive.svg diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 77974b3..fb08947 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -377,15 +377,15 @@ IDI_SHELL_FOLDER_OPEN_LARGE ICON resources/folder_open.ico IDI_SHELL_FOLDER_SMALL_XP ICON resources/folder_open.ico /* FIXME: Following resource is not yet added */ -/* @makedep: resources/floppy.ico */ -IDI_SHELL_5_12_FLOPPY ICON resources/floppy.ico +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_5_12_FLOPPY ICON resources/disk_drive.ico /* FIXME: Following resource is not yet added */ -/* @makedep: resources/floppy.ico */ -IDI_SHELL_3_14_FLOPPY ICON resources/floppy.ico +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_3_14_FLOPPY ICON resources/disk_drive.ico -/* @makedep: resources/floppy.ico */ -IDI_SHELL_FLOPPY ICON resources/floppy.ico +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_FLOPPY ICON resources/disk_drive.ico /* @makedep: resources/drive.ico */ IDI_SHELL_DRIVE ICON resources/drive.ico

1 0

Alex Henrie : shell32: Add card reader icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: bc6052a476212d8f57a8962fb7dbe0eed818cff9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc6052a476212d8f57a8962f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:45 2018 -0600 shell32: Add card reader icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c34a39e37a6fece2600659f9b11ce306a1b98a77) 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 fb08947..d9c6615 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -748,6 +748,10 @@ IDI_SHELL_AUDIO_FILE ICON resources/audio.ico /* @makedep: resources/optical_disc.ico */ IDI_SHELL_MUSIC_CD_95 ICON resources/optical_disc.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_CARD_READER ICON resources/disk_drive.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index a837a38..8960de6 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -292,6 +292,7 @@ #define IDI_SHELL_VIDEO_FILE 224 #define IDI_SHELL_AUDIO_FILE 225 #define IDI_SHELL_MUSIC_CD_95 228 +#define IDI_SHELL_CARD_READER 229 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236 #define IDI_SHELL_MY_MUSIC 237

1 0