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

Andrey Gusev : d3dx11: Add D3DX11GetImageInfoFromFileA/W stub.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: 178d778b8999dd7d767e588519f32de058feef93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=178d778b8999dd7d767e5885… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Mar 16 16:50:20 2020 +0200 d3dx11: Add D3DX11GetImageInfoFromFileA/W stub. For Project Cars. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 20a2094ecd4112313d30904284a0fdf7ccedcfa7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx11_42/d3dx11_42.spec | 4 ++-- dlls/d3dx11_43/d3dx11_43.spec | 4 ++-- dlls/d3dx11_43/main.c | 22 ++++++++++++++++++++++ include/d3dx11tex.h | 4 ++++ 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index 30bdba4244..99a38557b8 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -27,8 +27,8 @@ @ stub D3DX11CreateTextureFromResourceW @ stub D3DX11CreateThreadPump @ stdcall D3DX11FilterTexture(ptr ptr long long) -@ stub D3DX11GetImageInfoFromFileA -@ stub D3DX11GetImageInfoFromFileW +@ stdcall D3DX11GetImageInfoFromFileA(str ptr ptr ptr) +@ stdcall D3DX11GetImageInfoFromFileW(wstr ptr ptr ptr) @ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr) @ stub D3DX11GetImageInfoFromResourceA @ stub D3DX11GetImageInfoFromResourceW diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index 30bdba4244..99a38557b8 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -27,8 +27,8 @@ @ stub D3DX11CreateTextureFromResourceW @ stub D3DX11CreateThreadPump @ stdcall D3DX11FilterTexture(ptr ptr long long) -@ stub D3DX11GetImageInfoFromFileA -@ stub D3DX11GetImageInfoFromFileW +@ stdcall D3DX11GetImageInfoFromFileA(str ptr ptr ptr) +@ stdcall D3DX11GetImageInfoFromFileW(wstr ptr ptr ptr) @ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr) @ stub D3DX11GetImageInfoFromResourceA @ stub D3DX11GetImageInfoFromResourceW diff --git a/dlls/d3dx11_43/main.c b/dlls/d3dx11_43/main.c index 215a51b715..e8eac58cbb 100644 --- a/dlls/d3dx11_43/main.c +++ b/dlls/d3dx11_43/main.c @@ -58,6 +58,28 @@ HRESULT WINAPI D3DX11FilterTexture(ID3D11DeviceContext *context, ID3D11Resource return E_NOTIMPL; } +HRESULT WINAPI D3DX11GetImageInfoFromFileA(const char *filename, ID3DX11ThreadPump *pump, D3DX11_IMAGE_INFO *img_info, + HRESULT *hresult) +{ + FIXME("filename %s, pump %p, img_info %p, hresult %p stub!\n", debugstr_a(filename), pump, img_info, hresult); + + if (!filename) + return E_FAIL; + + return E_NOTIMPL; +} + +HRESULT WINAPI D3DX11GetImageInfoFromFileW(const WCHAR *filename, ID3DX11ThreadPump *pump, D3DX11_IMAGE_INFO *img_info, + HRESULT *hresult) +{ + FIXME("filename %s, pump %p, img_info %p, hresult %p stub!\n", debugstr_w(filename), pump, img_info, hresult); + + if (!filename) + return E_FAIL; + + return E_NOTIMPL; +} + HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump, D3DX11_IMAGE_INFO *img_info, HRESULT *hresult) { diff --git a/include/d3dx11tex.h b/include/d3dx11tex.h index b7c00ac4fd..c8a47925c8 100644 --- a/include/d3dx11tex.h +++ b/include/d3dx11tex.h @@ -119,6 +119,10 @@ HRESULT WINAPI D3DX11CreateTextureFromFileW(ID3D11Device *device, const WCHAR *f HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *src_data, SIZE_T src_data_size, D3DX11_IMAGE_LOAD_INFO *loadinfo, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult); HRESULT WINAPI D3DX11FilterTexture(ID3D11DeviceContext *context, ID3D11Resource *texture, UINT src_level, UINT filter); +HRESULT WINAPI D3DX11GetImageInfoFromFileA(const char *filename, ID3DX11ThreadPump *pump, D3DX11_IMAGE_INFO *img_info, + HRESULT *hresult); +HRESULT WINAPI D3DX11GetImageInfoFromFileW(const WCHAR *filename, ID3DX11ThreadPump *pump, D3DX11_IMAGE_INFO *img_info, + HRESULT *hresult); HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump, D3DX11_IMAGE_INFO *img_info, HRESULT *hresult); HRESULT WINAPI D3DX11SaveTextureToFileA(ID3D11DeviceContext *context, ID3D11Resource *texture,

1 0

Zebediah Figura : winegstreamer: Clamp both timestamp and timestamp + diff to 0.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: 5442ba0b65f971ef7bf6bb57ee839424038ff81d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5442ba0b65f971ef7bf6bb57… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 16 21:28:26 2020 -0500 winegstreamer: Clamp both timestamp and timestamp + diff to 0. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5ca1d28e8df7e3e87e5b9f3ff51445b07dfcc2fb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index cbded6abf5..3ab9e7c663 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1786,6 +1786,8 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil { struct gstdemux_source *pin = impl_from_IQualityControl(iface); GstQOSType type = GST_QOS_TYPE_OVERFLOW; + GstClockTime timestamp; + GstClockTimeDiff diff; GstEvent *evt; TRACE("(%p)->(%p, { 0x%x %u %s %s })\n", pin, sender, @@ -1795,16 +1797,23 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil mark_wine_thread(); - if (qm.Type == Flood) - qm.Late = 0; - /* GSTQOS_TYPE_OVERFLOW is also used for buffers that arrive on time, but * DirectShow filters might use Famine, so check that there actually is an * underrun. */ if (qm.Type == Famine && qm.Proportion > 1000) type = GST_QOS_TYPE_UNDERFLOW; - evt = gst_event_new_qos(type, qm.Proportion / 1000.0, qm.Late * 100, qm.TimeStamp * 100); + /* DirectShow filters sometimes pass negative timestamps (Audiosurf uses the + * current time instead of the time of the last buffer). GstClockTime is + * unsigned, so clamp it to 0. */ + timestamp = max(qm.TimeStamp * 100, 0); + + /* The documentation specifies that timestamp + diff must be nonnegative. */ + diff = qm.Late * 100; + if (timestamp < -diff) + diff = -timestamp; + + evt = gst_event_new_qos(type, qm.Proportion / 1000.0, diff, timestamp); if (!evt) { WARN("Failed to create QOS event\n");

1 0

Roman Pišl : wininet: Add stub for INTERNET_OPTION_IGNORE_OFFLINE.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: 12a29231faaa28980dbe3f05696bc7458f852afc URL: https://source.winehq.org/git/wine.git/?a=commit;h=12a29231faaa28980dbe3f05… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Thu Mar 12 12:01:15 2020 +0100 wininet: Add stub for INTERNET_OPTION_IGNORE_OFFLINE. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48739 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6fcd1378b2516165468bcbd71263c1b18c6be491) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/internet.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index aaa8b2a569..cdafbfa139 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2955,6 +2955,9 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, case INTERNET_OPTION_DISABLE_PASSPORT_AUTH: TRACE("Option INTERNET_OPTION_DISABLE_PASSPORT_AUTH: harmless stub, since not enabled\n"); break; + case INTERNET_OPTION_IGNORE_OFFLINE: + FIXME("Option INTERNET_OPTION_IGNORE_OFFLINE: STUB\n"); + break; case INTERNET_OPTION_SEND_TIMEOUT: case INTERNET_OPTION_RECEIVE_TIMEOUT: case INTERNET_OPTION_DATA_SEND_TIMEOUT:

1 0

Vijay Kiran Kamuju : include: Add missing GUIDs in dsound.h.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: 8051f3ea6a741e024cc7ef954ec7f067e29f2940 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8051f3ea6a741e024cc7ef95… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Mar 15 18:28:43 2020 +0100 include: Add missing GUIDs in dsound.h. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48750 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 90233748209bb9a5c0adfc41a100c83535a1b9b8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/dsound.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/dsound.h b/include/dsound.h index b4a2509e89..f217f0b391 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -116,6 +116,11 @@ DEFINE_GUID(DSDEVID_DefaultVoiceCapture, 0xDEF00003,0x9C6D,0x47ED,0xAA,0xF1,0x4D DEFINE_GUID(DSDEVID_WinePlayback, 0x40316A1D,0x605B,0xD611,0x87,0xC6,0x00,0x80,0xAD,0x00,0x02,0xFE); +#define DSD3DALG_DEFAULT GUID_NULL +DEFINE_GUID(DS3DALG_NO_VIRTUALIZATION, 0xc241333f,0x1c1b,0x11d2,0x94,0xf5,0x00,0xc0,0x4f,0xc2,0x8a,0xca); +DEFINE_GUID(DS3DALG_HRTF_FULL, 0xc2413340,0x1c1b,0x11d2,0x94,0xf5,0x00,0xc0,0x4f,0xc2,0x8a,0xca); +DEFINE_GUID(DS3DALG_HRTF_LIGHT, 0xc2413342,0x1c1b,0x11d2,0x94,0xf5,0x00,0xc0,0x4f,0xc2,0x8a,0xca); + DEFINE_GUID(GUID_DSFX_STANDARD_GARGLE, 0xDAFD8210,0x5711,0x4B91,0x9F,0xE3,0xF7,0x5B,0x7A,0xE2,0x79,0xBF); DEFINE_GUID(GUID_DSFX_STANDARD_CHORUS, 0xEFE6629C,0x81F7,0x4281,0xBD,0x91,0xC9,0xD6,0x04,0xA9,0x5A,0xF6); DEFINE_GUID(GUID_DSFX_STANDARD_FLANGER, 0xEFCA3D92,0xDFD8,0x4672,0xA6,0x03,0x74,0x20,0x89,0x4B,0xAD,0x98);

1 0

Alexandre Julliard : user.exe: Clear out the thunk array to catch invalid winprocs.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: 38d64fdb129c7e7ddb5aac0e549c84be41341e49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38d64fdb129c7e7ddb5aac0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 26 15:31:21 2020 +0100 user.exe: Clear out the thunk array to catch invalid winprocs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48814 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 64bd952b85eb183d97b438a3d2695b2bf78d17ea) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user.exe16/message.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 14e7a19889..e3ca3fd779 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -152,7 +152,8 @@ static WNDPROC16 alloc_win16_thunk( WNDPROC handle ) { assert( MAX_WINPROCS16 * sizeof(WINPROC_THUNK) <= 0x10000 ); - if (!(thunk_selector = GlobalAlloc16( GMEM_FIXED, MAX_WINPROCS16 * sizeof(WINPROC_THUNK) ))) + if (!(thunk_selector = GlobalAlloc16( GMEM_FIXED | GMEM_ZEROINIT, + MAX_WINPROCS16 * sizeof(WINPROC_THUNK) ))) return NULL; PrestoChangoSelector16( thunk_selector, thunk_selector ); thunk_array = GlobalLock16( thunk_selector );

1 0

Nikolay Sivov : comctl32/button: Use duplicated image for drawing.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: 493852a1f9c276583c6fe8e9f6ebf77366c60120 URL: https://source.winehq.org/git/wine.git/?a=commit;h=493852a1f9c276583c6fe8e9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 1 15:17:50 2020 +0300 comctl32/button: Use duplicated image for drawing. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47794 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5fcd20396fb29a1f2ce87645cbb0d045ce5cf2d8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/button.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 0078bd0fc6..b615df4a16 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -90,11 +90,12 @@ typedef struct _BUTTON_INFO HIMAGELIST glyph; /* this is a font character code when split_style doesn't have BCSS_IMAGE */ SIZE glyph_size; RECT text_margin; + HANDLE image; /* Original handle set with BM_SETIMAGE and returned with BM_GETIMAGE. */ union { HICON icon; HBITMAP bitmap; - HANDLE image; + HANDLE image; /* Duplicated handle used for drawing. */ } u; } BUTTON_INFO; @@ -488,6 +489,10 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L case WM_NCDESTROY: SetWindowLongPtrW( hWnd, 0, 0 ); + if (infoPtr->image_type == IMAGE_BITMAP) + DeleteObject(infoPtr->u.bitmap); + else if (infoPtr->image_type == IMAGE_ICON) + DestroyIcon(infoPtr->u.icon); heap_free(infoPtr->note); heap_free(infoPtr); break; @@ -859,13 +864,14 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L case BM_SETIMAGE: infoPtr->image_type = (DWORD)wParam; - oldHbitmap = infoPtr->u.image; - infoPtr->u.image = (HANDLE)lParam; - InvalidateRect( hWnd, NULL, FALSE ); - return (LRESULT)oldHbitmap; + oldHbitmap = infoPtr->image; + infoPtr->u.image = CopyImage((HANDLE)lParam, infoPtr->image_type, 0, 0, 0); + infoPtr->image = (HANDLE)lParam; + InvalidateRect( hWnd, NULL, FALSE ); + return (LRESULT)oldHbitmap; case BM_GETIMAGE: - return (LRESULT)infoPtr->u.image; + return (LRESULT)infoPtr->image; case BCM_SETIMAGELIST: {

1 0

Akihiro Sagawa : ddraw/tests: Add more managed texture tests.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: bd2b989eed0a49abbe1adae2eae45bd04b656bbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd2b989eed0a49abbe1adae2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 2 00:13:42 2020 +0900 ddraw/tests: Add more managed texture tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8bb3ebced4a7bd11ad929eafe7d7ffb3a6e96463) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 73 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/ddraw/tests/ddraw7.c | 73 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 142 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bd2b989eed0a49abbe1a…

1 0

Piotr Caban : msvcp90: Add std:_XLgamma implementation.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: 702fa0ca4cae79452e77d1a5986143ff12ae03f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=702fa0ca4cae79452e77d1a5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 27 16:33:44 2020 +0100 msvcp90: Add std:_XLgamma implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48806 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 70c3e08d32407c0d8ee751b124c438fc5910fc8d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 6 +++--- dlls/msvcp110/msvcp110.spec | 6 +++--- dlls/msvcp120/msvcp120.spec | 6 +++--- dlls/msvcp120_app/msvcp120_app.spec | 6 +++--- dlls/msvcp140/msvcp140.spec | 6 +++--- dlls/msvcp90/math.c | 33 +++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 6 +++--- 7 files changed, 51 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 4ca8d5b277..897b46fe90 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -1260,9 +1260,9 @@ @ cdecl -arch=win64 ?_Unlock@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@UEAAXXZ(ptr) basic_streambuf_wchar__Unlock @ thiscall -arch=win32 ?_Unlock(a)_Mutex@std@@QAEXXZ(ptr) mutex_unlock @ cdecl -arch=win64 ?_Unlock(a)_Mutex@std@@QEAAXXZ(ptr) mutex_unlock -@ stub ?_XLgamma(a)tr1@std@@YAMM(a)Z -@ stub ?_XLgamma(a)tr1@std@@YANN(a)Z -@ stub ?_XLgamma(a)tr1@std@@YAOO(a)Z +@ cdecl ?_XLgamma(a)tr1@std@@YAMM(a)Z(float) std__XLgamma_float +@ cdecl ?_XLgamma(a)tr1@std@@YANN(a)Z(double) std__XLgamma_double +@ cdecl ?_XLgamma(a)tr1@std@@YAOO(a)Z(double) std__XLgamma_double @ stub ?_Xbad(a)tr1@std@@YAXW4error_type(a)regex_constants@12@@Z @ stub ?_Xfunc(a)tr1@std@@YAXXZ @ cdecl -arch=win32 ?_Xinvalid_argument(a)std@@YAXPBD(a)Z(str) _Xinvalid_argument diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index eebc430b1e..8d79f8c9a8 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1829,9 +1829,9 @@ @ stub -arch=win64 ?_W_Gettnames(a)_Locinfo@std@@QEBA?AV_Timevec(a)2@XZ @ stub -arch=win32 ?_Winerror_map(a)std@@YAPBDH(a)Z @ stub -arch=win64 ?_Winerror_map(a)std@@YAPEBDH(a)Z -@ stub ?_XLgamma(a)std@@YAMM(a)Z -@ stub ?_XLgamma(a)std@@YANN(a)Z -@ stub ?_XLgamma(a)std@@YAOO(a)Z +@ cdecl ?_XLgamma(a)std@@YAMM(a)Z(float) std__XLgamma_float +@ cdecl ?_XLgamma(a)std@@YANN(a)Z(double) std__XLgamma_double +@ cdecl ?_XLgamma(a)std@@YAOO(a)Z(double) std__XLgamma_double @ cdecl ?_Xbad_alloc(a)std@@YAXXZ() _Xmem @ stub ?_Xbad_function_call(a)std@@YAXXZ @ cdecl -arch=win32 ?_Xinvalid_argument(a)std@@YAXPBD(a)Z(str) _Xinvalid_argument diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index e131d41ecc..6308c57b29 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1790,9 +1790,9 @@ @ stub -arch=win64 ?_W_Gettnames(a)_Locinfo@std@@QEBA?AV_Timevec(a)2@XZ @ stub -arch=win32 ?_Winerror_map(a)std@@YAPBDH(a)Z @ stub -arch=win64 ?_Winerror_map(a)std@@YAPEBDH(a)Z -@ stub ?_XLgamma(a)std@@YAMM(a)Z -@ stub ?_XLgamma(a)std@@YANN(a)Z -@ stub ?_XLgamma(a)std@@YAOO(a)Z +@ cdecl ?_XLgamma(a)std@@YAMM(a)Z(float) std__XLgamma_float +@ cdecl ?_XLgamma(a)std@@YANN(a)Z(double) std__XLgamma_double +@ cdecl ?_XLgamma(a)std@@YAOO(a)Z(double) std__XLgamma_double @ cdecl ?_Xbad_alloc(a)std@@YAXXZ() _Xmem @ stub ?_Xbad_function_call(a)std@@YAXXZ @ cdecl -arch=win32 ?_Xinvalid_argument(a)std@@YAXPBD(a)Z(str) _Xinvalid_argument diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index a76149071c..a44c89fdc8 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1790,9 +1790,9 @@ @ stub -arch=win64 ?_W_Gettnames(a)_Locinfo@std@@QEBA?AV_Timevec(a)2@XZ @ stub -arch=win32 ?_Winerror_map(a)std@@YAPBDH(a)Z @ stub -arch=win64 ?_Winerror_map(a)std@@YAPEBDH(a)Z -@ stub ?_XLgamma(a)std@@YAMM(a)Z -@ stub ?_XLgamma(a)std@@YANN(a)Z -@ stub ?_XLgamma(a)std@@YAOO(a)Z +@ cdecl ?_XLgamma(a)std@@YAMM(a)Z(float) msvcp120.?_XLgamma(a)std@@YAMM(a)Z +@ cdecl ?_XLgamma(a)std@@YANN(a)Z(double) msvcp120.?_XLgamma(a)std@@YANN(a)Z +@ cdecl ?_XLgamma(a)std@@YAOO(a)Z(double) msvcp120.?_XLgamma(a)std@@YAOO(a)Z @ cdecl ?_Xbad_alloc(a)std@@YAXXZ() msvcp120.?_Xbad_alloc(a)std@@YAXXZ @ stub ?_Xbad_function_call(a)std@@YAXXZ @ cdecl -arch=win32 ?_Xinvalid_argument(a)std@@YAXPBD(a)Z(str) msvcp120.?_Xinvalid_argument(a)std@@YAXPBD(a)Z diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 70caad8dba..2563c7bfa7 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1673,9 +1673,9 @@ @ cdecl -arch=win32 ?_Winerror_message(a)std@@YAKKPADK(a)Z(long ptr long) _Winerror_message @ cdecl -arch=win64 ?_Winerror_message(a)std@@YAKKPEADK(a)Z(long ptr long) _Winerror_message @ stub ?_XGetLastError(a)std@@YAXXZ -@ stub ?_XLgamma(a)std@@YAMM(a)Z -@ stub ?_XLgamma(a)std@@YANN(a)Z -@ stub ?_XLgamma(a)std@@YAOO(a)Z +@ cdecl ?_XLgamma(a)std@@YAMM(a)Z(float) std__XLgamma_float +@ cdecl ?_XLgamma(a)std@@YANN(a)Z(double) std__XLgamma_double +@ cdecl ?_XLgamma(a)std@@YAOO(a)Z(double) std__XLgamma_double @ cdecl ?_Xbad_alloc(a)std@@YAXXZ() _Xmem @ stub ?_Xbad_function_call(a)std@@YAXXZ @ cdecl -arch=win32 ?_Xinvalid_argument(a)std@@YAXPBD(a)Z(str) _Xinvalid_argument diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 9bc7c0867d..4ebf8baaee 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -2362,3 +2362,36 @@ short __cdecl _FExp(float *x, float y, short scale) return dclass(*x); } + +/* ?_XLgamma(a)std@@YANN(a)Z */ +double __cdecl std__XLgamma_double(double z) +{ + /* Lanczos coefficients g=5, n=6 */ + static const double lc[] = { + 1.000000000190015, + 76.18009172947146, + -86.50532032941677, + 24.01409824083091, + -1.231739572450155, + 0.1208650973866179e-2, + -0.5395239384953e-5 + }; + static const double log_sqrt_2pi = 0.91893853320467274178; + + double base = z + 4.5, sum = 0; + int i; + + if (z < 0.5) return log(M_PI / sin(M_PI * z)) - std__XLgamma_double(1 - z); + + z--; + for(i = ARRAY_SIZE(lc) - 1; i >= 1; i--) + sum += lc[i] / (z + i); + sum += lc[0]; + return log_sqrt_2pi + log(sum) - base + log(base) * (z + 0.5); +} + +/* ?_XLgamma(a)tr1@std@@YAMM(a)Z */ +float __cdecl std__XLgamma_float(float z) +{ + return std__XLgamma_double(z); +} diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 6a5a9a20a4..c38dd041af 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3185,9 +3185,9 @@ @ cdecl -arch=win64 ?_Widen_s@?$ctype(a)G@std@@QEBAPEBDPEBD0PEAG_K(a)Z(ptr ptr ptr ptr long) ctype_wchar__Widen_s @ thiscall -arch=win32 ?_Widen_s@?$ctype(a)_W@std@@QBEPBDPBD0PA_WI(a)Z(ptr ptr ptr ptr long) ctype_wchar__Widen_s @ cdecl -arch=win64 ?_Widen_s@?$ctype(a)_W@std@@QEBAPEBDPEBD0PEA_W_K(a)Z(ptr ptr ptr ptr long) ctype_wchar__Widen_s -@ stub ?_XLgamma(a)tr1@std@@YAMM(a)Z -@ stub ?_XLgamma(a)tr1@std@@YANN(a)Z -@ stub ?_XLgamma(a)tr1@std@@YAOO(a)Z +@ cdecl ?_XLgamma(a)tr1@std@@YAMM(a)Z(float) std__XLgamma_float +@ cdecl ?_XLgamma(a)tr1@std@@YANN(a)Z(double) std__XLgamma_double +@ cdecl ?_XLgamma(a)tr1@std@@YAOO(a)Z(double) std__XLgamma_double @ stub ?_Xbad(a)tr1@std@@YAXW4error_type(a)regex_constants@12@@Z @ stub -arch=win32 ?_Xfsopen(a)std@@YAPAU_iobuf@@PB_W0H(a)Z @ stub -arch=win64 ?_Xfsopen(a)std@@YAPEAU_iobuf@@PEB_W0H(a)Z

1 0

Alex Henrie : wine.inf: Add Winlogon keys.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: 19f0c18f01731ac887f74e8dcf1e5f6ebcb6a626 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19f0c18f01731ac887f74e8d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Mar 22 00:44:26 2020 -0600 wine.inf: Add Winlogon keys. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48611 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 27d1ef75c4fd5d47b5566e365caf0d3e5abc70ef) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index a80889a242..65e69b021b 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -524,6 +524,7 @@ HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57d [CurrentVersion] HKCU,%CurrentVersion%\Run,,16 +HKCU,%CurrentVersionNT%\Winlogon,,16 HKLM,%CurrentVersion%,"CommonFilesDir",,"%16427%" HKLM,%CurrentVersion%,"FirstInstallDateTime",1,21,81,7c,23 HKLM,%CurrentVersion%,"ProductId",,"12345-oem-0000001-54321" @@ -549,7 +550,6 @@ HKLM,%CurrentVersion%\Setup,"SharedDir",,"%25%" HKLM,%CurrentVersion%\Setup\WindowsFeatures\WindowsMediaVersion,,,"12.0.7601.18840" HKLM,%CurrentVersion%\Shell Extensions\Approved,,16 HKLM,%CurrentVersion%\Uninstall,,16 -HKLM,%CurrentVersion%\Winlogon,,16 HKLM,%CurrentVersionNT%,"InstallDate",0x10003,1273299354 HKLM,%CurrentVersionNT%,"ProductId",,"12345-oem-0000001-54321" HKLM,%CurrentVersionNT%,"RegisteredOrganization",2,"" @@ -572,6 +572,7 @@ HKLM,%CurrentVersionNT%\Perflib,,16 HKLM,%CurrentVersionNT%\Ports,,16 HKLM,%CurrentVersionNT%\Print,,16 HKLM,%CurrentVersionNT%\ProfileList,,16 +HKLM,%CurrentVersionNT%\Winlogon,"Shell",,"explorer.exe" [CurrentVersionWow64] HKLM,%CurrentVersion%,"ProgramFilesDir (x86)",,"%16426%"

1 0

Jeff Smith : mshtml/tests: Add tests showing how toString has changed in IE9+.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: a1e8694059cca9723cf0b2ddbafa42a8edd09f9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1e8694059cca9723cf0b2dd… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Mar 16 23:36:36 2020 -0500 mshtml/tests: Add tests showing how toString has changed in IE9+. Signed-off-by: Jeff Smith <whydoubt(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 79cde059ea2497194dfdf39140295fbf731b286b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/jscript/tests/api.js | 6 ++++++ dlls/mshtml/tests/es5.js | 23 +++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 1a81253a02..d4aa7f4383 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -351,6 +351,12 @@ tmp = Object.prototype.toString.call(new VBArray(createArray())); ok(tmp === "[object Object]", "toString.call(new VBArray()) = " + tmp); (tmp = new Enumerator()).f = Object.prototype.toString; ok(tmp.f() === "[object Object]", "tmp.f() = " + tmp.f()); +tmp = Object.prototype.toString.call(null); +ok(tmp === "[object Object]", "toString.call(null) = " + tmp); +tmp = Object.prototype.toString.call(undefined); +ok(tmp === "[object Object]", "toString.call(undefined) = " + tmp); +tmp = Object.prototype.toString.call(); +ok(tmp === "[object Object]", "toString.call() = " + tmp); function TSTestConstr() {} TSTestConstr.prototype = { toString: function() { return "test"; } }; diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 7ee8cc1e03..7a5b9d57ea 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -767,6 +767,28 @@ function test_getPrototypeOf() { next_test(); } +function test_toString() { + var tmp; + + (function () { tmp = Object.prototype.toString.call(arguments); })(); + todo_wine. + ok(tmp === "[object Arguments]", "toString.call(arguments) = " + tmp); + tmp = Object.prototype.toString.call(this); + todo_wine. + ok(tmp === "[object Window]", "toString.call(null) = " + tmp); + tmp = Object.prototype.toString.call(null); + todo_wine. + ok(tmp === "[object Null]", "toString.call(null) = " + tmp); + tmp = Object.prototype.toString.call(undefined); + todo_wine. + ok(tmp === "[object Undefined]", "toString.call(undefined) = " + tmp); + tmp = Object.prototype.toString.call(); + todo_wine. + ok(tmp === "[object Undefined]", "toString.call() = " + tmp); + + next_test(); +} + function test_bind() { var f, r; var o = new Object(), o2 = new Object(); @@ -860,5 +882,6 @@ var tests = [ test_global_properties, test_string_split, test_getPrototypeOf, + test_toString, test_bind ];

1 0