March 2021 - Wine-Commits - list.winehq.org

Myah Caron : dmstyle: Return S_FALSE for IDirectMusicStyle8::GetMotif.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 63d6994040dba6c14504e51c1dc42ce50153b9a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63d6994040dba6c14504e51c… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Thu Sep 17 09:04:02 2020 +0000 dmstyle: Return S_FALSE for IDirectMusicStyle8::GetMotif. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49850 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d28c7938c704fe4dcfc8920db494a7175a46fe6b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmstyle/style.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 5a97dac079a..6eaedb1fbdc 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -201,8 +201,8 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetMotif(IDirectMusicStyle8 *iface, IDirectMusicSegment **ppSegment) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); - FIXME("(%p, %p, %p): stub\n", This, pwszName, ppSegment); - return S_OK; + FIXME("(%p, %s, %p): stub\n", This, debugstr_w(pwszName), ppSegment); + return S_FALSE; } static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultChordMap(IDirectMusicStyle8 *iface,

1 0

Gijs Vermeulen : msvcr120: Add [_]strtoimax[_l] and [_]strtoumax[_l].
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: ae9ef40ee821a8a4b231075cac2601aaab7c069a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae9ef40ee821a8a4b231075c… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Sep 13 16:00:57 2020 +0200 msvcr120: Add [_]strtoimax[_l] and [_]strtoumax[_l]. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49738 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit db1403c5dedfdce2b697b7ead751075df281fab6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr120/msvcr120.spec | 8 ++++---- dlls/msvcr120_app/msvcr120_app.spec | 8 ++++---- include/msvcrt/stdlib.h | 4 ++++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 2079bbea94e..0fcd15adf89 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1734,7 +1734,7 @@ @ cdecl _strtof_l(str ptr ptr) MSVCRT__strtof_l @ cdecl -ret64 _strtoi64(str ptr long) MSVCRT_strtoi64 @ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l -@ stub _strtoimax_l +@ cdecl -ret64 _strtoimax_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl _strtol_l(str ptr long ptr) MSVCRT__strtol_l @ stub _strtold_l @ cdecl -ret64 _strtoll_l(str ptr long ptr) MSVCRT_strtoi64_l @@ -1742,7 +1742,7 @@ @ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l @ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l @ cdecl -ret64 _strtoull_l(str ptr long ptr) MSVCRT_strtoui64_l -@ stub _strtoumax_l +@ cdecl -ret64 _strtoumax_l(str ptr long ptr) MSVCRT_strtoui64_l @ cdecl _strupr(str) MSVCRT__strupr @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_s(str long) MSVCRT__strupr_s @@ -2387,7 +2387,7 @@ @ cdecl strstr(str str) MSVCRT_strstr @ cdecl strtod(str ptr) MSVCRT_strtod @ cdecl strtof(str ptr) MSVCRT_strtof -@ stub strtoimax +@ cdecl -ret64 strtoimax(str ptr long) MSVCRT_strtoi64 @ cdecl strtok(str str) MSVCRT_strtok @ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s @ cdecl strtol(str ptr long) MSVCRT_strtol @@ -2395,7 +2395,7 @@ @ cdecl -ret64 strtoll(str ptr long) MSVCRT_strtoi64 @ cdecl strtoul(str ptr long) MSVCRT_strtoul @ cdecl -ret64 strtoull(str ptr long) MSVCRT_strtoui64 -@ stub strtoumax +@ cdecl -ret64 strtoumax(str ptr long) MSVCRT_strtoui64 @ cdecl strxfrm(ptr str long) MSVCRT_strxfrm @ varargs swprintf_s(ptr long wstr) MSVCRT_swprintf_s @ varargs swscanf(wstr wstr) MSVCRT_swscanf diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 89d240b567e..bdbe3519f5f 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1445,7 +1445,7 @@ @ cdecl _strtof_l(str ptr ptr) msvcr120._strtof_l @ cdecl -ret64 _strtoi64(str ptr long) msvcr120._strtoi64 @ cdecl -ret64 _strtoi64_l(str ptr long ptr) msvcr120._strtoi64_l -@ stub _strtoimax_l +@ cdecl -ret64 _strtoimax_l(str ptr long ptr) msvcr120._strtoimax_l @ cdecl _strtol_l(str ptr long ptr) msvcr120._strtol_l @ stub _strtold_l @ cdecl -ret64 _strtoll_l(str ptr long ptr) msvcr120._strtoll_l @@ -1453,7 +1453,7 @@ @ cdecl -ret64 _strtoui64_l(str ptr long ptr) msvcr120._strtoui64_l @ cdecl _strtoul_l(str ptr long ptr) msvcr120._strtoul_l @ cdecl -ret64 _strtoull_l(str ptr long ptr) msvcr120._strtoull_l -@ stub _strtoumax_l +@ cdecl -ret64 _strtoumax_l(str ptr long ptr) msvcr120._strtoumax_l @ cdecl _strupr(str) msvcr120._strupr @ cdecl _strupr_l(str ptr) msvcr120._strupr_l @ cdecl _strupr_s(str long) msvcr120._strupr_s @@ -2050,7 +2050,7 @@ @ cdecl strstr(str str) msvcr120.strstr @ cdecl strtod(str ptr) msvcr120.strtod @ cdecl strtof(str ptr) msvcr120.strtof -@ stub strtoimax +@ cdecl -ret64 strtoimax(str ptr long) msvcr120.strtoimax @ cdecl strtok(str str) msvcr120.strtok @ cdecl strtok_s(ptr str ptr) msvcr120.strtok_s @ cdecl strtol(str ptr long) msvcr120.strtol @@ -2058,7 +2058,7 @@ @ cdecl -ret64 strtoll(str ptr long) msvcr120.strtoll @ cdecl strtoul(str ptr long) msvcr120.strtoul @ cdecl -ret64 strtoull(str ptr long) msvcr120.strtoull -@ stub strtoumax +@ cdecl -ret64 strtoumax(str ptr long) msvcr120.strtoumax @ cdecl strxfrm(ptr str long) msvcr120.strxfrm @ varargs swprintf_s(ptr long wstr) msvcr120.swprintf_s @ varargs swscanf(wstr wstr) msvcr120.swscanf diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 91fcc2a672d..4efc7b2bb00 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -222,6 +222,10 @@ __msvcrt_long __cdecl strtol(const char*,char**,int); __msvcrt_ulong __cdecl strtoul(const char*,char**,int); __int64 __cdecl strtoll_l(const char*,char**,int,_locale_t); unsigned __int64 __cdecl strtoull_l(const char*,char**,int,_locale_t); +__int64 __cdecl strtoimax(const char*,char**,int); +__int64 __cdecl strtoimax_l(const char*,char**,int,_locale_t); +unsigned __int64 __cdecl strtoumax(const char*,char**,int); +unsigned __int64 __cdecl strtoumax_l(const char*,char**,int,_locale_t); __int64 __cdecl _strtoi64(const char*,char**,int); __int64 __cdecl _strtoi64_l(const char*,char**,int,_locale_t); unsigned __int64 __cdecl _strtoui64(const char*,char**,int);

1 0

Rémi Bernon : winex11.drv: Don't wait for the desktop thread to store clipping window.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: fbcbfcb13a16a126a8ccee3d1cf9637effa2c881 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbcbfcb13a16a126a8ccee3d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 4 00:57:32 2020 +0200 winex11.drv: Don't wait for the desktop thread to store clipping window. The messages are in flight, the state will be updated eventually in the order they are received by the desktop thread, we shouldn't have to wait. If the clipping window gets overwritten, it will also receive a message from the desktop thread, which is sent asynchronously already. Call of Duty: WWII calls ClipCursor in a loop on startup while the foreground thread is stalled and the messages sometimes pile up. The recursive message processing that SendMessageW induces can then cause stack overflows. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49643 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 432858b285d2b63eca6f99a162c9a13dd6e6ac71) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/mouse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index c8a5749a2f1..5e3ac1d374e 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -447,7 +447,7 @@ static BOOL grab_clipping_window( const RECT *clip ) if (!data->clip_hwnd) sync_window_cursor( clip_window ); InterlockedExchangePointer( (void **)&cursor_window, msg_hwnd ); data->clip_hwnd = msg_hwnd; - SendMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, (LPARAM)msg_hwnd ); + SendNotifyMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, (LPARAM)msg_hwnd ); return TRUE; } @@ -467,7 +467,7 @@ void ungrab_clipping_window(void) XUnmapWindow( display, clip_window ); if (clipping_cursor) XUngrabPointer( display, CurrentTime ); clipping_cursor = FALSE; - SendMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, 0 ); + SendNotifyMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, 0 ); } /***********************************************************************

1 0

Jacek Caban : mshtml.idl: Add missing MoveUnitBounded to IMarkupPointer2.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 2ece4cff1d63c5880d75c76d6c571094e8245377 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ece4cff1d63c5880d75c76d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 2 16:56:57 2020 +0200 mshtml.idl: Add missing MoveUnitBounded to IMarkupPointer2. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ffbee79c88545a1ff308bc9d9783f4a2d662c718) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/mshtml.idl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/mshtml.idl b/include/mshtml.idl index f5e94132d76..d2b9c891adb 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -28529,6 +28529,10 @@ interface IMarkupPointer2 : IMarkupPointer [in] IMarkupContainer *pContainer, [in] long lMP); + HRESULT MoveUnitBounded( + [in] MOVEUNIT_ACTION muAction, + [in] IMarkupPointer *pIBoundary); + HRESULT IsInsideURL( [in] IMarkupPointer *pRight, [out] BOOL *pfResult);

