June 2021 - Wine-Devel - list.winehq.org

[PATCH 3/6] regedit: Enable visual styles.
by Zhiyi Zhang June 10, 2021

June 10, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/regedit/main.c | 2 ++ programs/regedit/regedit.manifest | 16 ++++++++++++++++ programs/regedit/regedit.rc | 3 +++ 3 files changed, 21 insertions(+) create mode 100644 programs/regedit/regedit.manifest diff --git a/programs/regedit/main.c b/programs/regedit/main.c index df92a13ab69..d9f81218acb 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -142,6 +142,8 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi HACCEL hAccel; BOOL is_wow64; + InitCommonControls(); + if (ProcessCmdLine(GetCommandLineW())) { return 0; } diff --git a/programs/regedit/regedit.manifest b/programs/regedit/regedit.manifest new file mode 100644 index 00000000000..a2c1a437027 --- /dev/null +++ b/programs/regedit/regedit.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.Regedit" 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/regedit/regedit.rc b/programs/regedit/regedit.rc index 4e629b7d878..d7dd7c4b49e 100644 --- a/programs/regedit/regedit.rc +++ b/programs/regedit/regedit.rc @@ -434,6 +434,9 @@ STRINGTABLE LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +/* @makedep: regedit.manifest */ +1 RT_MANIFEST regedit.manifest + /* @makedep: folderopen.ico */ IDI_OPEN_FILE ICON folderopen.ico -- 2.30.2

1 0

[PATCH 2/6] oleview: Enable visual styles.
by Zhiyi Zhang June 10, 2021

June 10, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/oleview/oleview.c | 3 +++ programs/oleview/oleview.manifest | 16 ++++++++++++++++ programs/oleview/oleview.rc | 3 +++ 3 files changed, 22 insertions(+) create mode 100644 programs/oleview/oleview.manifest diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 410cb053dd8..0d1838bfa69 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -19,6 +19,7 @@ */ #include "main.h" +#include "commctrl.h" #include "commdlg.h" #include "shellapi.h" @@ -554,6 +555,8 @@ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int MSG msg; HANDLE hAccelTable; + InitCommonControls(); + if(!InitApplication(hInst)) return FALSE; diff --git a/programs/oleview/oleview.manifest b/programs/oleview/oleview.manifest new file mode 100644 index 00000000000..da8d81cffec --- /dev/null +++ b/programs/oleview/oleview.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.Oleview" 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/oleview/oleview.rc b/programs/oleview/oleview.rc index bb252a67e6f..d225f533bbf 100644 --- a/programs/oleview/oleview.rc +++ b/programs/oleview/oleview.rc @@ -222,5 +222,8 @@ IDA_OLEVIEW ACCELERATORS VK_F5, IDM_REFRESH, VIRTKEY } +/* @makedep: oleview.manifest */ +1 RT_MANIFEST oleview.manifest + /* @makedep: toolbar.bmp */ IDB_TOOLBAR BITMAP toolbar.bmp -- 2.30.2

1 0

[PATCH 1/6] notepad: Enable visual styles.
by Zhiyi Zhang June 10, 2021

June 10, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/notepad/Makefile.in | 2 +- programs/notepad/main.c | 3 +++ programs/notepad/notepad.manifest | 16 ++++++++++++++++ programs/notepad/notepad.rc | 3 +++ 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 programs/notepad/notepad.manifest diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in index 06c5ff04c1e..ba32100c40f 100644 --- a/programs/notepad/Makefile.in +++ b/programs/notepad/Makefile.in @@ -1,5 +1,5 @@ MODULE = notepad.exe -IMPORTS = comdlg32 shell32 shlwapi user32 gdi32 advapi32 +IMPORTS = comdlg32 shell32 shlwapi user32 gdi32 advapi32 comctl32 EXTRADLLFLAGS = -mwindows -mno-cygwin diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 3f046f19d19..210ecd2bfc8 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -24,6 +24,7 @@ #include <stdio.h> #include <windows.h> +#include <commctrl.h> #include <commdlg.h> #include <shellapi.h> #include <shlwapi.h> @@ -750,6 +751,8 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) static const WCHAR className[] = {'N','o','t','e','p','a','d',0}; static const WCHAR winName[] = {'N','o','t','e','p','a','d',0}; + InitCommonControls(); + aFINDMSGSTRING = RegisterWindowMessageW(FINDMSGSTRINGW); ZeroMemory(&Globals, sizeof(Globals)); diff --git a/programs/notepad/notepad.manifest b/programs/notepad/notepad.manifest new file mode 100644 index 00000000000..30aa0f3853b --- /dev/null +++ b/programs/notepad/notepad.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.Notepad" 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/notepad/notepad.rc b/programs/notepad/notepad.rc index 63b8c7d91b8..6fc12dcf5cd 100644 --- a/programs/notepad/notepad.rc +++ b/programs/notepad/notepad.rc @@ -149,5 +149,8 @@ ID_ACCEL ACCELERATORS LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +/* @makedep: notepad.manifest */ +1 RT_MANIFEST notepad.manifest + /* @makedep: notepad.ico */ IDI_NOTEPAD ICON "notepad.ico" -- 2.30.2

