wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Alex Henrie : winhttp: Fix memory leak on error path in WinHttpCrackUrl (Coverity).
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: 2b63fdd9a5fb58951e90af877f79c0a65bd445ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b63fdd9a5fb58951e90af87… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 2 00:23:17 2022 -0700 winhttp: Fix memory leak on error path in WinHttpCrackUrl (Coverity). And use a single variable for the encoded or decoded URL so that free only has to be called once. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/url.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 0d9dfb76de6..8efd5ed0c49 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -172,7 +172,7 @@ static DWORD parse_port( const WCHAR *str, DWORD len, INTERNET_PORT *ret ) */ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONENTSW uc ) { - WCHAR *p, *q, *r, *url_decoded = NULL, *url_escaped = NULL; + WCHAR *p, *q, *r, *url_transformed = NULL; INTERNET_SCHEME scheme_number = 0; struct url_component scheme, username, password, hostname, path, extra; BOOL overflow = FALSE; @@ -189,25 +189,26 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN if (flags & ICU_ESCAPE) { - if ((err = escape_url( url, &len, &url_escaped ))) + if ((err = escape_url( url, &len, &url_transformed ))) { SetLastError( err ); return FALSE; } - url = url_escaped; + url = url_transformed; } else if (flags & ICU_DECODE) { - if (!(url_decoded = decode_url( url, &len ))) + if (!(url_transformed = decode_url( url, &len ))) { SetLastError( ERROR_OUTOFMEMORY ); return FALSE; } - url = url_decoded; + url = url_transformed; } if (!(p = wcschr( url, ':' ))) { SetLastError( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ); + free( url_transformed ); return FALSE; } if (p - url == 4 && !wcsnicmp( url, L"http", 4 )) scheme_number = INTERNET_SCHEME_HTTP; @@ -331,8 +332,7 @@ exit: if (overflow) err = ERROR_INSUFFICIENT_BUFFER; uc->nScheme = scheme_number; } - free( url_decoded ); - free( url_escaped ); + free( url_transformed ); SetLastError( err ); return !err; }

1 0

Alex Henrie : msi: Fix memory leak in get_fusion_filename (Coverity).
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: ad90181e1407bc4ffe81e55f07f83b23c09cccb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad90181e1407bc4ffe81e55f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 2 00:23:14 2022 -0700 msi: Fix memory leak in get_fusion_filename (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 349d7c0ffa3..93cc6210f6e 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -552,6 +552,7 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) GetWindowsDirectoryW(windir, MAX_PATH); len = lstrlenW(windir) + lstrlenW(L"Microsoft.NET\\Framework\\") + lstrlenW(L"v2.0.50727") + lstrlenW(L"fusion.dll") + 3; + msi_free(filename); if (!(filename = msi_alloc(len * sizeof(WCHAR)))) return NULL; lstrcpyW(filename, windir);

1 0

Nikolay Sivov : evr/mixer: Remove incorrect trace.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: 1a47ab043f3f56eb347f44a25b168a8ce29d2ca8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a47ab043f3f56eb347f44a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 2 12:54:15 2022 +0300 evr/mixer: Remove incorrect trace. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 89215b4dec0..0b957e7b6bd 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -957,8 +957,6 @@ static HRESULT WINAPI video_mixer_transform_SetOutputType(IMFTransform *iface, D if (SUCCEEDED(hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &mixer->output.rt_formats[i].device, &video_desc, rt_format, MAX_MIXER_INPUT_SUBSTREAMS, &mixer->processor))) { - ERR("picked dxva device %s\n", debugstr_guid(&mixer->output.rt_formats[i].device)); - if (FAILED(IMFMediaType_GetBlob(type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)&mixer->aperture, sizeof(mixer->aperture), NULL))) {

1 0

Alexandre Julliard : configure: Enable 64-bit time_t on Linux.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: 2211ca9fa57640b4c19c0a6aa57fda94328c53c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2211ca9fa57640b4c19c0a6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 2 13:23:21 2022 +0100 configure: Enable 64-bit time_t on Linux. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +++ configure.ac | 1 + include/config.h.in | 3 +++ 3 files changed, 7 insertions(+) diff --git a/configure b/configure index f5afadafd39..548a07d01bb 100755 --- a/configure +++ b/configure @@ -10579,6 +10579,9 @@ fi printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + +printf "%s\n" "#define _TIME_BITS 64" >>confdefs.h + case $host_cpu in *i[3456789]86*) DLLFLAGS="$DLLFLAGS -fno-PIC" diff --git a/configure.ac b/configure.ac index 039beaf98ac..f4a5ff03de4 100644 --- a/configure.ac +++ b/configure.ac @@ -812,6 +812,7 @@ case $host_os in *) AC_DEFINE(_GNU_SOURCE,1,[Define to 1 to enable GNU extensions on Linux]) + AC_DEFINE(_TIME_BITS,64,[Define to 64 to enable 64-bit time_t on Linux]) case $host_cpu in *i[[3456789]]86*) DLLFLAGS="$DLLFLAGS -fno-PIC" diff --git a/include/config.h.in b/include/config.h.in index 9717dc17236..a8218444be6 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -903,6 +903,9 @@ /* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES +/* Define to 64 to enable 64-bit time_t on Linux */ +#undef _TIME_BITS + /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ #ifndef __cplusplus

