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

Nikolay Sivov : d2d1: Add ID2D1DeviceContext stub.
by Alexandre Julliard 17 Aug '18

17 Aug '18

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

Nikolay Sivov : wmp: Improve media items handling.
by Alexandre Julliard 17 Aug '18

17 Aug '18

Module: wine Branch: master Commit: cd1c681ee71332e18081730ce7f8794fedb55f5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd1c681ee71332e18081730c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 17 18:05:16 2018 +0300 wmp: Improve media items handling. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/player.c | 98 +++++++++++++++++++++++++------------------------- dlls/wmp/tests/media.c | 77 +++++++++++++++++++++++++++++++++++++++ dlls/wmp/wmp_private.h | 20 +++++++++-- 3 files changed, 144 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cd1c681ee71332e18081…

1 0

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

17 Aug '18

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

Jacek Caban : server: Use pipe_end state in FSCTL_PIPE_DISCONNECT implementation.
by Alexandre Julliard 17 Aug '18

17 Aug '18

Module: wine Branch: master Commit: a03d0a8eae7d5694e10d767597c2f9ce4c5ee4ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=a03d0a8eae7d5694e10d7675… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 17 17:40:55 2018 +0200 server: Use pipe_end state in FSCTL_PIPE_DISCONNECT implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index bb4ea3b..80a56ae 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1011,31 +1011,26 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as return 1; case FSCTL_PIPE_DISCONNECT: - switch(server->state) + switch(server->pipe_end.state) { - case ps_connected_server: - assert( server->pipe_end.connection ); - + case FILE_PIPE_CONNECTED_STATE: /* dump the client connection - all data is lost */ + assert( server->pipe_end.connection ); release_object( server->pipe_end.connection->pipe ); server->pipe_end.connection->pipe = NULL; - - pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_DISCONNECTED ); - set_server_state( server, ps_wait_connect ); break; - case ps_wait_disconnect: - assert( !server->pipe_end.connection ); - pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_DISCONNECTED ); - set_server_state( server, ps_wait_connect ); + case FILE_PIPE_CLOSING_STATE: break; - case ps_idle_server: - case ps_wait_open: + case FILE_PIPE_LISTENING_STATE: set_error( STATUS_PIPE_LISTENING ); return 0; - case ps_wait_connect: + case FILE_PIPE_DISCONNECTED_STATE: set_error( STATUS_PIPE_DISCONNECTED ); return 0; } + + pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_DISCONNECTED ); + set_server_state( server, ps_wait_connect ); return 1; default:

1 0

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

17 Aug '18

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

Alex Henrie : shell32: Rename IDI_SHELL_DOCUMENT to IDI_SHELL_FILE.
by Alexandre Julliard 17 Aug '18

17 Aug '18

