wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Esme Povirk : diasymreader: Implement SymWriter_GetDebugInfo.
by Alexandre Julliard 04 Feb '22

04 Feb '22

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

Daniel Lehman : include: Add _sscanf_l.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: 3237e4025a276585ab5781dbb06258c0986cc5ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=3237e4025a276585ab5781db… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Feb 2 17:28:50 2022 -0800 include: Add _sscanf_l. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index e53929b94bc..ce198542285 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -359,6 +359,18 @@ static inline int WINAPIV _snscanf_l(const char *buffer, size_t size, const char return ret; } +static inline int WINAPIV _sscanf_l(const char *buffer, const char *format, _locale_t locale, ...) __WINE_CRT_SCANF_ATTR(2, 4); +static inline int WINAPIV _sscanf_l(const char *buffer, const char *format, _locale_t locale, ...) +{ + int ret; + va_list args; + + va_start(args, locale); + ret = __stdio_common_vsscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, buffer, -1, format, locale, args); + va_end(args); + return ret; +} + static inline int WINAPIV fscanf(FILE *file, const char *format, ...) __WINE_CRT_SCANF_ATTR(2, 3); static inline int WINAPIV fscanf(FILE *file, const char *format, ...) { @@ -432,6 +444,7 @@ static inline int vsnprintf(char *buffer, size_t size, const char *format, va_li { return _vsnprintf(buffer,size,format,args); } _ACRTIMP int WINAPIV _snscanf_l(const char*,size_t,const char*,_locale_t,...) __WINE_CRT_SCANF_ATTR(3, 5); +_ACRTIMP int WINAPIV _sscanf_l(const char *,const char*,_locale_t,...) __WINE_CRT_SCANF_ATTR(2, 4); _ACRTIMP int WINAPIV fscanf(FILE*,const char*,...) __WINE_CRT_SCANF_ATTR(2, 3); _ACRTIMP int WINAPIV fscanf_s(FILE*,const char*,...) __WINE_CRT_SCANF_ATTR(2, 3); _ACRTIMP int WINAPIV scanf(const char*,...) __WINE_CRT_SCANF_ATTR(1, 2);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: ae9b4f10db6e0fc563d208ea2a365f597f7f709d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae9b4f10db6e0fc563d208ea… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Feb 4 10:45:39 2022 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/po/lt.po b/po/lt.po index c01a11326e9..440f8bd2ef5 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-12-21 23:32+0200\n" +"PO-Revision-Date: 2022-02-04 10:44+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 3.0\n" +"X-Generator: Poedit 3.0.1\n" "X-Project-Style: default\n" #: dlls/aclui/aclui.rc:29 dlls/inetcpl.cpl/inetcpl.rc:90 @@ -6962,54 +6962,40 @@ msgid "This network connection does not exist.\n" msgstr "Šis tinklo ryšys neegzistuoja.\n" #: dlls/kernel32/winerror.mc:3748 -#, fuzzy -#| msgid "Invalid at interrupt time.\n" msgid "Call interrupted.\n" -msgstr "Netinkamas pertraukties metu.\n" +msgstr "Kreipinys pertrauktas.\n" #: dlls/kernel32/winerror.mc:3753 -#, fuzzy -#| msgid "Invalid handle.\n" msgid "Invalid file handle.\n" -msgstr "Neteisinga rodyklė.\n" +msgstr "Neteisinga failo rodyklė.\n" #: dlls/kernel32/winerror.mc:3763 -#, fuzzy -#| msgid "Invalid network address.\n" msgid "Invalid pointer address.\n" -msgstr "Neteisingas tinklo adresas.\n" +msgstr "Neteisingas rodyklės adresas.\n" #: dlls/kernel32/winerror.mc:3768 -#, fuzzy -#| msgid "Invalid name.\n" msgid "Invalid argument.\n" -msgstr "Neteisingas vardas.\n" +msgstr "Neteisingas argumentas.\n" #: dlls/kernel32/winerror.mc:3778 msgid "Connection reset by peer.\n" msgstr "Sujungimas nutrauktas kito serverio.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "Point not found.\n" msgid "Host not found.\n" -msgstr "Taškas nerastas.\n" +msgstr "Serveris nerastas.\n" #: dlls/kernel32/winerror.mc:3793 -#, fuzzy -#| msgid "Attribute is not found.\n" msgid "Nonauthoritative host not found.\n" -msgstr "Atributas nerastas.\n" +msgstr "Neautoritetingas serveris nerastas.\n" #: dlls/kernel32/winerror.mc:3798 -#, fuzzy -#| msgid "Unrecoverable error occurred.\n" msgid "Nonrecoverable error.\n" -msgstr "Įvyko nepataisoma klaida.\n" +msgstr "Nepataisoma klaida.\n" #: dlls/kernel32/winerror.mc:3803 msgid "Name valid, no data record.\n" -msgstr "" +msgstr "Vardas teisingas, nėra duomenų įrašo.\n" #: dlls/kernel32/winerror.mc:3817 msgid "Not implemented.\n"

1 0

Alexandre Julliard : msado15: Fix some LONG/LONG_PTR mismatches.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: 1bf3ebdfc4b7f7ec7c0506392ec3e67e245c2e62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bf3ebdfc4b7f7ec7c050639… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 4 15:33:23 2022 +0100 msado15: Fix some LONG/LONG_PTR mismatches. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/command.c | 4 ++-- dlls/msado15/connection.c | 4 +++- dlls/msado15/recordset.c | 40 +++++++++++++++++------------------ dlls/msado15/stream.c | 12 +++++------ dlls/msado15/tests/msado15.c | 47 ++++++++++++++++++++++-------------------- include/msado15_backcompat.idl | 42 +++++++++++++++++++------------------ 6 files changed, 78 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1bf3ebdfc4b7f7ec7c05…

1 0

Eric Pouech : windowscodecs: Use correct integral type.
by Alexandre Julliard 04 Feb '22

04 Feb '22

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 : vcomp: Use correct integral type.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: 26b56e4f991fc229f615f787ce376b9944c31caa URL: https://source.winehq.org/git/wine.git/?a=commit;h=26b56e4f991fc229f615f787… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:50:00 2022 +0100 vcomp: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 14c3546cb5a..c4f2572c86a 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -626,78 +626,78 @@ void CDECL _vcomp_reduction_i2(unsigned int flags, short *dest, short val) void CDECL _vcomp_atomic_add_i4(int *dest, int val) { - InterlockedExchangeAdd(dest, val); + InterlockedExchangeAdd((LONG *)dest, val); } void CDECL _vcomp_atomic_and_i4(int *dest, int val) { int old; - do old = *dest; while (InterlockedCompareExchange(dest, old & val, old) != old); + do old = *dest; while (InterlockedCompareExchange((LONG *)dest, old & val, old) != old); } void CDECL _vcomp_atomic_div_i4(int *dest, int val) { int old; - do old = *dest; while (InterlockedCompareExchange(dest, old / val, old) != old); + do old = *dest; while (InterlockedCompareExchange((LONG *)dest, old / val, old) != old); } void CDECL _vcomp_atomic_div_ui4(unsigned int *dest, unsigned int val) { unsigned int old; - do old = *dest; while (InterlockedCompareExchange((int *)dest, old / val, old) != old); + do old = *dest; while (InterlockedCompareExchange((LONG *)dest, old / val, old) != old); } void CDECL _vcomp_atomic_mul_i4(int *dest, int val) { int old; - do old = *dest; while (InterlockedCompareExchange(dest, old * val, old) != old); + do old = *dest; while (InterlockedCompareExchange((LONG *)dest, old * val, old) != old); } void CDECL _vcomp_atomic_or_i4(int *dest, int val) { int old; - do old = *dest; while (InterlockedCompareExchange(dest, old | val, old) != old); + do old = *dest; while (InterlockedCompareExchange((LONG *)dest, old | val, old) != old); } void CDECL _vcomp_atomic_shl_i4(int *dest, int val) { int old; - do old = *dest; while (InterlockedCompareExchange(dest, old << val, old) != old); + do old = *dest; while (InterlockedCompareExchange((LONG *)dest, old << val, old) != old); } void CDECL _vcomp_atomic_shr_i4(int *dest, int val) { int old; - do old = *dest; while (InterlockedCompareExchange(dest, old >> val, old) != old); + do old = *dest; while (InterlockedCompareExchange((LONG *)dest, old >> val, old) != old); } void CDECL _vcomp_atomic_shr_ui4(unsigned int *dest, unsigned int val) { unsigned int old; - do old = *dest; while (InterlockedCompareExchange((int *)dest, old >> val, old) != old); + do old = *dest; while (InterlockedCompareExchange((LONG *)dest, old >> val, old) != old); } void CDECL _vcomp_atomic_sub_i4(int *dest, int val) { - InterlockedExchangeAdd(dest, -val); + InterlockedExchangeAdd((LONG *)dest, -val); } void CDECL _vcomp_atomic_xor_i4(int *dest, int val) { int old; - do old = *dest; while (InterlockedCompareExchange(dest, old ^ val, old) != old); + do old = *dest; while (InterlockedCompareExchange((LONG *)dest, old ^ val, old) != old); } static void CDECL _vcomp_atomic_bool_and_i4(int *dest, int val) { int old; - do old = *dest; while (InterlockedCompareExchange(dest, old && val, old) != old); + do old = *dest; while (InterlockedCompareExchange((LONG *)dest, old && val, old) != old); } static void CDECL _vcomp_atomic_bool_or_i4(int *dest, int val) { int old; - do old = *dest; while (InterlockedCompareExchange(dest, old ? old : (val != 0), old) != old); + do old = *dest; while (InterlockedCompareExchange((LONG *)dest, old ? old : (val != 0), old) != old); } void CDECL _vcomp_reduction_i4(unsigned int flags, int *dest, int val) @@ -822,7 +822,7 @@ void CDECL _vcomp_atomic_add_r4(float *dest, float val) old = *(int *)dest; *(float *)&new = *(float *)&old + val; } - while (InterlockedCompareExchange((int *)dest, new, old) != old); + while (InterlockedCompareExchange((LONG *)dest, new, old) != old); } void CDECL _vcomp_atomic_div_r4(float *dest, float val) @@ -833,7 +833,7 @@ void CDECL _vcomp_atomic_div_r4(float *dest, float val) old = *(int *)dest; *(float *)&new = *(float *)&old / val; } - while (InterlockedCompareExchange((int *)dest, new, old) != old); + while (InterlockedCompareExchange((LONG *)dest, new, old) != old); } void CDECL _vcomp_atomic_mul_r4(float *dest, float val) @@ -844,7 +844,7 @@ void CDECL _vcomp_atomic_mul_r4(float *dest, float val) old = *(int *)dest; *(float *)&new = *(float *)&old * val; } - while (InterlockedCompareExchange((int *)dest, new, old) != old); + while (InterlockedCompareExchange((LONG *)dest, new, old) != old); } void CDECL _vcomp_atomic_sub_r4(float *dest, float val) @@ -855,7 +855,7 @@ void CDECL _vcomp_atomic_sub_r4(float *dest, float val) old = *(int *)dest; *(float *)&new = *(float *)&old - val; } - while (InterlockedCompareExchange((int *)dest, new, old) != old); + while (InterlockedCompareExchange((LONG *)dest, new, old) != old); } static void CDECL _vcomp_atomic_bool_and_r4(float *dest, float val) @@ -866,7 +866,7 @@ static void CDECL _vcomp_atomic_bool_and_r4(float *dest, float val) old = *(int *)dest; *(float *)&new = (*(float *)&old != 0.0) ? (val != 0.0) : 0.0; } - while (InterlockedCompareExchange((int *)dest, new, old) != old); + while (InterlockedCompareExchange((LONG *)dest, new, old) != old); } static void CDECL _vcomp_atomic_bool_or_r4(float *dest, float val) @@ -877,7 +877,7 @@ static void CDECL _vcomp_atomic_bool_or_r4(float *dest, float val) old = *(int *)dest; *(float *)&new = (*(float *)&old != 0.0) ? *(float *)&old : (val != 0.0); } - while (InterlockedCompareExchange((int *)dest, new, old) != old); + while (InterlockedCompareExchange((LONG *)dest, new, old) != old); } void CDECL _vcomp_reduction_r4(unsigned int flags, float *dest, float val) @@ -1850,7 +1850,7 @@ static void CDECL c2vectparallel_wrapper(int start, int end, int step, int end_i curr_end -= step; } - if ((new_start = InterlockedCompareExchange(dynamic_start, next_start, start)) != start) + if ((new_start = InterlockedCompareExchange((LONG volatile*)dynamic_start, next_start, start)) != start) { start = new_start; continue;

1 0

Eric Pouech : gdiplus: Use correct integral type.
by Alexandre Julliard 04 Feb '22

04 Feb '22

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 04 Feb '22

04 Feb '22

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 04 Feb '22

04 Feb '22

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@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@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 : xaudio2_7: Use correct integral type.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: d4bd5aaa910b5e5a8d3c0d2fafd8cc28cfe79f1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4bd5aaa910b5e5a8d3c0d2f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 11:50:06 2022 +0100 xaudio2_7: 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/xaudio2_7/xaudio_dll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 12383896b42..e5a83ebdbf8 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1291,7 +1291,7 @@ static void WINAPI XA2M_GetChannelMask(IXAudio2MasteringVoice *iface, TRACE("%p, %p\n", This, pChannelMask); - FAudioMasteringVoice_GetChannelMask(This->faudio_voice, pChannelMask); + FAudioMasteringVoice_GetChannelMask(This->faudio_voice, (uint32_t *)pChannelMask); } static const struct IXAudio2MasteringVoiceVtbl XAudio2MasteringVoice_Vtbl = {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2022