wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Jan Sikorski : winemac.drv: Omit WM_ENTER/EXITSIZEMOVE on non-interactive window changes.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: cb8fde193b80494301a6525e085b0b7727e903ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb8fde193b80494301a6525e… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Mon Sep 6 12:50:54 2021 +0200 winemac.drv: Omit WM_ENTER/EXITSIZEMOVE on non-interactive window changes. The motivating example is when a newly created window gets moved off the system menu bar. A program might not be prepared to handle these messages yet. Fixes a crash in Lord of the Rings online. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0d22e8455a2e809a891df289df42113276c0a276) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 19 +++++++++++++------ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 5 +++-- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index b6c5386469c..cc9166e24ea 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1775,7 +1775,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi /* Cocoa may adjust the frame when the window is ordered onto the screen. Generate a frame-changed event just in case. The back end will ignore it if nothing actually changed. */ - [self windowDidResize:nil]; + [self windowDidResize:nil skipSizeMove:TRUE]; if (![self isExcludedFromWindowsMenu]) [NSApp addWindowsItem:self title:[self title] filename:NO]; @@ -1954,7 +1954,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi { /* In case Cocoa adjusted the frame we tried to set, generate a frame-changed event. The back end will ignore it if nothing actually changed. */ - [self windowDidResize:nil]; + [self windowDidResize:nil skipSizeMove:TRUE]; } } } @@ -2114,7 +2114,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi macdrv_release_event(event); } - - (void) postWindowFrameChanged:(NSRect)frame fullscreen:(BOOL)isFullscreen resizing:(BOOL)resizing + - (void) postWindowFrameChanged:(NSRect)frame fullscreen:(BOOL)isFullscreen resizing:(BOOL)resizing skipSizeMove:(BOOL)skipSizeMove { macdrv_event* event; NSUInteger style = self.styleMask; @@ -2134,6 +2134,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi event->window_frame_changed.frame = cgrect_win_from_mac(NSRectToCGRect(frame)); event->window_frame_changed.fullscreen = isFullscreen; event->window_frame_changed.in_resize = resizing; + event->window_frame_changed.skip_size_move_loop = skipSizeMove; [queue postEvent:event]; macdrv_release_event(event); } @@ -2897,7 +2898,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi macdrv_release_event(event); } - - (void)windowDidResize:(NSNotification *)notification + - (void)windowDidResize:(NSNotification *)notification skipSizeMove:(BOOL)skipSizeMove { NSRect frame = self.wine_fractionalFrame; @@ -2920,12 +2921,18 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [self postWindowFrameChanged:frame fullscreen:([self styleMask] & NSWindowStyleMaskFullScreen) != 0 - resizing:[self inLiveResize]]; + resizing:[self inLiveResize] + skipSizeMove:skipSizeMove]; [[[self contentView] inputContext] invalidateCharacterCoordinates]; [self updateFullscreen]; } + - (void)windowDidResize:(NSNotification *)notification + { + [self windowDidResize:notification skipSizeMove:FALSE]; + } + - (BOOL)windowShouldClose:(id)sender { macdrv_event* event = macdrv_create_event(WINDOW_CLOSE_REQUESTED, self); @@ -2982,7 +2989,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) windowWillExitFullScreen:(NSNotification*)notification { exitingFullScreen = TRUE; - [self postWindowFrameChanged:nonFullscreenFrame fullscreen:FALSE resizing:FALSE]; + [self postWindowFrameChanged:nonFullscreenFrame fullscreen:FALSE resizing:FALSE skipSizeMove:FALSE]; } - (void)windowWillMiniaturize:(NSNotification *)notification diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index b02ad79f025..77c2ed87b64 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -443,6 +443,7 @@ typedef struct macdrv_event { CGRect frame; int fullscreen; int in_resize; + int skip_size_move_loop; } window_frame_changed; struct { unsigned long serial; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index e7f5327fcdc..267c4cd550d 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2322,10 +2322,11 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) flags |= SWP_NOSENDCHANGING; if (!(flags & SWP_NOSIZE) || !(flags & SWP_NOMOVE)) { - if (!event->window_frame_changed.in_resize && !being_dragged) + int send_sizemove = !event->window_frame_changed.in_resize && !being_dragged && !event->window_frame_changed.skip_size_move_loop; + if (send_sizemove) SendMessageW(hwnd, WM_ENTERSIZEMOVE, 0, 0); SetWindowPos(hwnd, 0, rect.left, rect.top, width, height, flags); - if (!event->window_frame_changed.in_resize && !being_dragged) + if (send_sizemove) SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); } }

