August 2018 - Wine-Commits - list.winehq.org

Jacek Caban : server: Share more code between pipe client and server destructors.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: 95296651b57dee423a567896cffa8424f2f5a8e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95296651b57dee423a567896… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 17 17:41:30 2018 +0200 server: Share more code between pipe client and server destructors. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 70134fb..ba6f507 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -133,6 +133,7 @@ static const struct object_ops named_pipe_ops = }; /* common server and client pipe end functions */ +static void pipe_end_destroy( struct object *obj ); static enum server_fd_type pipe_end_get_fd_type( struct fd *fd ); static struct fd *pipe_end_get_fd( struct object *obj ); static struct security_descriptor *pipe_end_get_sd( struct object *obj ); @@ -189,7 +190,6 @@ static const struct fd_ops pipe_server_fd_ops = /* client end functions */ static void pipe_client_dump( struct object *obj, int verbose ); -static void pipe_client_destroy( struct object *obj ); static int pipe_client_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct object_ops pipe_client_ops = @@ -211,7 +211,7 @@ static const struct object_ops pipe_client_ops = NULL, /* unlink_name */ no_open_file, /* open_file */ fd_close_handle, /* close_handle */ - pipe_client_destroy /* destroy */ + pipe_end_destroy /* destroy */ }; static const struct fd_ops pipe_client_fd_ops = @@ -382,10 +382,13 @@ static void pipe_end_disconnect( struct pipe_end *pipe_end, unsigned int status } } -static void pipe_end_destroy( struct pipe_end *pipe_end ) +static void pipe_end_destroy( struct object *obj ) { + struct pipe_end *pipe_end = (struct pipe_end *)obj; struct pipe_message *message; + pipe_end_disconnect( pipe_end, STATUS_PIPE_BROKEN ); + while (!list_empty( &pipe_end->message_queue )) { message = LIST_ENTRY( list_head(&pipe_end->message_queue), struct pipe_message, entry ); @@ -399,7 +402,7 @@ static void pipe_end_destroy( struct pipe_end *pipe_end ) if (pipe_end->pipe) release_object( pipe_end->pipe ); } -static void pipe_server_destroy( struct object *obj) +static void pipe_server_destroy( struct object *obj ) { struct pipe_server *server = (struct pipe_server *)obj; struct named_pipe *pipe = server->pipe_end.pipe; @@ -411,19 +414,7 @@ static void pipe_server_destroy( struct object *obj) list_remove( &server->entry ); free_async_queue( &server->listen_q ); - pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_BROKEN ); - - pipe_end_destroy( &server->pipe_end ); -} - -static void pipe_client_destroy( struct object *obj) -{ - struct pipe_client *client = (struct pipe_client *)obj; - - assert( obj->ops == &pipe_client_ops ); - - pipe_end_disconnect( &client->pipe_end, STATUS_PIPE_BROKEN ); - pipe_end_destroy( &client->pipe_end ); + pipe_end_destroy( obj ); } static void named_pipe_device_dump( struct object *obj, int verbose )

1 0

Alexandre Julliard : Release 3.14.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: c698682b3286d72cc7c4c4624b4d14b03dbe6908 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c698682b3286d72cc7c4c462… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 17 19:30:47 2018 +0200 Release 3.14. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 785 ++++++++++++++++++++++++++++++++++++-------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 462 insertions(+), 344 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c698682b3286d72cc7c4…

1 0

