September 2021 - Wine-commits

Connor McAdams : user32/tests: Add missing winevents to test_SetActiveWindow() message sequences.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 9196caea07e9b2e95b00412c92c22bb0a8f7c974 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9196caea07e9b2e95b00412c… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Sep 22 21:01:53 2021 -0400 user32/tests: Add missing winevents to test_SetActiveWindow() message sequences. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index cda14b7275d..900b31584d8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14565,6 +14565,7 @@ static const struct message SetActiveWindowSeq0[] = { WM_NCACTIVATE, sent|wparam, 0 }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ACTIVATE, sent|wparam, 0 }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_ACTIVATEAPP, sent|wparam|optional, 0 }, { WM_ACTIVATEAPP, sent|wparam|optional, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, @@ -14582,6 +14583,7 @@ static const struct message SetActiveWindowSeq0[] = { WM_IME_SETCONTEXT, sent|optional }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|defwinproc|optional }, { WM_GETTEXT, sent|optional }, { 0 } @@ -14599,6 +14601,7 @@ static const struct message SetActiveWindowSeq2[] = { WM_NCACTIVATE, sent|wparam, 0 }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ACTIVATE, sent|wparam, 0 }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE }, @@ -14615,6 +14618,7 @@ static const struct message SetActiveWindowSeq2[] = { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|defwinproc }, { WM_GETTEXT, sent|optional }, { 0 } @@ -14624,6 +14628,7 @@ static const struct message SetActiveWindowSeq2[] = static const struct message SetActiveWindowSeq3[] = { { HCBT_ACTIVATE, hook }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, @@ -14636,6 +14641,7 @@ static const struct message SetActiveWindowSeq3[] = { HCBT_SETFOCUS, hook }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|defwinproc }, { 0 } }; @@ -14646,6 +14652,7 @@ static const struct message SetActiveWindowSeq4[] = { WM_NCACTIVATE, sent|wparam, 0 }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ACTIVATE, sent|wparam, 0 }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE }, @@ -14660,6 +14667,7 @@ static const struct message SetActiveWindowSeq4[] = { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|defwinproc }, { 0 } }; @@ -18561,6 +18569,7 @@ START_TEST(msg) test_edit_messages(); test_quit_message(); test_notify_message(); + test_SetActiveWindow(); /* Fix message sequences before removing 4 lines below */ if (pUnhookWinEvent && hEvent_hook) @@ -18571,7 +18580,6 @@ START_TEST(msg) } hEvent_hook = 0; - test_SetActiveWindow(); test_restore_messages(); test_invalid_window();

1 0

Connor McAdams : user32/tests: Add missing winevents to test_restore_messages() message sequence.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: f4fdb721bf0ad69c73e0a7a2316ed08d5d5a6deb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4fdb721bf0ad69c73e0a7a2… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Sep 22 21:01:54 2021 -0400 user32/tests: Add missing winevents to test_restore_messages() message sequence. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 900b31584d8..6825c1d74d4 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -18333,6 +18333,7 @@ static void test_DoubleSetCapture(void) static const struct message WmRestoreMinimizedSeq[] = { { HCBT_ACTIVATE, hook }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_ACTIVATEAPP, sent|wparam, 1 }, @@ -18352,16 +18353,20 @@ static const struct message WmRestoreMinimizedSeq[] = { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_GETMINMAXINFO, sent|defwinproc }, { WM_NCCALCSIZE, sent|wparam|defwinproc, 1 }, + { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_NCPAINT, sent|wparam|defwinproc|optional, 1 }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent|defwinproc }, { WM_WINDOWPOSCHANGED, sent|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|defwinproc }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_SYSTEM_MINIMIZEEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_NCCALCSIZE, sent|wparam|defwinproc|optional, 1 }, { WM_NCPAINT, sent|wparam|defwinproc|optional, 1 }, { WM_ERASEBKGND, sent|defwinproc|optional }, { HCBT_SETFOCUS, hook }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|defwinproc }, { WM_ACTIVATE, sent|wparam|defwinproc, 1 }, { WM_PAINT, sent| optional }, @@ -18570,6 +18575,13 @@ START_TEST(msg) test_quit_message(); test_notify_message(); test_SetActiveWindow(); + test_restore_messages(); + test_invalid_window(); + + if (!pTrackMouseEvent) + win_skip("TrackMouseEvent is not available\n"); + else + test_TrackMouseEvent(); /* Fix message sequences before removing 4 lines below */ if (pUnhookWinEvent && hEvent_hook) @@ -18580,14 +18592,6 @@ START_TEST(msg) } hEvent_hook = 0; - test_restore_messages(); - test_invalid_window(); - - if (!pTrackMouseEvent) - win_skip("TrackMouseEvent is not available\n"); - else - test_TrackMouseEvent(); - test_SetWindowRgn(); test_sys_menu(); test_dialog_messages();

1 0