1 0

Myah Caron : cmd.exe: Fix /Y flag for move builtin.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: b88242df969df34be7e2e253736420dfbd0f98af URL: https://source.winehq.org/git/wine.git/?a=commit;h=b88242df969df34be7e2e253… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Thu Sep 10 19:10:55 2020 +0000 cmd.exe: Fix /Y flag for move builtin. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48397 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 81fe7a2165ed244cc0ac24b133e49ce596e77710) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/builtins.c | 15 +++++---------- programs/cmd/tests/test_builtins.cmd.exp | 4 ++-- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 8911a597eb9..291b76dae90 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3003,6 +3003,7 @@ void WCMD_move (void) WCHAR src[MAX_PATH]; DWORD attribs; BOOL ok = TRUE; + DWORD flags = 0; WINE_TRACE("Processing file '%s'\n", wine_dbgstr_w(fd.cFileName)); @@ -3051,20 +3052,14 @@ void WCMD_move (void) question = WCMD_format_string(WCMD_LoadMessage(WCMD_OVERWRITE), dest); ok = WCMD_ask_confirm(question, FALSE, NULL); LocalFree(question); - - /* So delete the destination prior to the move */ - if (ok) { - if (!DeleteFileW(dest)) { - WCMD_print_error (); - errorlevel = 1; - ok = FALSE; - } - } } + + if (ok) + flags |= MOVEFILE_REPLACE_EXISTING; } if (ok) { - status = MoveFileW(src, dest); + status = MoveFileExW(src, dest, flags); } else { status = TRUE; } diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 5bcd29b917c..36e986e8ad9 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1341,8 +1341,8 @@ original file still present ------------ Testing move ------------ --- file move file move succeeded -(a)todo_wine@file move with overwrite succeeded(a)or_broken@file overwrite impossible! -(a)todo_wine@bar(a)or_broken@baz +file move with overwrite succeeded(a)or_broken@file overwrite impossible! +bar(a)or_broken@baz read-only files are moveable file moved in subdirectory moving a file to itself is a no-op(a)or_broken@moving a file to itself should be a no-op!

