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

Piotr Caban : msvcrt: Import acosf from musl.
by Alexandre Julliard Aug. 5, 2020

Aug. 5, 2020

Module: wine Branch: master Commit: d53d42f1ae6f2bb2e98a36a9173ad0ffd3b205fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d53d42f1ae6f2bb2e98a36a9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 5 17:11:20 2020 +0200 msvcrt: Import acosf from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 54 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 59b6a98487..46af74f09f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -219,18 +219,63 @@ INT CDECL MSVCRT__isnanf( float num ) /********************************************************************* * MSVCRT_acosf (MSVCRT.@) + * + * Copied from musl: src/math/acosf.c */ +static float acosf_R(float z) +{ + static const float pS0 = 1.6666586697e-01, + pS1 = -4.2743422091e-02, + pS2 = -8.6563630030e-03, + qS1 = -7.0662963390e-01; + + float p, q; + p = z * (pS0 + z * (pS1 + z * pS2)); + q = 1.0f + z * qS1; + return p / q; +} + float CDECL MSVCRT_acosf( float x ) { - /* glibc implements acos() as the FPU equivalent of atan2(sqrt(1 - x ^ 2), x). - * asin() uses a similar construction. This is bad because as x gets nearer to - * 1 the error in the expression "1 - x^2" can get relatively large due to - * cancellation. The sqrt() makes things worse. A safer way to calculate - * acos() is to use atan2(sqrt((1 - x) * (1 + x)), x). */ - float ret = atan2f(sqrtf((1 - x) * (1 + x)), x); - if (x < -1.0 || x > 1.0 || !finitef(x)) - return math_error(_DOMAIN, "acosf", x, 0, ret); - return ret; + static const float pio2_hi = 1.5707962513e+00, + pio2_lo = 7.5497894159e-08; + + float z, w, s, c, df; + unsigned int hx, ix; + + hx = *(unsigned int*)&x; + ix = hx & 0x7fffffff; + /* |x| >= 1 or nan */ + if (ix >= 0x3f800000) { + if (ix == 0x3f800000) { + if (hx >> 31) + return 2 * pio2_hi + 7.5231638453e-37; + return 0; + } + if (MSVCRT__isnanf(x)) return x; + return math_error(_DOMAIN, "acosf", x, 0, 0 / (x - x)); + } + /* |x| < 0.5 */ + if (ix < 0x3f000000) { + if (ix <= 0x32800000) /* |x| < 2**-26 */ + return pio2_hi + 7.5231638453e-37; + return pio2_hi - (x - (pio2_lo - x * acosf_R(x * x))); + } + /* x < -0.5 */ + if (hx >> 31) { + z = (1 + x) * 0.5f; + s = sqrtf(z); + w = acosf_R(z) * s - pio2_lo; + return 2 * (pio2_hi - (s + w)); + } + /* x > 0.5 */ + z = (1 - x) * 0.5f; + s = sqrtf(z); + hx = *(unsigned int*)&s & 0xfffff000; + df = *(float*)&hx; + c = (z - df * df) / (s + df); + w = acosf_R(z) * s + c; + return 2 * (df + w); } /*********************************************************************

1 0

Alistair Leslie-Hughes : xactengine3_7: Use CLSID defined from global header.
by Alexandre Julliard Aug. 5, 2020

Aug. 5, 2020

Module: wine Branch: master Commit: 93bf951e1c1e2df700ce60f24db95a1436821357 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93bf951e1c1e2df700ce60f2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 5 14:38:38 2020 +1000 xactengine3_7: Use CLSID defined from global header. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine3_7/Makefile.in | 1 + dlls/xactengine3_7/xact_dll.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/Makefile.in b/dlls/xactengine3_7/Makefile.in index 6fce27d162..6d48617162 100644 --- a/dlls/xactengine3_7/Makefile.in +++ b/dlls/xactengine3_7/Makefile.in @@ -1,5 +1,6 @@ MODULE = xactengine3_7.dll IMPORTS = ole32 uuid +EXTRADEFS = -DXACT3_VER=0x0307 EXTRALIBS = $(FAUDIO_LIBS) EXTRAINCL = $(FAUDIO_CFLAGS) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 7e1add41fe..52bf9e5210 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -27,7 +27,6 @@ #include "initguid.h" #include "xact3.h" #include "rpcproxy.h" -#include "xact_classes.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(xact3); @@ -823,7 +822,7 @@ HRESULT WINAPI DllCanUnloadNow(void) HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { - if (IsEqualGUID(rclsid, &CLSID_XACTEngine37)) + if (IsEqualGUID(rclsid, &CLSID_XACTEngine)) { TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return IClassFactory_QueryInterface(&XACTFactory, riid, ppv);

1 0

Gijs Vermeulen : amstream/tests: Split test_IDirectDrawStreamSample().
by Alexandre Julliard Aug. 5, 2020

Aug. 5, 2020

Module: wine Branch: master Commit: 7bdb713bc47e741d59051bd3599dc0da12f441c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bdb713bc47e741d59051bd3… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Aug 5 16:31:25 2020 +0200 amstream/tests: Split test_IDirectDrawStreamSample(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 268 +++++++++++++++++++++++++---------------- 1 file changed, 167 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7bdb713bc47e741d5905…

1 0

Piotr Caban : msvcrt: Use correct code page in _write when outputing to console.
by Alexandre Julliard Aug. 5, 2020

Aug. 5, 2020

Module: wine Branch: master Commit: 081d25d4b989c732d301b786311c034132c8d7a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=081d25d4b989c732d301b786… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 5 15:08:06 2020 +0200 msvcrt: Use correct code page in _write when outputing to console. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 70 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b6655e6886..a37aa87b5d 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -40,6 +40,7 @@ #include "windef.h" #include "winbase.h" +#include "wincon.h" #include "winternl.h" #include "winnls.h" #include "msvcrt.h" @@ -3446,6 +3447,7 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) ioinfo *info = get_ioinfo(fd); HANDLE hand = info->handle; DWORD num_written, i; + BOOL console; if (hand == INVALID_HANDLE_VALUE || fd == MSVCRT_NO_CONSOLE_FD) { @@ -3480,13 +3482,65 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) return num_written; } + console = MSVCRT__isatty(fd); for (i = 0; i < count;) { const char *s = buf; char lfbuf[2048]; - DWORD j; + DWORD j = 0; - if (!(info->exflag & (EF_UTF8|EF_UTF16))) + if (!(info->exflag & (EF_UTF8|EF_UTF16)) && console) + { + char conv[sizeof(lfbuf)]; + MSVCRT_size_t len = 0; + +#if _MSVCR_VER >= 90 + if (info->dbcsBufferUsed) + { + conv[j++] = info->dbcsBuffer; + info->dbcsBufferUsed = FALSE; + conv[j++] = s[i++]; + len++; + } +#endif + + for (; i < count && j < sizeof(conv)-1; i++, j++, len++) + { + if (MSVCRT_isleadbyte((unsigned char)s[i])) + { + conv[j++] = s[i++]; + + if (i == count) + { +#if _MSVCR_VER >= 90 + info->dbcsBuffer = conv[j-1]; + info->dbcsBufferUsed = TRUE; + break; +#else + *MSVCRT__errno() = MSVCRT_EINVAL; + release_ioinfo(info); + return -1; +#endif + } + } + else if (s[i] == '\n') + { + conv[j++] = '\r'; + len++; + } + conv[j] = s[i]; + } + + len = MSVCRT_mbstowcs((WCHAR*)lfbuf, conv, len); + if (len == -1) + { + msvcrt_set_errno(GetLastError()); + release_ioinfo(info); + return -1; + } + j = len * 2; + } + else if (!(info->exflag & (EF_UTF8|EF_UTF16))) { for (j = 0; i < count && j < sizeof(lfbuf)-1; i++, j++) { @@ -3495,7 +3549,7 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) lfbuf[j] = s[i]; } } - else if (info->exflag & EF_UTF16) + else if (info->exflag & EF_UTF16 || console) { for (j = 0; i < count && j < sizeof(lfbuf)-3; i++, j++) { @@ -3532,9 +3586,20 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) } } - if (!WriteFile(hand, lfbuf, j, &num_written, NULL) || num_written != j) + if (console) { - TRACE("WriteFile (fd %d, hand %p) failed-last error (%d)\n", fd, + j = j/2; + if (!WriteConsoleW(hand, lfbuf, j, &num_written, NULL)) + num_written = -1; + } + else if (!WriteFile(hand, lfbuf, j, &num_written, NULL)) + { + num_written = -1; + } + + if (num_written != j) + { + TRACE("WriteFile/WriteConsoleW (fd %d, hand %p) failed-last error (%d)\n", fd, hand, GetLastError()); msvcrt_set_errno(GetLastError()); release_ioinfo(info);

1 0

Piotr Caban : msvcrt: Avoid allocations in _write implementation.
by Alexandre Julliard Aug. 5, 2020

Aug. 5, 2020

Module: wine Branch: master Commit: e0555a742f4e9527b31bd67a8dcf572046f7c4a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0555a742f4e9527b31bd67a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 5 15:07:27 2020 +0200 msvcrt: Avoid allocations in _write implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 154 +++++++++++++++-------------------------------------- 1 file changed, 42 insertions(+), 112 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index e63cedede5..b6655e6886 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3443,15 +3443,10 @@ int CDECL _wutime(const MSVCRT_wchar_t* path, struct MSVCRT___utimbuf32 *t) */ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) { - DWORD num_written; ioinfo *info = get_ioinfo(fd); HANDLE hand = info->handle; + DWORD num_written, i; - /* Don't trace small writes, it gets *very* annoying */ -#if 0 - if (count > 32) - TRACE(":fd (%d) handle (%d) buf (%p) len (%d)\n",fd,hand,buf,count); -#endif if (hand == INVALID_HANDLE_VALUE || fd == MSVCRT_NO_CONSOLE_FD) { *MSVCRT__errno() = MSVCRT_EBADF; @@ -3472,148 +3467,83 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) if (!(info->wxflag & WX_TEXT)) { - if (WriteFile(hand, buf, count, &num_written, NULL) - && (num_written == count)) + if (!WriteFile(hand, buf, count, &num_written, NULL) + || num_written != count) { - release_ioinfo(info); - return num_written; + TRACE("WriteFile (fd %d, hand %p) failed-last error (%d)\n", fd, + hand, GetLastError()); + msvcrt_set_errno(GetLastError()); + num_written = -1; } - TRACE("WriteFile (fd %d, hand %p) failed-last error (%d)\n", fd, - hand, GetLastError()); - msvcrt_set_errno(GetLastError()); + + release_ioinfo(info); + return num_written; } - else + + for (i = 0; i < count;) { - unsigned int i, j, nr_lf, size; - char *p = NULL; - const char *q; const char *s = buf; + char lfbuf[2048]; + DWORD j; if (!(info->exflag & (EF_UTF8|EF_UTF16))) { - /* find number of \n */ - for (nr_lf=0, i=0; i<count; i++) - if (s[i] == '\n') - nr_lf++; - if (nr_lf) - { - size = count+nr_lf; - if ((q = p = MSVCRT_malloc(size))) - { - for (s = buf, i = 0, j = 0; i < count; i++) - { - if (s[i] == '\n') - p[j++] = '\r'; - p[j++] = s[i]; - } - } - else - { - FIXME("Malloc failed\n"); - nr_lf = 0; - size = count; - q = buf; - } - } - else + for (j = 0; i < count && j < sizeof(lfbuf)-1; i++, j++) { - size = count; - q = buf; + if (s[i] == '\n') + lfbuf[j++] = '\r'; + lfbuf[j] = s[i]; } } else if (info->exflag & EF_UTF16) { - for (nr_lf=0, i=0; i<count; i+=2) - if (s[i]=='\n' && s[i+1]==0) - nr_lf += 2; - if (nr_lf) + for (j = 0; i < count && j < sizeof(lfbuf)-3; i++, j++) { - size = count+nr_lf; - if ((q = p = MSVCRT_malloc(size))) - { - for (s=buf, i=0, j=0; i<count; i++) - { - if (s[i]=='\n' && s[i+1]==0) - { - p[j++] = '\r'; - p[j++] = 0; - } - p[j++] = s[i++]; - p[j++] = s[i]; - } - } - else + if (s[i] == '\n' && !s[i+1]) { - FIXME("Malloc failed\n"); - nr_lf = 0; - size = count; - q = buf; + lfbuf[j++] = '\r'; + lfbuf[j++] = 0; } - } - else - { - size = count; - q = buf; + lfbuf[j++] = s[i++]; + lfbuf[j] = s[i]; } } else { - DWORD conv_len; - - for(nr_lf=0, i=0; i<count; i+=2) - if (s[i]=='\n' && s[i+1]==0) - nr_lf++; - - conv_len = WideCharToMultiByte(CP_UTF8, 0, (WCHAR*)buf, count/2, NULL, 0, NULL, NULL); - if(!conv_len) { - msvcrt_set_errno(GetLastError()); - MSVCRT_free(p); - release_ioinfo(info); - return -1; - } + char conv[sizeof(lfbuf)/4]; - size = conv_len+nr_lf; - if((p = MSVCRT_malloc(count+nr_lf*2+size))) + for (j = 0; i < count && j < sizeof(conv)-3; i++, j++) { - for (s=buf, i=0, j=0; i<count; i++) + if (s[i] == '\n' && !s[i+1]) { - if (s[i]=='\n' && s[i+1]==0) - { - p[j++] = '\r'; - p[j++] = 0; - } - p[j++] = s[i++]; - p[j++] = s[i]; + conv[j++] = '\r'; + conv[j++] = 0; } - q = p+count+nr_lf*2; - WideCharToMultiByte(CP_UTF8, 0, (WCHAR*)p, count/2+nr_lf, - p+count+nr_lf*2, conv_len+nr_lf, NULL, NULL); + conv[j++] = s[i++]; + conv[j] = s[i]; } - else + + j = WideCharToMultiByte(CP_UTF8, 0, (WCHAR*)conv, j/2, lfbuf, sizeof(lfbuf), NULL, NULL); + if (!j) { - FIXME("Malloc failed\n"); - nr_lf = 0; - size = count; - q = buf; + msvcrt_set_errno(GetLastError()); + release_ioinfo(info); + return -1; } } - if (!WriteFile(hand, q, size, &num_written, NULL)) - num_written = -1; - release_ioinfo(info); - MSVCRT_free(p); - if (num_written != size) + if (!WriteFile(hand, lfbuf, j, &num_written, NULL) || num_written != j) { - TRACE("WriteFile (fd %d, hand %p) failed-last error (%d), num_written %d\n", - fd, hand, GetLastError(), num_written); + TRACE("WriteFile (fd %d, hand %p) failed-last error (%d)\n", fd, + hand, GetLastError()); msvcrt_set_errno(GetLastError()); + release_ioinfo(info); return -1; } - return count; } release_ioinfo(info); - return -1; + return count; } /*********************************************************************

1 0

Gijs Vermeulen : amstream: Return E_INVALIDARG when a rect but no surface is passed in IDirectDrawMediaStream::CreateSample().
by Alexandre Julliard Aug. 5, 2020

Aug. 5, 2020

Module: wine Branch: master Commit: a4ddb5a1e6c0c94b344f5cf6d52b103538c378f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4ddb5a1e6c0c94b344f5cf6… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Aug 5 16:31:26 2020 +0200 amstream: Return E_INVALIDARG when a rect but no surface is passed in IDirectDrawMediaStream::CreateSample(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 3 +++ dlls/amstream/tests/amstream.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 4c94bacf52..917fcad9c9 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -442,6 +442,9 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_CreateSample(IDirectDrawMedia TRACE("stream %p, surface %p, rect %s, flags %#x, sample %p.\n", stream, surface, wine_dbgstr_rect(rect), flags, sample); + if (!surface && rect) + return E_INVALIDARG; + EnterCriticalSection(&stream->cs); hr = ddrawstreamsample_create(stream, surface, rect, sample); LeaveCriticalSection(&stream->cs); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 1310e42cf2..383ea7e936 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -5665,7 +5665,7 @@ static void test_ddrawstream_create_sample(void) SetRectEmpty(&rect); hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, &rect, 0, &sample); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); EXPECT_REF(stream, 3); hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample);