1 0

Francois Gouget : gdiplus: GdipGetFamilyName() should not crash when given a NULL name.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: 7a9898344d61ad4d8619f2bbb3ffe037f180ff3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a9898344d61ad4d8619f2bb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 26 13:16:12 2021 +0200 gdiplus: GdipGetFamilyName() should not crash when given a NULL name. It used to crash on Windows XP and Vista but does not since Windows 7. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ad663360fae6b4a9ee3d7786857404e0a4917329) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/font.c | 7 +++++-- dlls/gdiplus/tests/font.c | 9 +++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index c18e5702ca2..4d0a84943ea 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -798,17 +798,20 @@ GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily *family, GpFontFamily **clo * FAILURE: InvalidParameter if family is NULL * * NOTES - * If name is a NULL ptr, then both XP and Vista will crash (so we do as well) + * If name is NULL, XP and Vista crash but not Windows 7+ */ GpStatus WINGDIPAPI GdipGetFamilyName (GDIPCONST GpFontFamily *family, WCHAR *name, LANGID language) { static int lang_fixme; + TRACE("%p, %p, %d\n", family, name, language); + if (family == NULL) return InvalidParameter; - TRACE("%p, %p, %d\n", family, name, language); + if (name == NULL) + return Ok; if (language != LANG_NEUTRAL && !lang_fixme++) FIXME("No support for handling of multiple languages!\n"); diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index b208989c054..4ffa9e823fc 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -388,12 +388,9 @@ static void test_fontfamily (void) expect (Ok, stat); expect (0, lstrcmpiW(itsName, L"Tahoma")); - if (0) - { - /* Crashes on Windows XP SP2, Vista, and so Wine as well */ - stat = GdipGetFamilyName (family, NULL, LANG_NEUTRAL); - expect (Ok, stat); - } + /* Crashes on Windows XP SP2 and Vista */ + stat = GdipGetFamilyName (family, NULL, LANG_NEUTRAL); + expect (Ok, stat); /* Make sure we don't read old data */ ZeroMemory (itsName, sizeof(itsName));

1 0

Giovanni Mascellani : kernelbase: Fix an incorrect allocation size.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: 8506b2ae188243048cc897f7262a83bbea1e9884 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8506b2ae188243048cc897f7… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Aug 10 16:40:12 2021 +0200 kernelbase: Fix an incorrect allocation size. Variable nt_privs has type TOKEN_PRIVILEGES*, not TOKEN_GROUPS*. This fixes a crash in the Cyberpunk 2077 launcher. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1ca54db1bfd05c46dbd3039ed5ad48d9d915f212) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernelbase/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index 36196304db3..472076cf7fe 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -667,7 +667,7 @@ BOOL WINAPI CreateRestrictedToken( HANDLE token, DWORD flags, if (delete_priv_count) { - if (!(nt_privs = heap_alloc( offsetof( TOKEN_GROUPS, Groups[delete_priv_count] ) ))) goto out; + if (!(nt_privs = heap_alloc( offsetof( TOKEN_PRIVILEGES, Privileges[delete_priv_count] ) ))) goto out; nt_privs->PrivilegeCount = delete_priv_count; memcpy( nt_privs->Privileges, delete_privs, delete_priv_count * sizeof(*delete_privs) ); }

1 0

Paul Gofman : kernelbase: Fix copy size for delete_privs in CreateRestrictedToken().
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: f9f4e8f6921ba2a04d0ac669fe93267ebf61f9a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9f4e8f6921ba2a04d0ac669… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Aug 4 13:43:46 2021 +0300 kernelbase: Fix copy size for delete_privs in CreateRestrictedToken(). Fixes 3D Aim Trainer crash on start. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d63e0b7084ff651a8423324c54ab98ff8669de51) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernelbase/security.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index 97943048b01..36196304db3 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -662,21 +662,21 @@ BOOL WINAPI CreateRestrictedToken( HANDLE token, DWORD flags, { if (!(nt_disable_sids = heap_alloc( offsetof( TOKEN_GROUPS, Groups[disable_sid_count] ) ))) goto out; nt_disable_sids->GroupCount = disable_sid_count; - memcpy( nt_disable_sids->Groups, disable_sids, disable_sid_count * sizeof(SID_AND_ATTRIBUTES) ); + memcpy( nt_disable_sids->Groups, disable_sids, disable_sid_count * sizeof(*disable_sids) ); } if (delete_priv_count) { if (!(nt_privs = heap_alloc( offsetof( TOKEN_GROUPS, Groups[delete_priv_count] ) ))) goto out; nt_privs->PrivilegeCount = delete_priv_count; - memcpy( nt_privs->Privileges, delete_privs, delete_priv_count * sizeof(SID_AND_ATTRIBUTES) ); + memcpy( nt_privs->Privileges, delete_privs, delete_priv_count * sizeof(*delete_privs) ); } if (restrict_sid_count) { if (!(nt_restrict_sids = heap_alloc( offsetof( TOKEN_GROUPS, Groups[restrict_sid_count] ) ))) goto out; nt_restrict_sids->GroupCount = restrict_sid_count; - memcpy( nt_restrict_sids->Groups, restrict_sids, restrict_sid_count * sizeof(SID_AND_ATTRIBUTES) ); + memcpy( nt_restrict_sids->Groups, restrict_sids, restrict_sid_count * sizeof(*restrict_sids) ); } status = NtFilterToken(token, flags, nt_disable_sids, nt_privs, nt_restrict_sids, ret);

1 0

Zebediah Figura : server: Return STATUS_KEY_DELETED when trying to retrieve the full name of a deleted key.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: 83923e43d57d624f52ef478bfb18d7f0fb6a91e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83923e43d57d624f52ef478b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 30 22:08:09 2021 -0500 server: Return STATUS_KEY_DELETED when trying to retrieve the full name of a deleted key. This fixes a server crash that can be triggered by deleting a key and then trying to retrieve its name. In that case key->parent is NULL. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 089b2528c2c933e3c9b45a5f559fa4b5f830872a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- server/registry.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server/registry.c b/server/registry.c index c937e051597..49601bda77e 100644 --- a/server/registry.c +++ b/server/registry.c @@ -402,6 +402,12 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) data_size_t len = sizeof(root_name) - sizeof(WCHAR); char *ret; + if (key->flags & KEY_DELETED) + { + set_error( STATUS_KEY_DELETED ); + return NULL; + } + for (key = (struct key *)obj; key != root_key; key = key->parent) len += key->namelen + sizeof(WCHAR); if (!(ret = malloc( len ))) return NULL;

