January 2020 - Wine-commits

Henri Verbeet : d2d1: Rename d2d_ellipse_geometry_GetRoundedRect() to d2d_ellipse_geometry_GetEllipse().
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: 763da3f7cc782eced124e981acbdb680012ea760 URL: https://source.winehq.org/git/wine.git/?a=commit;h=763da3f7cc782eced124e981… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 29 14:15:32 2020 +0330 d2d1: Rename d2d_ellipse_geometry_GetRoundedRect() to d2d_ellipse_geometry_GetEllipse(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index a61ce692b9..2a1fbf5f7c 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -3707,7 +3707,7 @@ static HRESULT STDMETHODCALLTYPE d2d_ellipse_geometry_Widen(ID2D1EllipseGeometry return E_NOTIMPL; } -static void STDMETHODCALLTYPE d2d_ellipse_geometry_GetRoundedRect(ID2D1EllipseGeometry *iface, D2D1_ELLIPSE *ellipse) +static void STDMETHODCALLTYPE d2d_ellipse_geometry_GetEllipse(ID2D1EllipseGeometry *iface, D2D1_ELLIPSE *ellipse) { struct d2d_geometry *geometry = impl_from_ID2D1EllipseGeometry(iface); @@ -3735,7 +3735,7 @@ static const struct ID2D1EllipseGeometryVtbl d2d_ellipse_geometry_vtbl = d2d_ellipse_geometry_ComputeLength, d2d_ellipse_geometry_ComputePointAtLength, d2d_ellipse_geometry_Widen, - d2d_ellipse_geometry_GetRoundedRect, + d2d_ellipse_geometry_GetEllipse, }; HRESULT d2d_ellipse_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory, const D2D1_ELLIPSE *ellipse)

1 0

Alistair Leslie-Hughes : include: Add xact3wb.h.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: 1bb953c6766c9cc4372ca23a7c5b7de101324218 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bb953c6766c9cc4372ca23a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 29 04:24:58 2020 +0000 include: Add xact3wb.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/xact3wb.h | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 8284d6fdf3..b1e7d0084f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -772,6 +772,7 @@ SOURCES = \ wtypes.idl \ wuapi.idl \ x3daudio.h \ + xact3wb.h \ xapo.idl \ xapofx.h \ xaudio2.idl \ diff --git a/include/xact3wb.h b/include/xact3wb.h new file mode 100644 index 0000000000..b4c5a53d40 --- /dev/null +++ b/include/xact3wb.h @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __XACT3WB_H__ +#define __XACT3WB_H__ + +typedef union WAVEBANKMINIWAVEFORMAT +{ + struct + { + DWORD wFormatTag : 2; + DWORD nChannels : 3; + DWORD nSamplesPerSec : 18; + DWORD wBlockAlign : 8; + DWORD wBitsPerSample : 1; + } DUMMYSTRUCTNAME; + DWORD dwValue; +} WAVEBANKMINIWAVEFORMAT; + +typedef struct WAVEBANKREGION +{ + DWORD dwOffset; + DWORD dwLength; +} WAVEBANKREGION; + +typedef struct WAVEBANKSAMPLEREGION +{ + DWORD dwStartSample; + DWORD dwTotalSamples; +} WAVEBANKSAMPLEREGION; + +typedef struct WAVEBANKENTRY +{ + union + { + struct + { + DWORD dwFlags : 4; + DWORD Duration : 28; + } DUMMYSTRUCTNAME; + DWORD dwFlagsAndDuration; + } DUMMYUNIONNAME; + + WAVEBANKMINIWAVEFORMAT Format; + WAVEBANKREGION PlayRegion; + WAVEBANKSAMPLEREGION LoopRegion; +} WAVEBANKENTRY; + +#endif /* __XACT3WB_H__ */

1 0

