wine-commits June 2021

wine-commits@winehq.org

1 participants
811 discussions

Zhiyi Zhang : extrac32: Enable visual styles.
by Alexandre Julliard 09 Jun '21

09 Jun '21

Module: wine Branch: master Commit: ed673bdcf56784636aae29d8cf4dfbe52f1ef790 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed673bdcf56784636aae29d8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 9 21:57:40 2021 +0800 extrac32: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/extrac32/Makefile.in | 4 +++- programs/extrac32/extrac32.c | 3 +++ programs/extrac32/extrac32.manifest | 16 ++++++++++++++++ programs/extrac32/extrac32.rc | 25 +++++++++++++++++++++++++ 4 files changed, 47 insertions(+), 1 deletion(-) diff --git a/programs/extrac32/Makefile.in b/programs/extrac32/Makefile.in index cda7a84253b..3528a0d7599 100644 --- a/programs/extrac32/Makefile.in +++ b/programs/extrac32/Makefile.in @@ -1,7 +1,9 @@ MODULE = extrac32.exe -IMPORTS = shell32 setupapi shlwapi user32 +IMPORTS = shell32 setupapi shlwapi user32 comctl32 EXTRADLLFLAGS = -mwindows -municode -mno-cygwin C_SRCS = \ extrac32.c + +RC_SRCS = extrac32.rc diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index 278f8ff9bf5..3741f16b3cd 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -21,6 +21,7 @@ #include <stdio.h> #include <windows.h> +#include <commctrl.h> #include <shellapi.h> #include <setupapi.h> #include <shlwapi.h> @@ -226,6 +227,8 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho WCHAR path[MAX_PATH]; LPCWSTR cabfile = NULL; + InitCommonControls(); + path[0] = 0; /* Do not use CommandLineToArgvW() or __wgetmainargs() to parse diff --git a/programs/extrac32/extrac32.manifest b/programs/extrac32/extrac32.manifest new file mode 100644 index 00000000000..5fdae4e453e --- /dev/null +++ b/programs/extrac32/extrac32.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Extrac32" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/extrac32/extrac32.rc b/programs/extrac32/extrac32.rc new file mode 100644 index 00000000000..3526dcb6612 --- /dev/null +++ b/programs/extrac32/extrac32.rc @@ -0,0 +1,25 @@ +/* + * Extrac32 resources + * + * Copyright 2021 Zhiyi Zhang for CodeWeavers + * + * 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 <windef.h> +#include <winuser.h> + +/* @makedep: extrac32.manifest */ +1 RT_MANIFEST extrac32.manifest

1 0

Zhiyi Zhang : explorer: Enable visual styles.
by Alexandre Julliard 09 Jun '21

09 Jun '21

1 0

Zhiyi Zhang : dxdiag: Enable visual styles.
by Alexandre Julliard 09 Jun '21

09 Jun '21

