July 2017 - Wine-commits - list.winehq.org

Hugh McMaster : regedit: Do not import the line if a hex data type has a " 0x" prefix.
by Alexandre Julliard 05 Jul '17

05 Jul '17

Module: wine Branch: master Commit: b811b166945185d9dd2c47143a01cb943017eacb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b811b166945185d9dd2c47143… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 5 13:33:12 2017 +0000 regedit: Do not import the line if a hex data type has a "0x" prefix. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 +- programs/regedit/tests/regedit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index e94d14e..cddebf7 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -363,7 +363,7 @@ static BOOL parse_data_type(struct parser *parser, WCHAR **line) WCHAR *end; DWORD val; - if (!**line) + if (!**line || tolowerW((*line)[1]) == 'x') return FALSE; /* "hex(xx):" is special */ diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 5e127de..2b33bc9 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -467,7 +467,7 @@ static void test_basic_import(void) verify_reg(hkey, "Wine13g", 0x7fffffff, "Value", 6, 0); verify_reg(hkey, "Wine13h", 0xffffffff, "Value", 6, 0); verify_reg_nonexist(hkey, "Wine13i"); - todo_wine verify_reg_nonexist(hkey, "Wine13j"); + verify_reg_nonexist(hkey, "Wine13j"); verify_reg_nonexist(hkey, "Wine13k"); exec_import_str("REGEDIT4\n\n"

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 05 Jul '17

05 Jul '17

Module: wine Branch: master Commit: 759dd5517c877490d4aae402926008eca20ecbad URL: http://source.winehq.org/git/wine.git/?a=commit;h=759dd5517c877490d4aae4029… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jul 5 17:35:40 2017 +0300 po: Update Ukrainian translation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/uk.po | 316 ++++++++++++++++++++++----------------------------------------- 1 file changed, 108 insertions(+), 208 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=759dd5517c877490d4aae…

1 0

Alexandre Julliard : user32: Scale cursor sizes with the screen DPI.
by Alexandre Julliard 05 Jul '17

05 Jul '17

Module: wine Branch: master Commit: d4654e5799ffb02c025b0f41ccbf617e595186d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4654e5799ffb02c025b0f41c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 5 20:20:05 2017 +0200 user32: Scale cursor sizes with the screen DPI. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 6 ++++++ dlls/user32/tests/sysparams.c | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index bec4d66..97f6b57 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2413,6 +2413,12 @@ INT WINAPI GetSystemMetrics( INT index ) return ret; case SM_CXCURSOR: case SM_CYCURSOR: + if (IsProcessDPIAware()) + { + ret = MulDiv( 32, get_display_dpi(), USER_DEFAULT_SCREEN_DPI ); + if (ret >= 64) return 64; + if (ret >= 48) return 48; + } return 32; case SM_CYMENU: return GetSystemMetrics(SM_CYMENUSIZE) + 1; diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index b5ab784..fa473c1 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2696,6 +2696,14 @@ static BOOL is_font_enumerated(const char *name) return ret; } +static int get_cursor_size( int size ) +{ + /* only certain sizes are allowed for cursors */ + if (size >= 64) return 64; + if (size >= 48) return 48; + return 32; +} + static void test_GetSystemMetrics( void) { TEXTMETRICA tmMenuFont; @@ -2774,8 +2782,8 @@ static void test_GetSystemMetrics( void) /* These don't depend on the Shell Icon Size registry value */ ok_gsm( SM_CXICON, MulDiv( 32, dpi, USER_DEFAULT_SCREEN_DPI ) ); ok_gsm( SM_CYICON, MulDiv( 32, dpi, USER_DEFAULT_SCREEN_DPI ) ); - /* SM_CXCURSOR */ - /* SM_CYCURSOR */ + ok_gsm( SM_CXCURSOR, get_cursor_size( MulDiv( 32, dpi, USER_DEFAULT_SCREEN_DPI ))); + ok_gsm( SM_CYCURSOR, get_cursor_size( MulDiv( 32, dpi, USER_DEFAULT_SCREEN_DPI ))); ok_gsm( SM_CYMENU, ncm.iMenuHeight + 1); ok_gsm( SM_CXFULLSCREEN, GetSystemMetrics( SM_CXMAXIMIZED) - 2 * GetSystemMetrics( SM_CXFRAME));

1 0

Paul Gofman : d3dx9: Check type and register count for sampler constants.
by Alexandre Julliard 05 Jul '17

05 Jul '17

Module: wine Branch: master Commit: a7ea12c94374c7657630168b1e8d6cb800c71cad URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7ea12c94374c7657630168b1… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jun 28 14:28:22 2017 +0300 d3dx9: Check type and register count for sampler constants. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 911ca79..2fb14ab 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -654,10 +654,28 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab if (FAILED(hr = get_ctab_constant_desc(ctab, hc, &cdesc[i]))) goto err_out; inputs_param[i] = get_parameter_by_name(base, NULL, cdesc[i].Name); + if (!inputs_param[i]) + { + WARN("Could not find parameter %s in effect.\n", cdesc[i].Name); + continue; + } if (cdesc[i].Class == D3DXPC_OBJECT) + { TRACE("Object %s, parameter %p.\n", cdesc[i].Name, inputs_param[i]); - else if (!inputs_param[i]) - WARN("Could not find parameter %s in effect.\n", cdesc[i].Name); + if (cdesc[i].RegisterSet != D3DXRS_SAMPLER || inputs_param[i]->class != D3DXPC_OBJECT + || !is_param_type_sampler(inputs_param[i]->type)) + { + WARN("Unexpected object type, constant %s.\n", debugstr_a(cdesc[i].Name)); + hr = D3DERR_INVALIDCALL; + goto err_out; + } + if (max(inputs_param[i]->element_count, 1) < cdesc[i].RegisterCount) + { + WARN("Register count exceeds parameter size, constant %s.\n", debugstr_a(cdesc[i].Name)); + hr = D3DERR_INVALIDCALL; + goto err_out; + } + } } out->input_count = desc.Constants; out->inputs = cdesc;