Jacek Caban : server: Remove no longer needed pipe_state enum.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: ce5def4b58fb747bb3183220cb13c0e486048419 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce5def4b58fb747bb3183220… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 17 17:41:17 2018 +0200 server: Remove no longer needed pipe_state enum. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 42 ++---------------------------------------- 1 file changed, 2 insertions(+), 40 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index c2c80b1..70134fb 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -42,15 +42,6 @@ #include "security.h" #include "process.h" -enum pipe_state -{ - ps_idle_server, - ps_wait_open, - ps_connected_server, - ps_wait_disconnect, - ps_wait_connect -}; - struct named_pipe; struct pipe_message @@ -81,7 +72,6 @@ struct pipe_server { struct pipe_end pipe_end; /* common header for pipe_client and pipe_server */ struct list entry; /* entry in named pipe servers list */ - enum pipe_state state; /* server state */ unsigned int options; /* pipe options */ struct async_queue listen_q; /* listen queue */ }; @@ -305,7 +295,8 @@ static void pipe_server_dump( struct object *obj, int verbose ) { struct pipe_server *server = (struct pipe_server *) obj; assert( obj->ops == &pipe_server_ops ); - fprintf( stderr, "Named pipe server pipe=%p state=%d\n", server->pipe_end.pipe, server->state ); + fprintf( stderr, "Named pipe server pipe=%p state=%d\n", server->pipe_end.pipe, + server->pipe_end.state ); } static void pipe_client_dump( struct object *obj, int verbose ) @@ -330,12 +321,6 @@ static struct fd *pipe_end_get_fd( struct object *obj ) return (struct fd *) grab_object( pipe_end->fd ); } -static void set_server_state( struct pipe_server *server, enum pipe_state state ) -{ - server->state = state; -} - - static struct pipe_message *queue_message( struct pipe_end *pipe_end, struct iosb *iosb ) { struct pipe_message *message; @@ -434,29 +419,10 @@ static void pipe_server_destroy( struct object *obj) static void pipe_client_destroy( struct object *obj) { struct pipe_client *client = (struct pipe_client *)obj; - struct pipe_server *server = (struct pipe_server *)client->pipe_end.connection; assert( obj->ops == &pipe_client_ops ); pipe_end_disconnect( &client->pipe_end, STATUS_PIPE_BROKEN ); - - if (server) - { - switch(server->state) - { - case ps_connected_server: - /* Don't destroy the server's fd here as we can't - do a successful flush without it. */ - set_server_state( server, ps_wait_disconnect ); - break; - case ps_idle_server: - case ps_wait_open: - case ps_wait_disconnect: - case ps_wait_connect: - assert( 0 ); - } - } - pipe_end_destroy( &client->pipe_end ); } @@ -1007,7 +973,6 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as server->pipe_end.state = FILE_PIPE_LISTENING_STATE; queue_async( &server->listen_q, async ); - set_server_state( server, ps_wait_open ); async_wake_up( &server->pipe_end.pipe->waiters, STATUS_SUCCESS ); set_error( STATUS_PENDING ); return 1; @@ -1032,7 +997,6 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as } pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_DISCONNECTED ); - set_server_state( server, ps_wait_connect ); return 1; default: @@ -1091,7 +1055,6 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned allow_fd_caching( server->pipe_end.fd ); set_fd_signaled( server->pipe_end.fd, 1 ); init_async_queue( &server->listen_q ); - set_server_state( server, ps_idle_server ); return server; } @@ -1183,7 +1146,6 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc { async_wake_up( &server->listen_q, STATUS_SUCCESS ); server->pipe_end.state = FILE_PIPE_CONNECTED_STATE; - set_server_state( server, ps_connected_server ); server->pipe_end.connection = &client->pipe_end; client->pipe_end.connection = &server->pipe_end; server->pipe_end.client_pid = client->pipe_end.client_pid;

1 0