Nikolay Sivov : mfplat: Add MFCreateTransformActivate().
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: be45be2de750c4a97c8180490fba8a8832e50b64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be45be2de750c4a97c818049… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 29 15:36:20 2020 +0300 mfplat: Add MFCreateTransformActivate(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 416 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 25 +++ include/mftransform.idl | 2 + 4 files changed, 444 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=be45be2de750c4a97c81…

1 0

Nikolay Sivov : mfplat: Add support for local MFT registration.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: 97f646edabea52e136713830612eb737df3689dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=97f646edabea52e136713830… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 29 15:36:21 2020 +0300 mfplat: Add support for local MFT registration. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 214 ++++++++++++++++++++++++++++++++++++++------- dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 104 ++++++++++++++++++++++ include/mfapi.h | 1 + 4 files changed, 288 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=97f646edabea52e13671…

1 0

Jacek Caban : msvcrt/tests: Avoid using msvcrt.h header.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: 3dcedeef2d4f1aedfc6b30ebcfa5546cc986b1e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dcedeef2d4f1aedfc6b30eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 29 13:39:12 2020 +0100 msvcrt/tests: Avoid using msvcrt.h header. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/misc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index 7e2a7e4069..afc3a9de21 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -22,7 +22,6 @@ #include <errno.h> #include <stdio.h> #include <math.h> -#include "msvcrt.h" #include <process.h> static inline BOOL almost_equal(double d1, double d2) { @@ -33,14 +32,14 @@ static inline BOOL almost_equal(double d1, double d2) { static int (__cdecl *prand_s)(unsigned int *); static int (__cdecl *pI10_OUTPUT)(long double, int, int, void*); -static int (__cdecl *pstrerror_s)(char *, MSVCRT_size_t, int); +static int (__cdecl *pstrerror_s)(char *, size_t, int); static int (__cdecl *p_get_doserrno)(int *); static int (__cdecl *p_get_errno)(int *); static int (__cdecl *p_set_doserrno)(int); static int (__cdecl *p_set_errno)(int); static void (__cdecl *p__invalid_parameter)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned int, uintptr_t); -static void (__cdecl *p_qsort_s)(void*, MSVCRT_size_t, MSVCRT_size_t, +static void (__cdecl *p_qsort_s)(void*, size_t, size_t, int (__cdecl*)(void*, const void*, const void*), void*); static double (__cdecl *p_atan)(double); static double (__cdecl *p_exp)(double);

1 0

Jacek Caban : include: Use dllimport attribute for string.h functions.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: 3a67291af47bf5b3727d7d1a6cd3f3ddc81c8282 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a67291af47bf5b3727d7d1a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 29 13:40:04 2020 +0100 include: Use dllimport attribute for string.h functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt.h | 12 ++++ include/msvcrt/string.h | 180 +++++++++++++++++++++++------------------------ 2 files changed, 102 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3a67291af47bf5b3727d…

1 0

Piotr Caban : msvcrt: Add support for quoted paths in _searchenv_s.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: 2e7ad72a8dae21aa5a16396c408007d48e43f5ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e7ad72a8dae21aa5a16396c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 29 13:42:11 2020 +0100 msvcrt: Add support for quoted paths in _searchenv_s. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index d07fcd6c7d..806a2b0c85 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -1763,12 +1763,27 @@ int CDECL MSVCRT__searchenv_s(const char* file, const char* env, char *buf, MSVC for(; *penv; penv = (*end ? end + 1 : end)) { end = penv; - while(*end && *end != ';') end++; /* Find end of next path */ - path_len = end - penv; + path_len = 0; + while(*end && *end != ';' && path_len < MAX_PATH) + { + if (*end == '"') + { + end++; + while(*end && *end != '"' && path_len < MAX_PATH) + { + path[path_len++] = *end; + end++; + } + if (*end == '"') end++; + continue; + } + + path[path_len++] = *end; + end++; + } if (!path_len || path_len >= MAX_PATH) continue; - memcpy(path, penv, path_len); if (path[path_len - 1] != '/' && path[path_len - 1] != '\\') path[path_len++] = '\\'; if (path_len + fname_len >= MAX_PATH)

1 0

Piotr Caban : msvcrt: Don't duplicate _searchenv_s code in _searchenv.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: 98c554ac0617c642bc4481e6f56e0d66adec660a URL: https://source.winehq.org/git/wine.git/?a=commit;h=98c554ac0617c642bc4481e6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 29 13:42:15 2020 +0100 msvcrt: Don't duplicate _searchenv_s code in _searchenv. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 90 +++++-------------------------------------------------- 1 file changed, 8 insertions(+), 82 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 806a2b0c85..83aff8bcb5 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -1640,88 +1640,6 @@ range: return MSVCRT_ERANGE; } -/********************************************************************* - * _searchenv (MSVCRT.@) - * - * Search for a file in a list of paths from an environment variable. - * - * PARAMS - * file [I] Name of the file to search for. - * env [I] Name of the environment variable containing a list of paths. - * buf [O] Destination for the found file path. - * - * RETURNS - * Nothing. If the file is not found, buf will contain an empty string - * and errno is set. - */ -void CDECL MSVCRT__searchenv(const char* file, const char* env, char *buf) -{ - char*envVal, *penv, *end; - char path[MAX_PATH]; - MSVCRT_size_t path_len, fname_len = strlen(file); - - *buf = '\0'; - - /* Try CWD first */ - if (GetFileAttributesA( file ) != INVALID_FILE_ATTRIBUTES) - { - GetFullPathNameA( file, MAX_PATH, buf, NULL ); - return; - } - - /* Search given environment variable */ - envVal = MSVCRT_getenv(env); - if (!envVal) - { - msvcrt_set_errno(ERROR_FILE_NOT_FOUND); - return; - } - - penv = envVal; - TRACE(":searching for %s in paths %s\n", file, envVal); - - for(; *penv; penv = (*end ? end + 1 : end)) - { - end = penv; - path_len = 0; - while(*end && *end != ';' && path_len < MAX_PATH) - { - if (*end == '"') - { - end++; - while(*end && *end != '"' && path_len < MAX_PATH) - { - path[path_len++] = *end; - end++; - } - if (*end == '"') end++; - continue; - } - - path[path_len++] = *end; - end++; - } - if (!path_len || path_len >= MAX_PATH) - continue; - - if (path[path_len - 1] != '/' && path[path_len - 1] != '\\') - path[path_len++] = '\\'; - if (path_len + fname_len >= MAX_PATH) - continue; - - memcpy(path + path_len, file, fname_len + 1); - TRACE("Checking for file %s\n", path); - if (GetFileAttributesA( path ) != INVALID_FILE_ATTRIBUTES) - { - memcpy(buf, path, path_len + fname_len + 1); - return; - } - } - - msvcrt_set_errno(ERROR_FILE_NOT_FOUND); - return; -} - /********************************************************************* * _searchenv_s (MSVCRT.@) */ @@ -1807,6 +1725,14 @@ int CDECL MSVCRT__searchenv_s(const char* file, const char* env, char *buf, MSVC return MSVCRT_ENOENT; } +/********************************************************************* + * _searchenv (MSVCRT.@) + */ +void CDECL MSVCRT__searchenv(const char* file, const char* env, char *buf) +{ + MSVCRT__searchenv_s(file, env, buf, MAX_PATH); +} + /********************************************************************* * _wsearchenv (MSVCRT.@) *

1 0

Piotr Caban : msvcrt: Add support for quoted paths in _wsearchenv_s.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: f05549b7f71740362ae5ef6dc8d5e846f8c41f0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f05549b7f71740362ae5ef6d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 29 13:42:19 2020 +0100 msvcrt: Add support for quoted paths in _wsearchenv_s. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 83aff8bcb5..5bd8fb1b15 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -1833,12 +1833,27 @@ int CDECL MSVCRT__wsearchenv_s(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* for(; *penv; penv = (*end ? end + 1 : end)) { end = penv; - while(*end && *end != ';') end++; /* Find end of next path */ - path_len = end - penv; + path_len = 0; + while(*end && *end != ';' && path_len < MAX_PATH) + { + if (*end == '"') + { + end++; + while(*end && *end != '"' && path_len < MAX_PATH) + { + path[path_len++] = *end; + end++; + } + if (*end == '"') end++; + continue; + } + + path[path_len++] = *end; + end++; + } if (!path_len || path_len >= MAX_PATH) continue; - memcpy(path, penv, path_len * sizeof(MSVCRT_wchar_t)); if (path[path_len - 1] != '/' && path[path_len - 1] != '\\') path[path_len++] = '\\'; if (path_len + fname_len >= MAX_PATH)

1 0

Piotr Caban : msvcrt: Don't duplicate _wsearchenv_s code in _wsearchenv.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: 1b5a551324e113afefd247e703cc59c03ad80a9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b5a551324e113afefd247e7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 29 13:42:23 2020 +0100 msvcrt: Don't duplicate _wsearchenv_s code in _wsearchenv. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 66 +++++++------------------------------------------------ 1 file changed, 8 insertions(+), 58 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 5bd8fb1b15..5e84e38a00 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -1733,64 +1733,6 @@ void CDECL MSVCRT__searchenv(const char* file, const char* env, char *buf) MSVCRT__searchenv_s(file, env, buf, MAX_PATH); } -/********************************************************************* - * _wsearchenv (MSVCRT.@) - * - * Unicode version of _searchenv - */ -void CDECL MSVCRT__wsearchenv(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* env, MSVCRT_wchar_t *buf) -{ - MSVCRT_wchar_t *envVal, *penv, *end; - MSVCRT_wchar_t path[MAX_PATH]; - MSVCRT_size_t path_len, fname_len = strlenW(file); - - *buf = '\0'; - - /* Try CWD first */ - if (GetFileAttributesW( file ) != INVALID_FILE_ATTRIBUTES) - { - GetFullPathNameW( file, MAX_PATH, buf, NULL ); - return; - } - - /* Search given environment variable */ - envVal = MSVCRT__wgetenv(env); - if (!envVal) - { - msvcrt_set_errno(ERROR_FILE_NOT_FOUND); - return; - } - - penv = envVal; - TRACE(":searching for %s in paths %s\n", debugstr_w(file), debugstr_w(envVal)); - - for(; *penv; penv = (*end ? end + 1 : end)) - { - end = penv; - while(*end && *end != ';') end++; /* Find end of next path */ - path_len = end - penv; - if (!path_len || path_len >= MAX_PATH) - continue; - - memcpy(path, penv, path_len * sizeof(MSVCRT_wchar_t)); - if (path[path_len - 1] != '/' && path[path_len - 1] != '\\') - path[path_len++] = '\\'; - if (path_len + fname_len >= MAX_PATH) - continue; - - memcpy(path + path_len, file, (fname_len + 1) * sizeof(MSVCRT_wchar_t)); - TRACE("Checking for file %s\n", debugstr_w(path)); - if (GetFileAttributesW( path ) != INVALID_FILE_ATTRIBUTES) - { - memcpy(buf, path, (path_len + fname_len + 1) * sizeof(MSVCRT_wchar_t)); - return; - } - } - - msvcrt_set_errno(ERROR_FILE_NOT_FOUND); - return; -} - /********************************************************************* * _wsearchenv_s (MSVCRT.@) */ @@ -1876,3 +1818,11 @@ int CDECL MSVCRT__wsearchenv_s(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* *MSVCRT__errno() = MSVCRT_ENOENT; return MSVCRT_ENOENT; } + +/********************************************************************* + * _wsearchenv (MSVCRT.@) + */ +void CDECL MSVCRT__wsearchenv(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* env, MSVCRT_wchar_t *buf) +{ + MSVCRT__wsearchenv_s(file, env, buf, MAX_PATH); +}

1 0