Module: wine Branch: master Commit: 7af0ab05043d0d19e611c87b086b33ed43708ebb URL: https://source.winehq.org/git/wine.git/?a=commit;h=7af0ab05043d0d19e611c87b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 9 21:57:17 2021 +0800 dxdiag: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/dxdiag/Makefile.in | 2 +- programs/dxdiag/dxdiag.manifest | 16 ++++++++++++++++ programs/dxdiag/dxdiag.rc | 3 +++ programs/dxdiag/dxdiag_private.h | 1 + programs/dxdiag/main.c | 3 +++ 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/programs/dxdiag/Makefile.in b/programs/dxdiag/Makefile.in index aeab69ea306..f7420ee27df 100644 --- a/programs/dxdiag/Makefile.in +++ b/programs/dxdiag/Makefile.in @@ -1,5 +1,5 @@ MODULE = dxdiag.exe -IMPORTS = dxguid ole32 oleaut32 user32 +IMPORTS = dxguid ole32 oleaut32 user32 comctl32 EXTRADLLFLAGS = -mwindows -municode -mno-cygwin diff --git a/programs/dxdiag/dxdiag.manifest b/programs/dxdiag/dxdiag.manifest new file mode 100644 index 00000000000..57ba80c05db --- /dev/null +++ b/programs/dxdiag/dxdiag.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Dxdiag" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/dxdiag/dxdiag.rc b/programs/dxdiag/dxdiag.rc index a37b28d58d6..d7e45579706 100644 --- a/programs/dxdiag/dxdiag.rc +++ b/programs/dxdiag/dxdiag.rc @@ -29,3 +29,6 @@ STRINGTABLE STRING_DXDIAG_TOOL, "DirectX Diagnostic Tool" STRING_USAGE, "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]" } + +/* @makedep: dxdiag.manifest */ +1 RT_MANIFEST dxdiag.manifest diff --git a/programs/dxdiag/dxdiag_private.h b/programs/dxdiag/dxdiag_private.h index 010bb941b27..8d76c0ef677 100644 --- a/programs/dxdiag/dxdiag_private.h +++ b/programs/dxdiag/dxdiag_private.h @@ -19,6 +19,7 @@ */ #include <windef.h> +#include <winuser.h> /* Resource definitions. */ #define MAX_STRING_LEN 1024 diff --git a/programs/dxdiag/main.c b/programs/dxdiag/main.c index 968d84adea1..f57eec99292 100644 --- a/programs/dxdiag/main.c +++ b/programs/dxdiag/main.c @@ -21,6 +21,7 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <dxdiag.h> +#include <commctrl.h> #include "wine/debug.h" #include "dxdiag_private.h" @@ -180,6 +181,8 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm struct command_line_info info; struct dxdiag_information *dxdiag_info; + InitCommonControls(); + hInstance = hInst; if (!process_command_line(cmdline, &info))

1 0

Zhiyi Zhang : control: Enable visual styles.
by Alexandre Julliard 09 Jun '21

09 Jun '21

Module: wine Branch: master Commit: d576879fefc45f5f153f2f4d2de21a579245afe5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d576879fefc45f5f153f2f4d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 9 21:57:06 2021 +0800 control: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/control/Makefile.in | 4 +++- programs/control/control.c | 3 +++ programs/control/control.manifest | 16 ++++++++++++++++ programs/control/control.rc | 25 +++++++++++++++++++++++++ 4 files changed, 47 insertions(+), 1 deletion(-) diff --git a/programs/control/Makefile.in b/programs/control/Makefile.in index c90fca4de95..866896031b7 100644 --- a/programs/control/Makefile.in +++ b/programs/control/Makefile.in @@ -1,6 +1,8 @@ MODULE = control.exe -IMPORTS = shell32 user32 +IMPORTS = shell32 user32 comctl32 EXTRADLLFLAGS = -mwindows -municode -mno-cygwin C_SRCS = control.c + +RC_SRCS = control.rc diff --git a/programs/control/control.c b/programs/control/control.c index b72416893c9..507abcc1cce 100644 --- a/programs/control/control.c +++ b/programs/control/control.c @@ -24,6 +24,7 @@ #include <stdio.h> #include <string.h> #include <windows.h> +#include <commctrl.h> #include <shellapi.h> @@ -37,6 +38,8 @@ static void launch(LPCWSTR what) int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrev, LPWSTR lpszCmdLine, INT nCmdShow) { + InitCommonControls(); + /* no parameters - pop up whole "Control Panel" by default */ if (!*lpszCmdLine) { launch(lpszCmdLine); diff --git a/programs/control/control.manifest b/programs/control/control.manifest new file mode 100644 index 00000000000..2834937e564 --- /dev/null +++ b/programs/control/control.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Control" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/control/control.rc b/programs/control/control.rc new file mode 100644 index 00000000000..ef5e2f6e69e --- /dev/null +++ b/programs/control/control.rc @@ -0,0 +1,25 @@ +/* + * Control resources + * + * Copyright 2021 Zhiyi Zhang for CodeWeavers + * + * 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 <windef.h> +#include <winuser.h> + +/* @makedep: control.manifest */ +1 RT_MANIFEST control.manifest

