wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Alex Henrie : dxtrans: Add DllGetClassObject stub.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: a0f86f4410e7524a98779389d73fbc1472226bb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0f86f4410e7524a98779389… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 24 19:20:47 2021 -0600 dxtrans: Add DllGetClassObject stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51917 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxtrans/Makefile.in | 3 +++ dlls/dxtrans/dxtrans.spec | 2 +- dlls/dxtrans/main.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/dxtrans/Makefile.in b/dlls/dxtrans/Makefile.in index b5c1602917f..cf669277b93 100644 --- a/dlls/dxtrans/Makefile.in +++ b/dlls/dxtrans/Makefile.in @@ -1 +1,4 @@ MODULE = dxtrans.dll + +C_SRCS = \ + main.c diff --git a/dlls/dxtrans/dxtrans.spec b/dlls/dxtrans/dxtrans.spec index 7c2d605e534..b8ff0297a1b 100644 --- a/dlls/dxtrans/dxtrans.spec +++ b/dlls/dxtrans/dxtrans.spec @@ -6,6 +6,6 @@ @ stub ?DXOverArrayMMX@@YGXPAVDXPMSAMPLE@@PBV1@K@Z @ stdcall -private DllCanUnloadNow() @ stub DllEnumClassObjects -@ stub DllGetClassObject +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/dxtrans/main.c b/dlls/dxtrans/main.c new file mode 100644 index 00000000000..2b87e9f69c4 --- /dev/null +++ b/dlls/dxtrans/main.c @@ -0,0 +1,35 @@ +/* + * DirectX Transitions + * + * Copyright 2021 Alex Henrie + * + * 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 + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxtrans); + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) +{ + FIXME("(%s, %s, %p) stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); + return CLASS_E_CLASSNOTAVAILABLE; +}

1 0

Alistair Leslie-Hughes : cng.sys: New dll.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: d09d4d97e02a724c98df9a6cacc8d8f4e545ee0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d09d4d97e02a724c98df9a6c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 22 21:40:08 2021 +1100 cng.sys: New dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48981 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/cng.sys/Makefile.in | 1 + dlls/cng.sys/cng.sys.spec | 63 +++++++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 68 insertions(+) diff --git a/configure b/configure index 389b83e931e..5100dd8af5f 100755 --- a/configure +++ b/configure @@ -1174,6 +1174,7 @@ enable_cards enable_cdosys enable_cfgmgr32 enable_clusapi +enable_cng_sys enable_combase enable_comcat enable_comctl32 @@ -19002,6 +19003,7 @@ wine_fn_config_makefile dlls/cards enable_cards wine_fn_config_makefile dlls/cdosys enable_cdosys wine_fn_config_makefile dlls/cfgmgr32 enable_cfgmgr32 wine_fn_config_makefile dlls/clusapi enable_clusapi +wine_fn_config_makefile dlls/cng.sys enable_cng_sys wine_fn_config_makefile dlls/combase enable_combase wine_fn_config_makefile dlls/combase/tests enable_tests wine_fn_config_makefile dlls/comcat enable_comcat diff --git a/configure.ac b/configure.ac index 0dbf7365714..6941b2c73a8 100644 --- a/configure.ac +++ b/configure.ac @@ -2713,6 +2713,7 @@ WINE_CONFIG_MAKEFILE(dlls/cards) WINE_CONFIG_MAKEFILE(dlls/cdosys) WINE_CONFIG_MAKEFILE(dlls/cfgmgr32) WINE_CONFIG_MAKEFILE(dlls/clusapi) +WINE_CONFIG_MAKEFILE(dlls/cng.sys) WINE_CONFIG_MAKEFILE(dlls/combase) WINE_CONFIG_MAKEFILE(dlls/combase/tests) WINE_CONFIG_MAKEFILE(dlls/comcat) diff --git a/dlls/cng.sys/Makefile.in b/dlls/cng.sys/Makefile.in new file mode 100644 index 00000000000..81d37898e01 --- /dev/null +++ b/dlls/cng.sys/Makefile.in @@ -0,0 +1 @@ +MODULE = cng.sys diff --git a/dlls/cng.sys/cng.sys.spec b/dlls/cng.sys/cng.sys.spec new file mode 100644 index 00000000000..0a2858579d2 --- /dev/null +++ b/dlls/cng.sys/cng.sys.spec @@ -0,0 +1,63 @@ +@ stdcall BCryptAddContextFunctionProvider(long wstr long wstr wstr long) bcrypt.BCryptAddContextFunctionProvider +@ stdcall BCryptCloseAlgorithmProvider(ptr long) bcrypt.BCryptCloseAlgorithmProvider +@ stdcall BCryptCreateHash(ptr ptr ptr long ptr long long) bcrypt.BCryptCreateHash +@ stub BCryptCreateMultiHash +@ stdcall BCryptDecrypt(ptr ptr long ptr ptr long ptr long ptr long) bcrypt.BCryptDecrypt +@ stdcall BCryptDeriveKey(ptr wstr ptr ptr long ptr long) bcrypt.BCryptDeriveKey +@ stdcall BCryptDeriveKeyCapi(ptr ptr ptr long long) bcrypt.BCryptDeriveKeyCapi +@ stdcall BCryptDeriveKeyPBKDF2(ptr ptr long ptr long int64 ptr long long) bcrypt.BCryptDeriveKeyPBKDF2 +@ stdcall BCryptDestroyHash(ptr) bcrypt.BCryptDestroyHash +@ stdcall BCryptDestroyKey(ptr) bcrypt.BCryptDestroyKey +@ stdcall BCryptDestroySecret(ptr) bcrypt.BCryptDestroySecret +@ stdcall BCryptDuplicateHash(ptr ptr ptr long long) bcrypt.BCryptDuplicateHash +@ stdcall BCryptDuplicateKey(ptr ptr ptr long long) bcrypt.BCryptDuplicateKey +@ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long) bcrypt.BCryptEncrypt +@ stdcall BCryptEnumAlgorithms(long ptr ptr long) bcrypt.BCryptEnumAlgorithms +@ stub BCryptEnumProviders +@ stdcall BCryptExportKey(ptr ptr wstr ptr long ptr long) bcrypt.BCryptExportKey +@ stdcall BCryptFinalizeKeyPair(ptr long) bcrypt.BCryptFinalizeKeyPair +@ stdcall BCryptFinishHash(ptr ptr long long) bcrypt.BCryptFinishHash +@ stdcall BCryptFreeBuffer(ptr) bcrypt.BCryptFreeBuffer +@ stdcall BCryptGenRandom(ptr ptr long long) bcrypt.BCryptGenRandom +@ stdcall BCryptGenerateKeyPair(ptr ptr long long) bcrypt.BCryptGenerateKeyPair +@ stdcall BCryptGenerateSymmetricKey(ptr ptr ptr long ptr long long) bcrypt.BCryptGenerateSymmetricKey +@ stdcall BCryptGetFipsAlgorithmMode(ptr) bcrypt.BCryptGetFipsAlgorithmMode +@ stdcall BCryptGetProperty(ptr wstr ptr long ptr long) bcrypt.BCryptGetProperty +@ stdcall BCryptHash(ptr ptr long ptr long ptr long) bcrypt.BCryptHash +@ stdcall BCryptHashData(ptr ptr long long) bcrypt.BCryptHashData +@ stdcall BCryptImportKey(ptr ptr wstr ptr ptr long ptr long long) bcrypt.BCryptImportKey +@ stdcall BCryptImportKeyPair(ptr ptr wstr ptr ptr long long) bcrypt.BCryptImportKeyPair +@ stub BCryptKeyDerivation +@ stdcall BCryptOpenAlgorithmProvider(ptr wstr wstr long) bcrypt.BCryptOpenAlgorithmProvider +@ stub BCryptProcessMultiOperations +@ stub BCryptRegisterConfigChangeNotify +@ stdcall BCryptRegisterProvider(wstr long ptr) bcrypt.BCryptRegisterProvider +@ stub BCryptResolveProviders +@ stdcall BCryptSecretAgreement(ptr ptr ptr long) bcrypt.BCryptSecretAgreement +@ stdcall BCryptSetProperty(ptr wstr ptr long long) bcrypt.BCryptSetProperty +@ stdcall BCryptSignHash(ptr ptr ptr long ptr long ptr long) bcrypt.BCryptSignHash +@ stub BCryptUnregisterConfigChangeNotify +@ stdcall BCryptUnregisterProvider(wstr) bcrypt.BCryptUnregisterProvider +@ stdcall BCryptVerifySignature(ptr ptr ptr long ptr long long) bcrypt.BCryptVerifySignature +@ stub CngGetFipsAlgorithmMode +@ stub EntropyPoolTriggerReseedForIum +@ stub EntropyProvideData +@ stub EntropyRegisterCallback +@ stub EntropyRegisterSource +@ stub EntropyUnregisterSource +@ stub SslDecrementProviderReferenceCount +@ stub SslDecryptPacket +@ stub SslEncryptPacket +@ stub SslExportKey +@ stub SslExportKeyingMaterial +@ stub SslFreeObject +@ stub SslImportKey +@ stub SslIncrementProviderReferenceCount +@ stub SslLookupCipherLengths +@ stub SslLookupCipherSuiteInfo +@ stub SslOpenProvider +@ stub SymCrypt802_11SaeCustomCommitCreate +@ stub SymCrypt802_11SaeCustomCommitProcess +@ stub SymCrypt802_11SaeCustomDestroy +@ stub SymCrypt802_11SaeCustomInit +@ stub SystemPrng diff --git a/tools/make_specfiles b/tools/make_specfiles index ecfc6d0e8f2..f9e93799ba2 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -507,6 +507,7 @@ my @dll_groups = [ "bcrypt", "ncrypt", + "cng.sys", ], [ "ntoskrnl.exe",

1 0

Piotr Caban : msvcrt: Rewrite _popen function.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: e38f3761f890ccc0b32ac16c633cdf7582511133 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e38f3761f890ccc0b32ac16c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 25 18:29:00 2021 +0200 msvcrt: Rewrite _popen function. Old implementation was not thread safe, incorrectly copied file descriptors to child process and was leaking parent pipe fd to child process. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51719 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/process.c | 217 ++++++++++++++++++++++++++--------------------- dlls/msvcrt/tests/misc.c | 50 +++++++++-- 2 files changed, 166 insertions(+), 101 deletions(-) diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index f2240270179..630e378df87 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -1040,113 +1040,140 @@ void msvcrt_free_popen_data(void) */ FILE* CDECL _wpopen(const wchar_t* command, const wchar_t* mode) { - FILE *ret; - BOOL readPipe = TRUE; - int textmode, fds[2], fdToDup, fdToOpen, fdStdHandle = -1, fmode; - const wchar_t *p; - wchar_t *comspec, *fullcmd; - unsigned int len; - struct popen_handle *container; - DWORD i; - - TRACE("(command=%s, mode=%s)\n", debugstr_w(command), debugstr_w(mode)); - - if (!command || !mode) - return NULL; - - _get_fmode(&fmode); - textmode = fmode & (_O_BINARY | _O_TEXT); - for (p = mode; *p; p++) - { - switch (*p) + wchar_t *comspec, *fullcmd, fullname[MAX_PATH]; + int textmode, fds[2], fd_parent, fd_child; + struct popen_handle *container; + PROCESS_INFORMATION pi; + BOOL read_pipe = TRUE; + const wchar_t *p; + unsigned int len; + STARTUPINFOW si; + FILE *ret; + DWORD i; + BOOL r; + + TRACE("(command=%s, mode=%s)\n", debugstr_w(command), debugstr_w(mode)); + + if (!command || !mode) + return NULL; + + _get_fmode(&textmode); + textmode &= _O_BINARY | _O_TEXT; + textmode |= _O_NOINHERIT; + for (p = mode; *p; p++) { - case 'W': - case 'w': - readPipe = FALSE; - break; - case 'B': - case 'b': - textmode |= _O_BINARY; - textmode &= ~_O_TEXT; - break; - case 'T': - case 't': - textmode |= _O_TEXT; - textmode &= ~_O_BINARY; - break; + switch (*p) + { + case 'W': + case 'w': + read_pipe = FALSE; + break; + case 'B': + case 'b': + textmode |= _O_BINARY; + textmode &= ~_O_TEXT; + break; + case 'T': + case 't': + textmode |= _O_TEXT; + textmode &= ~_O_BINARY; + break; + } } - } - if (_pipe(fds, 0, textmode) == -1) - return NULL; + if (_pipe(fds, 0, textmode) == -1) + return NULL; - fdToDup = readPipe ? 1 : 0; - fdToOpen = readPipe ? 0 : 1; + if (read_pipe) + { + fd_parent = fds[0]; + fd_child = _dup(fds[1]); + _close(fds[1]); + } + else + { + fd_parent = fds[1]; + fd_child = _dup(fds[0]); + _close(fds[0]); + } + if (fd_child == -1) + { + _close(fd_parent); + return NULL; + } + ret = _wfdopen(fd_parent, mode); + if (!ret) + { + _close(fd_child); + return NULL; + } - _lock(_POPEN_LOCK); - for(i=0; i<popen_handles_size; i++) - { - if (!popen_handles[i].f) - break; - } - if (i==popen_handles_size) - { - i = (popen_handles_size ? popen_handles_size*2 : 8); - container = realloc(popen_handles, i*sizeof(*container)); - if (!container) goto error; - - popen_handles = container; - container = popen_handles+popen_handles_size; - memset(container, 0, (i-popen_handles_size)*sizeof(*container)); - popen_handles_size = i; - } - else container = popen_handles+i; + _lock(_POPEN_LOCK); + for (i = 0; i < popen_handles_size; i++) + { + if (!popen_handles[i].f) + break; + } + if (i == popen_handles_size) + { + i = (popen_handles_size ? popen_handles_size * 2 : 8); + container = realloc(popen_handles, i * sizeof(*container)); + if (!container) goto error; + + popen_handles = container; + container = popen_handles + popen_handles_size; + memset(container, 0, (i - popen_handles_size) * sizeof(*container)); + popen_handles_size = i; + } + else container = popen_handles + i; - if ((fdStdHandle = _dup(fdToDup)) == -1) - goto error; - if (_dup2(fds[fdToDup], fdToDup) != 0) - goto error; + if (!(comspec = msvcrt_get_comspec())) goto error; + len = wcslen(comspec) + wcslen(command) + 5; - _close(fds[fdToDup]); + if (!(fullcmd = HeapAlloc(GetProcessHeap(), 0, len * sizeof(wchar_t)))) + { + HeapFree(GetProcessHeap(), 0, comspec); + goto error; + } - if (!(comspec = msvcrt_get_comspec())) goto error; - len = wcslen(comspec) + wcslen(command) + 5; + wcscpy(fullcmd, comspec); + wcscat(fullcmd, L" /c "); + wcscat(fullcmd, command); + msvcrt_search_executable(comspec, fullname, 1); - if (!(fullcmd = HeapAlloc(GetProcessHeap(), 0, len * sizeof(wchar_t)))) - { + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + si.dwFlags = STARTF_USESTDHANDLES; + if (read_pipe) + { + si.hStdInput = (HANDLE)_get_osfhandle(STDIN_FILENO); + si.hStdOutput = (HANDLE)_get_osfhandle(fd_child); + } + else + { + si.hStdInput = (HANDLE)_get_osfhandle(fd_child); + si.hStdOutput = (HANDLE)_get_osfhandle(STDOUT_FILENO); + } + si.hStdError = (HANDLE)_get_osfhandle(STDERR_FILENO); + r = CreateProcessW(fullname, fullcmd, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi); HeapFree(GetProcessHeap(), 0, comspec); - goto error; - } - - wcscpy(fullcmd, comspec); - wcscat(fullcmd, L" /c "); - wcscat(fullcmd, command); - - if ((container->proc = (HANDLE)msvcrt_spawn(_P_NOWAIT, comspec, fullcmd, NULL, 1)) - == INVALID_HANDLE_VALUE) - { - _close(fds[fdToOpen]); - ret = NULL; - } - else - { - ret = _wfdopen(fds[fdToOpen], mode); - if (!ret) - _close(fds[fdToOpen]); + HeapFree(GetProcessHeap(), 0, fullcmd); + if (!r) + { + msvcrt_set_errno(GetLastError()); + goto error; + } + CloseHandle(pi.hThread); + _close(fd_child); + container->proc = pi.hProcess; container->f = ret; - } - _unlock(_POPEN_LOCK); - HeapFree(GetProcessHeap(), 0, comspec); - HeapFree(GetProcessHeap(), 0, fullcmd); - _dup2(fdStdHandle, fdToDup); - _close(fdStdHandle); - return ret; + _unlock(_POPEN_LOCK); + return ret; error: - _unlock(_POPEN_LOCK); - if (fdStdHandle != -1) _close(fdStdHandle); - _close(fds[0]); - _close(fds[1]); - return NULL; + _unlock(_POPEN_LOCK); + _close(fd_child); + fclose(ret); + return NULL; } /********************************************************************* diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index 81c23dd23f2..06555e209b7 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -20,6 +20,8 @@ #include "wine/test.h" #include <errno.h> +#include <fcntl.h> +#include <io.h> #include <stdio.h> #include <math.h> #include <process.h> @@ -330,21 +332,42 @@ static void test__set_errno(void) ok(errno == 0xdeadbeef, "Expected errno to be 0xdeadbeef, got %d\n", errno); } -static void test__popen_child(void) +static void test__popen_child(int fd) { /* don't execute any tests here */ /* ExitProcess is used to set return code of _pclose */ printf("child output\n"); + if ((HANDLE)_get_osfhandle(fd) != INVALID_HANDLE_VALUE) + ExitProcess(1); ExitProcess(0x37); } +static void test__popen_read_child(void) +{ + char buf[1024], *rets; + + rets = fgets(buf, sizeof(buf), stdin); + if (strcmp(buf, "child-to-parent\n") != 0) + ExitProcess(1); + + rets = fgets(buf, sizeof(buf), stdin); + if (rets) + ExitProcess(2); + ExitProcess(3); +} + static void test__popen(const char *name) { FILE *pipe; - char buf[1024]; - int ret; + char *tempf, buf[1024]; + int ret, fd; - sprintf(buf, "\"%s\" misc popen", name); + tempf = _tempnam(".", "wne"); + ok(tempf != NULL, "_tempnam failed\n"); + fd = _open(tempf, _O_CREAT | _O_WRONLY); + ok(fd != -1, "open failed\n"); + + sprintf(buf, "\"%s\" misc popen %d", name, fd); pipe = _popen(buf, "r"); ok(pipe != NULL, "_popen failed with error: %d\n", errno); @@ -353,12 +376,25 @@ static void test__popen(const char *name) ret = _pclose(pipe); ok(ret == 0x37, "_pclose returned %x, expected 0x37\n", ret); + _close(fd); + _unlink(tempf); + free(tempf); errno = 0xdeadbeef; ret = _pclose((FILE*)0xdeadbeef); ok(ret == -1, "_pclose returned %x, expected -1\n", ret); if(p_set_errno) ok(errno == EBADF, "errno = %d\n", errno); + + sprintf(buf, "\"%s\" misc popen_read", name); + pipe = _popen(buf, "w"); + ok(pipe != NULL, "_popen failed with error: %d\n", errno); + + ret = fputs("child-to-parent\n", pipe); + ok(ret != EOF, "fputs returned %x\n", ret); + + ret = _pclose(pipe); + ok(ret == 0x3, "_pclose returned %x, expected 0x3\n", ret); } static void test__invalid_parameter(void) @@ -711,8 +747,10 @@ START_TEST(misc) arg_c = winetest_get_mainargs(&arg_v); if(arg_c >= 3) { - if(!strcmp(arg_v[2], "popen")) - test__popen_child(); + if (!strcmp(arg_v[2], "popen_read")) + test__popen_read_child(); + else if(arg_c == 4 && !strcmp(arg_v[2], "popen")) + test__popen_child(atoi(arg_v[3])); else ok(0, "invalid argument '%s'\n", arg_v[2]);

1 0

Piotr Caban : msvcrt: Fix clearing NOINHERIT flag in _dup2.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 1420d28cd603ff4d96b4170e29f17b691cf9287b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1420d28cd603ff4d96b4170e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 25 18:28:39 2021 +0200 msvcrt: Fix clearing NOINHERIT flag in _dup2. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 7b41d336dc7..fd7168991f4 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1128,7 +1128,7 @@ int CDECL _dup2(int od, int nd) if (DuplicateHandle(GetCurrentProcess(), info_od->handle, GetCurrentProcess(), &handle, 0, TRUE, DUPLICATE_SAME_ACCESS)) { - int wxflag = info_od->wxflag & ~_O_NOINHERIT; + int wxflag = info_od->wxflag & ~WX_DONTINHERIT; if (info_nd->wxflag & WX_OPEN) _close(nd);

1 0

Zebediah Figura : wmvcore/tests: Add some basic tests for streaming with the synchronous reader.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 42d0d8d9071c8feb89a5ca798960123a3564de60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42d0d8d9071c8feb89a5ca79… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Oct 25 10:54:57 2021 -0500 wmvcore/tests: Add some basic tests for streaming with the synchronous reader. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/Makefile.in | 3 + dlls/wmvcore/tests/rsrc.rc | 25 +++ dlls/wmvcore/tests/test.wmv | Bin 0 -> 45663 bytes dlls/wmvcore/tests/wmvcore.c | 392 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 420 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=42d0d8d9071c8feb89a5…

1 0

Rémi Bernon : faudio: Build with -DNDEBUG.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: babaf916ab12c7a9128409f717878919ccc5826b URL: https://source.winehq.org/git/wine.git/?a=commit;h=babaf916ab12c7a9128409f7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 25 15:36:23 2021 +0200 faudio: Build with -DNDEBUG. Unix version of FAudio uses SDL_assert for its assertions, which is generally compiled as no-op in release builds. This better matches the original behavior. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51921 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/faudio/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/faudio/Makefile.in b/libs/faudio/Makefile.in index 9058cac6543..3a9bb591227 100644 --- a/libs/faudio/Makefile.in +++ b/libs/faudio/Makefile.in @@ -1,6 +1,6 @@ EXTLIB = libfaudio.a EXTRAINCL = -I$(srcdir)/include -EXTRADEFS = -DFAUDIO_WIN32_PLATFORM -DHAVE_WMADEC +EXTRADEFS = -DFAUDIO_WIN32_PLATFORM -DHAVE_WMADEC -DNDEBUG C_SRCS = \ src/F3DAudio.c \

1 0

Rémi Bernon : xaudio2_7: Restore FAudioCreateReverbWithCustomAllocatorEXT use for old XAPO versions.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 22c26a2dde318b5b370fc269cab871e5a8bc4231 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22c26a2dde318b5b370fc269… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 25 13:52:44 2021 +0200 xaudio2_7: Restore FAudioCreateReverbWithCustomAllocatorEXT use for old XAPO versions. This was initially guarded to check the presence of FAudioCreateReverb9* variant and dropped in d8be85863fedf6982944d06ebd1ce5904cb3d4e1 but it is required, and causes crackling sound after Life is Strange 2 intro. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xapo.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/xaudio2_7/xapo.c b/dlls/xaudio2_7/xapo.c index 657d2f3f507..47210f1570e 100644 --- a/dlls/xaudio2_7/xapo.c +++ b/dlls/xaudio2_7/xapo.c @@ -311,6 +311,7 @@ static inline HRESULT get_fapo_from_clsid(REFCLSID clsid, FAPO **fapo) XAudio_Internal_Free, XAudio_Internal_Realloc ); +#if XAUDIO2_VER >= 9 if(IsEqualGUID(clsid, &CLSID_AudioReverb27)) return FAudioCreateReverb9WithCustomAllocatorEXT( fapo, @@ -319,6 +320,16 @@ static inline HRESULT get_fapo_from_clsid(REFCLSID clsid, FAPO **fapo) XAudio_Internal_Free, XAudio_Internal_Realloc ); +#else + if(IsEqualGUID(clsid, &CLSID_AudioReverb27)) + return FAudioCreateReverbWithCustomAllocatorEXT( + fapo, + 0, + XAudio_Internal_Malloc, + XAudio_Internal_Free, + XAudio_Internal_Realloc + ); +#endif #endif #if XAUDIO2_VER >= 8 || defined XAPOFX1_VER if(IsEqualGUID(clsid, &CLSID_FXReverb) ||

1 0

Nikolay Sivov : evr: Trace normalized rectangle arguments.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 7c6c054427547f00b8c8d5418bcae1dafc4b6d89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c6c054427547f00b8c8d541… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 25 13:05:33 2021 +0300 evr: Trace normalized rectangle arguments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr_private.h | 6 ++++++ dlls/evr/mixer.c | 3 ++- dlls/evr/presenter.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/evr/evr_private.h b/dlls/evr/evr_private.h index 7ae83140579..ef38b0f70cf 100644 --- a/dlls/evr/evr_private.h +++ b/dlls/evr/evr_private.h @@ -45,6 +45,12 @@ static inline const char *debugstr_time(LONGLONG time) return wine_dbg_sprintf("%s", rev); } +static inline const char *debugstr_normalized_rect(const MFVideoNormalizedRect *rect) +{ + if (!rect) return "(null)"; + return wine_dbg_sprintf("(%.8e,%.8e)-(%.8e,%.8e)", rect->left, rect->top, rect->right, rect->bottom); +} + HRESULT evr_filter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; HRESULT evr_mixer_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; HRESULT evr_presenter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 66c3960511a..f821dc7e6d9 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -25,6 +25,7 @@ #include "mferror.h" #include "evr_classes.h" +#include "evr_private.h" #include "initguid.h" #include "evr9.h" @@ -1551,7 +1552,7 @@ static HRESULT WINAPI video_mixer_control_SetStreamOutputRect(IMFVideoMixerContr struct input_stream *stream; HRESULT hr; - TRACE("%p, %u, %p.\n", iface, id, rect); + TRACE("%p, %u, %s.\n", iface, id, debugstr_normalized_rect(rect)); if (!rect) return E_POINTER; diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index fa116c18ccc..bf0f89df0eb 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -1280,7 +1280,7 @@ static HRESULT WINAPI video_presenter_control_SetVideoPosition(IMFVideoDisplayCo struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); HRESULT hr = S_OK; - TRACE("%p, %p, %s.\n", iface, src_rect, wine_dbgstr_rect(dst_rect)); + TRACE("%p, %s, %s.\n", iface, debugstr_normalized_rect(src_rect), wine_dbgstr_rect(dst_rect)); if (!src_rect && !dst_rect) return E_POINTER;