1 0

Alexandre Julliard : ntdll: Avoid crash on shutting down partially initialized thread.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: a59337fb7e0d876dc90625dcd3244c04fcb0bf32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a59337fb7e0d876dc90625dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 27 19:32:48 2021 +0200 ntdll: Avoid crash on shutting down partially initialized thread. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 364099f528f83f0056f00178d9be6fe332692dc7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1f8e6c24400..35527119eae 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3230,7 +3230,7 @@ void WINAPI LdrShutdownThread(void) if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, DLL_THREAD_DETACH ); RtlAcquirePebLock(); - RemoveEntryList( &NtCurrentTeb()->TlsLinks ); + if (NtCurrentTeb()->TlsLinks.Flink) RemoveEntryList( &NtCurrentTeb()->TlsLinks ); if ((pointers = NtCurrentTeb()->ThreadLocalStoragePointer)) { for (i = 0; i < tls_module_count; i++) RtlFreeHeap( GetProcessHeap(), 0, pointers[i] );

1 0

Jacek Caban : include: Use __builtin_offsetof on Clang.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: d1d979bf914f9d9d348bf1f2da32471944729fe2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1d979bf914f9d9d348bf1f2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 7 16:27:22 2021 +0200 include: Use __builtin_offsetof on Clang. Fixes a number of warning on MSVC target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit de9982f069e576b6aaebd96383af263584eedb03) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/msvcrt/stddef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/msvcrt/stddef.h b/include/msvcrt/stddef.h index 8d946e5aedf..b3fdaf0c052 100644 --- a/include/msvcrt/stddef.h +++ b/include/msvcrt/stddef.h @@ -20,7 +20,7 @@ #include <corecrt.h> -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__clang__) #define offsetof(s,m) __builtin_offsetof(s,m) #elif defined(_WIN64) #define offsetof(s,m) (size_t)((ptrdiff_t)&(((s*)NULL)->m))