Alexandre Julliard : ntdll: Copy __wine_setjmpex/longjmp implementation to avoid importing winecrt0.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 15d5cb225642f1ec087b505004ba7852d0ae7e70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15d5cb225642f1ec087b5050… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 23 10:37:32 2021 +0200 ntdll: Copy __wine_setjmpex/longjmp implementation to avoid importing winecrt0. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 2 +- dlls/ntdll/unix/signal_arm.c | 34 ++++++++++++++++++++++ dlls/ntdll/unix/signal_arm64.c | 49 +++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_i386.c | 31 ++++++++++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 64 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 179 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=15d5cb225642f1ec087b…

1 0

Alexandre Julliard : makefiles: Allow including files with relative paths.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 3c81449d16c8bd2f824c8c16622857f7fff772a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c81449d16c8bd2f824c8c16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 23 12:42:45 2021 +0200 makefiles: Allow including files with relative paths. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 2 -- dlls/shell32/shell32.rc | 4 ++-- tools/makedep.c | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 8a37ee4822a..eeb6cd63d60 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -3,8 +3,6 @@ MODULE = shell32.dll IMPORTLIB = shell32 IMPORTS = uuid shlwapi user32 gdi32 advapi32 DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32 gdiplus -# AUTHORS file is in the top-level directory -EXTRAINCL = -I$(top_srcdir) C_SRCS = \ appbar.c \ diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index f7f8eea2da5..f899a27f12c 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -1101,8 +1101,8 @@ IDR_AVI_FILENUKE AVI resources/searching.avi /* @makedep: resources/searching.avi */ IDR_AVI_FILEDELETE AVI resources/searching.avi -/* @makedep: AUTHORS */ -AUTHORS RCDATA AUTHORS +/* @makedep: ../../AUTHORS */ +AUTHORS RCDATA ../../AUTHORS /* @makedep: shell32.manifest */ 124 RT_MANIFEST shell32.manifest diff --git a/tools/makedep.c b/tools/makedep.c index 46aea32440a..9110035d633 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -909,9 +909,6 @@ static void add_dependency( struct file *file, const char *name, enum incl_type { /* enforce some rules for the Wine tree */ - if (!memcmp( name, "../", 3 )) - fatal_error( "#include directive with relative path not allowed\n" ); - if (!strcmp( name, "config.h" )) { if (strendswith( file->name, ".h" )) @@ -1456,6 +1453,7 @@ static struct file *open_global_file( const struct makefile *make, const char *p */ static struct file *open_global_header( const struct makefile *make, const char *path, char **filename ) { + if (!strncmp( path, "../", 3 )) return NULL; return open_global_file( make, strmake( "include/%s", path ), filename ); }

1 0