1 0

Myah Caron : cmd.exe: Don't prompt for move when non-interactive.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 088aa52d1f26af873aeb98619b6f5e4db6928bfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=088aa52d1f26af873aeb9861… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Thu Sep 10 19:17:36 2020 +0000 cmd.exe: Don't prompt for move when non-interactive. Based on a patch by Francesco Noferi. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48396 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d1790c984bebb55e4d08644e84cfabd85abeefe2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/builtins.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 291b76dae90..418844a3d0c 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3033,15 +3033,28 @@ void WCMD_move (void) WCHAR copycmd[MAXSTRING]; DWORD len; - /* /-Y has the highest priority, then /Y and finally the COPYCMD env. variable */ + /* Default whether automatic overwriting is on. If we are interactive then + we prompt by default, otherwise we overwrite by default + /-Y has the highest priority, then /Y and finally the COPYCMD env. variable */ if (wcsstr (quals, parmNoY)) force = FALSE; else if (wcsstr (quals, parmY)) force = TRUE; else { static const WCHAR copyCmdW[] = {'C','O','P','Y','C','M','D','\0'}; + /* By default, we will force the overwrite in batch mode and ask for + * confirmation in interactive mode. */ + force = !interactive; + /* If COPYCMD is set, then we force the overwrite with /Y and ask for + * confirmation with /-Y. If COPYCMD is neither of those, then we use the + * default behavior. */ len = GetEnvironmentVariableW(copyCmdW, copycmd, ARRAY_SIZE(copycmd)); - force = (len && len < ARRAY_SIZE(copycmd) && !lstrcmpiW(copycmd, parmY)); + if (len && len < ARRAY_SIZE(copycmd)) { + if (!lstrcmpiW (copycmd, parmY)) + force = TRUE; + else if (!lstrcmpiW (copycmd, parmNoY)) + force = FALSE; + } } /* Prompt if overwriting */