1 0

Zebediah Figura : quartz: Do not print an incorrect state warning in MediaFilter_GetState() if a filter has been run asynchronously.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: 2a51b72ec3cd0219c4cf9e189748cda73d431077 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a51b72ec3cd0219c4cf9e18… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 29 15:00:15 2021 -0500 quartz: Do not print an incorrect state warning in MediaFilter_GetState() if a filter has been run asynchronously. This is a valid case in which the filter state may or may not match the graph state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7f1623bc626d3ca2411c1a3088512d8ef461252b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/quartz/filtergraph.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 58038829217..20eec80e00c 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -5095,7 +5095,6 @@ static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, F { struct filter_graph *graph = impl_from_IMediaFilter(iface); DWORD end = GetTickCount() + timeout; - FILTER_STATE expect_state; HRESULT hr; TRACE("graph %p, timeout %u, state %p.\n", graph, timeout, state); @@ -5111,7 +5110,6 @@ static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, F EnterCriticalSection(&graph->cs); *state = graph->state; - expect_state = graph->needs_async_run ? State_Paused : graph->state; for (;;) { @@ -5143,9 +5141,18 @@ static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, F else if (filter_state != graph->state && filter_state != State_Paused) hr = E_FAIL; - if (filter_state != expect_state) - ERR("Filter %p reported incorrect state %u (expected %u).\n", - filter->filter, filter_state, expect_state); + if (graph->needs_async_run) + { + if (filter_state != State_Paused && filter_state != State_Running) + ERR("Filter %p reported incorrect state %u (expected %u or %u).\n", + filter->filter, filter_state, State_Paused, State_Running); + } + else + { + if (filter_state != graph->state) + ERR("Filter %p reported incorrect state %u (expected %u).\n", + filter->filter, filter_state, graph->state); + } } LeaveCriticalSection(&graph->cs);

1 0

Gijs Vermeulen : ntdll: Avoid declaration-after-statement warning.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: 08a3472c54d7ec427736d4f8dd6c16a9d621e685 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08a3472c54d7ec427736d4f8… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Jun 17 14:35:50 2021 +0200 ntdll: Avoid declaration-after-statement warning. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 836ec1d7ed423798c57ba00dbcd19a1a480e32da) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/unix/process.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 57bb8002dfa..a8c05e3d069 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1108,10 +1108,11 @@ void fill_vm_counters( VM_COUNTERS_EX *pvmi, int unix_pid ) { #if defined(MACH_TASK_BASIC_INFO) struct mach_task_basic_info info; + mach_msg_type_number_t infoCount; if (unix_pid != -1) return; /* FIXME: Retrieve information for other processes. */ - mach_msg_type_number_t infoCount = MACH_TASK_BASIC_INFO_COUNT; + infoCount = MACH_TASK_BASIC_INFO_COUNT; if(task_info(mach_task_self(), MACH_TASK_BASIC_INFO, (task_info_t)&info, &infoCount) == KERN_SUCCESS) { pvmi->VirtualSize = info.resident_size + info.virtual_size;

1 0

Andrew Eikum : comctl32: Avoid gcc 11 maybe-uninitialized warning.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: dd412ae81cbb343db89f0aeb6a9db8ad9ae6f635 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd412ae81cbb343db89f0aeb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 4 15:01:01 2021 -0500 comctl32: Avoid gcc 11 maybe-uninitialized warning. dlls/comctl32/monthcal.c:1783:19: warning: ‘htinfo.uHit’ may be used uninitialized [-Wmaybe-uninitialized] Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ce8f724740542a389145abee7e43a3bbd98cbebb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/monthcal.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 98c682df334..f4a01bbbed8 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1799,6 +1799,7 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) if(!lpht || lpht->cbSize < MCHITTESTINFO_V1_SIZE) return -1; htinfo.st = st_null; + htinfo.uHit = 0; /* we should preserve passed fields if hit area doesn't need them */ if (lpht->cbSize == sizeof(MCHITTESTINFO))

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
150
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2022