1 0

Vijay Kiran Kamuju : xactengine3_7: Implement IXACT3Cue Interface.
by Alexandre Julliard Aug. 5, 2020

Aug. 5, 2020

Module: wine Branch: master Commit: e8321d7de9dafd7303977ffd69b6d6be69b2ee6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8321d7de9dafd7303977ffd… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Jul 18 22:21:39 2020 +0200 xactengine3_7: Implement IXACT3Cue Interface. Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine3_7/xact_dll.c | 183 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 181 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 828739533c..7e1add41fe 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -34,6 +34,158 @@ WINE_DEFAULT_DEBUG_CHANNEL(xact3); static HINSTANCE instance; +typedef struct _XACT3CueImpl { + IXACT3Cue IXACT3Cue_iface; + FACTCue *fact_cue; +} XACT3CueImpl; + +static inline XACT3CueImpl *impl_from_IXACT3Cue(IXACT3Cue *iface) +{ + return CONTAINING_RECORD(iface, XACT3CueImpl, IXACT3Cue_iface); +} + +static HRESULT WINAPI IXACT3CueImpl_Play(IXACT3Cue *iface) +{ + XACT3CueImpl *This = impl_from_IXACT3Cue(iface); + + TRACE("(%p)\n", iface); + + return FACTCue_Play(This->fact_cue); +} + +static HRESULT WINAPI IXACT3CueImpl_Stop(IXACT3Cue *iface, DWORD dwFlags) +{ + XACT3CueImpl *This = impl_from_IXACT3Cue(iface); + + TRACE("(%p)->(%u)\n", iface, dwFlags); + + return FACTCue_Stop(This->fact_cue, dwFlags); +} + +static HRESULT WINAPI IXACT3CueImpl_GetState(IXACT3Cue *iface, DWORD *pdwState) +{ + XACT3CueImpl *This = impl_from_IXACT3Cue(iface); + + TRACE("(%p)->(%p)\n", iface, pdwState); + + return FACTCue_GetState(This->fact_cue, pdwState); +} + +static HRESULT WINAPI IXACT3CueImpl_Destroy(IXACT3Cue *iface) +{ + XACT3CueImpl *This = impl_from_IXACT3Cue(iface); + HRESULT hr; + + TRACE("(%p)\n", iface); + + hr = FACTCue_Destroy(This->fact_cue); + HeapFree(GetProcessHeap(), 0, This); + return hr; +} + +static HRESULT WINAPI IXACT3CueImpl_SetMatrixCoefficients(IXACT3Cue *iface, + UINT32 uSrcChannelCount, UINT32 uDstChannelCount, + float *pMatrixCoefficients) +{ + XACT3CueImpl *This = impl_from_IXACT3Cue(iface); + + TRACE("(%p)->(%u, %u, %p)\n", iface, uSrcChannelCount, uDstChannelCount, + pMatrixCoefficients); + + return FACTCue_SetMatrixCoefficients(This->fact_cue, uSrcChannelCount, + uDstChannelCount, pMatrixCoefficients); +} + +static XACTVARIABLEINDEX WINAPI IXACT3CueImpl_GetVariableIndex(IXACT3Cue *iface, + PCSTR szFriendlyName) +{ + XACT3CueImpl *This = impl_from_IXACT3Cue(iface); + + TRACE("(%p)->(%s)\n", iface, szFriendlyName); + + return FACTCue_GetVariableIndex(This->fact_cue, szFriendlyName); +} + +static HRESULT WINAPI IXACT3CueImpl_SetVariable(IXACT3Cue *iface, + XACTVARIABLEINDEX nIndex, XACTVARIABLEVALUE nValue) +{ + XACT3CueImpl *This = impl_from_IXACT3Cue(iface); + + TRACE("(%p)->(%u, %f)\n", iface, nIndex, nValue); + + return FACTCue_SetVariable(This->fact_cue, nIndex, nValue); +} + +static HRESULT WINAPI IXACT3CueImpl_GetVariable(IXACT3Cue *iface, + XACTVARIABLEINDEX nIndex, XACTVARIABLEVALUE *nValue) +{ + XACT3CueImpl *This = impl_from_IXACT3Cue(iface); + + TRACE("(%p)->(%u, %p)\n", iface, nIndex, nValue); + + return FACTCue_GetVariable(This->fact_cue, nIndex, nValue); +} + +static HRESULT WINAPI IXACT3CueImpl_Pause(IXACT3Cue *iface, BOOL fPause) +{ + XACT3CueImpl *This = impl_from_IXACT3Cue(iface); + + TRACE("(%p)->(%u)\n", iface, fPause); + + return FACTCue_Pause(This->fact_cue, fPause); +} + +static HRESULT WINAPI IXACT3CueImpl_GetProperties(IXACT3Cue *iface, + XACT_CUE_INSTANCE_PROPERTIES **ppProperties) +{ + XACT3CueImpl *This = impl_from_IXACT3Cue(iface); + FACTCueInstanceProperties *fProps; + HRESULT hr; + + TRACE("(%p)->(%p)\n", iface, ppProperties); + + hr = FACTCue_GetProperties(This->fact_cue, &fProps); + if(FAILED(hr)) + return hr; + + *ppProperties = (XACT_CUE_INSTANCE_PROPERTIES*) fProps; + return hr; +} + +static HRESULT WINAPI IXACT3CueImpl_SetOutputVoices(IXACT3Cue *iface, + const XAUDIO2_VOICE_SENDS *pSendList) +{ + XACT3CueImpl *This = impl_from_IXACT3Cue(iface); + FIXME("(%p)->(%p): stub!\n", This, pSendList); + return S_OK; +} + +static HRESULT WINAPI IXACT3CueImpl_SetOutputVoiceMatrix(IXACT3Cue *iface, + IXAudio2Voice *pDestinationVoice, UINT32 SourceChannels, + UINT32 DestinationChannels, const float *pLevelMatrix) +{ + XACT3CueImpl *This = impl_from_IXACT3Cue(iface); + FIXME("(%p)->(%p %u %u %p): stub!\n", This, pDestinationVoice, SourceChannels, + DestinationChannels, pLevelMatrix); + return S_OK; +} + +static const IXACT3CueVtbl XACT3Cue_Vtbl = +{ + IXACT3CueImpl_Play, + IXACT3CueImpl_Stop, + IXACT3CueImpl_GetState, + IXACT3CueImpl_Destroy, + IXACT3CueImpl_SetMatrixCoefficients, + IXACT3CueImpl_GetVariableIndex, + IXACT3CueImpl_SetVariable, + IXACT3CueImpl_GetVariable, + IXACT3CueImpl_Pause, + IXACT3CueImpl_GetProperties, + IXACT3CueImpl_SetOutputVoices, + IXACT3CueImpl_SetOutputVoiceMatrix +}; + typedef struct _XACT3SoundBankImpl { IXACT3SoundBank IXACT3SoundBank_iface; @@ -81,9 +233,36 @@ static HRESULT WINAPI IXACT3SoundBankImpl_Prepare(IXACT3SoundBank *iface, IXACT3Cue** ppCue) { XACT3SoundBankImpl *This = impl_from_IXACT3SoundBank(iface); - FIXME("(%p)->(%u, 0x%x, %u, %p): stub!\n", This, nCueIndex, dwFlags, timeOffset, + XACT3CueImpl *cue; + FACTCue *fcue; + UINT ret; + + TRACE("(%p)->(%u, 0x%x, %u, %p)\n", This, nCueIndex, dwFlags, timeOffset, ppCue); - return E_NOTIMPL; + + ret = FACTSoundBank_Prepare(This->fact_soundbank, nCueIndex, dwFlags, + timeOffset, &fcue); + if(ret != 0) + { + ERR("Failed to CreateCue: %d\n", ret); + return E_FAIL; + } + + cue = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*cue)); + if (!cue) + { + FACTCue_Destroy(fcue); + ERR("Failed to allocate XACT3CueImpl!"); + return E_OUTOFMEMORY; + } + + cue->IXACT3Cue_iface.lpVtbl = &XACT3Cue_Vtbl; + cue->fact_cue = fcue; + *ppCue = (IXACT3Cue*)&cue->IXACT3Cue_iface; + + TRACE("Created Cue: %p\n", cue); + + return S_OK; } static HRESULT WINAPI IXACT3SoundBankImpl_Play(IXACT3SoundBank *iface,

1 0

Vijay Kiran Kamuju : xactengine3_7: Implement IXACT3SoundBank Interface.
by Alexandre Julliard Aug. 5, 2020

Aug. 5, 2020

Module: wine Branch: master Commit: b63f17ab49098de9cb662f813af5503347248756 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b63f17ab49098de9cb662f81… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Jul 18 22:07:24 2020 +0200 xactengine3_7: Implement IXACT3SoundBank Interface. Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine3_7/xact_dll.c | 137 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 135 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 69570e8cef..828739533c 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -34,6 +34,112 @@ WINE_DEFAULT_DEBUG_CHANNEL(xact3); static HINSTANCE instance; +typedef struct _XACT3SoundBankImpl { + IXACT3SoundBank IXACT3SoundBank_iface; + + FACTSoundBank *fact_soundbank; +} XACT3SoundBankImpl; + +static inline XACT3SoundBankImpl *impl_from_IXACT3SoundBank(IXACT3SoundBank *iface) +{ + return CONTAINING_RECORD(iface, XACT3SoundBankImpl, IXACT3SoundBank_iface); +} + +static XACTINDEX WINAPI IXACT3SoundBankImpl_GetCueIndex(IXACT3SoundBank *iface, + PCSTR szFriendlyName) +{ + XACT3SoundBankImpl *This = impl_from_IXACT3SoundBank(iface); + + TRACE("(%p)->(%s)\n", This, szFriendlyName); + + return FACTSoundBank_GetCueIndex(This->fact_soundbank, szFriendlyName); +} + +static HRESULT WINAPI IXACT3SoundBankImpl_GetNumCues(IXACT3SoundBank *iface, + XACTINDEX *pnNumCues) +{ + XACT3SoundBankImpl *This = impl_from_IXACT3SoundBank(iface); + + TRACE("(%p)->(%p)\n", This, pnNumCues); + + return FACTSoundBank_GetNumCues(This->fact_soundbank, pnNumCues); +} + +static HRESULT WINAPI IXACT3SoundBankImpl_GetCueProperties(IXACT3SoundBank *iface, + XACTINDEX nCueIndex, XACT_CUE_PROPERTIES *pProperties) +{ + XACT3SoundBankImpl *This = impl_from_IXACT3SoundBank(iface); + + TRACE("(%p)->(%u, %p)\n", This, nCueIndex, pProperties); + + return FACTSoundBank_GetCueProperties(This->fact_soundbank, nCueIndex, + (FACTCueProperties*) pProperties); +} + +static HRESULT WINAPI IXACT3SoundBankImpl_Prepare(IXACT3SoundBank *iface, + XACTINDEX nCueIndex, DWORD dwFlags, XACTTIME timeOffset, + IXACT3Cue** ppCue) +{ + XACT3SoundBankImpl *This = impl_from_IXACT3SoundBank(iface); + FIXME("(%p)->(%u, 0x%x, %u, %p): stub!\n", This, nCueIndex, dwFlags, timeOffset, + ppCue); + return E_NOTIMPL; +} + +static HRESULT WINAPI IXACT3SoundBankImpl_Play(IXACT3SoundBank *iface, + XACTINDEX nCueIndex, DWORD dwFlags, XACTTIME timeOffset, + IXACT3Cue** ppCue) +{ + XACT3SoundBankImpl *This = impl_from_IXACT3SoundBank(iface); + FIXME("(%p)->(%u, 0x%x, %u, %p): stub!\n", This, nCueIndex, dwFlags, timeOffset, + ppCue); + return E_NOTIMPL; +} + +static HRESULT WINAPI IXACT3SoundBankImpl_Stop(IXACT3SoundBank *iface, + XACTINDEX nCueIndex, DWORD dwFlags) +{ + XACT3SoundBankImpl *This = impl_from_IXACT3SoundBank(iface); + + TRACE("(%p)->(%u)\n", This, dwFlags); + + return FACTSoundBank_Stop(This->fact_soundbank, nCueIndex, dwFlags); +} + +static HRESULT WINAPI IXACT3SoundBankImpl_Destroy(IXACT3SoundBank *iface) +{ + XACT3SoundBankImpl *This = impl_from_IXACT3SoundBank(iface); + HRESULT hr; + + TRACE("(%p)\n", This); + + hr = FACTSoundBank_Destroy(This->fact_soundbank); + HeapFree(GetProcessHeap(), 0, This); + return hr; +} + +static HRESULT WINAPI IXACT3SoundBankImpl_GetState(IXACT3SoundBank *iface, + DWORD *pdwState) +{ + XACT3SoundBankImpl *This = impl_from_IXACT3SoundBank(iface); + + TRACE("(%p)->(%p)\n", This, pdwState); + + return FACTSoundBank_GetState(This->fact_soundbank, pdwState); +} + +static const IXACT3SoundBankVtbl XACT3SoundBank_Vtbl = +{ + IXACT3SoundBankImpl_GetCueIndex, + IXACT3SoundBankImpl_GetNumCues, + IXACT3SoundBankImpl_GetCueProperties, + IXACT3SoundBankImpl_Prepare, + IXACT3SoundBankImpl_Play, + IXACT3SoundBankImpl_Stop, + IXACT3SoundBankImpl_Destroy, + IXACT3SoundBankImpl_GetState +}; + typedef struct _XACT3EngineImpl { IXACT3Engine IXACT3Engine_iface; @@ -226,9 +332,36 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateSoundBank(IXACT3Engine *iface, DWORD dwAllocAttributes, IXACT3SoundBank **ppSoundBank) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); - FIXME("(%p)->(%p, %u, 0x%x, 0x%x, %p): stub!\n", This, pvBuffer, dwSize, dwFlags, + XACT3SoundBankImpl *sb; + FACTSoundBank *fsb; + UINT ret; + + TRACE("(%p)->(%p, %u, 0x%x, 0x%x, %p): stub!\n", This, pvBuffer, dwSize, dwFlags, dwAllocAttributes, ppSoundBank); - return E_NOTIMPL; + + ret = FACTAudioEngine_CreateSoundBank(This->fact_engine, pvBuffer, dwSize, + dwFlags, dwAllocAttributes, &fsb); + if(ret != 0) + { + ERR("Failed to CreateSoundBank: %d\n", ret); + return E_FAIL; + } + + sb = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*sb)); + if (!sb) + { + FACTSoundBank_Destroy(fsb); + ERR("Failed to allocate XACT3SoundBankImpl!"); + return E_OUTOFMEMORY; + } + + sb->IXACT3SoundBank_iface.lpVtbl = &XACT3SoundBank_Vtbl; + sb->fact_soundbank = fsb; + *ppSoundBank = (IXACT3SoundBank*)sb; + + TRACE("Created SoundBank: %p\n", sb); + + return S_OK; } static HRESULT WINAPI IXACT3EngineImpl_CreateInMemoryWaveBank(IXACT3Engine *iface,

1 0

Jeff Smith : gdiplus: Avoid a few unnecessary calculations for arc2polybezier.
by Alexandre Julliard Aug. 5, 2020

Aug. 5, 2020

Module: wine Branch: master Commit: 82eb0a66a25dda810476295920d8d12212fe00e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82eb0a66a25dda8104762959… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Aug 4 08:57:12 2020 -0500 gdiplus: Avoid a few unnecessary calculations for arc2polybezier. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index d114ff797e..ee98d024f8 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -202,54 +202,54 @@ static void add_arc_part(GpPointF * pt, REAL x1, REAL y1, REAL x2, REAL y2, * adjusts the angles so that when we stretch the points they will end in the * right place. This is only complicated because atan and atan2 do not behave * conveniently. */ -static void unstretch_angle(REAL * angle, REAL rad_x, REAL rad_y) +static REAL unstretch_angle(REAL angle, REAL dia_x, REAL dia_y) { REAL stretched; INT revs_off; - *angle = deg2rad(*angle); + if(fabs(cos(angle)) < 0.00001 || fabs(sin(angle)) < 0.00001) + return angle; - if(fabs(cos(*angle)) < 0.00001 || fabs(sin(*angle)) < 0.00001) - return; - - stretched = gdiplus_atan2(sin(*angle) / fabs(rad_y), cos(*angle) / fabs(rad_x)); - revs_off = gdip_round(*angle / (2.0 * M_PI)) - gdip_round(stretched / (2.0 * M_PI)); + stretched = gdiplus_atan2(sin(angle) / fabs(dia_y), cos(angle) / fabs(dia_x)); + revs_off = gdip_round(angle / (2.0 * M_PI)) - gdip_round(stretched / (2.0 * M_PI)); stretched += ((REAL)revs_off) * M_PI * 2.0; - *angle = stretched; + return stretched; } /* Stores the bezier points that correspond to the arc in points. If points is * null, just return the number of points needed to represent the arc. */ -INT arc2polybezier(GpPointF * points, REAL x1, REAL y1, REAL x2, REAL y2, - REAL startAngle, REAL sweepAngle) +INT arc2polybezier(GpPointF * points, REAL left, REAL top, REAL width, REAL height, + REAL start_angle, REAL sweep_angle) { INT i; - REAL end_angle, start_angle, endAngle; + REAL partial_end_angle, end_angle; - endAngle = startAngle + sweepAngle; - unstretch_angle(&startAngle, x2 / 2.0, y2 / 2.0); - unstretch_angle(&endAngle, x2 / 2.0, y2 / 2.0); + end_angle = deg2rad(start_angle + sweep_angle); + start_angle = deg2rad(start_angle); - /* start_angle and end_angle are the iterative variables */ - start_angle = startAngle; + if (width != height) + { + start_angle = unstretch_angle(start_angle, width, height); + end_angle = unstretch_angle(end_angle, width, height); + } for(i = 0; i < MAX_ARC_PTS - 1; i += 3){ /* check if we've overshot the end angle */ - if( sweepAngle > 0.0 ) + if( sweep_angle > 0.0 ) { - if (start_angle >= endAngle) break; - end_angle = min(start_angle + M_PI_2, endAngle); + if (start_angle >= end_angle) break; + partial_end_angle = min(start_angle + M_PI_2, end_angle); } else { - if (start_angle <= endAngle) break; - end_angle = max(start_angle - M_PI_2, endAngle); + if (start_angle <= end_angle) break; + partial_end_angle = max(start_angle - M_PI_2, end_angle); } if (points) - add_arc_part(&points[i], x1, y1, x2, y2, start_angle, end_angle, i == 0); + add_arc_part(&points[i], left, top, width, height, start_angle, partial_end_angle, i == 0); - start_angle += M_PI_2 * (sweepAngle < 0.0 ? -1.0 : 1.0); + start_angle = partial_end_angle; } if (i == 0) return 0;

1 0

Alistair Leslie-Hughes : include: Define all CLSID/IID_IXACT3Engine versions.
by Alexandre Julliard Aug. 5, 2020

Aug. 5, 2020

Module: wine Branch: master Commit: 7c9ed2eeb4bceb1d8450c6c98c57df85cb25e40e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c9ed2eeb4bceb1d8450c6c9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 5 14:38:37 2020 +1000 include: Define all CLSID/IID_IXACT3Engine versions. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/xact3.h | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/include/xact3.h b/include/xact3.h index 80059c124a..2b4f0e07f3 100644 --- a/include/xact3.h +++ b/include/xact3.h @@ -30,11 +30,34 @@ extern "C" { #endif -DEFINE_GUID(CLSID_XACTEngine, 0xbcc782bc, 0x6492, 0x4c22, 0x8c, 0x35, 0xf5, 0xd7, 0x2f, 0xe7, 0x3c, 0x6e); +#if XACT3_VER == 0x0300 + DEFINE_GUID(CLSID_XACTEngine, 0x3b80ee2a, 0xb0f5, 0x4780, 0x9e, 0x30, 0x90, 0xcb, 0x39, 0x68, 0x5b, 0x03); +#elif XACT3_VER == 0x0301 + DEFINE_GUID(CLSID_XACTEngine, 0x962f5027, 0x99be, 0x4692, 0xa4, 0x68, 0x85, 0x80, 0x2c, 0xf8, 0xde, 0x61); +#elif XACT3_VER == 0x0302 + DEFINE_GUID(CLSID_XACTEngine, 0xd3332f02, 0x3dd0, 0x4de9, 0x9a, 0xec, 0x20, 0xd8, 0x5c, 0x41, 0x11, 0xb6); +#elif XACT3_VER == 0x0303 + DEFINE_GUID(CLSID_XACTEngine, 0x94c1affa, 0x66e7, 0x4961, 0x95, 0x21, 0xcf, 0xde, 0xf3, 0x12, 0x8d, 0x4f); +#elif XACT3_VER == 0x0304 + DEFINE_GUID(CLSID_XACTEngine, 0x0977d092, 0x2d95, 0x4e43, 0x8d, 0x42, 0x9d, 0xdc, 0xc2, 0x54, 0x5e, 0xd5); +#elif XACT3_VER == 0x0305 + DEFINE_GUID(CLSID_XACTEngine, 0x074b110f, 0x7f58, 0x4743, 0xae, 0xa5, 0x12, 0xf1, 0x5b, 0x50, 0x74, 0xed); +#elif XACT3_VER == 0x0306 + DEFINE_GUID(CLSID_XACTEngine, 0x248d8a3b, 0x6256, 0x44d3, 0xa0, 0x18, 0x2a, 0xc9, 0x6c, 0x45, 0x9f, 0x47); +#else /* XACT3_VER == 0x0307 or not defined */ + DEFINE_GUID(CLSID_XACTEngine, 0xbcc782bc, 0x6492, 0x4c22, 0x8c, 0x35, 0xf5, 0xd7, 0x2f, 0xe7, 0x3c, 0x6e); +#endif + DEFINE_GUID(CLSID_XACTAuditionEngine, 0x9ecdd80d, 0x0e81, 0x40d8, 0x89, 0x03, 0x2b, 0xf7, 0xb1, 0x31, 0xac, 0x43); DEFINE_GUID(CLSID_XACTDebugEngine, 0x02860630, 0xbf3b, 0x42a8, 0xb1, 0x4e, 0x91, 0xed, 0xa2, 0xf5, 0x1e, 0xa5); -DEFINE_GUID(IID_IXACT3Engine, 0xb1ee676a, 0xd9cd, 0x4d2a, 0x89, 0xa8, 0xfa, 0x53, 0xeb, 0x9e, 0x48, 0x0b); +#if XACT3_VER == 0x0300 + DEFINE_GUID(IID_IXACT3Engine, 0x9e33f661, 0x2d07, 0x43ec, 0x97, 0x04, 0xbb, 0xcb, 0x71, 0xa5, 0x49, 0x72); +#elif XACT3_VER >= 0x0301 && XACT3_VER <= 0x304 + DEFINE_GUID(IID_IXACT3Engine, 0xe72c1b9a, 0xd717, 0x41c0, 0x81, 0xa6, 0x50, 0xeb, 0x56, 0xe8, 0x06, 0x49); +#else + DEFINE_GUID(IID_IXACT3Engine, 0xb1ee676a, 0xd9cd, 0x4d2a, 0x89, 0xa8, 0xfa, 0x53, 0xeb, 0x9e, 0x48, 0x0b); +#endif typedef struct IXACT3SoundBank IXACT3SoundBank; typedef struct IXACT3WaveBank IXACT3WaveBank;

1 0