1 0

Nikolay Sivov : mfplay: Change to stopped state when playback ends.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: e1e7c160931120000b5cc3b404a41d27499fecb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1e7c160931120000b5cc3b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 25 13:04:22 2021 +0300 mfplay: Change to stopped state when playback ends. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index a34973f8e36..6f8d4942a0b 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1929,6 +1929,17 @@ static void media_player_create_forward_event(struct media_player *player, HRESU LeaveCriticalSection(&player->cs); } +static void media_player_playback_ended(struct media_player *player, HRESULT event_status, + struct media_event **event) +{ + EnterCriticalSection(&player->cs); + + media_player_set_state(player, MFP_MEDIAPLAYER_STATE_STOPPED); + media_event_create(player, MFP_EVENT_TYPE_PLAYBACK_ENDED, event_status, player->item, event); + + LeaveCriticalSection(&player->cs); +} + static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { @@ -1990,7 +2001,7 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba if (SUCCEEDED(IMFMediaEvent_GetUINT32(session_event, &MF_EVENT_TOPOLOGY_STATUS, &status)) && status == MF_TOPOSTATUS_ENDED) { - media_event_create(player, MFP_EVENT_TYPE_PLAYBACK_ENDED, event_status, player->item, &event); + media_player_playback_ended(player, event_status, &event); } break;

1 0

Nikolay Sivov : mfplay: Implement GetPosition().
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: dd1a603a1f0447c980f41606aba5f6aa7717643e URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd1a603a1f0447c980f41606… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 25 13:04:21 2021 +0300 mfplay: Implement GetPosition(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 40 +++++++++++++++++++++++++++++++++++++--- dlls/mfplay/tests/mfplay.c | 24 ++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 3 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 0e33dcbd649..a34973f8e36 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -904,9 +904,40 @@ static HRESULT WINAPI media_player_SetPosition(IMFPMediaPlayer *iface, REFGUID p static HRESULT WINAPI media_player_GetPosition(IMFPMediaPlayer *iface, REFGUID postype, PROPVARIANT *position) { - FIXME("%p, %s, %p.\n", iface, debugstr_guid(postype), position); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + IMFPresentationClock *presentation_clock; + IMFClock *clock; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s, %p.\n", iface, debugstr_guid(postype), position); + + if (!position) + return E_POINTER; + + if (!IsEqualGUID(postype, &MFP_POSITIONTYPE_100NS)) + return E_INVALIDARG; + + EnterCriticalSection(&player->cs); + if (player->state == MFP_MEDIAPLAYER_STATE_SHUTDOWN) + hr = MF_E_SHUTDOWN; + else if (!player->item) + hr = MF_E_INVALIDREQUEST; + else + { + if (SUCCEEDED(hr = IMFMediaSession_GetClock(player->session, &clock))) + { + if (SUCCEEDED(hr = IMFClock_QueryInterface(clock, &IID_IMFPresentationClock, (void **)&presentation_clock))) + { + position->vt = VT_UI8; + hr = IMFPresentationClock_GetTime(presentation_clock, (MFTIME *)&position->uhVal.QuadPart); + IMFPresentationClock_Release(presentation_clock); + } + IMFClock_Release(clock); + } + } + LeaveCriticalSection(&player->cs); + + return hr; } static HRESULT WINAPI media_player_GetDuration(IMFPMediaPlayer *iface, REFGUID postype, PROPVARIANT *duration) @@ -916,9 +947,12 @@ static HRESULT WINAPI media_player_GetDuration(IMFPMediaPlayer *iface, REFGUID p TRACE("%p, %s, %p.\n", iface, debugstr_guid(postype), duration); - if (!postype || !duration) + if (!duration) return E_POINTER; + if (!IsEqualGUID(postype, &MFP_POSITIONTYPE_100NS)) + return E_INVALIDARG; + EnterCriticalSection(&player->cs); if (player->state == MFP_MEDIAPLAYER_STATE_SHUTDOWN) hr = MF_E_SHUTDOWN; diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index cfa689c189e..1daaa3af1d5 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -227,6 +227,15 @@ todo_wine hr = IMFPMediaPlayer_GetDuration(player, &MFP_POSITIONTYPE_100NS, &propvar); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_GetPosition(player, NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetPosition(player, &MFP_POSITIONTYPE_100NS, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetPosition(player, &MFP_POSITIONTYPE_100NS, &propvar); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_Shutdown(player); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -371,9 +380,24 @@ static void test_duration(void) hr = IMFPMediaPlayer_GetDuration(player, &MFP_POSITIONTYPE_100NS, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_GetDuration(player, &IID_IUnknown, &propvar); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_GetDuration(player, &MFP_POSITIONTYPE_100NS, &propvar); ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_GetPosition(player, NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetPosition(player, &MFP_POSITIONTYPE_100NS, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetPosition(player, &IID_IUnknown, &propvar); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetPosition(player, &MFP_POSITIONTYPE_100NS, &propvar); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + IMFPMediaPlayer_Release(player); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2021