1 0

[PATCH] include: Add ICommandWithParameters interface
by Alistair Leslie-Hughes June 10, 2021

June 10, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdaps/usrmarshal.c | 44 +++++++++++++++++++++++++++ include/cmdwpr.idl | 64 ++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + 3 files changed, 109 insertions(+) create mode 100644 include/cmdwpr.idl diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 27de85077b8..9ecd9bd93f8 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1697,3 +1697,47 @@ HRESULT __RPC_STUB ICommandPrepare_Unprepare_Stub(ICommandPrepare* This, IErrorI FIXME("(%p)->(%p): stub\n", This, error); return E_NOTIMPL; } + +HRESULT CALLBACK ICommandWithParameters_GetParameterInfo_Proxy(ICommandWithParameters* This, + DB_UPARAMS *uparams, DBPARAMINFO **info, OLECHAR **buffer) +{ + FIXME("(%p)->(%d %p %p): stub\n", This, uparams, info, buffer); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ICommandWithParameters_GetParameterInfo_Stub(ICommandWithParameters* This, + DB_UPARAMS *uparams, DBPARAMINFO **param_info, DBBYTEOFFSET **offsets, DBLENGTH *buff_len, + OLECHAR **buffer, IErrorInfo **error) +{ + FIXME("(%p)->(%d %p %p %p %p %p %p): stub\n", This, uparams, param_info, buffer, offsets, buff_len, + buffer, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK ICommandWithParameters_SetParameterInfo_Proxy(ICommandWithParameters* This, + DB_UPARAMS params, const DB_UPARAMS ordinals[], const DBPARAMBINDINFO bindinfo[]) +{ + FIXME("(%p)->(%d %p %p): stub\n", This, params, ordinals, bindinfo); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ICommandWithParameters_SetParameterInfo_Stub(ICommandWithParameters* This, + DB_UPARAMS params, const DB_UPARAMS *ordinals, const DBPARAMBINDINFO *bindinfo, IErrorInfo **error) +{ + FIXME("(%p)->(%d %p %p %p): stub\n", This, params, ordinals, bindinfo, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK ICommandWithParameters_MapParameterNames_Proxy(ICommandWithParameters* This, + DB_UPARAMS count, LPCWSTR names[], DB_LPARAMS ordinals[]) +{ + FIXME("(%p)->(%d %p %p): stub\n", This, count, names, ordinals); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ICommandWithParameters_MapParameterNames_Stub(ICommandWithParameters* This, + DB_UPARAMS count, LPCOLESTR *names, DB_LPARAMS *ordinals, IErrorInfo **error) +{ + FIXME("(%p)->(%d %p %p %p): stub\n", This, count, names, ordinals, error); + return E_NOTIMPL; +} diff --git a/include/cmdwpr.idl b/include/cmdwpr.idl new file mode 100644 index 00000000000..9e25f649902 --- /dev/null +++ b/include/cmdwpr.idl @@ -0,0 +1,64 @@ +/* + * 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 + */ + +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a64-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ICommandWithParameters : IUnknown +{ + + typedef struct tagDBPARAMBINDINFO + { + LPOLESTR pwszDataSourceType; + LPOLESTR pwszName; + DBLENGTH ulParamSize; + DBPARAMFLAGS dwFlags; + BYTE bPrecision; + BYTE bScale; + } DBPARAMBINDINFO; + + [local] + HRESULT GetParameterInfo([in, out] DB_UPARAMS *uparams, [out, size_is(,*uparams)] DBPARAMINFO **info, [out] OLECHAR **buffer); + + [call_as(GetParameterInfo)] + HRESULT RemoteGetParameterInfo([in, out] DB_UPARAMS *uparams, [out, size_is(,(ULONG)*uparams)] DBPARAMINFO **param_info, + [out, size_is(,(ULONG)*uparams)] DBBYTEOFFSET **offsets, [in, out] DBLENGTH *buff_len, + [in, out, unique, size_is(,(ULONG)*buff_len)] OLECHAR **buffer, [out] IErrorInfo **error); + + [local] + HRESULT MapParameterNames([in] DB_UPARAMS uparams, [in, size_is((ULONG)uparams)] LPCWSTR names[], + [out, size_is((ULONG)uparams)] DB_LPARAMS ordinals[]); + + [call_as(MapParameterNames)] + HRESULT RemoteMapParameterNames([in] DB_UPARAMS uparams, [in, size_is((ULONG)uparams)] LPCOLESTR *names, + [out, size_is((ULONG)uparams)] DB_LPARAMS *ordinals, [out] IErrorInfo **error); + + [local] + HRESULT SetParameterInfo([in] DB_UPARAMS uparams, [in, unique, size_is((ULONG)uparams)] const DB_UPARAMS ordinals[], + [in, unique, size_is((ULONG)uparams)] const DBPARAMBINDINFO bindinfo[]); + + [call_as(SetParameterInfo)] + HRESULT RemoteSetParameterInfo([in] DB_UPARAMS uparams, [in, unique, size_is((ULONG)uparams)] const DB_UPARAMS *ordinals, + [in, unique, size_is((ULONG)uparams)] const DBPARAMBINDINFO *bindinfo, [out] IErrorInfo **error); +} diff --git a/include/oledb.idl b/include/oledb.idl index 4976a8ce33e..49c0c304b2d 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -79,6 +79,7 @@ typedef LONG_PTR DB_LRESERVE; #include "rstchg.idl" #include "rstupd.idl" #include "mulres.idl" +#include "cmdwpr.idl" cpp_quote("#include <accctrl.h>") -- 2.30.2

1 0

An introduction from a new comer potential student contributor
by Yinchu Liu June 10, 2021

June 10, 2021

Hi everyone, My name is Yinchu Liu, a master student in Computer Science at University of Quebec working on Computer Graphics. I noticed that wine has suitable summer projects in relation to *vkd3d-shade*, although I do not have much experience writing shader since my research project is Physical-Based Amimation, I do have some experience from COMP551 and COMP559 at Mcgill University and am quite into Computer Graphics and have done a lot of CG projects. Hope I can contribute something this summer! Best, Yinchu

4 3

[PATCH 1/4] l3codeca.acm: Remove the Mac OS AudioToolbox backend.
by Zebediah Figura June 9, 2021

June 9, 2021

libmpg123 is readily available in Mac OS package managers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- configure.ac | 2 +- dlls/l3codeca.acm/Makefile.in | 2 +- dlls/l3codeca.acm/mpegl3.c | 390 +--------------------------------- 3 files changed, 3 insertions(+), 391 deletions(-) diff --git a/configure.ac b/configure.ac index fd266c6fb89..425f3541d94 100644 --- a/configure.ac +++ b/configure.ac @@ -1893,7 +1893,7 @@ then MPG123_LIBS="" fi]) fi -WINE_NOTICE_WITH(mpg123,[test "x$ac_cv_lib_mpg123_mpg123_feed" != xyes -a x"$ac_cv_header_CoreAudio_CoreAudio_h" != xyes], +WINE_NOTICE_WITH(mpg123,[test "x$ac_cv_lib_mpg123_mpg123_feed" != xyes], [libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported.], [enable_l3codeca_acm]) test "x$ac_cv_lib_mpg123_mpg123_feed" = xyes || enable_mp3dmod=${enable_mp3dmod:-no} diff --git a/dlls/l3codeca.acm/Makefile.in b/dlls/l3codeca.acm/Makefile.in index 4f946ed6542..d46523a557a 100644 --- a/dlls/l3codeca.acm/Makefile.in +++ b/dlls/l3codeca.acm/Makefile.in @@ -1,7 +1,7 @@ MODULE = l3codeca.acm IMPORTS = winmm user32 EXTRAINCL = $(MPG123_CFLAGS) -EXTRALIBS = $(MPG123_LIBS) $(COREAUDIO_LIBS) +EXTRALIBS = $(MPG123_LIBS) C_SRCS = \ mpegl3.c diff --git a/dlls/l3codeca.acm/mpegl3.c b/dlls/l3codeca.acm/mpegl3.c index 2e929371ae8..e625a75b7ac 100644 --- a/dlls/l3codeca.acm/mpegl3.c +++ b/dlls/l3codeca.acm/mpegl3.c @@ -3,8 +3,6 @@ * * Copyright (C) 2002 Eric Pouech * Copyright (C) 2009 CodeWeavers, Aric Stewart - * Copyright (C) 2010 Kristofer Henriksson - * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,17 +26,7 @@ #include <stdarg.h> #include <string.h> -#ifdef HAVE_MPG123_H -# include <mpg123.h> -#else -# ifdef HAVE_COREAUDIO_COREAUDIO_H -# include <CoreFoundation/CoreFoundation.h> -# include <CoreAudio/CoreAudio.h> -# endif -# ifdef HAVE_AUDIOTOOLBOX_AUDIOCONVERTER_H -# include <AudioToolbox/AudioConverter.h> -# endif -#endif +#include <mpg123.h> #include "windef.h" #include "winbase.h" @@ -123,8 +111,6 @@ static DWORD MPEG3_GetFormatIndex(LPWAVEFORMATEX wfx) return 0xFFFFFFFF; } -#ifdef HAVE_MPG123_H - typedef struct tagAcmMpeg3Data { void (*convert)(PACMDRVSTREAMINSTANCE adsi, @@ -298,380 +284,6 @@ static LRESULT MPEG3_StreamClose(PACMDRVSTREAMINSTANCE adsi) return MMSYSERR_NOERROR; } -#elif defined(HAVE_AUDIOTOOLBOX_AUDIOCONVERTER_H) - -static const unsigned short Mp3BitRates[2][16] = -{ - {0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 0}, - {0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 0} -}; - -static const unsigned short Mp3SampleRates[2][4] = -{ - {44100, 48000, 32000, 0}, - {22050, 24000, 16000, 0} -}; - -typedef struct tagAcmMpeg3Data -{ - LRESULT (*convert)(PACMDRVSTREAMINSTANCE adsi, unsigned char*, - LPDWORD, unsigned char*, LPDWORD); - AudioConverterRef acr; - AudioStreamBasicDescription in,out; - - AudioBufferList outBuffer; - AudioBuffer inBuffer; - - SInt32 tagBytesLeft; - - UInt32 NumberPackets; - AudioStreamPacketDescription *PacketDescriptions; -} AcmMpeg3Data; - -/*********************************************************************** - * MPEG3_drvOpen - */ -static LRESULT MPEG3_drvOpen(LPCSTR str) -{ - return 1; -} - -/*********************************************************************** - * MPEG3_drvClose - */ -static LRESULT MPEG3_drvClose(DWORD_PTR dwDevID) -{ - return 1; -} - -/* - When it asks for data, give it all we have. If we have no data, we assume - we will in the future, so give it no packets and return an error, which - signals that we will have more later. - */ -static OSStatus Mp3AudioConverterComplexInputDataProc( - AudioConverterRef inAudioConverter, - UInt32 *ioNumberDataPackets, - AudioBufferList *ioData, - AudioStreamPacketDescription **outDataPacketDescription, - void *inUserData -) -{ - AcmMpeg3Data *amd = (AcmMpeg3Data*)inUserData; - - if (amd->inBuffer.mDataByteSize > 0) - { - *ioNumberDataPackets = amd->NumberPackets; - ioData->mNumberBuffers = 1; - ioData->mBuffers[0] = amd->inBuffer; - amd->inBuffer.mDataByteSize = 0; - if (outDataPacketDescription) - *outDataPacketDescription = amd->PacketDescriptions; - return noErr; - } - else - { - *ioNumberDataPackets = 0; - return -74; - } -} - -/* - Get the length of the current frame. We need to be at the start of a - frame now. The buffer must have at least the four bytes for the header. - */ -static SInt32 Mp3GetPacketLength(const unsigned char* src) -{ - unsigned char mpegv; - unsigned short brate, srate; - unsigned int size; - - /* - Check that our position looks like an MP3 header and see which type - of MP3 file we have. - */ - if (src[0] == 0xff && src[1] >> 1 == 0x7d) mpegv = 0; /* MPEG-1 File */ - else if (src[0] == 0xff && src[1] >> 1 == 0x79) mpegv = 1; /* MPEG-2 File */ - else return -1; - - /* Fill in bit rate and sample rate. */ - brate = Mp3BitRates[mpegv][(src[2] & 0xf0) >> 4]; - srate = Mp3SampleRates[mpegv][(src[2] & 0xc) >> 2]; - - /* Certain values for bit rate and sample rate are invalid. */ - if (brate == 0 || srate == 0) return -1; - - /* Compute frame size, round down */ - size = 72 * (2 - mpegv) * brate * 1000 / srate; - - /* If there is padding, add one byte */ - if (src[2] & 0x2) return size + 1; - else return size; -} - -/* - Apple's AudioFileStream does weird things so we deal with parsing the - file ourselves. It was also designed for a different use case, so this - is not unexpected. We expect to have MP3 data as input (i.e. we can only - deal with MPEG-1 or MPEG-2 Layer III), which simplifies parsing a bit. We - understand the ID3v2 header and skip over it. Whenever we have data we - want to skip at the beginning of the input, we do this by setting *ndst=0 - and *nsrc to the length of the unwanted data and return no error. - */ -static LRESULT mp3_leopard_horse(PACMDRVSTREAMINSTANCE adsi, - unsigned char* src, LPDWORD nsrc, - unsigned char* dst, LPDWORD ndst) -{ - OSStatus err; - UInt32 size, aspdi, synci, syncSkip; - short framelen[4]; - const unsigned char* psrc; - AcmMpeg3Data* amd = (AcmMpeg3Data*)adsi->dwDriver; - - TRACE("ndst %u %p <- %u %p\n", *ndst, dst, *nsrc, src); - - TRACE("First 16 bytes to input: %s\n", wine_dbgstr_an((const char *)src, 16)); - - /* Parse ID3 tag */ - if (!memcmp(src, "ID3", 3) && amd->tagBytesLeft == -1) - { - amd->tagBytesLeft = (src[6] << 21) + (src[7] << 14) + (src[8] << 7) + src[9]; - if (src[5] & 0x10) amd->tagBytesLeft += 20; /* There is a footer */ - else amd->tagBytesLeft += 10; - } - - /* Consume the tag */ - if (amd->tagBytesLeft >= (SInt32)*nsrc) - { - *ndst = 0; - amd->tagBytesLeft -= *nsrc; - - TRACE("All %d bytes of source data is ID3 tag\n", *nsrc); - return MMSYSERR_NOERROR; - } - else if (amd->tagBytesLeft > 0) - { - src += amd->tagBytesLeft; - *nsrc -= amd->tagBytesLeft; - TRACE("Skipping %ld for ID3 tag\n", amd->tagBytesLeft); - } - - /* - Sync to initial MP3 frame. The largest possible MP3 frame is 1440. - Thus, in the first 1440 bytes we must find the beginning of 3 valid - frames in a row unless we reach the end of the file first. - */ - syncSkip = 0; - for (psrc = src; psrc <= src + *nsrc - 4 && psrc < src + 1440; psrc++) - { - framelen[0] = 0; - for (synci = 1; - synci < 4 && psrc + framelen[synci-1] < src + *nsrc - 4; - synci++) - { - framelen[synci] = Mp3GetPacketLength(psrc + framelen[synci-1]); - if (framelen[synci] == -1) - { - synci = 0; - break; - } - framelen[synci] += framelen[synci-1]; - } - if (synci > 0) /* We synced successfully */ - { - if (psrc - src > 0) - { - syncSkip = psrc - src; - src += syncSkip; - *nsrc -= syncSkip; - TRACE("Skipping %ld for frame sync\n", syncSkip); - } - break; - } - } - - if (Mp3GetPacketLength(src) == -1) - { - *ndst = *nsrc = 0; - ERR("Frame sync failed. Cannot play file.\n"); - return MMSYSERR_ERROR; - } - - /* - Fill in frame descriptions for all frames. We use an extra pointer - to keep track of our position in the input. - */ - - amd->NumberPackets = 25; /* This is the initial array capacity */ - amd->PacketDescriptions = HeapAlloc(GetProcessHeap(), 0, amd->NumberPackets * sizeof(AudioStreamPacketDescription)); - if (amd->PacketDescriptions == 0) return MMSYSERR_NOMEM; - - for (aspdi = 0, psrc = src; - psrc <= src + *nsrc - 4; - psrc += amd->PacketDescriptions[aspdi].mDataByteSize, aspdi++) - { - /* Return an error if we can't read the frame header */ - if (Mp3GetPacketLength(psrc) == -1) - { - *ndst = *nsrc = 0; - ERR("Invalid header at %p.\n", psrc); - HeapFree(GetProcessHeap(), 0, amd->PacketDescriptions); - return MMSYSERR_ERROR; - } - - /* If we run out of space, double size and reallocate */ - if (aspdi >= amd->NumberPackets) - { - amd->NumberPackets *= 2; - amd->PacketDescriptions = HeapReAlloc(GetProcessHeap(), 0, amd->PacketDescriptions, amd->NumberPackets * sizeof(AudioStreamPacketDescription)); - if (amd->PacketDescriptions == 0) return MMSYSERR_NOMEM; - } - - /* Fill in packet data */ - amd->PacketDescriptions[aspdi].mStartOffset = psrc - src; - amd->PacketDescriptions[aspdi].mVariableFramesInPacket = 0; - amd->PacketDescriptions[aspdi].mDataByteSize = Mp3GetPacketLength(psrc); - - /* If this brings us past the end, the last one doesn't count */ - if (psrc + amd->PacketDescriptions[aspdi].mDataByteSize > src + *nsrc) break; - } - - /* Fill in correct number of frames */ - amd->NumberPackets = aspdi; - - /* Adjust nsrc to only include full frames */ - *nsrc = psrc - src; - - amd->inBuffer.mDataByteSize = *nsrc; - amd->inBuffer.mData = src; - amd->inBuffer.mNumberChannels = amd->in.mChannelsPerFrame; - - amd->outBuffer.mNumberBuffers = 1; - amd->outBuffer.mBuffers[0].mDataByteSize = *ndst; - amd->outBuffer.mBuffers[0].mData = dst; - amd->outBuffer.mBuffers[0].mNumberChannels = amd->out.mChannelsPerFrame; - - /* Convert the data */ - size = amd->outBuffer.mBuffers[0].mDataByteSize / amd->out.mBytesPerPacket; - err = AudioConverterFillComplexBuffer(amd->acr, Mp3AudioConverterComplexInputDataProc, amd, &size, &amd->outBuffer, 0); - - HeapFree(GetProcessHeap(), 0, amd->PacketDescriptions); - - /* Add skipped bytes back into *nsrc */ - if (amd->tagBytesLeft > 0) - { - *nsrc += amd->tagBytesLeft; - amd->tagBytesLeft = 0; - } - *nsrc += syncSkip; - - if (err != noErr && err != -74) - { - *ndst = *nsrc = 0; - ERR("Feed Error: %ld\n", err); - return MMSYSERR_ERROR; - } - - *ndst = amd->outBuffer.mBuffers[0].mDataByteSize; - - TRACE("convert %d -> %d\n", *nsrc, *ndst); - - return MMSYSERR_NOERROR; -} - -/*********************************************************************** - * MPEG3_Reset - * - */ -static void MPEG3_Reset(PACMDRVSTREAMINSTANCE adsi, AcmMpeg3Data* aad) -{ - AudioConverterReset(aad->acr); -} - -/*********************************************************************** - * MPEG3_StreamOpen - * - */ -static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) -{ - AcmMpeg3Data* aad; - - assert(!(adsi->fdwOpen & ACM_STREAMOPENF_ASYNC)); - - if (MPEG3_GetFormatIndex(adsi->pwfxSrc) == 0xFFFFFFFF || - MPEG3_GetFormatIndex(adsi->pwfxDst) == 0xFFFFFFFF) - return ACMERR_NOTPOSSIBLE; - - aad = HeapAlloc(GetProcessHeap(), 0, sizeof(AcmMpeg3Data)); - if (aad == 0) return MMSYSERR_NOMEM; - - adsi->dwDriver = (DWORD_PTR)aad; - - if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 || - adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEG) && - adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) - { - OSStatus err; - - aad->in.mSampleRate = adsi->pwfxSrc->nSamplesPerSec; - aad->out.mSampleRate = adsi->pwfxDst->nSamplesPerSec; - aad->in.mBitsPerChannel = adsi->pwfxSrc->wBitsPerSample; - aad->out.mBitsPerChannel = adsi->pwfxDst->wBitsPerSample; - aad->in.mFormatID = kAudioFormatMPEGLayer3; - aad->out.mFormatID = kAudioFormatLinearPCM; - aad->in.mChannelsPerFrame = adsi->pwfxSrc->nChannels; - aad->out.mChannelsPerFrame = adsi->pwfxDst->nChannels; - aad->in.mFormatFlags = 0; - aad->out.mFormatFlags = kLinearPCMFormatFlagIsSignedInteger; - aad->in.mBytesPerFrame = 0; - aad->out.mBytesPerFrame = (aad->out.mBitsPerChannel * aad->out.mChannelsPerFrame) / 8; - aad->in.mBytesPerPacket = 0; - aad->out.mBytesPerPacket = aad->out.mBytesPerFrame; - aad->in.mFramesPerPacket = 0; - aad->out.mFramesPerPacket = 1; - aad->in.mReserved = aad->out.mReserved = 0; - - aad->tagBytesLeft = -1; - - aad->convert = mp3_leopard_horse; - - err = AudioConverterNew(&aad->in, &aad->out, &aad->acr); - if (err != noErr) - { - ERR("Create failed: %ld\n", err); - } - else - { - MPEG3_Reset(adsi, aad); - - return MMSYSERR_NOERROR; - } - } - - HeapFree(GetProcessHeap(), 0, aad); - adsi->dwDriver = 0; - - return MMSYSERR_NOTSUPPORTED; -} - -/*********************************************************************** - * MPEG3_StreamClose - * - */ -static LRESULT MPEG3_StreamClose(PACMDRVSTREAMINSTANCE adsi) -{ - AcmMpeg3Data* amd = (AcmMpeg3Data*)adsi->dwDriver; - - AudioConverterDispose(amd->acr); - - HeapFree(GetProcessHeap(), 0, amd); - adsi->dwDriver = 0; - - return MMSYSERR_NOERROR; -} - -#endif - /*********************************************************************** * MPEG3_DriverDetails * -- 2.30.2

5 13

[PATCH] advapi32: Fix typo.
by Esme Povirk June 9, 2021

June 9, 2021

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- 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 }, -- 2.25.1

1 0

[PATCH] write: Use correct wordpad.exe path.
by Zhiyi Zhang June 9, 2021

June 9, 2021

Wordpad.exe is in C:\Program Files\Windows NT\Accessories\ now. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- 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); -- 2.30.2

1 0

[PATCH 6/6] msinfo32: Enable visual styles.
by Zhiyi Zhang June 9, 2021

June 9, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/msinfo32/Makefile.in | 2 +- programs/msinfo32/main.c | 8 ++++++++ programs/msinfo32/msinfo32.manifest | 16 ++++++++++++++++ programs/msinfo32/msinfo32.rc | 3 +++ programs/msinfo32/resource.h | 1 + 5 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 programs/msinfo32/msinfo32.manifest diff --git a/programs/msinfo32/Makefile.in b/programs/msinfo32/Makefile.in index e3e657baf61..8c36594fa31 100644 --- a/programs/msinfo32/Makefile.in +++ b/programs/msinfo32/Makefile.in @@ -1,5 +1,5 @@ MODULE = msinfo32.exe -IMPORTS = shell32 user32 +IMPORTS = shell32 user32 comctl32 EXTRADLLFLAGS = -mwindows -municode -mno-cygwin diff --git a/programs/msinfo32/main.c b/programs/msinfo32/main.c index 6c307853301..a1f89db2b68 100644 --- a/programs/msinfo32/main.c +++ b/programs/msinfo32/main.c @@ -16,6 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <commctrl.h> #include <shlwapi.h> #include <shellapi.h> @@ -29,6 +35,8 @@ int __cdecl wmain(int argc, WCHAR *argv[]) int i; WCHAR system_info[64]; + InitCommonControls(); + WINE_FIXME("stub:"); for (i = 0; i < argc; i++) WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); diff --git a/programs/msinfo32/msinfo32.manifest b/programs/msinfo32/msinfo32.manifest new file mode 100644 index 00000000000..67eb98a2799 --- /dev/null +++ b/programs/msinfo32/msinfo32.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.Msinfo32" 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/msinfo32/msinfo32.rc b/programs/msinfo32/msinfo32.rc index fc9b46a6cdb..94b1e764d63 100644 --- a/programs/msinfo32/msinfo32.rc +++ b/programs/msinfo32/msinfo32.rc @@ -26,3 +26,6 @@ STRINGTABLE { STRING_SYSTEM_INFO, "System Information" } + +/* @makedep: msinfo32.manifest */ +1 RT_MANIFEST msinfo32.manifest diff --git a/programs/msinfo32/resource.h b/programs/msinfo32/resource.h index 37db7e5e8bc..9ca33da5ec8 100644 --- a/programs/msinfo32/resource.h +++ b/programs/msinfo32/resource.h @@ -17,5 +17,6 @@ */ #include <windef.h> +#include <winuser.h> #define STRING_SYSTEM_INFO 100 -- 2.30.2

1 0

[PATCH 5/6] msiexec: Enable visual styles.
by Zhiyi Zhang June 9, 2021

June 9, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/msiexec/Makefile.in | 2 +- programs/msiexec/msiexec.c | 3 +++ programs/msiexec/msiexec.manifest | 16 ++++++++++++++++ programs/msiexec/rsrc.rc | 3 +++ 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 programs/msiexec/msiexec.manifest diff --git a/programs/msiexec/Makefile.in b/programs/msiexec/Makefile.in index e82acc0da74..05b0e0629cc 100644 --- a/programs/msiexec/Makefile.in +++ b/programs/msiexec/Makefile.in @@ -1,5 +1,5 @@ MODULE = msiexec.exe -IMPORTS = msi ole32 advapi32 user32 +IMPORTS = msi ole32 advapi32 user32 comctl32 EXTRADLLFLAGS = -mwindows -mno-cygwin diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 2bc0ba9bbef..e25cc2659e6 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -22,6 +22,7 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> +#include <commctrl.h> #include <msi.h> #include <winsvc.h> #include <objbase.h> @@ -626,6 +627,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine int argc; LPWSTR *argvW = NULL; + InitCommonControls(); + /* parse the command line */ process_args( GetCommandLineW(), &argc, &argvW ); diff --git a/programs/msiexec/msiexec.manifest b/programs/msiexec/msiexec.manifest new file mode 100644 index 00000000000..a4a17a5397d --- /dev/null +++ b/programs/msiexec/msiexec.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.Msiexec" 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/msiexec/rsrc.rc b/programs/msiexec/rsrc.rc index 91c3df8d7ec..9cc45a446ee 100644 --- a/programs/msiexec/rsrc.rc +++ b/programs/msiexec/rsrc.rc @@ -33,3 +33,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: msiexec.ico */ 1 ICON msiexec.ico + +/* @makedep: msiexec.manifest */ +1 RT_MANIFEST msiexec.manifest -- 2.30.2

1 0