February 2022 - Wine-Commits

Esme Povirk : diasymreader: Return success from methods with no output variables.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: b8f322aa33fd384fa3c2eea3d518eac6250e93cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8f322aa33fd384fa3c2eea3… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Feb 4 13:41:51 2022 -0600 diasymreader: Return success from methods with no output variables. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/diasymreader/writer.c | 58 +++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/diasymreader/writer.c b/dlls/diasymreader/writer.c index 50b79e2175c..efa0f48947d 100644 --- a/dlls/diasymreader/writer.c +++ b/dlls/diasymreader/writer.c @@ -125,19 +125,19 @@ static HRESULT WINAPI SymWriter_DefineDocument(ISymUnmanagedWriter5 *iface, cons static HRESULT WINAPI SymWriter_SetUserEntryPoint(ISymUnmanagedWriter5 *iface, mdMethodDef entryMethod) { FIXME("(%p,0x%x)\n", iface, entryMethod); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_OpenMethod(ISymUnmanagedWriter5 *iface, mdMethodDef method) { FIXME("(%p,0x%x)\n", iface, method); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_CloseMethod(ISymUnmanagedWriter5 *iface) { FIXME("(%p)\n", iface); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_OpenScope(ISymUnmanagedWriter5 *iface, ULONG32 startOffset, @@ -150,14 +150,14 @@ static HRESULT WINAPI SymWriter_OpenScope(ISymUnmanagedWriter5 *iface, ULONG32 s static HRESULT WINAPI SymWriter_CloseScope(ISymUnmanagedWriter5 *iface, ULONG32 endOffset) { FIXME("(%p,%u)\n", iface, endOffset); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_SetScopeRange(ISymUnmanagedWriter5 *iface, ULONG32 scopeID, ULONG32 startOffset, ULONG32 endOffset) { FIXME("(%p,%u,%u,%u)\n", iface, scopeID, startOffset, endOffset); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_DefineLocalVariable(ISymUnmanagedWriter5 *iface, const WCHAR *name, @@ -165,7 +165,7 @@ static HRESULT WINAPI SymWriter_DefineLocalVariable(ISymUnmanagedWriter5 *iface, ULONG32 addr1, ULONG32 addr2, ULONG32 addr3, ULONG32 startOffset, ULONG32 endOffset) { FIXME("(%p,%s,0x%x,%u,%u)\n", iface, debugstr_w(name), attributes, cSig, addrKind); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_DefineParameter(ISymUnmanagedWriter5 *iface, const WCHAR *name, @@ -173,7 +173,7 @@ static HRESULT WINAPI SymWriter_DefineParameter(ISymUnmanagedWriter5 *iface, con ULONG32 addr1, ULONG32 addr2, ULONG32 addr3) { FIXME("(%p,%s,0x%x,%u,%u)\n", iface, debugstr_w(name), attributes, sequence, addrKind); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_DefineField(ISymUnmanagedWriter5 *iface, mdTypeDef parent, @@ -181,7 +181,7 @@ static HRESULT WINAPI SymWriter_DefineField(ISymUnmanagedWriter5 *iface, mdTypeD ULONG32 addr1, ULONG32 addr2, ULONG32 addr3) { FIXME("(%p,0x%x,%s,0x%x,%u,%u)\n", iface, parent, debugstr_w(name), attributes, cSig, addrKind); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_DefineGlobalVariable(ISymUnmanagedWriter5 *iface, const WCHAR *name, @@ -189,45 +189,45 @@ static HRESULT WINAPI SymWriter_DefineGlobalVariable(ISymUnmanagedWriter5 *iface ULONG32 addr1, ULONG32 addr2, ULONG32 addr3) { FIXME("(%p,%s,0x%x,%u,%u)\n", iface, debugstr_w(name), attributes, cSig, addrKind); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_Close(ISymUnmanagedWriter5 *iface) { FIXME("(%p)\n", iface); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_SetSymAttributes(ISymUnmanagedWriter5 *iface, mdToken parent, const WCHAR *name, ULONG32 cData, unsigned char data[]) { FIXME("(%p,0x%x,%s,%u)\n", iface, parent, debugstr_w(name), cData); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_OpenNamespace(ISymUnmanagedWriter5 *iface, const WCHAR *name) { FIXME("(%p,%s)\n", iface, debugstr_w(name)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_CloseNamespace(ISymUnmanagedWriter5 *iface) { FIXME("(%p)\n", iface); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_UsingNamespace(ISymUnmanagedWriter5 *iface, const WCHAR *fullName) { FIXME("(%p,%s)\n", iface, debugstr_w(fullName)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_SetMethodSourceRange(ISymUnmanagedWriter5 *iface, ISymUnmanagedDocumentWriter *startDoc, ULONG32 startLine, ULONG32 startColumn, ISymUnmanagedDocumentWriter *endDoc, ULONG32 endLine, ULONG32 endColumn) { FIXME("(%p,%p,%u,%u,%p,%u,%u)\n", iface, startDoc, startLine, startColumn, endDoc, endLine, endColumn); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_Initialize(ISymUnmanagedWriter5 *iface, IUnknown *emitter, const WCHAR *filename, @@ -297,33 +297,33 @@ static HRESULT WINAPI SymWriter_DefineSequencePoints(ISymUnmanagedWriter5 *iface ULONG32 spCount, ULONG32 offsets[], ULONG32 lines[], ULONG32 columns[], ULONG32 endLines[], ULONG32 endColumns[]) { FIXME("(%p,%p,%u)\n", iface, document, spCount); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_RemapToken(ISymUnmanagedWriter5 *iface, mdToken oldToken, mdToken newToken) { FIXME("(%p,0x%x,0x%x)\n", iface, oldToken, newToken); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_Initialize2(ISymUnmanagedWriter5 *iface, IUnknown *emitter, const WCHAR *tempFilename, IStream *pIStream, BOOL fFullBuild, const WCHAR *finalFilename) { FIXME("(%p,%p,%s,%p,%u,%s)\n", iface, emitter, debugstr_w(tempFilename), pIStream, fFullBuild, debugstr_w(finalFilename)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_DefineConstant(ISymUnmanagedWriter5 *iface, const WCHAR *name, VARIANT value, ULONG32 cSig, unsigned char signature[]) { FIXME("(%p,%s,%s,%u,%p)\n", iface, debugstr_w(name), debugstr_variant(&value), cSig, signature); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_Abort(ISymUnmanagedWriter5 *iface) { FIXME("(%p)\n", iface); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_DefineLocalVariable2(ISymUnmanagedWriter5 *iface, const WCHAR *name, ULONG32 attributes, @@ -331,32 +331,32 @@ static HRESULT WINAPI SymWriter_DefineLocalVariable2(ISymUnmanagedWriter5 *iface ULONG32 startOffset, ULONG32 endOffset) { FIXME("(%p,%s,0x%x,0x%x,%u)\n", iface, debugstr_w(name), attributes, sigToken, addrKind); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_DefineGlobalVariable2(ISymUnmanagedWriter5 *iface, const WCHAR *name, ULONG32 attributes, mdSignature sigToken, ULONG32 addrKind, ULONG32 addr1, ULONG32 addr2, ULONG32 addr3) { FIXME("(%p,%s,0x%x,0x%x,%u)\n", iface, debugstr_w(name), attributes, sigToken, addrKind); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_DefineConstant2(ISymUnmanagedWriter5 *iface, const WCHAR *name, VARIANT value, mdSignature sigToken) { FIXME("(%p,%s,%s,0x%x)\n", iface, debugstr_w(name), debugstr_variant(&value), sigToken); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_OpenMethod2(ISymUnmanagedWriter5 *iface, mdMethodDef method, ULONG32 isect, ULONG32 offset) { FIXME("(%p,0x%x,%u,%u)\n", iface, method, isect, offset); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_Commit(ISymUnmanagedWriter5 *iface) { FIXME("(%p)\n", iface); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_GetDebugInfoWithPadding(ISymUnmanagedWriter5 *iface, IMAGE_DEBUG_DIRECTORY *pIDD, DWORD cbData, @@ -369,20 +369,20 @@ static HRESULT WINAPI SymWriter_GetDebugInfoWithPadding(ISymUnmanagedWriter5 *if static HRESULT WINAPI SymWriter_OpenMapTokensToSourceSpans(ISymUnmanagedWriter5 *iface) { FIXME("(%p)\n", iface); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_CloseMapTokensToSourceSpans(ISymUnmanagedWriter5 *iface) { FIXME("(%p)\n", iface); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_MapTokenToSourceSpan(ISymUnmanagedWriter5 *iface, mdToken token, ISymUnmanagedDocumentWriter* document, ULONG32 line, ULONG32 column, ULONG32 endLine, ULONG32 endColumn) { FIXME("(%p,%x,%p,%u,%u,%u,%u)\n", iface, token, document, line, column, endLine, endColumn); - return E_NOTIMPL; + return S_OK; } @@ -458,7 +458,7 @@ static HRESULT WINAPI SymWriter_OpenMod(IPdbWriter *iface, const WCHAR *modulena static HRESULT WINAPI SymWriter_CloseMod(IPdbWriter *iface) { FIXME("(%p)\n", iface); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_GetPath(IPdbWriter *iface, DWORD ccData, DWORD *pccData, WCHAR *path)

1 0

Esme Povirk : diasymreader: Return success from SymWriter_OpenScope.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: 7ac9798680d0a03e4f3b7d726cb5402456fa0f0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ac9798680d0a03e4f3b7d72… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Feb 4 13:41:52 2022 -0600 diasymreader: Return success from SymWriter_OpenScope. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/diasymreader/writer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/diasymreader/writer.c b/dlls/diasymreader/writer.c index efa0f48947d..1820ccb51b0 100644 --- a/dlls/diasymreader/writer.c +++ b/dlls/diasymreader/writer.c @@ -144,7 +144,8 @@ static HRESULT WINAPI SymWriter_OpenScope(ISymUnmanagedWriter5 *iface, ULONG32 s ULONG32 *pRetVal) { FIXME("(%p,%u,%p)\n", iface, startOffset, pRetVal); - return E_NOTIMPL; + *pRetVal = 0xdeadbeef; + return S_OK; } static HRESULT WINAPI SymWriter_CloseScope(ISymUnmanagedWriter5 *iface, ULONG32 endOffset)

1 0

Michael Stefaniuc : dmsynth: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: 26a9ce80089073b583681325dbcadbb47dc33e41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26a9ce80089073b583681325… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 4 22:35:56 2022 +0100 dmsynth: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/Makefile.in | 1 - dlls/dmsynth/synth.c | 68 ++++++++++++++++++++++++------------------------ dlls/dmsynth/synthsink.c | 14 +++++----- 3 files changed, 41 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=26a9ce80089073b58368…

1 0

Esme Povirk : diasymreader: Stub IPdbWriter.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: 6a0262b2920bbb0b76346953795bc6e923d632a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a0262b2920bbb0b76346953… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Feb 4 13:41:49 2022 -0600 diasymreader: Stub IPdbWriter. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/diasymreader/Makefile.in | 2 + dlls/diasymreader/diasymreader.idl | 39 ++++++++++++++++++ dlls/diasymreader/diasymreader_private.h | 1 + dlls/diasymreader/writer.c | 70 ++++++++++++++++++++++++++++++++ 4 files changed, 112 insertions(+) diff --git a/dlls/diasymreader/Makefile.in b/dlls/diasymreader/Makefile.in index 34e1286a496..545368d5c11 100644 --- a/dlls/diasymreader/Makefile.in +++ b/dlls/diasymreader/Makefile.in @@ -7,4 +7,6 @@ C_SRCS = \ main.c \ writer.c +IDL_SRCS = diasymreader.idl + RC_SRCS = diasymreader.rc diff --git a/dlls/diasymreader/diasymreader.idl b/dlls/diasymreader/diasymreader.idl new file mode 100644 index 00000000000..954495e515d --- /dev/null +++ b/dlls/diasymreader/diasymreader.idl @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2022 Esme Povirk + * + * 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 + */ + +import "unknwn.idl"; +import "objidl.idl"; +import "oaidl.idl"; + +#pragma makedep header + +/* Undocumented interface used by + * https://github.com/dotnet/symreader/blob/fe43beb65a8567834c717e2478ba36f1e9… */ +[ + object, + uuid(98ecee1e-752d-11d3-8d56-00c04f680b2b), + pointer_default(unique) +] +interface IPdbWriter : IUnknown +{ + HRESULT SetPath([in] const WCHAR *fullpath, [in] IStream *stream, [in] BOOL fullbuild); + HRESULT OpenMod([in] const WCHAR *modulename, [in] const WCHAR *filename); + HRESULT CloseMod(); + HRESULT GetPath([in] DWORD ccData, [out] DWORD *pccData, [out, size_is(ccData), length_is(*pccData)] WCHAR *path); + HRESULT GetSignatureAge([out] DWORD *timestamp, [out] DWORD *age); +} diff --git a/dlls/diasymreader/diasymreader_private.h b/dlls/diasymreader/diasymreader_private.h index 4275193e3d4..2d05859d447 100644 --- a/dlls/diasymreader/diasymreader_private.h +++ b/dlls/diasymreader/diasymreader_private.h @@ -19,5 +19,6 @@ #include "corhdr.h" #include "cordebug.h" #include "corsym.h" +#include "diasymreader.h" HRESULT SymWriter_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; diff --git a/dlls/diasymreader/writer.c b/dlls/diasymreader/writer.c index 638c3adec51..78d3d81a1bd 100644 --- a/dlls/diasymreader/writer.c +++ b/dlls/diasymreader/writer.c @@ -35,6 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(diasymreader); typedef struct SymWriter { ISymUnmanagedWriter5 iface; + IPdbWriter IPdbWriter_iface; LONG ref; CRITICAL_SECTION lock; GUID pdb_guid; @@ -47,6 +48,11 @@ static inline SymWriter *impl_from_ISymUnmanagedWriter5(ISymUnmanagedWriter5 *if return CONTAINING_RECORD(iface, SymWriter, iface); } +static inline SymWriter *impl_from_IPdbWriter(IPdbWriter *iface) +{ + return CONTAINING_RECORD(iface, SymWriter, IPdbWriter_iface); +} + static HRESULT WINAPI SymWriter_QueryInterface(ISymUnmanagedWriter5 *iface, REFIID iid, void **ppv) { @@ -63,6 +69,10 @@ static HRESULT WINAPI SymWriter_QueryInterface(ISymUnmanagedWriter5 *iface, REFI { *ppv = &This->iface; } + else if (IsEqualIID(&IID_IPdbWriter, iid)) + { + *ppv = &This->IPdbWriter_iface; + } else { WARN("unknown interface %s\n", debugstr_guid(iid)); @@ -411,6 +421,65 @@ static const ISymUnmanagedWriter5Vtbl SymWriter_Vtbl = { SymWriter_MapTokenToSourceSpan }; +static HRESULT WINAPI SymWriter_PdbWriter_QueryInterface(IPdbWriter *iface, REFIID iid, void **ppv) +{ + SymWriter *This = impl_from_IPdbWriter(iface); + return ISymUnmanagedWriter5_QueryInterface(&This->iface, iid, ppv); +} + +static ULONG WINAPI SymWriter_PdbWriter_AddRef(IPdbWriter *iface) +{ + SymWriter *This = impl_from_IPdbWriter(iface); + return ISymUnmanagedWriter5_AddRef(&This->iface); +} + +static ULONG WINAPI SymWriter_PdbWriter_Release(IPdbWriter *iface) +{ + SymWriter *This = impl_from_IPdbWriter(iface); + return ISymUnmanagedWriter5_Release(&This->iface); +} + +static HRESULT WINAPI SymWriter_SetPath(IPdbWriter *iface, const WCHAR *fullpath, IStream *stream, BOOL fullbuild) +{ + FIXME("(%p,%s,%p,%u)\n", iface, debugstr_w(fullpath), stream, fullbuild); + return E_NOTIMPL; +} + +static HRESULT WINAPI SymWriter_OpenMod(IPdbWriter *iface, const WCHAR *modulename, const WCHAR *fullpath) +{ + FIXME("(%p,%s,%s)\n", iface, debugstr_w(modulename), debugstr_w(fullpath)); + return E_NOTIMPL; +} + +static HRESULT WINAPI SymWriter_CloseMod(IPdbWriter *iface) +{ + FIXME("(%p)\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI SymWriter_GetPath(IPdbWriter *iface, DWORD ccData, DWORD *pccData, WCHAR *path) +{ + FIXME("(%p,%lu,%p,%p)\n", iface, ccData, pccData, path); + return E_NOTIMPL; +} + +static HRESULT WINAPI SymWriter_GetSignatureAge(IPdbWriter *iface, DWORD *timestamp, DWORD *age) +{ + FIXME("(%p,%p,%p)\n", iface, timestamp, age); + return E_NOTIMPL; +} + +static const IPdbWriterVtbl SymWriter_PdbWriter_Vtbl = { + SymWriter_PdbWriter_QueryInterface, + SymWriter_PdbWriter_AddRef, + SymWriter_PdbWriter_Release, + SymWriter_SetPath, + SymWriter_OpenMod, + SymWriter_CloseMod, + SymWriter_GetPath, + SymWriter_GetSignatureAge +}; + HRESULT SymWriter_CreateInstance(REFIID iid, void **ppv) { SymWriter *This; @@ -421,6 +490,7 @@ HRESULT SymWriter_CreateInstance(REFIID iid, void **ppv) return E_OUTOFMEMORY; This->iface.lpVtbl = &SymWriter_Vtbl; + This->IPdbWriter_iface.lpVtbl = &SymWriter_PdbWriter_Vtbl; This->ref = 1; InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SymWriter.lock");

1 0

Esme Povirk : diasymreader: Implement SymWriter_GetDebugInfo.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: b2fe43b5a0b62dd5de99acbaee7177894fab6b68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2fe43b5a0b62dd5de99acba… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Feb 4 13:41:48 2022 -0600 diasymreader: Implement SymWriter_GetDebugInfo. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/diasymreader/Makefile.in | 2 +- dlls/diasymreader/writer.c | 64 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 63 insertions(+), 3 deletions(-) diff --git a/dlls/diasymreader/Makefile.in b/dlls/diasymreader/Makefile.in index e9d6fee09e8..34e1286a496 100644 --- a/dlls/diasymreader/Makefile.in +++ b/dlls/diasymreader/Makefile.in @@ -1,5 +1,5 @@ MODULE = diasymreader.dll -IMPORTS = uuid +IMPORTS = uuid rpcrt4 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/diasymreader/writer.c b/dlls/diasymreader/writer.c index 7970fbaca9a..638c3adec51 100644 --- a/dlls/diasymreader/writer.c +++ b/dlls/diasymreader/writer.c @@ -23,7 +23,9 @@ #include "windef.h" #include "winbase.h" #include "objbase.h" +#include "rpc.h" +#include "wine/mscvpdb.h" #include "wine/debug.h" #include "wine/heap.h" @@ -34,6 +36,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(diasymreader); typedef struct SymWriter { ISymUnmanagedWriter5 iface; LONG ref; + CRITICAL_SECTION lock; + GUID pdb_guid; + DWORD pdb_age; + WCHAR pdb_filename[MAX_PATH]; } SymWriter; static inline SymWriter *impl_from_ISymUnmanagedWriter5(ISymUnmanagedWriter5 *iface) @@ -87,6 +93,8 @@ static ULONG WINAPI SymWriter_Release(ISymUnmanagedWriter5 *iface) if (ref == 0) { + This->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->lock); heap_free(This); } @@ -213,15 +221,62 @@ static HRESULT WINAPI SymWriter_SetMethodSourceRange(ISymUnmanagedWriter5 *iface static HRESULT WINAPI SymWriter_Initialize(ISymUnmanagedWriter5 *iface, IUnknown *emitter, const WCHAR *filename, IStream *pIStream, BOOL fFullBuild) { + SymWriter *This = impl_from_ISymUnmanagedWriter5(iface); + FIXME("(%p,%p,%s,%p,%u)\n", iface, emitter, debugstr_w(filename), pIStream, fFullBuild); + + EnterCriticalSection(&This->lock); + + if (filename) + wcsncpy_s(This->pdb_filename, MAX_PATH, filename, _TRUNCATE); + + LeaveCriticalSection(&This->lock); + return S_OK; } static HRESULT WINAPI SymWriter_GetDebugInfo(ISymUnmanagedWriter5 *iface, IMAGE_DEBUG_DIRECTORY *pIDD, DWORD cData, DWORD *pcData, BYTE data[]) { - FIXME("(%p,%p,%lu,%p,%p)\n", iface, pIDD, cData, pcData, data); - return E_NOTIMPL; + SymWriter *This = impl_from_ISymUnmanagedWriter5(iface); + DWORD name_length, data_size; + OMFSignatureRSDS *rsds_data = (OMFSignatureRSDS*)data; + + TRACE("(%p,%p,%lu,%p,%p)\n", iface, pIDD, cData, pcData, data); + + EnterCriticalSection(&This->lock); + + name_length = WideCharToMultiByte(CP_UTF8, 0, This->pdb_filename, -1, NULL, 0, NULL, NULL); + data_size = FIELD_OFFSET(OMFSignatureRSDS, name) + name_length; + if (pcData) + *pcData = data_size; + + if (pIDD) + { + pIDD->Characteristics = 0; + pIDD->MajorVersion = 0; + pIDD->MinorVersion = 0; + pIDD->Type = IMAGE_DEBUG_TYPE_CODEVIEW; + pIDD->SizeOfData = data_size; + } + + if (data) + { + if (data_size > cData) + { + LeaveCriticalSection(&This->lock); + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } + + memcpy(rsds_data->Signature, "RSDS", 4); + rsds_data->guid = This->pdb_guid; + rsds_data->age = This->pdb_age; + WideCharToMultiByte(CP_UTF8, 0, This->pdb_filename, -1, rsds_data->name, name_length, NULL, NULL); + } + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI SymWriter_DefineSequencePoints(ISymUnmanagedWriter5 *iface, ISymUnmanagedDocumentWriter *document, @@ -367,6 +422,11 @@ HRESULT SymWriter_CreateInstance(REFIID iid, void **ppv) This->iface.lpVtbl = &SymWriter_Vtbl; This->ref = 1; + InitializeCriticalSection(&This->lock); + This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SymWriter.lock"); + UuidCreate(&This->pdb_guid); + This->pdb_age = 1; + This->pdb_filename[0] = 0; hr = IUnknown_QueryInterface(&This->iface, iid, ppv);

1 0

Eric Pouech : windowscodecs: Use correct integral type.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: 0adcd7d1fb38d875cd5a3efe7b040cd2bbff7b2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0adcd7d1fb38d875cd5a3efe… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 11:49:36 2022 +0100 windowscodecs: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/bmpdecode.c | 3 ++- dlls/windowscodecs/ddsformat.c | 3 ++- dlls/windowscodecs/decoder.c | 2 +- dlls/windowscodecs/info.c | 26 ++++++++++++++------------ dlls/windowscodecs/wincodecs_private.h | 4 ++-- 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index a01dc78c616..888f41a6138 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -1217,7 +1217,8 @@ void BmpDecoder_FindIconMask(BmpDecoder *This, ULONG *mask_offset, int *topdown) if (This->read_data_func == BmpFrameDecode_ReadUncompressed) { /* RGB or BITFIELDS data */ - ULONG width, height, bytesperrow, datasize; + UINT width, height; + ULONG bytesperrow, datasize; IWICBitmapFrameDecode_GetSize(&This->IWICBitmapFrameDecode_iface, &width, &height); bytesperrow = (((width * This->bitsperpixel)+31)/32)*4; datasize = bytesperrow * height; diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index f94f6708c2b..5a947a898b9 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -1331,7 +1331,8 @@ static HRESULT WINAPI DdsDecoder_Dds_GetFrame(IWICDdsDecoder *iface, LARGE_INTEGER seek; UINT width, height, depth, block_width, block_height, width_in_blocks, height_in_blocks, size; UINT frame_width = 0, frame_height = 0, frame_width_in_blocks = 0, frame_height_in_blocks = 0, frame_size = 0; - UINT bytes_per_block, bytesread, i; + UINT bytes_per_block, i; + DWORD bytesread; DdsFrameDecode *frame_decode = NULL; TRACE("(%p,%u,%u,%u,%p)\n", iface, arrayIndex, mipLevel, sliceIndex, bitmapFrame); diff --git a/dlls/windowscodecs/decoder.c b/dlls/windowscodecs/decoder.c index 2c72cdfc1b5..2cd5a2d148f 100644 --- a/dlls/windowscodecs/decoder.c +++ b/dlls/windowscodecs/decoder.c @@ -250,7 +250,7 @@ typedef struct { DWORD frame; struct decoder_frame decoder_frame; BOOL metadata_initialized; - ULONG metadata_count; + UINT metadata_count; struct decoder_block* metadata_blocks; } CommonDecoderFrame; diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index cbe8aae572d..7a9ecf52b5a 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -101,8 +101,8 @@ static HRESULT ComponentInfo_GetGUIDValue(HKEY classkey, LPCWSTR value, return hr; } -static HRESULT ComponentInfo_GetDWORDValue(HKEY classkey, LPCWSTR value, - DWORD *result) +static HRESULT ComponentInfo_GetUINTValue(HKEY classkey, LPCWSTR value, + UINT *result) { LONG ret; DWORD cbdata = sizeof(DWORD); @@ -111,7 +111,7 @@ static HRESULT ComponentInfo_GetDWORDValue(HKEY classkey, LPCWSTR value, return E_INVALIDARG; ret = RegGetValueW(classkey, NULL, value, RRF_RT_DWORD, NULL, - result, &cbdata); + (DWORD *)result, &cbdata); if (ret == ERROR_FILE_NOT_FOUND) { @@ -179,7 +179,7 @@ static HRESULT ComponentInfo_GetGuidList(HKEY classkey, LPCWSTR subkeyname, } else { - ret = RegQueryInfoKeyW(subkey, NULL, NULL, NULL, actual_size, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ret = RegQueryInfoKeyW(subkey, NULL, NULL, NULL, (DWORD *)actual_size, NULL, NULL, NULL, NULL, NULL, NULL, NULL); if (ret != ERROR_SUCCESS) hr = HRESULT_FROM_WIN32(ret); } @@ -552,7 +552,8 @@ static const IWICBitmapDecoderInfoVtbl BitmapDecoderInfo_Vtbl = { static void read_bitmap_patterns(BitmapDecoderInfo *info) { - UINT pattern_count=0, patterns_size=0; + DWORD pattern_count=0; + UINT patterns_size=0; WCHAR subkeyname[11]; LONG res; HKEY patternskey, patternkey; @@ -1353,7 +1354,7 @@ static HRESULT WINAPI PixelFormatInfo_GetBitsPerPixel(IWICPixelFormatInfo2 *ifac TRACE("(%p,%p)\n", iface, puiBitsPerPixel); - return ComponentInfo_GetDWORDValue(This->classkey, L"BitLength", puiBitsPerPixel); + return ComponentInfo_GetUINTValue(This->classkey, L"BitLength", puiBitsPerPixel); } static HRESULT WINAPI PixelFormatInfo_GetChannelCount(IWICPixelFormatInfo2 *iface, @@ -1363,7 +1364,7 @@ static HRESULT WINAPI PixelFormatInfo_GetChannelCount(IWICPixelFormatInfo2 *ifac TRACE("(%p,%p)\n", iface, puiChannelCount); - return ComponentInfo_GetDWORDValue(This->classkey, L"ChannelCount", puiChannelCount); + return ComponentInfo_GetUINTValue(This->classkey, L"ChannelCount", puiChannelCount); } static HRESULT WINAPI PixelFormatInfo_GetChannelMask(IWICPixelFormatInfo2 *iface, @@ -1413,7 +1414,7 @@ static HRESULT WINAPI PixelFormatInfo_SupportsTransparency(IWICPixelFormatInfo2 TRACE("(%p,%p)\n", iface, pfSupportsTransparency); - return ComponentInfo_GetDWORDValue(This->classkey, L"SupportsTransparency", (DWORD*)pfSupportsTransparency); + return ComponentInfo_GetUINTValue(This->classkey, L"SupportsTransparency", (UINT *)pfSupportsTransparency); } static HRESULT WINAPI PixelFormatInfo_GetNumericRepresentation(IWICPixelFormatInfo2 *iface, @@ -1423,7 +1424,7 @@ static HRESULT WINAPI PixelFormatInfo_GetNumericRepresentation(IWICPixelFormatIn TRACE("(%p,%p)\n", iface, pNumericRepresentation); - return ComponentInfo_GetDWORDValue(This->classkey, L"NumericRepresentation", pNumericRepresentation); + return ComponentInfo_GetUINTValue(This->classkey, L"NumericRepresentation", pNumericRepresentation); } static const IWICPixelFormatInfo2Vtbl PixelFormatInfo_Vtbl = { @@ -1682,7 +1683,7 @@ static HRESULT WINAPI MetadataReaderInfo_DoesRequireFullStream(IWICMetadataReade { MetadataReaderInfo *This = impl_from_IWICMetadataReaderInfo(iface); TRACE("(%p,%p)\n", iface, param); - return ComponentInfo_GetDWORDValue(This->classkey, L"RequiresFullStream", (DWORD *)param); + return ComponentInfo_GetUINTValue(This->classkey, L"RequiresFullStream", (UINT *)param); } static HRESULT WINAPI MetadataReaderInfo_DoesSupportPadding(IWICMetadataReaderInfo *iface, @@ -1690,7 +1691,7 @@ static HRESULT WINAPI MetadataReaderInfo_DoesSupportPadding(IWICMetadataReaderIn { MetadataReaderInfo *This = impl_from_IWICMetadataReaderInfo(iface); TRACE("(%p,%p)\n", iface, param); - return ComponentInfo_GetDWORDValue(This->classkey, L"SupportsPadding", (DWORD *)param); + return ComponentInfo_GetUINTValue(This->classkey, L"SupportsPadding", (UINT *)param); } static HRESULT WINAPI MetadataReaderInfo_DoesRequireFixedSize(IWICMetadataReaderInfo *iface, @@ -1826,7 +1827,8 @@ static const IWICMetadataReaderInfoVtbl MetadataReaderInfo_Vtbl = { static void read_metadata_patterns(MetadataReaderInfo *info, GUID *container_guid, struct metadata_container *container) { - UINT pattern_count=0, patterns_size=0; + DWORD pattern_count=0; + UINT patterns_size=0; WCHAR subkeyname[11], guidkeyname[39]; LONG res; HKEY containers_key, guid_key, patternkey; diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 5fb7720781c..72227cf0cd2 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -265,7 +265,7 @@ struct decoder_info struct decoder_stat { DWORD flags; - DWORD frame_count; + UINT frame_count; }; struct decoder_frame @@ -361,7 +361,7 @@ struct encoder_frame UINT bpp; BOOL indexed; DOUBLE dpix, dpiy; - DWORD num_colors; + UINT num_colors; WICColor palette[256]; /* encoder options */ BOOL interlace;

1 0

Eric Pouech : gdiplus: Use correct integral type.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: e39352685552fecacc98284735806743ee3188dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e39352685552fecacc982847… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 2 12:01:38 2022 +0100 gdiplus: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 56eb62392ec..a7297047308 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -95,7 +95,7 @@ static ColorPalette *get_palette(IWICBitmapFrameDecode *frame, WICBitmapPaletteT IWICPalette_GetColorCount(wic_palette, &count); palette = heap_alloc(2 * sizeof(UINT) + count * sizeof(ARGB)); - IWICPalette_GetColors(wic_palette, count, palette->Entries, &palette->Count); + IWICPalette_GetColors(wic_palette, count, (UINT *)palette->Entries, &palette->Count); IWICPalette_GetType(wic_palette, &type); switch(type) { @@ -140,7 +140,7 @@ static HRESULT set_palette(IWICBitmapFrameEncode *frame, ColorPalette *palette) IWICImagingFactory_Release(factory); if (SUCCEEDED(hr)) { - hr = IWICPalette_InitializeCustom(wic_palette, palette->Entries, palette->Count); + hr = IWICPalette_InitializeCustom(wic_palette, (UINT *)palette->Entries, palette->Count); if (SUCCEEDED(hr)) hr = IWICBitmapFrameEncode_SetPalette(frame, wic_palette); @@ -2437,7 +2437,8 @@ GpStatus WINGDIPAPI GdipGetPropertyIdList(GpImage *image, UINT num, PROPID *list HRESULT hr; IWICMetadataReader *reader; IWICEnumMetadataItem *enumerator; - UINT prop_count, i, items_returned; + UINT prop_count, i; + ULONG items_returned; TRACE("(%p, %u, %p)\n", image, num, list); @@ -2781,7 +2782,8 @@ GpStatus WINGDIPAPI GdipGetPropertySize(GpImage *image, UINT *size, UINT *count) for (i = 0; i < prop_count; i++) { - UINT items_returned, item_size; + ULONG items_returned; + UINT item_size; hr = IWICEnumMetadataItem_Next(enumerator, 1, NULL, &id, &value, &items_returned); if (hr != S_OK) break; @@ -2859,7 +2861,8 @@ GpStatus WINGDIPAPI GdipGetAllPropertyItems(GpImage *image, UINT size, for (i = 0; i < prop_count; i++) { PropertyItem *item; - UINT items_returned, item_size; + ULONG items_returned; + UINT item_size; hr = IWICEnumMetadataItem_Next(enumerator, 1, NULL, &id, &value, &items_returned); if (hr != S_OK) break; @@ -4113,7 +4116,7 @@ static GpStatus load_wmf(IStream *stream, GpMetafile **metafile) METAHEADER mh; HMETAFILE hmf; HRESULT hr; - UINT size; + ULONG size; void *buf; hr = IStream_Read(stream, &mh, sizeof(mh), &size); @@ -4192,7 +4195,7 @@ static GpStatus load_emf(IStream *stream, GpMetafile **metafile) HENHMETAFILE hemf; GpStatus status; HRESULT hr; - UINT size; + ULONG size; void *buf; hr = IStream_Read(stream, &emh, sizeof(emh), &size); @@ -4281,7 +4284,7 @@ static GpStatus get_decoder_info(IStream* stream, const struct image_codec **res const BYTE *pattern, *mask; LARGE_INTEGER seek; HRESULT hr; - UINT bytesread; + ULONG bytesread; int i; DWORD j, sig; @@ -5839,7 +5842,7 @@ static GpStatus create_optimal_palette(ColorPalette *palette, INT desired, { palette->Flags = 0; IWICPalette_GetColorCount(wic_palette, &palette->Count); - IWICPalette_GetColors(wic_palette, palette->Count, palette->Entries, &palette->Count); + IWICPalette_GetColors(wic_palette, palette->Count, (UINT *)palette->Entries, &palette->Count); } IWICBitmap_Release(bitmap);

1 0

Eric Pouech : msvcrt: Use correct integral type in _except1.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: 948f465da76b40dfc0cdc5124168a28fd33c2402 URL: https://source.winehq.org/git/wine.git/?a=commit;h=948f465da76b40dfc0cdc512… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:49:47 2022 +0100 msvcrt: Use correct integral type in _except1. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b13a4e03fd1..33afe8d1d90 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -10314,7 +10314,7 @@ double CDECL _except1(DWORD fpe, _FP_OPERATION_CODE op, double arg, double res, { ULONG_PTR exception_arg; DWORD exception = 0; - DWORD fpword = 0; + unsigned int fpword = 0; WORD operation; int raise = 0;

1 0

Eric Pouech : msvcr*: Use correct integral type in Interlocked* calls.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: 9ddcbb5f646630627b54ace6592a5e92b3cec8dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ddcbb5f646630627b54ace6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:49:41 2022 +0100 msvcr*: Use correct integral type in Interlocked* calls. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/details.c | 2 +- dlls/msvcp90/details.c | 2 +- dlls/msvcrt/concurrency.c | 4 ++-- dlls/msvcrt/file.c | 8 ++++---- dlls/msvcrt/heap.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/concrt140/details.c b/dlls/concrt140/details.c index 59345c52871..72bb744744c 100644 --- a/dlls/concrt140/details.c +++ b/dlls/concrt140/details.c @@ -371,7 +371,7 @@ void __thiscall _Concurrent_queue_base_v4_dummy(_Concurrent_queue_base_v4 *this) DEFINE_RTTI_DATA0(_Concurrent_queue_base_v4, 0, ".?AV_Concurrent_queue_base_v4(a)details@Concurrency@@") -static int _Runtime_object_id; +static LONG _Runtime_object_id; typedef struct { diff --git a/dlls/msvcp90/details.c b/dlls/msvcp90/details.c index 6b54ea9597f..d63a47667f9 100644 --- a/dlls/msvcp90/details.c +++ b/dlls/msvcp90/details.c @@ -385,7 +385,7 @@ void __thiscall _Concurrent_queue_base_v4_dummy(_Concurrent_queue_base_v4 *this) DEFINE_RTTI_DATA0(_Concurrent_queue_base_v4, 0, ".?AV_Concurrent_queue_base_v4(a)details@Concurrency@@") -static int _Runtime_object_id; +static LONG _Runtime_object_id; typedef struct { diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 0a393cd0004..6afe6e81489 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -34,8 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); typedef exception cexception; CREATE_EXCEPTION_OBJECT(cexception) -static int context_id = -1; -static int scheduler_id = -1; +static LONG context_id = -1; +static LONG scheduler_id = -1; typedef enum { SchedulerKind, diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 2b0395d7535..2666492956c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -144,8 +144,8 @@ static int MSVCRT_max_streams = 512, MSVCRT_stream_idx; static int MSVCRT_umask = 0; /* INTERNAL: static data for tmpnam and _wtmpname functions */ -static int tmpnam_unique; -static int tmpnam_s_unique; +static LONG tmpnam_unique; +static LONG tmpnam_s_unique; static const unsigned int EXE = 'e' << 16 | 'x' << 8 | 'e'; static const unsigned int BAT = 'b' << 16 | 'a' << 8 | 't'; @@ -4935,7 +4935,7 @@ void CDECL setbuf(FILE* file, char *buf) setvbuf(file, buf, buf ? _IOFBF : _IONBF, BUFSIZ); } -static int tmpnam_helper(char *s, size_t size, int *tmpnam_unique, int tmp_max) +static int tmpnam_helper(char *s, size_t size, LONG *tmpnam_unique, int tmp_max) { char tmpstr[8]; char *p = s; @@ -5006,7 +5006,7 @@ char * CDECL tmpnam(char *s) return tmpnam_helper(s, -1, &tmpnam_unique, TMP_MAX) ? NULL : s; } -static int wtmpnam_helper(wchar_t *s, size_t size, int *tmpnam_unique, int tmp_max) +static int wtmpnam_helper(wchar_t *s, size_t size, LONG *tmpnam_unique, int tmp_max) { wchar_t tmpstr[8]; wchar_t *p = s; diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 429a9e2ecda..049c4e0cd93 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -46,7 +46,7 @@ static HANDLE heap, sb_heap; typedef int (CDECL *MSVCRT_new_handler_func)(size_t size); static MSVCRT_new_handler_func MSVCRT_new_handler; -static int MSVCRT_new_mode; +static LONG MSVCRT_new_mode; /* FIXME - According to documentation it should be 8*1024, at runtime it returns 16 */ static unsigned int MSVCRT_amblksiz = 16;

1 0

Eric Pouech : winmm: Use correct integral type.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: b5ad46a58a1d6d620fe722204d84199188408738 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5ad46a58a1d6d620fe72220… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 11:49:54 2022 +0100 winmm: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/waveform.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index ecffa700662..66444ee82dc 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -183,7 +183,7 @@ typedef struct _WINMM_QueryInterfaceInfo { BOOL is_out; UINT index; WCHAR *str; - UINT *len_bytes; + ULONG *len_bytes; } WINMM_QueryInterfaceInfo; static LRESULT WOD_Open(WINMM_OpenInfo *info); @@ -1771,7 +1771,8 @@ exit: static void WID_PullACMData(WINMM_Device *device) { - UINT32 packet, packet_bytes; + UINT32 packet; + DWORD packet_bytes; DWORD flags; BYTE *data; WAVEHDR *queue;

1 0