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

Akihiro Sagawa : vbscript: Support non-Latin 1 characters in Asc.
by Alexandre Julliard 23 Mar '21

23 Mar '21

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

Vijay Kiran Kamuju : include: Add IMarkupServices2, IMarkupContainer2 and IMarkupPointer2 related interfaces.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 18d22fe7fb9449b8277a11300ceab2d7bd00d5e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18d22fe7fb9449b8277a1130… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Jun 7 21:49:28 2020 +0200 include: Add IMarkupServices2, IMarkupContainer2 and IMarkupPointer2 related interfaces. Signed-off-by: Vijay Kiran Kamuju <infyquest(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 cbf16e4c4c119eedcdf00bbd4706c563ef8a488e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/mshtml.idl | 282 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 266 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=18d22fe7fb9449b8277a…

1 0

Jacek Caban : mshtml.idl: Add missing MoveUnitBounded to IMarkupPointer2.
by Alexandre Julliard 23 Mar '21

23 Mar '21

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

Jacek Caban : mshtml: Add IMarkupServices::CreateMarkupPointer implementation.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 7bfaf46e7b0a0d5624978c56cf9689cbc026f87d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bfaf46e7b0a0d5624978c56… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 2 16:57:21 2020 +0200 mshtml: Add IMarkupServices::CreateMarkupPointer implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5679312635c075c7fc9a8ec7c2fc3c01a509bb30) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/htmldoc.c | 6 +- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/range.c | 294 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 22 ++++ 4 files changed, 321 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7bfaf46e7b0a0d562497…

1 0

Myah Caron : include: Add IShellLinkDual interface.
by Alexandre Julliard 23 Mar '21

23 Mar '21

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

Myah Caron : shell32: Add ShellLinkObject stubs.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 9985b86707cf4ee1030173b38554bafbea62dbe5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9985b86707cf4ee1030173b3… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Mon Sep 14 20:52:16 2020 +0000 shell32: Add ShellLinkObject stubs. Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1c26b3dc759e7784bf98a2484e4fb5959259e52b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32_main.h | 1 + dlls/shell32/shelldispatch.c | 297 ++++++++++++++++++++++++++++++++++++- dlls/shell32/tests/shelldispatch.c | 149 +++++++++++++++++++ 3 files changed, 444 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9985b86707cf4ee10301…

1 0

Myah Caron : shell32: Implement ShellLinkObject::get_Path.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: cc1f837b9b5a8919e624d1b2b89196c1f17ec1b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc1f837b9b5a8919e624d1b2… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Mon Sep 14 20:52:47 2020 +0000 shell32: Implement ShellLinkObject::get_Path. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49591 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4c99e3ef341a6b4eda67dffa13a86829fa343bbb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shelldispatch.c | 53 ++++++++++++++++++++++++++++++++++---- dlls/shell32/tests/shelldispatch.c | 2 +- 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 5eda5c76eef..de581dec427 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -106,6 +106,8 @@ typedef struct { typedef struct { IShellLinkDual2 IShellLinkDual2_iface; LONG ref; + + IShellLinkW *shell_link; } ShellLinkObjectImpl; static inline ShellDispatch *impl_from_IShellDispatch6(IShellDispatch6 *iface) @@ -671,6 +673,7 @@ static ULONG WINAPI ShellLinkObject_Release(IShellLinkDual2 *iface) if (!ref) { + if (This->shell_link) IShellLinkW_Release(This->shell_link); heap_free(This); } return ref; @@ -732,9 +735,20 @@ static HRESULT WINAPI ShellLinkObject_Invoke(IShellLinkDual2 *iface, DISPID disp static HRESULT WINAPI ShellLinkObject_get_Path(IShellLinkDual2 *iface, BSTR *pbs) { - FIXME("(%p, %p)\n", iface, pbs); + ShellLinkObjectImpl *This = impl_from_IShellLinkDual(iface); + WCHAR path[MAX_PATH]; + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p, %p)\n", iface, pbs); + + *pbs = NULL; + + hr = IShellLinkW_GetPath(This->shell_link, path, MAX_PATH, NULL, 0); + if (hr != S_OK) + return hr; + + *pbs = SysAllocString(path); + return hr; } static HRESULT WINAPI ShellLinkObject_put_Path(IShellLinkDual2 *iface, BSTR bs) @@ -878,11 +892,13 @@ static const IShellLinkDual2Vtbl ShellLinkObjectVtbl = { ShellLinkObject_get_Target, }; -static HRESULT ShellLinkObject_Constructor(IShellLinkDual2 **link) +static HRESULT ShellLinkObject_Constructor(FolderItemImpl *item, IShellLinkDual2 **link) { + HRESULT hr; + IPersistFile *persist_file = NULL; ShellLinkObjectImpl *This; - FIXME("(%p)\n", link); + TRACE("(%p, %p)\n", item, link); *link = NULL; @@ -891,6 +907,33 @@ static HRESULT ShellLinkObject_Constructor(IShellLinkDual2 **link) This->IShellLinkDual2_iface.lpVtbl = &ShellLinkObjectVtbl; This->ref = 1; + This->shell_link = NULL; + hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellLinkW, (LPVOID*)&This->shell_link); + if (FAILED(hr)) + { + heap_free(This); + return hr; + } + + hr = IShellLinkW_QueryInterface(This->shell_link, &IID_IPersistFile, + (LPVOID*)&persist_file); + if (FAILED(hr)) + { + IShellLinkW_Release(This->shell_link); + heap_free(This); + return hr; + } + + hr = IPersistFile_Load(persist_file, item->path, STGM_READ); + IPersistFile_Release(persist_file); + if (FAILED(hr)) + { + IShellLinkW_Release(This->shell_link); + heap_free(This); + return hr; + } + *link = (IShellLinkDual2 *)&This->IShellLinkDual2_iface; return S_OK; } @@ -1092,7 +1135,7 @@ static HRESULT WINAPI FolderItemImpl_get_GetLink(FolderItem2 *iface, if (!(This->attributes & SFGAO_LINK)) return E_NOTIMPL; - hr = ShellLinkObject_Constructor(&link); + hr = ShellLinkObject_Constructor(This, &link); if (hr != S_OK) return hr; diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 9bd2cfd7155..8a9b8690b06 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1481,7 +1481,7 @@ static void test_ShellLinkObject(void) str = NULL; hr = IShellLinkDual2_get_Path(sld, &str); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) { ok(!wcscmp(str, empty_path), "got %s (wanted %s)\n", wine_dbgstr_w(str), wine_dbgstr_w(empty_path));

1 0

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

23 Mar '21

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

Gijs Vermeulen : msvcr120: Add [_]strtoimax[_l] and [_]strtoumax[_l].
by Alexandre Julliard 23 Mar '21

23 Mar '21

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

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

23 Mar '21

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