1 0

Alexandre Julliard : ntdll: Consistently use time_t in timezone matching.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: abfa6bf8609f92d8ecb9bff816f18d43bd787a29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abfa6bf8609f92d8ecb9bff8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 21 14:18:26 2022 +0100 ntdll: Consistently use time_t in timezone matching. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 9f49b9e6f58..4052d28f644 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2254,12 +2254,12 @@ static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, const char* tzi->DaylightDate.wDay, tzi->DaylightDate.wMonth, tzi->DaylightDate.wYear); } -static time_t find_dst_change(unsigned long min, unsigned long max, int *is_dst) +static time_t find_dst_change(time_t start, time_t end, int *is_dst) { - time_t start; struct tm *tm; + ULONGLONG min = (sizeof(time_t) == sizeof(int)) ? (ULONG)start : start; + ULONGLONG max = (sizeof(time_t) == sizeof(int)) ? (ULONG)end : end; - start = min; tm = localtime(&start); *is_dst = !tm->tm_isdst; TRACE("starting date isdst %d, %s", !*is_dst, ctime(&start));

1 0

Eric Pouech : uxtheme: Use correct integral type.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: 208c04111ecb0a2f5b8bd5c716ac592c281651d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=208c04111ecb0a2f5b8bd5c7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 2 12:03:09 2022 +0100 uxtheme: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/msstyles.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index c0f626d54aa..376d8bc6db9 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -42,6 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); */ static BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, int *value); +static BOOL MSSTYLES_GetNextLong(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LONG *value); static BOOL MSSTYLES_GetNextToken(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LPWSTR lpBuff, DWORD buffSize); static void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics); static HRESULT MSSTYLES_GetFont (LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LOGFONTW* logfont); @@ -1159,10 +1160,10 @@ HBITMAP MSSTYLES_LoadBitmap (PTHEME_CLASS tc, LPCWSTR lpFilename, BOOL* hasAlpha return img->image; } -static BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, int *value) +static BOOL MSSTYLES_GetNextLong(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LONG *value) { LPCWSTR cur = lpStringStart; - int total = 0; + LONG total = 0; BOOL gotNeg = FALSE; while(cur < lpStringEnd && (*cur < '0' || *cur > '9' || *cur == '-')) cur++; @@ -1183,6 +1184,11 @@ static BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, return TRUE; } +static BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, int *value) +{ + return MSSTYLES_GetNextLong(lpStringStart, lpStringEnd, lpValEnd, (LONG *)value); +} + static inline BOOL isSpace(WCHAR c) { return c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v'; @@ -1377,10 +1383,10 @@ HRESULT MSSTYLES_GetPropertyRect(PTHEME_PROPERTY tp, RECT *pRect) LPCWSTR lpCur = tp->lpValue; LPCWSTR lpEnd = tp->lpValue + tp->dwValueLen; - MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &pRect->left); - MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &pRect->top); - MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &pRect->right); - if(!MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &pRect->bottom)) { + MSSTYLES_GetNextLong(lpCur, lpEnd, &lpCur, &pRect->left); + MSSTYLES_GetNextLong(lpCur, lpEnd, &lpCur, &pRect->top); + MSSTYLES_GetNextLong(lpCur, lpEnd, &lpCur, &pRect->right); + if(!MSSTYLES_GetNextLong(lpCur, lpEnd, &lpCur, &pRect->bottom)) { TRACE("Could not parse rect property\n"); return E_PROP_ID_UNSUPPORTED; }

1 0

Eric Pouech : mfreadwrite: Use correct integral types.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: 715a6bfc633da493848ae2315501d465b2d593b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=715a6bfc633da493848ae231… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 2 15:53:31 2022 +0300 mfreadwrite: Use correct integral types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index be77e1c5b1d..8ba00e86ff6 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -87,7 +87,7 @@ struct media_stream struct stream_transform decoder; IMFVideoSampleAllocatorEx *allocator; IMFVideoSampleAllocatorNotify notify_cb; - unsigned int id; + DWORD id; unsigned int index; enum media_stream_state state; unsigned int flags; @@ -162,9 +162,9 @@ struct source_reader unsigned int first_audio_stream_index; unsigned int first_video_stream_index; unsigned int last_read_index; - unsigned int stream_count; + DWORD stream_count; unsigned int flags; - unsigned int queue; + DWORD queue; enum media_source_state source_state; struct media_stream *streams; struct list responses; @@ -368,8 +368,8 @@ static void source_reader_response_ready(struct source_reader *reader, struct st static void source_reader_copy_sample_buffer(IMFSample *src, IMFSample *dst) { IMFMediaBuffer *buffer; - unsigned int flags; LONGLONG time; + DWORD flags; HRESULT hr; IMFSample_CopyAllItems(src, (IMFAttributes *)dst); @@ -1057,7 +1057,7 @@ static BOOL source_reader_get_read_result(struct source_reader *reader, struct m return !request_sample; } -static HRESULT source_reader_get_next_selected_stream(struct source_reader *reader, unsigned int *stream_index) +static HRESULT source_reader_get_next_selected_stream(struct source_reader *reader, DWORD *stream_index) { unsigned int i, first_selected = ~0u, requests = ~0u; BOOL selected, stream_drained; @@ -1095,7 +1095,7 @@ static HRESULT source_reader_get_next_selected_stream(struct source_reader *read return first_selected == ~0u ? MF_E_MEDIA_SOURCE_NO_STREAMS_SELECTED : S_OK; } -static HRESULT source_reader_get_stream_read_index(struct source_reader *reader, unsigned int index, unsigned int *stream_index) +static HRESULT source_reader_get_stream_read_index(struct source_reader *reader, unsigned int index, DWORD *stream_index) { BOOL selected; HRESULT hr; @@ -1814,7 +1814,8 @@ static HRESULT WINAPI src_reader_SetCurrentPosition(IMFSourceReader *iface, REFG { struct source_reader *reader = impl_from_IMFSourceReader(iface); struct source_reader_async_command *command; - unsigned int i, flags; + unsigned int i; + DWORD flags; HRESULT hr; TRACE("%p, %s, %p.\n", iface, debugstr_guid(format), position); @@ -1871,8 +1872,8 @@ static HRESULT WINAPI src_reader_SetCurrentPosition(IMFSourceReader *iface, REFG static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD index, DWORD flags, DWORD *actual_index, DWORD *stream_flags, LONGLONG *timestamp, IMFSample **sample) { - unsigned int actual_index_tmp; struct media_stream *stream; + DWORD actual_index_tmp; LONGLONG timestamp_tmp; DWORD stream_index; HRESULT hr = S_OK; @@ -1931,7 +1932,7 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind } static HRESULT source_reader_read_sample_async(struct source_reader *reader, unsigned int index, unsigned int flags, - unsigned int *actual_index, unsigned int *stream_flags, LONGLONG *timestamp, IMFSample **sample) + DWORD *actual_index, DWORD *stream_flags, LONGLONG *timestamp, IMFSample **sample) { struct source_reader_async_command *command; HRESULT hr; @@ -2166,7 +2167,7 @@ static const IMFSourceReaderVtbl srcreader_vtbl = static DWORD reader_get_first_stream_index(IMFPresentationDescriptor *descriptor, const GUID *major) { - unsigned int count, i; + DWORD count, i; BOOL selected; HRESULT hr; GUID guid; @@ -2415,8 +2416,9 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) { mp4vmagic, L".m4v", mp4mask }, }; unsigned char buffer[4 * sizeof(unsigned int)], pattern[4 * sizeof(unsigned int)]; - unsigned int i, j, length = 0, caps = 0; IMFAttributes *attributes; + DWORD length = 0, caps = 0; + unsigned int i, j; QWORD position; HRESULT hr; @@ -2424,12 +2426,13 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) if (SUCCEEDED(IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attributes))) { - IMFAttributes_GetStringLength(attributes, &MF_BYTESTREAM_CONTENT_TYPE, &length); + UINT32 string_length = 0; + IMFAttributes_GetStringLength(attributes, &MF_BYTESTREAM_CONTENT_TYPE, &string_length); IMFAttributes_Release(attributes); - } - if (length) - return S_OK; + if (string_length) + return S_OK; + } if (FAILED(hr = IMFByteStream_GetCapabilities(stream, &caps))) return hr;

1 0

Eric Pouech : mfmediaengine: Use correct integral type.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: 223d2945b5724cc6aed3a458328dd970913d170b URL: https://source.winehq.org/git/wine.git/?a=commit;h=223d2945b5724cc6aed3a458… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 2 12:02:21 2022 +0100 mfmediaengine: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 4b5a3f83446..fb8b4b8e9ae 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1074,8 +1074,8 @@ static HRESULT media_engine_create_video_renderer(struct media_engine *engine, I static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMediaSource *source) { IMFStreamDescriptor *sd_audio = NULL, *sd_video = NULL; - unsigned int stream_count = 0, i; IMFPresentationDescriptor *pd; + DWORD stream_count = 0, i; IMFTopology *topology; UINT64 duration; HRESULT hr;

1 0

Eric Pouech : mfplay: Use correct integral type.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: 6c2d0bb9ae6c33e09a3cfecb561665dc83c1305e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c2d0bb9ae6c33e09a3cfecb… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 2 15:04:40 2022 +0300 mfplay: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 5abee9d7de8..d7ec7085def 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -657,16 +657,17 @@ static HRESULT WINAPI media_item_GetPresentationAttribute(IMFPMediaItem *iface, static HRESULT WINAPI media_item_GetCharacteristics(IMFPMediaItem *iface, MFP_MEDIAITEM_CHARACTERISTICS *flags) { struct media_item *item = impl_from_IMFPMediaItem(iface); + DWORD value = 0; HRESULT hr; TRACE("%p, %p.\n", iface, flags); *flags = 0; - if (SUCCEEDED(hr = IMFMediaSource_GetCharacteristics(item->source, flags))) + if (SUCCEEDED(hr = IMFMediaSource_GetCharacteristics(item->source, &value))) { - *flags &= (MFP_MEDIAITEM_IS_LIVE | MFP_MEDIAITEM_CAN_SEEK | - MFP_MEDIAITEM_CAN_PAUSE | MFP_MEDIAITEM_HAS_SLOW_SEEK); + *flags = value & (MFP_MEDIAITEM_IS_LIVE | MFP_MEDIAITEM_CAN_SEEK | + MFP_MEDIAITEM_CAN_PAUSE | MFP_MEDIAITEM_HAS_SLOW_SEEK); } return hr;

1 0

Eric Pouech : user32: Use correct integral type.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: 10e0867f8600d4936a3b0ff0a8678ccbbe41d41a URL: https://source.winehq.org/git/wine.git/?a=commit;h=10e0867f8600d4936a3b0ff0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 2 12:03:03 2022 +0100 user32: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 2 +- dlls/user32/spy.c | 2 +- dlls/user32/user_private.h | 2 +- dlls/user32/win.c | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index fde4b9965ed..eca8c3f115a 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -49,7 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); WINE_DECLARE_DEBUG_CHANNEL(keyboard); -INT global_key_state_counter = 0; +LONG global_key_state_counter = 0; /*********************************************************************** * get_key_state diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 727094be05d..e4651661ae0 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -2045,7 +2045,7 @@ typedef struct WCHAR wnd_name[16]; /* window name for message */ } SPY_INSTANCE; -static int indent_tls_index = TLS_OUT_OF_INDEXES; +static LONG indent_tls_index = TLS_OUT_OF_INDEXES; /*********************************************************************** * get_indent_level diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index d1016780658..9e65e9f1f66 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -120,7 +120,7 @@ struct rawinput_thread_data RAWINPUT buffer[1]; /* rawinput message data buffer */ }; -extern INT global_key_state_counter DECLSPEC_HIDDEN; +extern LONG global_key_state_counter DECLSPEC_HIDDEN; extern BOOL (WINAPI *imm_register_window)(HWND) DECLSPEC_HIDDEN; extern void (WINAPI *imm_unregister_window)(HWND) DECLSPEC_HIDDEN; #define WM_IME_INTERNAL 0x287 diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 4f1f70d9802..02891cd34ce 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -4192,7 +4192,8 @@ BOOL WINAPI GetProcessDefaultLayout( DWORD *layout ) if (process_layout == ~0u) { WCHAR *str, buffer[MAX_PATH]; - DWORD i, len, version_layout = 0; + DWORD i, version_layout = 0; + UINT len; DWORD user_lang = GetUserDefaultLangID(); DWORD *languages; void *data = NULL;

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