Jacek Caban : server: Use separated async queue for listeners.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: 03317d10a0dfd21bf7b64120432274b98d8bfcb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03317d10a0dfd21bf7b64120… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 17 17:41:01 2018 +0200 server: Use separated async queue for listeners. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 80a56ae..c17889b 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -83,6 +83,7 @@ struct pipe_server struct list entry; /* entry in named pipe servers list */ enum pipe_state state; /* server state */ unsigned int options; /* pipe options */ + struct async_queue listen_q; /* listen queue */ }; struct pipe_client @@ -424,6 +425,7 @@ static void pipe_server_destroy( struct object *obj) if (!--pipe->instances) unlink_named_object( &pipe->obj ); list_remove( &server->entry ); + free_async_queue( &server->listen_q ); pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_BROKEN ); pipe_end_destroy( &server->pipe_end ); @@ -1003,8 +1005,8 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as return 0; } - fd_queue_async( server->pipe_end.fd, async, ASYNC_TYPE_WAIT ); server->pipe_end.state = FILE_PIPE_LISTENING_STATE; + queue_async( &server->listen_q, async ); set_server_state( server, ps_wait_open ); async_wake_up( &server->pipe_end.pipe->waiters, STATUS_SUCCESS ); set_error( STATUS_PENDING ); @@ -1088,6 +1090,7 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned } allow_fd_caching( server->pipe_end.fd ); set_fd_signaled( server->pipe_end.fd, 1 ); + init_async_queue( &server->listen_q ); set_server_state( server, ps_idle_server ); return server; } @@ -1178,8 +1181,7 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc if ((client = create_pipe_client( options, pipe, pipe->outsize, options ))) { - if (server->state == ps_wait_open) - fd_async_wake_up( server->pipe_end.fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); + async_wake_up( &server->listen_q, STATUS_SUCCESS ); server->pipe_end.state = FILE_PIPE_CONNECTED_STATE; set_server_state( server, ps_connected_server ); server->pipe_end.connection = &client->pipe_end;

1 0

Zebediah Figura : setupapi: Implement SPINT_LINKED.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: f48e726e5130cf78572a2d5c243c82446415f894 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f48e726e5130cf78572a2d5c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 16 18:37:38 2018 -0500 setupapi: Implement SPINT_LINKED. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 9f77669..c69304b 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -91,6 +91,8 @@ static const WCHAR UpperFilters[] = {'U','p','p','e','r','F','i','l','t','e','r' static const WCHAR LowerFilters[] = {'L','o','w','e','r','F','i','l','t','e','r','s',0}; static const WCHAR Phantom[] = {'P','h','a','n','t','o','m',0}; static const WCHAR SymbolicLink[] = {'S','y','m','b','o','l','i','c','L','i','n','k',0}; +static const WCHAR Control[] = {'C','o','n','t','r','o','l',0}; +static const WCHAR Linked[] = {'L','i','n','k','e','d',0}; /* is used to identify if a DeviceInfoSet pointer is valid or not */ @@ -299,6 +301,25 @@ static LPWSTR SETUPDI_CreateSymbolicLinkPath(LPCWSTR instanceId, return ret; } +static BOOL is_linked(HKEY key) +{ + DWORD linked, type, size; + HKEY control_key; + BOOL ret = FALSE; + + if (!RegOpenKeyW(key, Control, &control_key)) + { + size = sizeof(DWORD); + if (!RegQueryValueExW(control_key, Linked, NULL, &type, (BYTE *)&linked, &size) + && type == REG_DWORD && linked) + ret = TRUE; + + RegCloseKey(control_key); + } + + return ret; +} + static struct device_iface *SETUPDI_CreateDeviceInterface(struct device *device, const GUID *class, const WCHAR *refstr) { @@ -334,7 +355,7 @@ static struct device_iface *SETUPDI_CreateDeviceInterface(struct device *device, iface->symlink = symlink; iface->device = device; iface->class = *class; - iface->flags = SPINT_ACTIVE; /* FIXME */ + iface->flags = 0; if (!(path = get_iface_key_path(iface))) { @@ -365,6 +386,10 @@ static struct device_iface *SETUPDI_CreateDeviceInterface(struct device *device, } RegSetValueExW(key, SymbolicLink, 0, REG_SZ, (BYTE *)iface->symlink, lstrlenW(iface->symlink) * sizeof(WCHAR)); + + if (is_linked(key)) + iface->flags |= SPINT_ACTIVE; + RegCloseKey(key); heap_free(path);

1 0

Jacek Caban : server: Use pipe_end state in FSCTL_PIPE_LISTEN implementation.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: 290320a8fec6f78289761d5162f27873d83edbb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=290320a8fec6f78289761d51… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 17 17:40:44 2018 +0200 server: Use pipe_end state in FSCTL_PIPE_LISTEN implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 8 ++++++++ server/named_pipe.c | 34 ++++++++++++++++------------------ 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 94db1a2..d6a0d41 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1341,6 +1341,14 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state) ok(status == expected_status, "NtReadFile failed in %s state %u: %x\n", is_server ? "server" : "client", state, status); } + + if (is_server && (state == FILE_PIPE_CLOSING_STATE || state == FILE_PIPE_CONNECTED_STATE)) + { + memset(&io, 0xcc, sizeof(io)); + status = listen_pipe(pipe, NULL, &io, FALSE); + ok(status == (state == FILE_PIPE_CLOSING_STATE ? STATUS_PIPE_CLOSING : STATUS_PIPE_CONNECTED), + "status = %x in %u state\n", status, state); + } } static void test_pipe_with_data_state(HANDLE pipe, BOOL is_server, DWORD state) diff --git a/server/named_pipe.c b/server/named_pipe.c index 76e38a9..bb4ea3b 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -990,27 +990,25 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as switch(code) { case FSCTL_PIPE_LISTEN: - switch(server->state) + switch(server->pipe_end.state) { - case ps_idle_server: - case ps_wait_connect: - fd_queue_async( server->pipe_end.fd, async, ASYNC_TYPE_WAIT ); - server->pipe_end.state = FILE_PIPE_LISTENING_STATE; - set_server_state( server, ps_wait_open ); - async_wake_up( &server->pipe_end.pipe->waiters, STATUS_SUCCESS ); - set_error( STATUS_PENDING ); - return 1; - case ps_connected_server: - set_error( STATUS_PIPE_CONNECTED ); - break; - case ps_wait_disconnect: - set_error( STATUS_NO_DATA_DETECTED ); - break; - case ps_wait_open: - set_error( STATUS_INVALID_HANDLE ); + case FILE_PIPE_LISTENING_STATE: + case FILE_PIPE_DISCONNECTED_STATE: break; + case FILE_PIPE_CONNECTED_STATE: + set_error( STATUS_PIPE_CONNECTED ); + return 0; + case FILE_PIPE_CLOSING_STATE: + set_error( STATUS_PIPE_CLOSING ); + return 0; } - return 0; + + fd_queue_async( server->pipe_end.fd, async, ASYNC_TYPE_WAIT ); + server->pipe_end.state = FILE_PIPE_LISTENING_STATE; + set_server_state( server, ps_wait_open ); + async_wake_up( &server->pipe_end.pipe->waiters, STATUS_SUCCESS ); + set_error( STATUS_PENDING ); + return 1; case FSCTL_PIPE_DISCONNECT: switch(server->state)

1 0

Akihiro Sagawa : dinput: Correct key name mappings on Japanese 106 keyboard.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: 966b3b20de0c060a32c88ba1fce193725310afd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=966b3b20de0c060a32c88ba1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 17 17:15:03 2018 +0900 dinput: Correct key name mappings on Japanese 106 keyboard. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/keyboard.c | 42 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index c810515..6c7b535 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -433,6 +433,40 @@ static HRESULT WINAPI SysKeyboardAImpl_GetCapabilities(LPDIRECTINPUTDEVICE8A ifa return SysKeyboardWImpl_GetCapabilities(IDirectInputDevice8W_from_impl(This), lpDIDevCaps); } +static DWORD map_dik_to_scan(DWORD dik_code, DWORD subtype) +{ + if (dik_code == DIK_PAUSE || dik_code == DIK_NUMLOCK) dik_code ^= 0x80; + if (subtype == DIDEVTYPEKEYBOARD_JAPAN106) + { + switch (dik_code) + { + case DIK_CIRCUMFLEX: + dik_code = 0x0d; + break; + case DIK_AT: + dik_code = 0x1a; + break; + case DIK_LBRACKET: + dik_code = 0x1b; + break; + case DIK_COLON: + dik_code = 0x28; + break; + case DIK_KANJI: + dik_code = 0x29; + break; + case DIK_RBRACKET: + dik_code = 0x2b; + break; + case DIK_BACKSLASH: + dik_code = 0x73; + break; + } + } + + return dik_code; +} + /****************************************************************************** * GetObjectInfo : get information about a device object such as a button * or axis @@ -444,14 +478,14 @@ SysKeyboardAImpl_GetObjectInfo( DWORD dwObj, DWORD dwHow) { + SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); HRESULT res; LONG scan; res = IDirectInputDevice2AImpl_GetObjectInfo(iface, pdidoi, dwObj, dwHow); if (res != DI_OK) return res; - scan = DIDFT_GETINSTANCE(pdidoi->dwType); - if (scan == DIK_PAUSE || scan == DIK_NUMLOCK) scan ^= 0x80; + scan = map_dik_to_scan(DIDFT_GETINSTANCE(pdidoi->dwType), This->subtype); if (!GetKeyNameTextA((scan & 0x80) << 17 | (scan & 0x7f) << 16, pdidoi->tszName, sizeof(pdidoi->tszName))) return DIERR_OBJECTNOTFOUND; @@ -465,14 +499,14 @@ static HRESULT WINAPI SysKeyboardWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface DWORD dwObj, DWORD dwHow) { + SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); HRESULT res; LONG scan; res = IDirectInputDevice2WImpl_GetObjectInfo(iface, pdidoi, dwObj, dwHow); if (res != DI_OK) return res; - scan = DIDFT_GETINSTANCE(pdidoi->dwType); - if (scan == DIK_PAUSE || scan == DIK_NUMLOCK) scan ^= 0x80; + scan = map_dik_to_scan(DIDFT_GETINSTANCE(pdidoi->dwType), This->subtype); if (!GetKeyNameTextW((scan & 0x80) << 17 | (scan & 0x7f) << 16, pdidoi->tszName, sizeof(pdidoi->tszName)/sizeof(pdidoi->tszName[0]))) return DIERR_OBJECTNOTFOUND;

1 0

Akihiro Sagawa : dinput/tests: Add more tests for keyboard subtypes.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: 937dcde349781025ea4d6aa9e4d928f3d9836ac8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=937dcde349781025ea4d6aa9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 17 17:14:52 2018 +0900 dinput/tests: Add more tests for keyboard subtypes. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/keyboard.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 535f0bd..f7923d3 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -263,6 +263,7 @@ static void test_capabilities(IDirectInputA *pDI, HWND hwnd) HRESULT hr; IDirectInputDeviceA *pKeyboard = NULL; DIDEVCAPS caps; + int kbd_type, kbd_subtype, dev_subtype; hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKeyboard, NULL); ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); @@ -275,8 +276,21 @@ static void test_capabilities(IDirectInputA *pDI, HWND hwnd) ok (caps.dwFlags & DIDC_ATTACHED, "GetCapabilities dwFlags: 0x%08x\n", caps.dwFlags); ok (GET_DIDEVICE_TYPE(caps.dwDevType) == DIDEVTYPE_KEYBOARD, "GetCapabilities invalid device type for dwDevType: 0x%08x\n", caps.dwDevType); - ok (GET_DIDEVICE_SUBTYPE(caps.dwDevType) != DIDEVTYPEKEYBOARD_UNKNOWN, - "GetCapabilities invalid device subtype for dwDevType: 0x%08x\n", caps.dwDevType); + kbd_type = GetKeyboardType(0); + kbd_subtype = GetKeyboardType(1); + dev_subtype = GET_DIDEVICE_SUBTYPE(caps.dwDevType); + if (kbd_type == 4 || (kbd_type == 7 && kbd_subtype == 0)) + ok (dev_subtype == DIDEVTYPEKEYBOARD_PCENH, + "GetCapabilities invalid device subtype for dwDevType: 0x%08x (%04x:%04x)\n", + caps.dwDevType, kbd_type, kbd_subtype); + else if (kbd_type == 7 && kbd_subtype == 2) + todo_wine ok (dev_subtype == DIDEVTYPEKEYBOARD_JAPAN106, + "GetCapabilities invalid device subtype for dwDevType: 0x%08x (%04x:%04x)\n", + caps.dwDevType, kbd_type, kbd_subtype); + else + ok (dev_subtype != DIDEVTYPEKEYBOARD_UNKNOWN, + "GetCapabilities invalid device subtype for dwDevType: 0x%08x (%04x:%04x)\n", + caps.dwDevType, kbd_type, kbd_subtype); IUnknown_Release(pKeyboard); }

1 0

Henri Verbeet : d2d1/tests: Run the tests in parallel.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: e7949902c51f3ffd5c005aa911176061fd709376 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7949902c51f3ffd5c005aa9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 17 19:42:10 2018 +0430 d2d1/tests: Run the tests in parallel. Like d3d11. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 132 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 105 insertions(+), 27 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 26c81e6..a8b67f1 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -25,6 +25,15 @@ #include "initguid.h" #include "dwrite.h" #include "wincodec.h" +#include "wine/heap.h" + +static BOOL use_mt = TRUE; + +static struct test_entry +{ + void (*test)(void); +} *mt_tests; +size_t mt_tests_size, mt_test_count; struct resource_readback { @@ -83,6 +92,63 @@ struct expected_geometry_figure const struct geometry_segment *segments; }; +static void queue_test(void (*test)(void)) +{ + if (mt_test_count >= mt_tests_size) + { + mt_tests_size = max(16, mt_tests_size * 2); + mt_tests = heap_realloc(mt_tests, mt_tests_size * sizeof(*mt_tests)); + } + mt_tests[mt_test_count++].test = test; +} + +static DWORD WINAPI thread_func(void *ctx) +{ + LONG *i = ctx, j; + + while (*i < mt_test_count) + { + j = *i; + if (InterlockedCompareExchange(i, j + 1, j) == j) + mt_tests[j].test(); + } + + return 0; +} + +static void run_queued_tests(void) +{ + unsigned int thread_count, i; + HANDLE *threads; + SYSTEM_INFO si; + LONG test_idx; + + if (!use_mt) + { + for (i = 0; i < mt_test_count; ++i) + { + mt_tests[i].test(); + } + + return; + } + + GetSystemInfo(&si); + thread_count = si.dwNumberOfProcessors; + threads = heap_calloc(thread_count, sizeof(*threads)); + for (i = 0, test_idx = 0; i < thread_count; ++i) + { + threads[i] = CreateThread(NULL, 0, thread_func, &test_idx, 0, NULL); + ok(!!threads[i], "Failed to create thread %u.\n", i); + } + WaitForMultipleObjects(thread_count, threads, TRUE, INFINITE); + for (i = 0; i < thread_count; ++i) + { + CloseHandle(threads[i]); + } + heap_free(threads); +} + static void set_point(D2D1_POINT_2F *point, float x, float y) { point->x = x; @@ -6465,31 +6531,43 @@ static void test_create_device(void) START_TEST(d2d1) { - test_clip(); - test_state_block(); - test_color_brush(); - test_bitmap_brush(); - test_linear_brush(); - test_radial_brush(); - test_path_geometry(); - test_rectangle_geometry(); - test_rounded_rectangle_geometry(); - test_bitmap_formats(); - test_alpha_mode(); - test_shared_bitmap(); - test_bitmap_updates(); - test_opacity_brush(); - test_create_target(); - test_draw_text_layout(); - test_dc_target(); - test_hwnd_target(); - test_bitmap_target(); - test_desktop_dpi(); - test_stroke_style(); - test_gradient(); - test_draw_geometry(); - test_gdi_interop(); - test_layer(); - test_bezier_intersect(); - test_create_device(); + unsigned int argc, i; + char **argv; + + argc = winetest_get_mainargs(&argv); + for (i = 2; i < argc; ++i) + { + if (!strcmp(argv[i], "--single")) + use_mt = FALSE; + } + + queue_test(test_clip); + queue_test(test_state_block); + queue_test(test_color_brush); + queue_test(test_bitmap_brush); + queue_test(test_linear_brush); + queue_test(test_radial_brush); + queue_test(test_path_geometry); + queue_test(test_rectangle_geometry); + queue_test(test_rounded_rectangle_geometry); + queue_test(test_bitmap_formats); + queue_test(test_alpha_mode); + queue_test(test_shared_bitmap); + queue_test(test_bitmap_updates); + queue_test(test_opacity_brush); + queue_test(test_create_target); + queue_test(test_draw_text_layout); + queue_test(test_dc_target); + queue_test(test_hwnd_target); + queue_test(test_bitmap_target); + queue_test(test_desktop_dpi); + queue_test(test_stroke_style); + queue_test(test_gradient); + queue_test(test_draw_geometry); + queue_test(test_gdi_interop); + queue_test(test_layer); + queue_test(test_bezier_intersect); + queue_test(test_create_device); + + run_queued_tests(); }

1 0

Nikolay Sivov : d2d1: Add ID2D1DeviceContext stub.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: 31cbe190f7caa0cd9089fba8ca77179fef9dfb66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31cbe190f7caa0cd9089fba8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 17 19:42:11 2018 +0430 d2d1: Add ID2D1DeviceContext stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 8 +- dlls/d2d1/bitmap_render_target.c | 2 +- dlls/d2d1/brush.c | 4 +- dlls/d2d1/d2d1_private.h | 10 +- dlls/d2d1/device.c | 786 +++++++++++++++++++++++++++------------ 5 files changed, 563 insertions(+), 247 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=31cbe190f7caa0cd9089…

1 0