September 2021 - Wine-Commits

Francois Gouget : msi: Remove CDECL on static functions where not needed.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: b60e4064508e79ca6fdb2937ca8cfd3f58423f79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b60e4064508e79ca6fdb2937… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 31 15:14:09 2021 +0200 msi: Remove CDECL on static functions where not needed. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/media.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 41c82af1b59..cc4648481ba 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -271,7 +271,7 @@ static LONG CDECL cabinet_seek_stream( INT_PTR hf, LONG dist, int seektype ) return -1; } -static UINT CDECL msi_media_get_disk_info(MSIPACKAGE *package, MSIMEDIAINFO *mi) +static UINT msi_media_get_disk_info(MSIPACKAGE *package, MSIMEDIAINFO *mi) { MSIRECORD *row;

1 0

Zebediah Figura : server: Use async->iosb->status instead of async->status in async_satisfied().
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: 8e7a5ec81724917687b9f200e03f56545c8ee2af URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e7a5ec81724917687b9f200… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 31 19:23:49 2021 -0500 server: Use async->iosb->status instead of async->status in async_satisfied(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/async.c b/server/async.c index 086e5eb2870..7890122969f 100644 --- a/server/async.c +++ b/server/async.c @@ -112,13 +112,16 @@ static void async_satisfied( struct object *obj, struct wait_queue_entry *entry struct async *async = (struct async *)obj; assert( obj->ops == &async_ops ); + /* we only return an async handle for asyncs created via create_request_async() */ + assert( async->iosb ); + if (async->direct_result) { async_set_result( &async->obj, async->iosb->status, async->iosb->result ); async->direct_result = 0; } - set_wait_status( entry, async->status ); + set_wait_status( entry, async->iosb->status ); /* close wait handle here to avoid extra server round trip */ if (async->wait_handle) @@ -398,6 +401,7 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota if (async->timeout) remove_timeout_user( async->timeout ); async->timeout = NULL; async->status = status; + if (async->iosb) async->iosb->status = status; if (async->data.apc) {

1 0

Zebediah Figura : server: Use a separate field to track whether the async has been alerted.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: da838c2ae53396be6ba415e3868e1667ff2bbc66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da838c2ae53396be6ba415e3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 31 19:23:50 2021 -0500 server: Use a separate field to track whether the async has been alerted. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/async.c b/server/async.c index 7890122969f..47225af11c9 100644 --- a/server/async.c +++ b/server/async.c @@ -52,6 +52,7 @@ struct async unsigned int signaled :1; unsigned int pending :1; /* request successfully queued, but pending */ unsigned int direct_result :1;/* a flag if we're passing result directly from request instead of APC */ + unsigned int alerted :1; /* fd is signaled, but we are waiting for client-side I/O */ struct completion *completion; /* completion associated with fd */ apc_param_t comp_key; /* completion key associated with fd */ unsigned int comp_flags; /* completion flags */ @@ -161,6 +162,8 @@ void async_terminate( struct async *async, unsigned int status ) async->status = status; if (async->iosb && async->iosb->status == STATUS_PENDING) async->iosb->status = status; + if (status == STATUS_ALERTED) + async->alerted = 1; /* if no APC could be queued (e.g. the process is terminated), * thread_queue_apc() may trigger async_set_result(), which may drop the @@ -246,6 +249,7 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da async->pending = 1; async->wait_handle = 0; async->direct_result = 0; + async->alerted = 0; async->completion = fd_get_completion( fd, &async->comp_key ); async->comp_flags = 0; async->completion_callback = NULL; @@ -390,9 +394,10 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota if (status == STATUS_PENDING) /* restart it */ { - if (async->status == STATUS_ALERTED) + if (async->alerted) { async->status = STATUS_PENDING; + async->alerted = 0; async_reselect( async ); } }

1 0

Zhiyi Zhang : comctl32: Use OpenThemeDataForDpi() to create a theme handle not associated to a window.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: 7be103bba9f9569409c5131b6dd96ff0ec2c2365 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7be103bba9f9569409c5131b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 1 14:37:46 2021 +0800 comctl32: Use OpenThemeDataForDpi() to create a theme handle not associated to a window. If a window is not passed to OpenThemeData(), OpenThemeData() assumes the DPI is 96 according to tests. And GetThemePartSize() should select theme parts according to the DPI stored in theme handles rather than using GDI device contexts. Thus, OpenThemeDataForDpi() should be used in place of OpenThemeData() when DPI is not 96 and theme handles shouldn't be associated with a window. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/datetime.c | 2 +- dlls/comctl32/hotkey.c | 2 +- dlls/comctl32/toolbar.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index ac5268f146c..f8827d4e26c 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -1317,7 +1317,7 @@ static LRESULT DATETIME_NCPaint (HWND hwnd, HRGN region) RECT r; HDC dc; - theme = OpenThemeData(NULL, WC_EDITW); + theme = OpenThemeDataForDpi(NULL, WC_EDITW, GetDpiForWindow(hwnd)); if (!theme) return DefWindowProcW(hwnd, WM_NCPAINT, (WPARAM)region, 0); diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c index 7421ff6ef65..7808660e7f5 100644 --- a/dlls/comctl32/hotkey.c +++ b/dlls/comctl32/hotkey.c @@ -434,7 +434,7 @@ HOTKEY_NCPaint (HWND hwnd, HRGN region) RECT r; HDC dc; - theme = OpenThemeData(NULL, WC_EDITW); + theme = OpenThemeDataForDpi(NULL, WC_EDITW, GetDpiForWindow(hwnd)); if (!theme) return DefWindowProcW(hwnd, WM_NCPAINT, (WPARAM)region, 0); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index cf1dc42449b..2ae70ad4f3e 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5313,7 +5313,7 @@ TOOLBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) SystemParametersInfoW (SPI_GETICONTITLELOGFONT, 0, &logFont, 0); infoPtr->hFont = infoPtr->hDefaultFont = CreateFontIndirectW (&logFont); - infoPtr->hTheme = OpenThemeData (NULL, themeClass); + infoPtr->hTheme = OpenThemeDataForDpi (NULL, themeClass, GetDpiForWindow (hwnd)); TOOLBAR_CheckStyle (infoPtr); @@ -6550,7 +6550,7 @@ TOOLBAR_SysColorChange (void) static LRESULT theme_changed (TOOLBAR_INFO *infoPtr) { CloseThemeData (infoPtr->hTheme); - infoPtr->hTheme = OpenThemeData (NULL, themeClass); + infoPtr->hTheme = OpenThemeDataForDpi (NULL, themeClass, GetDpiForWindow (infoPtr->hwndSelf)); InvalidateRect (infoPtr->hwndSelf, NULL, TRUE); return 0; }

1 0

Zhiyi Zhang : uxtheme: Use OpenThemeDataForDpi() to create a theme handle not associated to a window.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: 8aed2ec3b9eccdbdd77aef669acb6f445d178214 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8aed2ec3b9eccdbdd77aef66… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 1 14:37:54 2021 +0800 uxtheme: Use OpenThemeDataForDpi() to create a theme handle not associated to a window. If a window is not passed to OpenThemeData(), OpenThemeData() assumes the DPI is 96 according to tests. And GetThemePartSize() should select theme parts according to the DPI stored in theme handles rather than using GDI device contexts. Thus, OpenThemeDataForDpi() should be used in place of OpenThemeData() when DPI is not 96 and theme handles shouldn't be associated with a window. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/scrollbar.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/scrollbar.c b/dlls/uxtheme/scrollbar.c index a9d5a83f2bb..0e42de7d77f 100644 --- a/dlls/uxtheme/scrollbar.c +++ b/dlls/uxtheme/scrollbar.c @@ -41,7 +41,11 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES HTHEME theme; DWORD style; - theme = bar == SB_CTL ? GetWindowTheme(hwnd) : OpenThemeData(NULL, WC_SCROLLBARW); + if (bar == SB_CTL) + theme = GetWindowTheme(hwnd); + else + theme = OpenThemeDataForDpi(NULL, WC_SCROLLBARW, GetDpiForWindow(hwnd)); + if (!theme) { user_api.pScrollBarDraw(hwnd, dc, bar, hit_test, tracking_info, draw_arrows, draw_interior,

1 0

Paul Gofman : kernelbase: Mind OS version in the PE header when reporting OS version.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: 03c297b1c1cab7da244d2fc05aaab47c7d0e63d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03c297b1c1cab7da244d2fc0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Aug 30 15:52:45 2021 +0300 kernelbase: Mind OS version in the PE header when reporting OS version. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/version.c | 175 ++++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/version.c | 34 +++++++- 2 files changed, 205 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=03c297b1c1cab7da244d…

1 0

Zebediah Figura : server: Do not call async_terminate() when restarting an already terminated async.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: be0701540788d0c5a9b9297bec1b6a45953a722f URL: https://source.winehq.org/git/wine.git/?a=commit;h=be0701540788d0c5a9b9297b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 31 19:23:48 2021 -0500 server: Do not call async_terminate() when restarting an already terminated async. At best this is a no-op. At worst this will emit an extra APC_ASYNC_IO where the termination (e.g. cancellation) should already have emitted one. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/server/async.c b/server/async.c index b290005f9a0..086e5eb2870 100644 --- a/server/async.c +++ b/server/async.c @@ -387,13 +387,11 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota if (status == STATUS_PENDING) /* restart it */ { - status = async->status; - async->status = STATUS_PENDING; - - if (status != STATUS_ALERTED) /* it was terminated in the meantime */ - async_terminate( async, status ); - else + if (async->status == STATUS_ALERTED) + { + async->status = STATUS_PENDING; async_reselect( async ); + } } else {

1 0

Gabriel Ivăncescu : user32: Add a helper to retrieve the work rect.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: d8252025d1c6bf9e16406cb430f0531477da76bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8252025d1c6bf9e16406cb4… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 1 08:30:50 2021 +0100 user32: Add a helper to retrieve the work rect. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 6e96a4b5964..bc8c35afc58 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -675,6 +675,33 @@ BOOL WINAPI MoveWindow( HWND hwnd, INT x, INT y, INT cx, INT cy, } +/******************************************************************* + * get_work_rect + * + * Get the work area that a maximized window can cover, depending on style. + */ +static BOOL get_work_rect( HWND hwnd, RECT *rect ) +{ + HMONITOR monitor = MonitorFromWindow( hwnd, MONITOR_DEFAULTTOPRIMARY ); + MONITORINFO mon_info; + DWORD style; + + if (!monitor) return FALSE; + + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW( monitor, &mon_info ); + *rect = mon_info.rcMonitor; + + style = GetWindowLongW( hwnd, GWL_STYLE ); + if (style & WS_MAXIMIZEBOX) + { + if ((style & WS_CAPTION) == WS_CAPTION || !(style & (WS_CHILD | WS_POPUP))) + *rect = mon_info.rcWork; + } + return TRUE; +} + + /******************************************************************* * WINPOS_GetMinMaxInfo * @@ -683,8 +710,8 @@ BOOL WINAPI MoveWindow( HWND hwnd, INT x, INT y, INT cx, INT cy, MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) { DPI_AWARENESS_CONTEXT context; + RECT rc_work, rc_primary; MINMAXINFO MinMax; - HMONITOR monitor; INT xinc, yinc; LONG style = GetWindowLongW( hwnd, GWL_STYLE ); LONG adjustedStyle; @@ -738,22 +765,8 @@ MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) /* if the app didn't change the values, adapt them for the current monitor */ - if ((monitor = MonitorFromWindow( hwnd, MONITOR_DEFAULTTOPRIMARY ))) + if (get_work_rect( hwnd, &rc_work )) { - RECT rc_work, rc_primary; - MONITORINFO mon_info; - - mon_info.cbSize = sizeof(mon_info); - GetMonitorInfoW( monitor, &mon_info ); - - rc_work = mon_info.rcMonitor; - - if (style & WS_MAXIMIZEBOX) - { - if ((style & WS_CAPTION) == WS_CAPTION || !(style & (WS_CHILD | WS_POPUP))) - rc_work = mon_info.rcWork; - } - rc_primary = get_primary_monitor_rect(); if (MinMax.ptMaxSize.x == (rc_primary.right - rc_primary.left) + 2 * xinc && MinMax.ptMaxSize.y == (rc_primary.bottom - rc_primary.top) + 2 * yinc)

1 0

Francois Gouget : shell32: Fix a couple of ASCII / ANSI mixups in comments.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: c10d9d102c21a4c01f47afb5e8748a85338bdae4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c10d9d102c21a4c01f47afb5… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 1 09:30:08 2021 +0200 shell32: Fix a couple of ASCII / ANSI mixups in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelllink.c | 2 +- dlls/shell32/shellord.c | 2 +- dlls/shell32/shlfileop.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 2353ac3e56e..1a8eca3abe4 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -680,7 +680,7 @@ static HRESULT Stream_LoadLocation( IStream *stm, * * 0 Length of the block (4 bytes, usually 0x314) * 4 tag (dword) - * 8 string data in ASCII + * 8 string data in ANSI * 8+0x104 string data in UNICODE * * In the original Win32 implementation the buffers are not initialized diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index e1262accdd8..639576ca50d 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1,6 +1,6 @@ /* * The parameters of many functions changes between different OS versions - * (NT uses Unicode strings, 95 uses ASCII strings) + * (NT uses Unicode strings, 95 uses ANSI strings) * * Copyright 1997 Marcus Meissner * 1998 Jürgen Schmied diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 3726c61dfaa..ed66a1a555c 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -819,9 +819,9 @@ static DWORD SHFindAttrW(LPCWSTR pName, BOOL fileOnly) * * SHNameTranslate HelperFunction for SHFileOperationA * - * Translates a list of 0 terminated ASCII strings into Unicode. If *wString + * Translates a list of 0 terminated ANSI strings into Unicode. If *wString * is NULL, only the necessary size of the string is determined and returned, - * otherwise the ASCII strings are copied into it and the buffer is increased + * otherwise the ANSI strings are copied into it and the buffer is increased * to point to the location after the final 0 termination char. */ static DWORD SHNameTranslate(LPWSTR* wString, LPCWSTR* pWToFrom, BOOL more)

1 0

Zebediah Figura : server: Use a simple boolean to track whether the async has been terminated.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: 6cb5f660795044637f5caf7fb9a3c262123f8751 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cb5f660795044637f5caf7f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 31 19:23:51 2021 -0500 server: Use a simple boolean to track whether the async has been terminated. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/server/async.c b/server/async.c index 47225af11c9..1c3082083ed 100644 --- a/server/async.c +++ b/server/async.c @@ -42,7 +42,6 @@ struct async struct list process_entry; /* entry in process list */ struct async_queue *queue; /* queue containing this async */ struct fd *fd; /* fd associated with an unqueued async */ - unsigned int status; /* current status */ struct timeout_user *timeout; unsigned int timeout_status; /* status to report upon timeout */ struct event *event; @@ -53,6 +52,7 @@ struct async unsigned int pending :1; /* request successfully queued, but pending */ unsigned int direct_result :1;/* a flag if we're passing result directly from request instead of APC */ unsigned int alerted :1; /* fd is signaled, but we are waiting for client-side I/O */ + unsigned int terminated :1; /* async has been terminated */ struct completion *completion; /* completion associated with fd */ apc_param_t comp_key; /* completion key associated with fd */ unsigned int comp_flags; /* completion flags */ @@ -158,9 +158,9 @@ void async_terminate( struct async *async, unsigned int status ) { assert( status != STATUS_PENDING ); - if (async->status != STATUS_PENDING) return; /* already terminated */ + if (async->terminated) return; - async->status = status; + async->terminated = 1; if (async->iosb && async->iosb->status == STATUS_PENDING) async->iosb->status = status; if (status == STATUS_ALERTED) async->alerted = 1; @@ -240,7 +240,6 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da async->thread = (struct thread *)grab_object( thread ); async->event = event; - async->status = STATUS_PENDING; async->data = *data; async->timeout = NULL; async->queue = NULL; @@ -250,6 +249,7 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da async->wait_handle = 0; async->direct_result = 0; async->alerted = 0; + async->terminated = 0; async->completion = fd_get_completion( fd, &async->comp_key ); async->comp_flags = 0; async->completion_callback = NULL; @@ -273,7 +273,7 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da void set_async_pending( struct async *async, int signal ) { - if (async->status == STATUS_PENDING) + if (!async->terminated) { async->pending = 1; if (signal && !async->signaled) @@ -390,13 +390,13 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota if (obj->ops != &async_ops) return; /* in case the client messed up the APC results */ - assert( async->status != STATUS_PENDING ); /* it must have been woken up if we get a result */ + assert( async->terminated ); /* it must have been woken up if we get a result */ if (status == STATUS_PENDING) /* restart it */ { if (async->alerted) { - async->status = STATUS_PENDING; + async->terminated = 0; async->alerted = 0; async_reselect( async ); } @@ -405,7 +405,7 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota { if (async->timeout) remove_timeout_user( async->timeout ); async->timeout = NULL; - async->status = status; + async->terminated = 1; if (async->iosb) async->iosb->status = status; if (async->data.apc) @@ -457,7 +457,7 @@ int async_waiting( struct async_queue *queue ) if (!(ptr = list_head( &queue->queue ))) return 0; async = LIST_ENTRY( ptr, struct async, queue_entry ); - return async->status == STATUS_PENDING; + return !async->terminated; } static int cancel_async( struct process *process, struct object *obj, struct thread *thread, client_ptr_t iosb ) @@ -468,7 +468,7 @@ static int cancel_async( struct process *process, struct object *obj, struct thr restart: LIST_FOR_EACH_ENTRY( async, &process->asyncs, struct async, process_entry ) { - if (async->status != STATUS_PENDING) continue; + if (async->terminated) continue; if ((!obj || (get_fd_user( async->fd ) == obj)) && (!thread || async->thread == thread) && (!iosb || async->data.iosb == iosb)) @@ -578,7 +578,7 @@ struct async *find_pending_async( struct async_queue *queue ) { struct async *async; LIST_FOR_EACH_ENTRY( async, &queue->queue, struct async, queue_entry ) - if (async->status == STATUS_PENDING) return (struct async *)grab_object( async ); + if (!async->terminated) return (struct async *)grab_object( async ); return NULL; }

1 0