1 0

Akihiro Sagawa : vbscript: Support non-Latin 1 characters in Asc.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: ef68fe06af2ae17975e1c7adbd48937eac3ee085 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef68fe06af2ae17975e1c7ad… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Sep 16 21:34:13 2020 +0900 vbscript: Support non-Latin 1 characters in Asc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49309 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 35376075ac7b11af3ab6bfb8bdd7b09a61d648b2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/global.c | 23 ++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 5 +++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 6214a6575fc..17d3639a105 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1727,10 +1727,27 @@ static HRESULT Global_Asc(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VA str = conv_str; } - if(!SysStringLen(str) || *str >= 0x100) + if(!SysStringLen(str)) hres = MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); - else if(res) - hres = return_short(res, *str); + else { + unsigned char buf[2]; + short val = 0; + int n = WideCharToMultiByte(CP_ACP, 0, str, 1, (char*)buf, sizeof(buf), NULL, NULL); + switch(n) { + case 1: + val = buf[0]; + break; + case 2: + val = (buf[0] << 8) | buf[1]; + break; + default: + WARN("Failed to convert %x\n", *str); + hres = MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + } + if(SUCCEEDED(hres)) + hres = return_short(res, val); + } + SysFreeString(conv_str); return hres; } diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index efe8643166b..413c9a8b9b6 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1679,6 +1679,11 @@ call testAsc(" ", 32) call testAsc(Chr(255), 255) call testAsc(Chr(0), 0) if isEnglishLang then testAsc true, 84 +if Asc(Chr(&h81)) = &h8145 then + ' Japanese (CP 932) + call testAsc(Chr(&h8e8e), -29042) + call testAsc(Chr(220), 220) +end if call testAscError() sub testErrNumber(n)

1 0