1 0

Paul Gofman : d3dx9: Support arrays of samplers.
by Alexandre Julliard 05 Jul '17

05 Jul '17

Module: wine Branch: master Commit: 8f9bbdf9ad38985f499943eafe81764579c16778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f9bbdf9ad38985f499943eaf… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jun 28 14:28:23 2017 +0300 d3dx9: Support arrays of samplers. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index e9b139e..c3647d3 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2928,15 +2928,20 @@ static HRESULT d3dx_set_shader_constants(struct ID3DXEffectImpl *effect, struct if (params[i] && params[i]->class == D3DXPC_OBJECT && is_param_type_sampler(params[i]->type)) { struct d3dx_sampler *sampler; + unsigned int sampler_idx; - sampler = (struct d3dx_sampler *)params[i]->data; - TRACE("sampler %s, register index %u, state count %u.\n", debugstr_a(params[i]->name), - cdesc[i].RegisterIndex, sampler->state_count); - for (j = 0; j < sampler->state_count; ++j) + for (sampler_idx = 0; sampler_idx < cdesc[i].RegisterCount; ++sampler_idx) { - if (FAILED(hr = d3dx9_apply_state(effect, pass, &sampler->states[j], - cdesc[i].RegisterIndex + (vs ? D3DVERTEXTEXTURESAMPLER0 : 0), update_all))) - ret = hr; + sampler = params[i]->element_count ? params[i]->members[sampler_idx].data : params[i]->data; + TRACE("sampler %s, register index %u, state count %u.\n", debugstr_a(params[i]->name), + cdesc[i].RegisterIndex, sampler->state_count); + for (j = 0; j < sampler->state_count; ++j) + { + if (FAILED(hr = d3dx9_apply_state(effect, pass, &sampler->states[j], + cdesc[i].RegisterIndex + sampler_idx + (vs ? D3DVERTEXTEXTURESAMPLER0 : 0), + update_all))) + ret = hr; + } } } } @@ -4000,12 +4005,17 @@ static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_ if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) { struct d3dx_sampler *sampler; + unsigned int sampler_idx; + unsigned int samplers_count = max(param->element_count, 1); - sampler = (struct d3dx_sampler *)param->data; - for (i = 0; i < sampler->state_count; ++i) + for (sampler_idx = 0; sampler_idx < samplers_count; ++sampler_idx) { - if (walk_state_dep(&sampler->states[i], param_func, data)) - return TRUE; + sampler = param->element_count ? param->members[sampler_idx].data : param->data; + for (i = 0; i < sampler->state_count; ++i) + { + if (walk_state_dep(&sampler->states[i], param_func, data)) + return TRUE; + } } return FALSE; }

1 0

Paul Gofman : d3dx9/tests: Add tests for array of samplers.
by Alexandre Julliard 05 Jul '17

05 Jul '17

Module: wine Branch: master Commit: 4e2c0444121d341bac9bc841ab6662fceeb42c1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e2c0444121d341bac9bc841a… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jun 28 14:28:24 2017 +0300 d3dx9/tests: Add tests for array of samplers. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 541 +++++++++++++++++++++++++++---------------- 1 file changed, 347 insertions(+), 194 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e2c0444121d341bac9bc…

1 0

Alistair Leslie-Hughes : webservices/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 05 Jul '17

05 Jul '17