1 0

Zhiyi Zhang : write: Use correct wordpad.exe path.
by Alexandre Julliard 09 Jun '21

09 Jun '21

Module: wine Branch: master Commit: 148d4048b466a81ba5ae1b4b018535a976a2f75f URL: https://source.winehq.org/git/wine.git/?a=commit;h=148d4048b466a81ba5ae1b4b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 9 22:01:37 2021 +0800 write: Use correct wordpad.exe path. Wordpad.exe is in C:\Program Files\Windows NT\Accessories\ now. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/write/Makefile.in | 2 +- programs/write/write.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/write/Makefile.in b/programs/write/Makefile.in index b0280b713da..5bde6efdf8d 100644 --- a/programs/write/Makefile.in +++ b/programs/write/Makefile.in @@ -1,5 +1,5 @@ MODULE = write.exe -IMPORTS = user32 gdi32 +IMPORTS = user32 gdi32 shell32 EXTRADLLFLAGS = -mwindows -mno-cygwin diff --git a/programs/write/write.c b/programs/write/write.c index 1481e900f75..da9cba8ec51 100644 --- a/programs/write/write.c +++ b/programs/write/write.c @@ -23,6 +23,7 @@ #include <stdarg.h> #include <windows.h> +#include <shlobj.h> #include "resources.h" int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdParagraph, int res) @@ -31,9 +32,9 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar STARTUPINFOW stinf; PROCESS_INFORMATION info; - if (!GetSystemDirectoryW(path, MAX_PATH - 1 - lstrlenW(L"\\wordpad.exe"))) + if (FAILED(SHGetFolderPathW(NULL, CSIDL_PROGRAM_FILES, NULL, 0, path))) goto failed; - lstrcatW(path, L"\\wordpad.exe"); + lstrcatW(path, L"\\Windows NT\\Accessories\\wordpad.exe"); stinf.cb = sizeof(STARTUPINFOW); GetStartupInfoW(&stinf);

1 0

Haidong Yu : shell32: Fix a memory leak.
by Alexandre Julliard 09 Jun '21

09 Jun '21

Module: wine Branch: master Commit: 56976159ab792563e1e3ce237dce39d0ea68d0b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56976159ab792563e1e3ce23… Author: Haidong Yu <yuhaidong(a)uniontech.com> Date: Wed Jun 9 20:53:59 2021 +0800 shell32: Fix a memory leak. Signed-off-by: Haidong Yu <yuhaidong(a)uniontech.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlexec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index ce0b8f6d2be..ee1e832df33 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1763,7 +1763,8 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) buf = heap_alloc(size * sizeof(WCHAR)); if (!buf || FAILED(PathCreateFromUrlW(sei_tmp.lpFile, buf, &size, 0))) { heap_free(buf); - return SE_ERR_OOM; + retval = SE_ERR_OOM; + goto end; } heap_free(wszApplicationName);

1 0

Esme Povirk : advapi32: Fix typo.
by Alexandre Julliard 09 Jun '21

09 Jun '21