Myah Caron : include: Add IShellLinkDual interface.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: e80b471c0625c1974b9e3ae969aa82620d78b4d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e80b471c0625c1974b9e3ae9… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Mon Jul 27 07:30:25 2020 +0000 include: Add IShellLinkDual interface. Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6d66efa3fee7f529bba6c478e71d54e0d66995f5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/shldisp.idl | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/include/shldisp.idl b/include/shldisp.idl index 19f2d73ed0a..9032b94ea0a 100644 --- a/include/shldisp.idl +++ b/include/shldisp.idl @@ -738,6 +738,82 @@ coclass ShellFolderView [default, source] dispinterface DShellFolderViewEvents; } +/***************************************************************************** + * IShellLinkDual interface + */ +[ + uuid (88a05c00-f000-11ce-8350-444553540000), + oleautomation, + dual, + hidden + ] +interface IShellLinkDual : IDispatch { + [propget] + HRESULT Path ([out, retval] BSTR *pbs); + + [propput] + HRESULT Path ([in] BSTR bs); + + [propget] + HRESULT Description ([out, retval] BSTR *pbs); + + [propput] + HRESULT Description ([in] BSTR bs); + + [propget] + HRESULT WorkingDirectory ([out, retval] BSTR *pbs); + + [propput] + HRESULT WorkingDirectory ([in] BSTR bs); + + [propget] + HRESULT Arguments ([out, retval] BSTR *pbs); + + [propput] + HRESULT Arguments ([in] BSTR bs); + + [propget] + HRESULT Hotkey ([out, retval] int *piHK); + + [propput] + HRESULT Hotkey ([in] int iHK); + + [propget] + HRESULT ShowCommand ([out, retval] int *piShowCommand); + + [propput] + HRESULT ShowCommand ([in] int iShowCommand); + + HRESULT Resolve ([in] int fFlags); + + HRESULT GetIconLocation ([out] BSTR *pbs, + [out, retval] int *piIcon); + + HRESULT SetIconLocation ([in] BSTR bs, + [in] int iIcon); + + HRESULT Save ([in, optional] VARIANT vWhere); +} + +[ + uuid (317ee249-f12e-11d2-b1e4-00c04f8eeb3e), + oleautomation, + dual, + hidden +] +interface IShellLinkDual2 : IShellLinkDual { + [propget] + HRESULT Target ([out, retval] FolderItem **ppfi); +} + +[ + uuid (11219420-1768-11d1-95be-00609797ea4f), + noncreatable +] +coclass ShellLinkObject { + [default] interface IShellLinkDual2; +} + } /* library Shell32 */ /*****************************************************************************

1 0

Brendan Shanks : winemac.drv: Don't fail GPU detection if some IOKit properties are missing.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 433dd4b4f109c53444e92d9796392499cc87b2ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=433dd4b4f109c53444e92d97… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Sep 8 16:10:32 2020 -0700 winemac.drv: Don't fail GPU detection if some IOKit properties are missing. Fixes GPU detection when running in VMware Fusion, where the GPU entry lacks a "model" property. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49774 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0ead40dc9b87ebbd74ad6ebda0182365ab2efde3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winemac.drv/cocoa_display.m | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 9d95eee99a9..e769772feaa 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -215,18 +215,15 @@ static int macdrv_get_gpu_info_from_entry(struct macdrv_gpu* gpu, io_registry_en if (IORegistryEntryGetRegistryEntryID(gpu_entry, &gpu->id) != kIOReturnSuccess) goto done; - if (get_entry_property_uint32(gpu_entry, CFSTR("vendor-id"), &gpu->vendor_id)) - goto done; - if (get_entry_property_uint32(gpu_entry, CFSTR("device-id"), &gpu->device_id)) - goto done; - if (get_entry_property_uint32(gpu_entry, CFSTR("subsystem-id"), &gpu->subsys_id)) - goto done; - if (get_entry_property_uint32(gpu_entry, CFSTR("revision-id"), &gpu->revision_id)) - goto done; - if (get_entry_property_string(gpu_entry, CFSTR("model"), gpu->name, sizeof(gpu->name))) - goto done; ret = 0; + + get_entry_property_uint32(gpu_entry, CFSTR("vendor-id"), &gpu->vendor_id); + get_entry_property_uint32(gpu_entry, CFSTR("device-id"), &gpu->device_id); + get_entry_property_uint32(gpu_entry, CFSTR("subsystem-id"), &gpu->subsys_id); + get_entry_property_uint32(gpu_entry, CFSTR("revision-id"), &gpu->revision_id); + get_entry_property_string(gpu_entry, CFSTR("model"), gpu->name, sizeof(gpu->name)); + done: if (gpu_entry != entry) IOObjectRelease(gpu_entry);

1 0

Nikolay Sivov : widl: Enable [hidden] attribute for enums.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 7ec8670985eb49e128b8c0d8be27b143b1c702fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ec8670985eb49e128b8c0d8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 23 18:10:17 2020 +0300 widl: Enable [hidden] attribute for enums. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8eb756c6993e8931059ac51bff668fb6a546123e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/widl/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 92b4f8ebd5a..f49172bbd8f 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2115,7 +2115,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_HELPSTRING */ { 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, "helpstring" }, /* ATTR_HELPSTRINGCONTEXT */ { 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, "helpstringcontext" }, /* ATTR_HELPSTRINGDLL */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "helpstringdll" }, - /* ATTR_HIDDEN */ { 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, "hidden" }, + /* ATTR_HIDDEN */ { 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, "hidden" }, /* ATTR_ID */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, "id" }, /* ATTR_IDEMPOTENT */ { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "idempotent" }, /* ATTR_IGNORE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "ignore" },

1 0