Module: wine Branch: master Commit: 4b5d0f2f43ad1d34b1e3fb4424615c918487e68c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b5d0f2f43ad1d34b1e3fb44… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 14 22:09:56 2018 -0600 shell32: Rename IDI_SHELL_DOCUMENT to IDI_SHELL_FILE. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/iconcache.c | 12 ++++++------ dlls/shell32/shell32.rc | 3 ++- dlls/shell32/shresdef.h | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index d55bde9..6107e0c 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -467,8 +467,8 @@ static BOOL WINAPI SIC_Initialize( INIT_ONCE *once, void *param, void **context shell_imagelists[i] = ImageList_Create(sizes[i].cx, sizes[i].cy, ILC_COLOR32 | ILC_MASK, 0, 0x20); ImageList_SetBkColor(shell_imagelists[i], CLR_NONE); - /* Load the document icon, which is used as the default if an icon isn't found. */ - if (!(hicons[i] = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_DOCUMENT), + /* Load the generic file icon, which is used as the default if an icon isn't found. */ + if (!(hicons[i] = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_FILE), IMAGE_ICON, sizes[i].cx, sizes[i].cy, LR_SHARED))) { failed = TRUE; @@ -477,12 +477,12 @@ static BOOL WINAPI SIC_Initialize( INIT_ONCE *once, void *param, void **context if (failed) { - FIXME("Failed to load IDI_SHELL_DOCUMENT icon!\n"); + FIXME("Failed to load IDI_SHELL_FILE icon!\n"); return FALSE; } - SIC_IconAppend(swShell32Name, IDI_SHELL_DOCUMENT - 1, hicons, 0); - SIC_IconAppend(swShell32Name, -IDI_SHELL_DOCUMENT, hicons, 0); + SIC_IconAppend(swShell32Name, IDI_SHELL_FILE - 1, hicons, 0); + SIC_IconAppend(swShell32Name, -IDI_SHELL_FILE, hicons, 0); TRACE("small list=%p, large list=%p\n", shell_imagelists[SHIL_SMALL], shell_imagelists[SHIL_LARGE]); @@ -1014,7 +1014,7 @@ HRESULT WINAPI SHGetStockIconInfo(SHSTOCKICONID id, UINT flags, SHSTOCKICONINFO GetSystemDirectoryW(sii->szPath, MAX_PATH); /* no icons defined: use default */ - sii->iIcon = -IDI_SHELL_DOCUMENT; + sii->iIcon = -IDI_SHELL_FILE; lstrcatW(sii->szPath, shell32dll); if (flags) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 084b052..992c70f 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -418,8 +418,9 @@ BEGIN VK_F5, FCIDM_SHVIEW_REFRESH, VIRTKEY END +/* FIXME: Following resource is not yet added */ /* @makedep: document.ico */ -IDI_SHELL_DOCUMENT ICON document.ico +IDI_SHELL_FILE ICON document.ico /* @makedep: folder.ico */ IDI_SHELL_FOLDER ICON folder.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 1518de5..cf43d4a 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -169,7 +169,7 @@ #define IDD_TITLE 0x3742 #define IDD_TREEVIEW 0x3741 -#define IDI_SHELL_DOCUMENT 1 +#define IDI_SHELL_FILE 1 #define IDI_SHELL_FOLDER 4 #define IDI_SHELL_FOLDER_OPEN 5 #define IDI_SHELL_5_12_FLOPPY 6

1 0

Alex Henrie : shell32: Add document icon.
by Alexandre Julliard 17 Aug '18

17 Aug '18

Module: wine Branch: master Commit: b14d8f9f11856c1b1f192bf773eb864cba5ad78b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b14d8f9f11856c1b1f192bf7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 14 22:09:57 2018 -0600 shell32: Add document icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 3 +++ dlls/shell32/shresdef.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 992c70f..b6cae77 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -422,6 +422,9 @@ END /* @makedep: document.ico */ IDI_SHELL_FILE ICON document.ico +/* @makedep: document.ico */ +IDI_SHELL_DOCUMENT ICON document.ico + /* @makedep: folder.ico */ IDI_SHELL_FOLDER ICON folder.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index cf43d4a..9c46d5f 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -170,6 +170,7 @@ #define IDD_TREEVIEW 0x3741 #define IDI_SHELL_FILE 1 +#define IDI_SHELL_DOCUMENT 2 #define IDI_SHELL_FOLDER 4 #define IDI_SHELL_FOLDER_OPEN 5 #define IDI_SHELL_5_12_FLOPPY 6

1 0

Nikolay Sivov : winecfg: Update changed state on associations checkbox click.
by Alexandre Julliard 17 Aug '18

17 Aug '18

Module: wine Branch: master Commit: 25ba7708d3ad01202d1fd59633f0829360c0b4c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25ba7708d3ad01202d1fd596… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 17 00:31:56 2018 +0300 winecfg: Update changed state on associations checkbox click. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/theme.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 1934538..5304f72 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1320,6 +1320,7 @@ ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) case IDC_ENABLE_FILE_ASSOCIATIONS: update_mime_types(hDlg); + SendMessageW(GetParent(hDlg), PSM_CHANGED, 0, 0); break; } break;

1 0

Alex Henrie : shell32: Add window icon.
by Alexandre Julliard 17 Aug '18

17 Aug '18

Module: wine Branch: master Commit: 5ee4e0027c941aa74da00166aa5f07bfd292b1b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ee4e0027c941aa74da00166… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 14 22:09:58 2018 -0600 shell32: Add window icon. Adapted from new-window.svg in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 3 +- dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + dlls/shell32/window.ico | Bin 0 -> 30799 bytes dlls/shell32/window.svg | 598 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 604 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5ee4e0027c941aa74da0…

1 0

Alex Henrie : shell32: Add 512k and 314k floppy drive icons.
by Alexandre Julliard 17 Aug '18

17 Aug '18

Module: wine Branch: master Commit: d72d37008aff257fc157ebc0c321dcfc2ac87f82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d72d37008aff257fc157ebc0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 14 22:09:59 2018 -0600 shell32: Add 512k and 314k floppy drive icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 5c5fdf6..20261de 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -442,6 +442,14 @@ IDI_SHELL_FOLDER_OPEN_LARGE ICON folder_open.ico /* @makedep: folder_open.ico */ IDI_SHELL_FOLDER_SMALL_XP ICON folder_open.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: floppy.ico */ +IDI_SHELL_5_12_FLOPPY ICON floppy.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: floppy.ico */ +IDI_SHELL_3_14_FLOPPY ICON floppy.ico + /* @makedep: floppy.ico */ IDI_SHELL_FLOPPY ICON floppy.ico

1 0