Module: wine Branch: master Commit: 75c0879826dbcf0b21b0c5a25c2b96f3a9d288e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c0879826dbcf0b21b0c5a25… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 5 02:36:28 2017 +0000 webservices/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/reader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index a62a069..66151ff 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -3546,7 +3546,7 @@ static void test_datetime(void) ok( hr == tests[i].hr, "%u: got %08x\n", i, hr ); if (hr == S_OK) { - ok( date.ticks == tests[i].ticks, "%u: got %x%08x\n", i, (ULONG)(date.ticks >> 32), (ULONG)date.ticks ); + ok( date.ticks == tests[i].ticks, "%u: got %s\n", i, wine_dbgstr_longlong(date.ticks) ); ok( date.format == tests[i].format, "%u: got %u\n", i, date.format ); } } @@ -3622,14 +3622,14 @@ static void test_WsFileTimeToDateTime(void) dt.format = 0xdeadbeef; hr = WsFileTimeToDateTime( &ft, &dt, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( dt.ticks == 0x701ce1722770000, "got %x%08x\n", (ULONG)(dt.ticks >> 32), (ULONG)dt.ticks ); + ok( dt.ticks == 0x701ce1722770000, "got %s\n", wine_dbgstr_longlong(dt.ticks) ); ok( dt.format == WS_DATETIME_FORMAT_UTC, "got %u\n", dt.format ); ft.dwLowDateTime = 0xd1c03fff; ft.dwHighDateTime = 0x24c85a5e; hr = WsFileTimeToDateTime( &ft, &dt, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( dt.ticks == 0x2bca2875f4373fff, "got %x%08x\n", (ULONG)(dt.ticks >> 32), (ULONG)dt.ticks ); + ok( dt.ticks == 0x2bca2875f4373fff, "got %s\n", wine_dbgstr_longlong(dt.ticks) ); ok( dt.format == WS_DATETIME_FORMAT_UTC, "got %u\n", dt.format ); ft.dwLowDateTime++; @@ -3734,7 +3734,7 @@ static void test_double(void) hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_DOUBLE_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val, sizeof(val), NULL ); ok( hr == tests[i].hr, "%u: got %08x\n", i, hr ); - if (hr == tests[i].hr) ok( val == tests[i].val, "%u: got %x%08x\n", i, (ULONG)(val >> 32), (ULONG)val ); + if (hr == tests[i].hr) ok( val == tests[i].val, "%u: got %s\n", i, wine_dbgstr_longlong(val) ); } WsFreeReader( reader );

1 0

Alistair Leslie-Hughes : pdh/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 05 Jul '17

05 Jul '17

Module: wine Branch: master Commit: 39378faddf203ca3fc8121ab9bfb35fb637709d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39378faddf203ca3fc8121ab9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 5 02:36:49 2017 +0000 pdh/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pdh/tests/pdh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index f492d5a..573bcc3 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -854,7 +854,7 @@ static void test_PdhCollectQueryDataEx(void) status = PdhGetFormattedCounterValue( counter, PDH_FMT_LARGE, NULL, &value ); ok(status == ERROR_SUCCESS, "PdhGetFormattedCounterValue failed 0x%08x\n", status); - trace( "uptime %x%08x\n", (DWORD)(U(value).largeValue >> 32), (DWORD)U(value).largeValue ); + trace( "uptime %s\n", wine_dbgstr_longlong(U(value).largeValue) ); } }

1 0

Alistair Leslie-Hughes : shell32/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 05 Jul '17

05 Jul '17

Module: wine Branch: master Commit: 771d3514e92d78d18aef6d9cb14b3cd2d09ad6cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=771d3514e92d78d18aef6d9cb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 5 02:36:39 2017 +0000 shell32/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/recyclebin.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/tests/recyclebin.c b/dlls/shell32/tests/recyclebin.c index a5ac1dc..50e262e 100644 --- a/dlls/shell32/tests/recyclebin.c +++ b/dlls/shell32/tests/recyclebin.c @@ -28,18 +28,6 @@ static int (WINAPI *pSHQueryRecycleBinA)(LPCSTR,LPSHQUERYRBINFO); static int (WINAPI *pSHFileOperationA)(LPSHFILEOPSTRUCTA); -static char int64_buffer[65]; -/* Note: This function uses a single buffer for the return value.*/ -static const char* str_from_int64(__int64 ll) -{ - - if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) - sprintf(int64_buffer,"%lx%08lx",(unsigned long)(ll >> 32),(unsigned long)ll); - else - sprintf(int64_buffer,"%lx",(unsigned long)ll); - return int64_buffer; -} - static void setup_pointers(void) { HMODULE hshell32 = GetModuleHandleA("shell32.dll"); @@ -88,8 +76,8 @@ static void test_query_recyclebin(void) ok(!pSHFileOperationA(&shfo), "Deletion was not successful\n"); hr = pSHQueryRecycleBinA(buf,&info2); ok(hr == S_OK, "SHQueryRecycleBinA failed with error 0x%x\n", hr); - ok(info2.i64Size==info1.i64Size+written,"Expected recycle bin to have 0x%s bytes\n",str_from_int64(info1.i64Size+written)); - ok(info2.i64NumItems==info1.i64NumItems+1,"Expected recycle bin to have 0x%s items\n",str_from_int64(info1.i64NumItems+1)); + ok(info2.i64Size==info1.i64Size+written,"Expected recycle bin to have 0x%s bytes\n",wine_dbgstr_longlong(info1.i64Size+written)); + ok(info2.i64NumItems==info1.i64NumItems+1,"Expected recycle bin to have 0x%s items\n",wine_dbgstr_longlong(info1.i64NumItems+1)); }