Module: wine Branch: master Commit: 5a7d9fc26155ea40018ba4fb7d1b0ba2e7d61783 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a7d9fc26155ea40018ba4fb… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Jun 9 12:46:03 2021 -0500 advapi32: Fix typo. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 6246cd21a62..02787fc841c 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -101,7 +101,7 @@ static const AccountSid ACCOUNT_SIDS[] = { { WinBuiltinPreWindows2000CompatibleAccessSid, L"Pre-Windows 2000 Compatible Access", L"BUILTIN", SidTypeAlias }, { WinBuiltinRemoteDesktopUsersSid, L"Remote Desktop Users", L"BUILTIN", SidTypeAlias }, { WinBuiltinNetworkConfigurationOperatorsSid, L"Network Configuration Operators", L"BUILTIN", SidTypeAlias }, - { WinNTLMAuthenticationSid, L"NTML Authentication", L"NT AUTHORITY", SidTypeWellKnownGroup }, + { WinNTLMAuthenticationSid, L"NTLM Authentication", L"NT AUTHORITY", SidTypeWellKnownGroup }, { WinDigestAuthenticationSid, L"Digest Authentication", L"NT AUTHORITY", SidTypeWellKnownGroup }, { WinSChannelAuthenticationSid, L"SChannel Authentication", L"NT AUTHORITY", SidTypeWellKnownGroup }, { WinThisOrganizationSid, L"This Organization", L"NT AUTHORITY", SidTypeWellKnownGroup },

1 0

Zebediah Figura : l3codeca.acm: Store the mpg123 handle directly as the ACM driver data.
by Alexandre Julliard 09 Jun '21

09 Jun '21

Module: wine Branch: master Commit: 1e047d786d71ed8d8e9f0f9442fd019c96080751 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e047d786d71ed8d8e9f0f94… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 4 16:43:39 2021 -0500 l3codeca.acm: Store the mpg123 handle directly as the ACM driver data. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/l3codeca.acm/mpegl3.c | 51 +++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 30 deletions(-) diff --git a/dlls/l3codeca.acm/mpegl3.c b/dlls/l3codeca.acm/mpegl3.c index fb7c9cf386b..fa9f38258e5 100644 --- a/dlls/l3codeca.acm/mpegl3.c +++ b/dlls/l3codeca.acm/mpegl3.c @@ -111,11 +111,6 @@ static DWORD MPEG3_GetFormatIndex(LPWAVEFORMATEX wfx) return 0xFFFFFFFF; } -typedef struct tagAcmMpeg3Data -{ - mpg123_handle *mh; -} AcmMpeg3Data; - /*********************************************************************** * MPEG3_drvOpen */ @@ -135,11 +130,9 @@ static LRESULT MPEG3_drvClose(DWORD_PTR dwDevID) } -static void mp3_horse(PACMDRVSTREAMINSTANCE adsi, - const unsigned char* src, LPDWORD nsrc, - unsigned char* dst, LPDWORD ndst) +static void mp3_horse(mpg123_handle *handle, const unsigned char *src, + DWORD *nsrc, unsigned char *dst, DWORD *ndst) { - AcmMpeg3Data* amd = (AcmMpeg3Data*)adsi->dwDriver; int ret; size_t size; DWORD dpos = 0; @@ -147,7 +140,7 @@ static void mp3_horse(PACMDRVSTREAMINSTANCE adsi, if (*nsrc > 0) { - ret = mpg123_feed(amd->mh, src, *nsrc); + ret = mpg123_feed(handle, src, *nsrc); if (ret != MPG123_OK) { ERR("Error feeding data\n"); @@ -158,7 +151,7 @@ static void mp3_horse(PACMDRVSTREAMINSTANCE adsi, do { size = 0; - ret = mpg123_read(amd->mh, dst + dpos, *ndst - dpos, &size); + ret = mpg123_read(handle, dst + dpos, *ndst - dpos, &size); if (ret == MPG123_ERR) { FIXME("Error occurred during decoding!\n"); @@ -170,7 +163,7 @@ static void mp3_horse(PACMDRVSTREAMINSTANCE adsi, { long rate; int channels, enc; - mpg123_getformat(amd->mh, &rate, &channels, &enc); + mpg123_getformat(handle, &rate, &channels, &enc); TRACE("New format: %li Hz, %i channels, encoding value %i\n", rate, channels, enc); } dpos += size; @@ -185,7 +178,7 @@ static void mp3_horse(PACMDRVSTREAMINSTANCE adsi, */ static LRESULT MPEG3_StreamOpen(ACMDRVSTREAMINSTANCE *instance) { - AcmMpeg3Data* aad; + mpg123_handle *handle; int err; assert(!(instance->fdwOpen & ACM_STREAMOPENF_ASYNC)); @@ -215,12 +208,9 @@ static LRESULT MPEG3_StreamOpen(ACMDRVSTREAMINSTANCE *instance) || instance->pwfxDst->wBitsPerSample != 16) return MMSYSERR_NOTSUPPORTED; - if (!(aad = HeapAlloc(GetProcessHeap(), 0, sizeof(AcmMpeg3Data)))) - return MMSYSERR_NOMEM; - instance->dwDriver = (DWORD_PTR)aad; - - aad->mh = mpg123_new(NULL, &err); - mpg123_open_feed(aad->mh); + handle = mpg123_new(NULL, &err); + instance->dwDriver = (DWORD_PTR)handle; + mpg123_open_feed(handle); #if MPG123_API_VERSION >= 31 /* needed for MPG123_IGNORE_FRAMEINFO enum value */ /* mpg123 may find a XING header in the mp3 and use that information @@ -228,7 +218,7 @@ static LRESULT MPEG3_StreamOpen(ACMDRVSTREAMINSTANCE *instance) * We cannot allow that since the caller application is feeding us. * This fixes problems for mp3 files encoded with LAME (bug 42361) */ - mpg123_param(aad->mh, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0); + mpg123_param(handle, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0); #endif return MMSYSERR_NOERROR; @@ -238,11 +228,12 @@ static LRESULT MPEG3_StreamOpen(ACMDRVSTREAMINSTANCE *instance) * MPEG3_StreamClose * */ -static LRESULT MPEG3_StreamClose(PACMDRVSTREAMINSTANCE adsi) +static LRESULT MPEG3_StreamClose(ACMDRVSTREAMINSTANCE *instance) { - mpg123_close(((AcmMpeg3Data*)adsi->dwDriver)->mh); - mpg123_delete(((AcmMpeg3Data*)adsi->dwDriver)->mh); - HeapFree(GetProcessHeap(), 0, (void*)adsi->dwDriver); + mpg123_handle *handle = (mpg123_handle *)instance->dwDriver; + + mpg123_close(handle); + mpg123_delete(handle); return MMSYSERR_NOERROR; } @@ -513,9 +504,9 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad * MPEG3_StreamConvert * */ -static LRESULT MPEG3_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER adsh) +static LRESULT MPEG3_StreamConvert(ACMDRVSTREAMINSTANCE *instance, ACMDRVSTREAMHEADER *adsh) { - AcmMpeg3Data* aad = (AcmMpeg3Data*)adsi->dwDriver; + mpg123_handle *handle = (mpg123_handle *)instance->dwDriver; DWORD nsrc = adsh->cbSrcLength; DWORD ndst = adsh->cbDstLength; @@ -533,12 +524,12 @@ static LRESULT MPEG3_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEAD */ if ((adsh->fdwConvert & ACM_STREAMCONVERTF_START)) { - mpg123_feedseek(aad->mh, 0, SEEK_SET, NULL); - mpg123_close(aad->mh); - mpg123_open_feed(aad->mh); + mpg123_feedseek(handle, 0, SEEK_SET, NULL); + mpg123_close(handle); + mpg123_open_feed(handle); } - mp3_horse(adsi, adsh->pbSrc, &nsrc, adsh->pbDst, &ndst); + mp3_horse(handle, adsh->pbSrc, &nsrc, adsh->pbDst, &ndst); adsh->cbSrcLengthUsed = nsrc; adsh->cbDstLengthUsed = ndst;

1 0

Zebediah Figura : l3codeca.acm: Simplify error handling in MPEG3_StreamOpen().
by Alexandre Julliard 09 Jun '21

09 Jun '21

Module: wine Branch: master Commit: 341b0cf2300efffc831122870296dc4cb5646ab0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=341b0cf2300efffc83112287… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 4 16:43:38 2021 -0500 l3codeca.acm: Simplify error handling in MPEG3_StreamOpen(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/l3codeca.acm/mpegl3.c | 105 ++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 69 deletions(-) diff --git a/dlls/l3codeca.acm/mpegl3.c b/dlls/l3codeca.acm/mpegl3.c index 25097d424c4..fb7c9cf386b 100644 --- a/dlls/l3codeca.acm/mpegl3.c +++ b/dlls/l3codeca.acm/mpegl3.c @@ -179,94 +179,59 @@ static void mp3_horse(PACMDRVSTREAMINSTANCE adsi, *ndst = dpos; } -/*********************************************************************** - * MPEG3_Reset - * - */ -static void MPEG3_Reset(PACMDRVSTREAMINSTANCE adsi, AcmMpeg3Data* aad) -{ - mpg123_feedseek(aad->mh, 0, SEEK_SET, NULL); - mpg123_close(aad->mh); - mpg123_open_feed(aad->mh); -} - /*********************************************************************** * MPEG3_StreamOpen * */ -static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) +static LRESULT MPEG3_StreamOpen(ACMDRVSTREAMINSTANCE *instance) { - LRESULT error = MMSYSERR_NOTSUPPORTED; AcmMpeg3Data* aad; int err; - assert(!(adsi->fdwOpen & ACM_STREAMOPENF_ASYNC)); + assert(!(instance->fdwOpen & ACM_STREAMOPENF_ASYNC)); - if (MPEG3_GetFormatIndex(adsi->pwfxSrc) == 0xFFFFFFFF || - MPEG3_GetFormatIndex(adsi->pwfxDst) == 0xFFFFFFFF) - return ACMERR_NOTPOSSIBLE; + if (MPEG3_GetFormatIndex(instance->pwfxSrc) == 0xFFFFFFFF + || MPEG3_GetFormatIndex(instance->pwfxDst) == 0xFFFFFFFF) + return ACMERR_NOTPOSSIBLE; - aad = HeapAlloc(GetProcessHeap(), 0, sizeof(AcmMpeg3Data)); - if (aad == 0) return MMSYSERR_NOMEM; + if (instance->pwfxDst->wFormatTag != WAVE_FORMAT_PCM) + return MMSYSERR_NOTSUPPORTED; - adsi->dwDriver = (DWORD_PTR)aad; + if (instance->pwfxSrc->wFormatTag != WAVE_FORMAT_MPEGLAYER3 + && instance->pwfxSrc->wFormatTag != WAVE_FORMAT_MPEG) + return MMSYSERR_NOTSUPPORTED; - if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && - adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) + if (instance->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3) { - goto theEnd; + MPEGLAYER3WAVEFORMAT *mp3_format = (MPEGLAYER3WAVEFORMAT *)instance->pwfxSrc; + + if (instance->pwfxSrc->cbSize < MPEGLAYER3_WFX_EXTRA_BYTES + || mp3_format->wID != MPEGLAYER3_ID_MPEG) + return ACMERR_NOTPOSSIBLE; } - else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 || - adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEG) && - adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) - { - if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3) - { - MPEGLAYER3WAVEFORMAT *formatmp3 = (MPEGLAYER3WAVEFORMAT *)adsi->pwfxSrc; - - if (adsi->pwfxSrc->cbSize < MPEGLAYER3_WFX_EXTRA_BYTES || - formatmp3->wID != MPEGLAYER3_ID_MPEG) - { - error = ACMERR_NOTPOSSIBLE; - goto theEnd; - } - } - /* resampling or mono <=> stereo not available - * MPEG3 algo only define 16 bit per sample output - */ - if (adsi->pwfxSrc->nSamplesPerSec != adsi->pwfxDst->nSamplesPerSec || - adsi->pwfxSrc->nChannels != adsi->pwfxDst->nChannels || - adsi->pwfxDst->wBitsPerSample != 16) - goto theEnd; - aad->mh = mpg123_new(NULL,&err); - mpg123_open_feed(aad->mh); + if (instance->pwfxSrc->nSamplesPerSec != instance->pwfxDst->nSamplesPerSec + || instance->pwfxSrc->nChannels != instance->pwfxDst->nChannels + || instance->pwfxDst->wBitsPerSample != 16) + return MMSYSERR_NOTSUPPORTED; + + if (!(aad = HeapAlloc(GetProcessHeap(), 0, sizeof(AcmMpeg3Data)))) + return MMSYSERR_NOMEM; + instance->dwDriver = (DWORD_PTR)aad; + + aad->mh = mpg123_new(NULL, &err); + mpg123_open_feed(aad->mh); #if MPG123_API_VERSION >= 31 /* needed for MPG123_IGNORE_FRAMEINFO enum value */ - /* mpg123 may find a XING header in the mp3 and use that information - * to ask for seeks in order to read specific frames in the file. - * We cannot allow that since the caller application is feeding us. - * This fixes problems for mp3 files encoded with LAME (bug 42361) - */ - mpg123_param(aad->mh, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0); + /* mpg123 may find a XING header in the mp3 and use that information + * to ask for seeks in order to read specific frames in the file. + * We cannot allow that since the caller application is feeding us. + * This fixes problems for mp3 files encoded with LAME (bug 42361) + */ + mpg123_param(aad->mh, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0); #endif - } - else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && - (adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEGLAYER3 || - adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEG)) - { - WARN("Encoding to MPEG is not supported\n"); - goto theEnd; - } - else goto theEnd; - MPEG3_Reset(adsi, aad); return MMSYSERR_NOERROR; - - theEnd: - HeapFree(GetProcessHeap(), 0, aad); - adsi->dwDriver = 0L; - return error; } /*********************************************************************** @@ -568,7 +533,9 @@ static LRESULT MPEG3_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEAD */ if ((adsh->fdwConvert & ACM_STREAMCONVERTF_START)) { - MPEG3_Reset(adsi, aad); + mpg123_feedseek(aad->mh, 0, SEEK_SET, NULL); + mpg123_close(aad->mh); + mpg123_open_feed(aad->mh); } mp3_horse(adsi, adsh->pbSrc, &nsrc, adsh->pbDst, &ndst);

1 0

Zebediah Figura : l3codeca.acm: Call mp3_horse() directly.
by Alexandre Julliard 09 Jun '21

09 Jun '21

Module: wine Branch: master Commit: 7a85ec7172639353af8c4873830bd7d1dba52c71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a85ec7172639353af8c4873… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 4 16:43:37 2021 -0500 l3codeca.acm: Call mp3_horse() directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/l3codeca.acm/mpegl3.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/l3codeca.acm/mpegl3.c b/dlls/l3codeca.acm/mpegl3.c index e625a75b7ac..25097d424c4 100644 --- a/dlls/l3codeca.acm/mpegl3.c +++ b/dlls/l3codeca.acm/mpegl3.c @@ -113,8 +113,6 @@ static DWORD MPEG3_GetFormatIndex(LPWAVEFORMATEX wfx) typedef struct tagAcmMpeg3Data { - void (*convert)(PACMDRVSTREAMINSTANCE adsi, - const unsigned char*, LPDWORD, unsigned char*, LPDWORD); mpg123_handle *mh; } AcmMpeg3Data; @@ -241,7 +239,6 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) adsi->pwfxSrc->nChannels != adsi->pwfxDst->nChannels || adsi->pwfxDst->wBitsPerSample != 16) goto theEnd; - aad->convert = mp3_horse; aad->mh = mpg123_new(NULL,&err); mpg123_open_feed(aad->mh); @@ -574,7 +571,7 @@ static LRESULT MPEG3_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEAD MPEG3_Reset(adsi, aad); } - aad->convert(adsi, adsh->pbSrc, &nsrc, adsh->pbDst, &ndst); + mp3_horse(adsi, adsh->pbSrc, &nsrc, adsh->pbDst, &ndst); adsh->cbSrcLengthUsed = nsrc; adsh->cbDstLengthUsed = ndst;

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
82
Older →

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 June 2021