Alexandre Julliard : makefiles: Use explicit header path for sanity checks.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 8ec232132853ee9efae4c5bde9fce665d9846ca1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ec232132853ee9efae4c5bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 23 14:44:50 2021 +0200 makefiles: Use explicit header path for sanity checks. This makes it possible to use a local config.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 9110035d633..6e10e4d3be4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -907,26 +907,6 @@ static struct file *add_file( const char *name ) */ static void add_dependency( struct file *file, const char *name, enum incl_type type ) { - /* enforce some rules for the Wine tree */ - - if (!strcmp( name, "config.h" )) - { - if (strendswith( file->name, ".h" )) - fatal_error( "config.h must not be included by a header file\n" ); - if (file->deps_count) - fatal_error( "config.h must be included before anything else\n" ); - } - else if (!strcmp( name, "wine/port.h" )) - { - if (strendswith( file->name, ".h" )) - fatal_error( "wine/port.h must not be included by a header file\n" ); - if (!file->deps_count) fatal_error( "config.h must be included before wine/port.h\n" ); - if (file->deps_count > 1) - fatal_error( "wine/port.h must be included before everything except config.h\n" ); - if (strcmp( file->deps[0].name, "config.h" )) - fatal_error( "config.h must be included before wine/port.h\n" ); - } - if (file->deps_count >= file->deps_size) { file->deps_size *= 2; @@ -1630,9 +1610,6 @@ static void add_all_includes( struct makefile *make, struct incl_file *parent, s { unsigned int i; - parent->files_count = 0; - parent->files_size = file->deps_count; - parent->files = xmalloc( parent->files_size * sizeof(*parent->files) ); for (i = 0; i < file->deps_count; i++) { switch (file->deps[i].type) @@ -2094,7 +2071,22 @@ static void get_dependencies( struct incl_file *file, struct incl_file *source ) return; /* library is imported only when building a typelib */ file->owner = source; strarray_add( &source->dependencies, file->filename ); + + /* sanity checks */ + if ((!strcmp( file->filename, "include/config.h" ) && file != source->files[0]) || + (!strcmp( file->filename, "include/wine/port.h" ) && file != source->files[1])) + { + input_file_name = source->filename; + input_line = 0; + for (i = 0; i < source->file->deps_count; i++) + { + if (!strcmp( source->file->deps[i].name, file->name )) + input_line = source->file->deps[i].line; + } + fatal_error( "%s must be included before other headers\n", file->name ); + } } + for (i = 0; i < file->files_count; i++) get_dependencies( file->files[i], source ); }

1 0

Alexandre Julliard : winebuild: Unify the strarray implementation with the one from makedep.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: d6d5a217219222ed5f953cca3c662f48b46cdf46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6d5a217219222ed5f953cca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 23 11:35:48 2021 +0200 winebuild: Unify the strarray implementation with the one from makedep. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 10 +-- tools/winebuild/import.c | 78 ++++++++++++----------- tools/winebuild/main.c | 6 +- tools/winebuild/res32.c | 15 +++-- tools/winebuild/spec32.c | 2 +- tools/winebuild/utils.c | 163 ++++++++++++++++++++++------------------------- 6 files changed, 135 insertions(+), 139 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d6d5a217219222ed5f95…

1 0

Alexandre Julliard : winebuild: Use strarrays for the argument lists.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: c878a0a4c0f5169689cbc53e327e632464881437 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c878a0a4c0f5169689cbc53e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 23 12:23:25 2021 +0200 winebuild: Use strarrays for the argument lists. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 8 +++---- tools/winebuild/import.c | 20 ++++++++-------- tools/winebuild/main.c | 61 ++++++++++++++++++++++++++---------------------- tools/winebuild/spec32.c | 22 +++++++++-------- 4 files changed, 59 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c878a0a4c0f5169689cb…

1 0

Alexandre Julliard : winegcc: Unify the strarray implementation with the one from makedep.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 2064181c1f120e8d537952b3eeed5ab6938a59bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2064181c1f120e8d537952b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 23 11:52:15 2021 +0200 winegcc: Unify the strarray implementation with the one from makedep. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/utils.c | 161 ++++----- tools/winegcc/utils.h | 31 +- tools/winegcc/winegcc.c | 862 +++++++++++++++++++++++------------------------- 3 files changed, 493 insertions(+), 561 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2064181c1f120e8d5379…

1 0

Rémi Bernon : dinput: Check data format dwObjSize in IDirectInputDevice2WImpl_SetDataFormat.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 0e757229715d4301a040f9a130b9769d471435fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e757229715d4301a040f9a1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 23 10:51:34 2021 +0200 dinput: Check data format dwObjSize in IDirectInputDevice2WImpl_SetDataFormat. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 1 + dlls/dinput8/tests/hid.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 17eaff69d50..2a3ed391919 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1094,6 +1094,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetDataFormat(LPDIRECTINPUTDEVICE8W ifac _dump_DIDATAFORMAT(df); if (df->dwSize != sizeof(DIDATAFORMAT)) return DIERR_INVALIDPARAM; + if (df->dwObjSize != sizeof(DIOBJECTDATAFORMAT)) return DIERR_INVALIDPARAM; if (This->acquired) return DIERR_ACQUIRED; EnterCriticalSection(&This->crit); diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 371edc99251..e017e048a30 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -4015,7 +4015,6 @@ static void test_simple_joystick(void) ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr ); dataformat.dwSize = sizeof(DIDATAFORMAT); hr = IDirectInputDevice8_SetDataFormat( device, &dataformat ); - todo_wine ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr ); dataformat.dwObjSize = sizeof(DIOBJECTDATAFORMAT); hr = IDirectInputDevice8_SetDataFormat( device, &dataformat );

1 0

Rémi Bernon : dinput: Check acquired state in IDirectInputDevice2WImpl_SetCooperativeLevel.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 0686815ff621479f7c53f3318cd08f0b0d837172 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0686815ff621479f7c53f331… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 23 10:51:35 2021 +0200 dinput: Check acquired state in IDirectInputDevice2WImpl_SetCooperativeLevel. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 12 +++++++++--- dlls/dinput8/tests/hid.c | 1 - 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 2a3ed391919..11496640049 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1118,6 +1118,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetDataFormat(LPDIRECTINPUTDEVICE8W ifac HRESULT WINAPI IDirectInputDevice2WImpl_SetCooperativeLevel(LPDIRECTINPUTDEVICE8W iface, HWND hwnd, DWORD dwflags) { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + HRESULT hr; TRACE("(%p) %p,0x%08x\n", This, hwnd, dwflags); _dump_cooperativelevel_DI(dwflags); @@ -1144,11 +1145,16 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetCooperativeLevel(LPDIRECTINPUTDEVICE8 /* Store the window which asks for the mouse */ EnterCriticalSection(&This->crit); - This->win = hwnd; - This->dwCoopLevel = dwflags; + if (This->acquired) hr = DIERR_ACQUIRED; + else + { + This->win = hwnd; + This->dwCoopLevel = dwflags; + hr = DI_OK; + } LeaveCriticalSection(&This->crit); - return DI_OK; + return hr; } /****************************************************************************** diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index e017e048a30..c0f1b78160c 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -4082,7 +4082,6 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_Acquire( device ); ok( hr == DI_OK, "IDirectInputDevice8_Acquire returned: %#x\n", hr ); hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_FOREGROUND | DISCL_EXCLUSIVE ); - todo_wine ok( hr == DIERR_ACQUIRED, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); hr = IDirectInputDevice8_Unacquire( device ); ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr );

1 0