1 0

Jacek Caban : server: Keep weak fd reference in async object when async is queued.
by Alexandre Julliard 05 Jul '17

05 Jul '17

Module: wine Branch: master Commit: 9df88c305507672aea65f40c1fc499335276f6ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=9df88c305507672aea65f40c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 4 15:25:51 2017 +0200 server: Keep weak fd reference in async object when async is queued. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/server/async.c b/server/async.c index 3a83a63..ed85899 100644 --- a/server/async.c +++ b/server/async.c @@ -118,7 +118,7 @@ static const struct object_ops async_queue_ops = static inline void async_reselect( struct async *async ) { - if (async->queue && async->queue->fd) fd_reselect_async( async->queue->fd, async->queue ); + if (async->queue && async->fd) fd_reselect_async( async->fd, async->queue ); } static void async_dump( struct object *obj, int verbose ) @@ -167,8 +167,8 @@ static void async_destroy( struct object *obj ) async_reselect( async ); release_object( async->queue ); } + else if (async->fd) release_object( async->fd ); - if (async->fd) release_object( async->fd ); if (async->timeout) remove_timeout_user( async->timeout ); if (async->event) release_object( async->event ); if (async->iosb) release_object( async->iosb ); @@ -250,8 +250,11 @@ struct async_queue *create_async_queue( struct fd *fd ) /* free an async queue, cancelling all async operations */ void free_async_queue( struct async_queue *queue ) { + struct async *async; + if (!queue) return; if (queue->fd) queue->completion = fd_get_completion( queue->fd, &queue->comp_key ); + LIST_FOR_EACH_ENTRY( async, &queue->queue, struct async, queue_entry ) async->fd = NULL; queue->fd = NULL; async_wake_up( queue, STATUS_HANDLES_CLOSED ); release_object( queue ); @@ -259,14 +262,14 @@ void free_async_queue( struct async_queue *queue ) void queue_async( struct async_queue *queue, struct async *async ) { + /* fd will be set to NULL in free_async_queue when fd is destroyed */ release_object( async->fd ); - async->fd = NULL; async->queue = (struct async_queue *)grab_object( queue ); grab_object( async ); list_add_tail( &queue->queue, &async->queue_entry ); - if (queue->fd) set_fd_signaled( queue->fd, 0 ); + if (async->fd) set_fd_signaled( async->fd, 0 ); } /* create an async on a given queue of a fd */ @@ -383,12 +386,10 @@ void async_set_timeout( struct async *async, timeout_t timeout, unsigned int sta static void add_async_completion( struct async *async, apc_param_t cvalue, unsigned int status, apc_param_t information ) { - struct fd *fd = async->queue ? async->queue->fd : async->fd; - - if (fd) + if (async->fd) { apc_param_t ckey; - struct completion *completion = fd_get_completion( fd, &ckey ); + struct completion *completion = fd_get_completion( async->fd, &ckey ); if (completion) { @@ -443,7 +444,6 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota if (async->event) set_event( async->event ); else if (async->fd) set_fd_signaled( async->fd, 1 ); - else if (async->queue && async->queue->fd) set_fd_signaled( async->queue->fd, 1 ); if (!async->signaled) { async->signaled = 1; @@ -473,15 +473,13 @@ int async_waiting( struct async_queue *queue ) static int cancel_async( struct process *process, struct object *obj, struct thread *thread, client_ptr_t iosb ) { struct async *async; - struct fd *fd; int woken = 0; restart: LIST_FOR_EACH_ENTRY( async, &process->asyncs, struct async, process_entry ) { if (async->status == STATUS_CANCELLED) continue; - fd = async->queue ? async->queue->fd : async->fd; - if ((!obj || (fd && get_fd_user( fd ) == obj)) && + if ((!obj || (async->fd && get_fd_user( async->fd ) == obj)) && (!thread || async->thread == thread) && (!iosb || async->data.iosb == iosb)) {

1 0