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

Alexandre Julliard : server: Store the surface rectangle in the server.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: wine Branch: master Commit: 85f81948de1d7fe6d6d16f681a3a7cf8c08a566f URL: https://source.winehq.org/git/wine.git/?a=commit;h=85f81948de1d7fe6d6d16f68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 11 10:01:58 2018 +0200 server: Store the surface rectangle in the server. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 15 +++++++++++---- server/window.c | 37 ++++++++++++++++++++----------------- 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 659321c..56a5393 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2067,7 +2067,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, WND *win; HWND surface_win = 0, parent = GetAncestor( hwnd, GA_PARENT ); BOOL ret, needs_update = FALSE; - RECT visible_rect, old_visible_rect, old_window_rect, old_client_rect; + RECT visible_rect, old_visible_rect, old_window_rect, old_client_rect, extra_rects[3]; struct window_surface *old_surface, *new_surface = NULL; if (!parent || parent == GetDesktopWindow()) @@ -2111,10 +2111,17 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, req->client.top = client_rect->top; req->client.right = client_rect->right; req->client.bottom = client_rect->bottom; - if (!EqualRect( window_rect, &visible_rect ) || valid_rects) + if (!EqualRect( window_rect, &visible_rect ) || new_surface || valid_rects) { - wine_server_add_data( req, &visible_rect, sizeof(visible_rect) ); - if (valid_rects) wine_server_add_data( req, valid_rects, sizeof(*valid_rects) ); + extra_rects[0] = extra_rects[1] = visible_rect; + if (new_surface) + { + extra_rects[1] = new_surface->rect; + OffsetRect( &extra_rects[1], visible_rect.left, visible_rect.top ); + } + if (valid_rects) extra_rects[2] = valid_rects[0]; + else SetRectEmpty( &extra_rects[2] ); + wine_server_add_data( req, extra_rects, sizeof(extra_rects) ); } if (new_surface) req->paint_flags |= SET_WINPOS_PAINT_SURFACE; if (win->pixel_format) req->paint_flags |= SET_WINPOS_PIXEL_FORMAT; diff --git a/server/window.c b/server/window.c index 532edd8..47e8c25 100644 --- a/server/window.c +++ b/server/window.c @@ -70,6 +70,7 @@ struct window user_handle_t last_active; /* last active popup */ rectangle_t window_rect; /* window rectangle (relative to parent client area) */ rectangle_t visible_rect; /* visible part of window rect (relative to parent client area) */ + rectangle_t surface_rect; /* window surface rectangle (relative to parent client area) */ rectangle_t client_rect; /* client rectangle (relative to parent client area) */ struct region *win_region; /* region for shaped windows (relative to window rect) */ struct region *update_region; /* update region (relative to window rect) */ @@ -510,7 +511,7 @@ static struct window *create_window( struct window *parent, struct window *owner win->prop_alloc = 0; win->properties = NULL; win->nb_extra_bytes = extra_bytes; - win->window_rect = win->visible_rect = win->client_rect = empty_rect; + win->window_rect = win->visible_rect = win->surface_rect = win->client_rect = empty_rect; memset( win->extra_bytes, 0, extra_bytes ); list_init( &win->children ); list_init( &win->unlinked ); @@ -1624,7 +1625,7 @@ static struct region *expose_window( struct window *win, const rectangle_t *old_ static void set_window_pos( struct window *win, struct window *previous, unsigned int swp_flags, const rectangle_t *window_rect, const rectangle_t *client_rect, const rectangle_t *visible_rect, - const rectangle_t *valid_rect ) + const rectangle_t *surface_rect, const rectangle_t *valid_rect ) { struct region *old_vis_rgn = NULL, *exposed_rgn = NULL; const rectangle_t old_window_rect = win->window_rect; @@ -1642,6 +1643,7 @@ static void set_window_pos( struct window *win, struct window *previous, win->window_rect = *window_rect; win->visible_rect = *visible_rect; + win->surface_rect = *surface_rect; win->client_rect = *client_rect; if (!(swp_flags & SWP_NOZORDER) && win->parent) link_window( win, previous ); if (swp_flags & SWP_SHOWWINDOW) win->style |= WS_VISIBLE; @@ -1658,6 +1660,7 @@ static void set_window_pos( struct window *win, struct window *previous, { offset_rect( &child->window_rect, new_size - old_size, 0 ); offset_rect( &child->visible_rect, new_size - old_size, 0 ); + offset_rect( &child->surface_rect, new_size - old_size, 0 ); offset_rect( &child->client_rect, new_size - old_size, 0 ); } } @@ -1738,7 +1741,7 @@ static void set_window_pos( struct window *win, struct window *previous, client_rect->right - old_client_rect.right != x_offset || client_rect->top - old_client_rect.top != y_offset || client_rect->bottom - old_client_rect.bottom != y_offset || - !valid_rect || memcmp( valid_rect, client_rect, sizeof(*client_rect) )); + memcmp( valid_rect, client_rect, sizeof(*client_rect) )); } if (frame_changed || client_changed) @@ -1746,7 +1749,7 @@ static void set_window_pos( struct window *win, struct window *previous, struct region *win_rgn = old_vis_rgn; /* reuse previous region */ set_region_rect( win_rgn, window_rect ); - if (valid_rect) + if (!is_rect_empty( valid_rect )) { /* subtract the valid portion of client rect from the total region */ struct region *tmp = create_empty_region(); @@ -2222,7 +2225,8 @@ DECL_HANDLER(get_window_tree) /* set the position and Z order of a window */ DECL_HANDLER(set_window_pos) { - rectangle_t window_rect, client_rect, visible_rect; + rectangle_t window_rect, client_rect, visible_rect, surface_rect, valid_rect; + const rectangle_t *extra_rects = get_req_data(); struct window *previous = NULL; struct window *top, *win = get_window( req->handle ); unsigned int flags = req->swp_flags; @@ -2269,29 +2273,28 @@ DECL_HANDLER(set_window_pos) return; } - window_rect = visible_rect = req->window; + window_rect = req->window; client_rect = req->client; - if (get_req_data_size() >= sizeof(rectangle_t)) - memcpy( &visible_rect, get_req_data(), sizeof(rectangle_t) ); + if (get_req_data_size() >= sizeof(rectangle_t)) visible_rect = extra_rects[0]; + else visible_rect = window_rect; + if (get_req_data_size() >= 2 * sizeof(rectangle_t)) surface_rect = extra_rects[1]; + else surface_rect = visible_rect; + if (get_req_data_size() >= 3 * sizeof(rectangle_t)) valid_rect = extra_rects[2]; + else valid_rect = empty_rect; if (win->parent && win->parent->ex_style & WS_EX_LAYOUTRTL) { mirror_rect( &win->parent->client_rect, &window_rect ); mirror_rect( &win->parent->client_rect, &visible_rect ); mirror_rect( &win->parent->client_rect, &client_rect ); + mirror_rect( &win->parent->client_rect, &surface_rect ); + mirror_rect( &win->parent->client_rect, &valid_rect ); } win->paint_flags = (win->paint_flags & ~PAINT_CLIENT_FLAGS) | (req->paint_flags & PAINT_CLIENT_FLAGS); if (win->paint_flags & PAINT_HAS_PIXEL_FORMAT) update_pixel_format_flags( win ); - if (get_req_data_size() >= 2 * sizeof(rectangle_t)) - { - rectangle_t valid_rect; - memcpy( &valid_rect, (const rectangle_t *)get_req_data() + 1, sizeof(rectangle_t) ); - if (win->parent && win->parent->ex_style & WS_EX_LAYOUTRTL) - mirror_rect( &win->parent->client_rect, &valid_rect ); - set_window_pos( win, previous, flags, &window_rect, &client_rect, &visible_rect, &valid_rect ); - } - else set_window_pos( win, previous, flags, &window_rect, &client_rect, &visible_rect, NULL ); + set_window_pos( win, previous, flags, &window_rect, &client_rect, + &visible_rect, &surface_rect, &valid_rect ); reply->new_style = win->style; reply->new_ex_style = win->ex_style;

1 0

Alexandre Julliard : server: Clip visible region to the surface rectangle instead of the desktop.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: wine Branch: master Commit: 6ccb94392a8ef4bca701ae2a560f4ea1da677edd URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ccb94392a8ef4bca701ae2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 11 10:02:45 2018 +0200 server: Clip visible region to the surface rectangle instead of the desktop. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/window.c | 50 +++++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/server/window.c b/server/window.c index 47e8c25..2a0acb8 100644 --- a/server/window.c +++ b/server/window.c @@ -951,6 +951,17 @@ static void set_region_client_rect( struct region *region, struct window *win ) rectangle_t rect; intersect_rect( &rect, &win->window_rect, &win->client_rect ); + intersect_rect( &rect, &rect, &win->surface_rect ); + set_region_rect( region, &rect ); +} + + +/* set the region to the visible rect clipped by the window surface, in parent-relative coordinates */ +static void set_region_visible_rect( struct region *region, struct window *win ) +{ + rectangle_t rect; + + intersect_rect( &rect, &win->visible_rect, &win->surface_rect ); set_region_rect( region, &rect ); } @@ -976,16 +987,22 @@ static struct region *get_visible_region( struct window *win, unsigned int flags if (!is_visible( win )) return region; /* empty region */ + if (is_desktop_window( win )) + { + set_region_rect( region, &win->window_rect ); + return region; + } + /* create a region relative to the window itself */ - if ((flags & DCX_PARENTCLIP) && win->parent && !is_desktop_window(win->parent)) + if ((flags & DCX_PARENTCLIP) && !is_desktop_window( win->parent )) { set_region_client_rect( region, win->parent ); offset_region( region, -win->parent->client_rect.left, -win->parent->client_rect.top ); } else if (flags & DCX_WINDOW) { - set_region_rect( region, &win->visible_rect ); + set_region_visible_rect( region, win ); if (win->win_region && !intersect_window_region( region, win )) goto error; } else @@ -998,42 +1015,29 @@ static struct region *get_visible_region( struct window *win, unsigned int flags if (flags & DCX_CLIPCHILDREN) { - if (is_desktop_window(win)) offset_x = offset_y = 0; - else - { - offset_x = win->client_rect.left; - offset_y = win->client_rect.top; - } - if (!clip_children( win, NULL, region, offset_x, offset_y )) goto error; + if (!clip_children( win, NULL, region, win->client_rect.left, win->client_rect.top )) goto error; } /* clip siblings of ancestors */ - if (is_desktop_window(win)) offset_x = offset_y = 0; - else - { - offset_x = win->window_rect.left; - offset_y = win->window_rect.top; - } + offset_x = win->window_rect.left; + offset_y = win->window_rect.top; if ((tmp = create_empty_region()) != NULL) { - while (win->parent) + while (!is_desktop_window( win->parent )) { /* we don't clip out top-level siblings as that's up to the native windowing system */ - if ((win->style & WS_CLIPSIBLINGS) && !is_desktop_window( win->parent )) + if (win->style & WS_CLIPSIBLINGS) { if (!clip_children( win->parent, win, region, 0, 0 )) goto error; if (is_region_empty( region )) break; } /* clip to parent client area */ win = win->parent; - if (!is_desktop_window(win)) - { - offset_x += win->client_rect.left; - offset_y += win->client_rect.top; - offset_region( region, win->client_rect.left, win->client_rect.top ); - } + offset_x += win->client_rect.left; + offset_y += win->client_rect.top; + offset_region( region, win->client_rect.left, win->client_rect.top ); set_region_client_rect( tmp, win ); if (win->win_region && !intersect_window_region( tmp, win )) goto error; if (!intersect_region( region, region, tmp )) goto error;

1 0

Alexandre Julliard : server: Return the surface rect as top clipping rect.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: wine Branch: master Commit: 766287ad6adcca090d7b718031e0c1e8a424d185 URL: https://source.winehq.org/git/wine.git/?a=commit;h=766287ad6adcca090d7b7180… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 11 15:20:56 2018 +0200 server: Return the surface rect as top clipping rect. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dc.c | 7 +------ dlls/user32/painting.c | 2 +- server/window.c | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 1aa67f3..2c4d7d0 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -572,7 +572,6 @@ void dibdrv_set_window_surface( DC *dc, struct window_surface *surface ) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer; - RECT rect; void *bits; PHYSDEV windev; struct windrv_physdev *physdev; @@ -599,12 +598,8 @@ void dibdrv_set_window_surface( DC *dc, struct window_surface *surface ) dibdrv = physdev->dibdrv; bits = surface->funcs->get_info( surface, info ); init_dib_info_from_bitmapinfo( &dibdrv->dib, info, bits ); - /* clip the device rect to the surface */ - rect = surface->rect; - offset_rect( &rect, dc->device_rect.left, dc->device_rect.top ); - intersect_rect( &dc->device_rect, &dc->device_rect, &rect ); dibdrv->dib.rect = dc->vis_rect; - offset_rect( &dibdrv->dib.rect, -rect.left, -rect.top ); + offset_rect( &dibdrv->dib.rect, -dc->device_rect.left, -dc->device_rect.top ); dibdrv->bounds = surface->funcs->get_bounds( surface ); DC_InitDC( dc ); } diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 9178b61..665e1c0 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -179,7 +179,7 @@ static void update_visible_region( struct dce *dce ) } } - if (!surface) top_rect = get_virtual_screen_rect(); + if (!surface) SetRectEmpty( &top_rect ); __wine_set_visible_region( dce->hdc, vis_rgn, &win_rect, &top_rect, surface ); if (surface) window_surface_release( surface ); } diff --git a/server/window.c b/server/window.c index 2a0acb8..e58d7e4 100644 --- a/server/window.c +++ b/server/window.c @@ -2445,7 +2445,7 @@ DECL_HANDLER(get_visible_region) if (data) set_reply_data_ptr( data, reply->total_size ); } reply->top_win = top->handle; - reply->top_rect = top->visible_rect; + reply->top_rect = top->surface_rect; if (!is_desktop_window(win)) {

1 0

Zebediah Figura : msi: Avoid starting the RPC server more than once for a given package.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: wine Branch: master Commit: 5c7cf0a47d9d43b11f84914f5890eae3fd694592 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c7cf0a47d9d43b11f84914f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 10 12:08:44 2018 +0200 msi: Avoid starting the RPC server more than once for a given package. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 46 +++++++++++++++++++++------------------------- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 2 ++ 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index e68528f..af6e9f7 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -572,16 +572,15 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) return r; } -static DWORD WINAPI DllThread( LPVOID arg ) +static DWORD WINAPI custom_client_thread(void *arg) { static const WCHAR msiexecW[] = {'\\','m','s','i','e','x','e','c','.','e','x','e',0}; static const WCHAR argsW[] = {' ','-','E','m','b','e','d','d','i','n','g',' ',0}; - msi_custom_action_info *info; + msi_custom_action_info *info = arg; PROCESS_INFORMATION pi = {0}; STARTUPINFOW si = {0}; WCHAR buffer[MAX_PATH], cmdline[MAX_PATH + 60]; RPC_STATUS status; - GUID *guid = arg; void *cookie; BOOL wow64; DWORD arch; @@ -592,24 +591,28 @@ static DWORD WINAPI DllThread( LPVOID arg ) CoInitializeEx(NULL, COINIT_MULTITHREADED); /* needed to marshal streams */ - status = RpcServerUseProtseqEpW(ncalrpcW, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, endpoint_lrpcW, NULL); - if (status != RPC_S_OK) + if (!info->package->rpc_server_started) { - ERR("RpcServerUseProtseqEp failed: %#x\n", status); - return status; - } + status = RpcServerUseProtseqEpW(ncalrpcW, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, + endpoint_lrpcW, NULL); + if (status != RPC_S_OK) + { + ERR("RpcServerUseProtseqEp failed: %#x\n", status); + return status; + } - status = RpcServerRegisterIfEx(s_IWineMsiRemote_v0_0_s_ifspec, NULL, NULL, - RPC_IF_AUTOLISTEN, RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL); - if (status != RPC_S_OK) - { - ERR("RpcServerRegisterIfEx failed: %#x\n", status); - return status; + status = RpcServerRegisterIfEx(s_IWineMsiRemote_v0_0_s_ifspec, NULL, NULL, + RPC_IF_AUTOLISTEN, RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL); + if (status != RPC_S_OK) + { + ERR("RpcServerRegisterIfEx failed: %#x\n", status); + return status; + } + + info->package->rpc_server_started = 1; } - info = find_action_by_guid(guid); ret = GetBinaryTypeW(info->source, &arch); - release_custom_action_data(info); if (sizeof(void *) == 8 && ret && arch == SCS_32BIT_BINARY) GetSystemWow64DirectoryW(buffer, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); @@ -618,7 +621,7 @@ static DWORD WINAPI DllThread( LPVOID arg ) strcatW(buffer, msiexecW); strcpyW(cmdline, buffer); strcatW(cmdline, argsW); - StringFromGUID2(guid, cmdline + strlenW(cmdline), 39); + StringFromGUID2(&info->guid, cmdline + strlenW(cmdline), 39); if (IsWow64Process(GetCurrentProcess(), &wow64) && wow64 && arch == SCS_64BIT_BINARY) { @@ -634,13 +637,6 @@ static DWORD WINAPI DllThread( LPVOID arg ) CloseHandle(pi.hProcess); CloseHandle(pi.hThread); - status = RpcServerUnregisterIf(s_IWineMsiRemote_v0_0_s_ifspec, NULL, FALSE); - if (status != RPC_S_OK) - { - ERR("RpcServerUnregisterIf failed: %#x\n", status); - return status; - } - CoUninitialize(); TRACE("custom action (%x) returned %i\n", GetCurrentThreadId(), rc ); @@ -671,7 +667,7 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( list_add_tail( &msi_pending_custom_actions, &info->entry ); LeaveCriticalSection( &msi_custom_action_cs ); - info->handle = CreateThread( NULL, 0, DllThread, &info->guid, 0, NULL ); + info->handle = CreateThread(NULL, 0, custom_client_thread, info, 0, NULL); if (!info->handle) { /* release both references */ diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 789d541..6304375 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -449,6 +449,7 @@ typedef struct tagMSIPACKAGE unsigned char need_reboot_at_end : 1; unsigned char need_reboot_now : 1; unsigned char need_rollback : 1; + unsigned char rpc_server_started : 1; } MSIPACKAGE; typedef struct tagMSIPREVIEW diff --git a/dlls/msi/package.c b/dlls/msi/package.c index d6f22d0..9569c4f 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -342,6 +342,8 @@ static void MSI_FreePackage( MSIOBJECTHDR *arg) msiobj_release( &package->db->hdr ); free_package_structures(package); CloseHandle( package->log_file ); + if (package->rpc_server_started) + RpcServerUnregisterIf(s_IWineMsiRemote_v0_0_s_ifspec, NULL, FALSE); if (package->delete_on_close) DeleteFileW( package->localfile ); msi_free( package->localfile );

1 0

Zebediah Figura : msi: Create the custom action thread inside msiexec.exe.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: wine Branch: master Commit: 7908d6ee399f4ef556e194dfa5cdef746fc091b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7908d6ee399f4ef556e194df… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 10 12:08:45 2018 +0200 msi: Create the custom action thread inside msiexec.exe. This patch is effectively a no-op by itself, but makes the next patch architecturally much simpler. We need the main thread to be non-blocking to allow nested custom actions to work, so creating the thread inside of msiexec allows the custom action thread to write the result of the action to the server pipe while the main thread simply reads from it. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 33 ++++++++++++++++++++++++--------- programs/msiexec/msiexec.c | 21 ++++++++++++++++++++- 2 files changed, 44 insertions(+), 10 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index af6e9f7..55294d0 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -484,6 +484,29 @@ static void handle_msi_break(LPCSTR target) static WCHAR ncalrpcW[] = {'n','c','a','l','r','p','c',0}; static WCHAR endpoint_lrpcW[] = {'m','s','i',0}; +#ifdef __i386__ +/* wrapper for apps that don't declare the thread function correctly */ +extern UINT custom_proc_wrapper( MsiCustomActionEntryPoint entry, MSIHANDLE hinst ); +__ASM_GLOBAL_FUNC(custom_proc_wrapper, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "subl $4,%esp\n\t" + "pushl 12(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ) +#else +static UINT custom_proc_wrapper( MsiCustomActionEntryPoint entry, MSIHANDLE hinst ) +{ + return entry(hinst); +} +#endif + UINT CDECL __wine_msi_call_dll_function(const GUID *guid) { MsiCustomActionEntryPoint fn; @@ -494,7 +517,6 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) LPWSTR dll = NULL; LPSTR proc = NULL; HANDLE hModule; - HANDLE thread; INT type; UINT r; @@ -514,9 +536,6 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) } RpcStringFreeW(&binding_str); - /* We need this to unmarshal streams, and some apps expect it to be present. */ - CoInitializeEx(NULL, COINIT_MULTITHREADED); - r = remote_GetActionInfo(guid, &type, &dll, &proc, &remote_package); if (r != ERROR_SUCCESS) return r; @@ -539,9 +558,7 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) __TRY { - thread = CreateThread(NULL, 0, (void *)fn, (void *)(ULONG_PTR) hPackage, 0, NULL); - WaitForSingleObject(thread, INFINITE); - GetExitCodeThread(thread, &r); + r = custom_proc_wrapper(fn, hPackage); } __EXCEPT_PAGE_FAULT { @@ -565,8 +582,6 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) midl_user_free(dll); midl_user_free(proc); - CoUninitialize(); - RpcBindingFree(&rpc_handle); return r; diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 5ebfea7..74f6d51 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -395,11 +395,30 @@ static DWORD DoUnregServer(void) extern UINT CDECL __wine_msi_call_dll_function(GUID *guid); +static DWORD CALLBACK custom_action_thread(void *arg) +{ + GUID *guid = arg; + return __wine_msi_call_dll_function(guid); +} + static int DoEmbedding(LPCWSTR key) { + HANDLE thread; GUID guid; + UINT r; + + /* We need this to unmarshal streams, and some apps expect it to be present. */ + CoInitializeEx(NULL, COINIT_MULTITHREADED); + CLSIDFromString(key, &guid); - return __wine_msi_call_dll_function(&guid); + thread = CreateThread(NULL, 0, custom_action_thread, &guid, 0, NULL); + WaitForSingleObject(thread, INFINITE); + GetExitCodeThread(thread, &r); + CloseHandle(thread); + + CoUninitialize(); + + return r; } /*

1 0

Zebediah Figura : msi: Avoid connecting to the RPC server more than once.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: wine Branch: master Commit: 6135b38d7d60e7bceb36a57630cad72d3e7e4b2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6135b38d7d60e7bceb36a576… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 10 12:08:46 2018 +0200 msi: Avoid connecting to the RPC server more than once. This is a no-op as is, but is necessary as of the next patch in the case of nested custom actions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 27 ++++++++++++++------------- dlls/msi/package.c | 2 ++ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 55294d0..cf30ac3 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -522,19 +522,22 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) TRACE("%s\n", debugstr_guid( guid )); - status = RpcStringBindingComposeW(NULL, ncalrpcW, NULL, endpoint_lrpcW, NULL, &binding_str); - if (status != RPC_S_OK) + if (!rpc_handle) { - ERR("RpcStringBindingCompose failed: %#x\n", status); - return status; - } - status = RpcBindingFromStringBindingW(binding_str, &rpc_handle); - if (status != RPC_S_OK) - { - ERR("RpcBindingFromStringBinding failed: %#x\n", status); - return status; + status = RpcStringBindingComposeW(NULL, ncalrpcW, NULL, endpoint_lrpcW, NULL, &binding_str); + if (status != RPC_S_OK) + { + ERR("RpcStringBindingCompose failed: %#x\n", status); + return status; + } + status = RpcBindingFromStringBindingW(binding_str, &rpc_handle); + if (status != RPC_S_OK) + { + ERR("RpcBindingFromStringBinding failed: %#x\n", status); + return status; + } + RpcStringFreeW(&binding_str); } - RpcStringFreeW(&binding_str); r = remote_GetActionInfo(guid, &type, &dll, &proc, &remote_package); if (r != ERROR_SUCCESS) @@ -582,8 +585,6 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) midl_user_free(dll); midl_user_free(proc); - RpcBindingFree(&rpc_handle); - return r; } diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 9569c4f..1ab52ea 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -344,6 +344,8 @@ static void MSI_FreePackage( MSIOBJECTHDR *arg) CloseHandle( package->log_file ); if (package->rpc_server_started) RpcServerUnregisterIf(s_IWineMsiRemote_v0_0_s_ifspec, NULL, FALSE); + if (rpc_handle) + RpcBindingFree(&rpc_handle); if (package->delete_on_close) DeleteFileW( package->localfile ); msi_free( package->localfile );

1 0

Zebediah Figura : msi: Reuse the custom action server process where possible.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: wine Branch: master Commit: 457431ab5bc1dd10c4957f145de85c4ba6d0ef72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=457431ab5bc1dd10c4957f14… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 10 12:08:47 2018 +0200 msi: Reuse the custom action server process where possible. We use a named pipe to communicate between the client (i.e. the process that called MsiInstallProduct() and the custom action server. The naïve approach has the client send custom action GUIDs to the server and the server send back the results of executing the action, but this fails in the case of nested custom actions, so instead we send back handles of threads for the client to wait on. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 133 +++++++++++++++++++++++++++++++++++---------- dlls/msi/msipriv.h | 6 ++ dlls/msi/package.c | 4 ++ dlls/msi/tests/custom.c | 19 +++++++ dlls/msi/tests/custom.spec | 3 + dlls/msi/tests/install.c | 14 ++++- programs/msiexec/msiexec.c | 59 ++++++++++++++++---- 7 files changed, 198 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=457431ab5bc1dd10c495…

1 0

Mark Jansen : ntdll/tests: Tests for RtlIpv4StringToAddressEx.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: wine Branch: master Commit: bf6d38258ee819126249f8f722e80578f7f8c2f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf6d38258ee819126249f8f7… Author: Mark Jansen <learn0more+wine(a)gmail.com> Date: Wed Jul 11 05:36:25 2018 +0000 ntdll/tests: Tests for RtlIpv4StringToAddressEx. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 369 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 246 insertions(+), 123 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bf6d38258ee819126249…

1 0

Mark Jansen : ntdll/tests: Add tests for RtlIpv6AddressToString and RtlIpv6AddressToStringEx.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: wine Branch: master Commit: 5ae2b885e70bc5c0cf007731f096d4d0febe4483 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ae2b885e70bc5c0cf007731… Author: Mark Jansen <learn0more(a)gmail.com> Date: Wed Jul 11 05:36:27 2018 +0000 ntdll/tests: Add tests for RtlIpv6AddressToString and RtlIpv6AddressToStringEx. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 246 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 246 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5ae2b885e70bc5c0cf00…

1 0

Nikolay Sivov : crypt32: Fix key buffer leak (Coverity).
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: wine Branch: master Commit: 568673282c9d727de7f6cb3ca2423eb8579aa1fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=568673282c9d727de7f6cb3c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 11 08:42:01 2018 +0300 crypt32: Fix key buffer leak (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 1667b42..4a7a1fe 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2553,6 +2553,7 @@ static BOOL CNG_ImportECCPubKey(CERT_PUBLIC_KEY_INFO *pubKeyInfo, BCRYPT_KEY_HAN memcpy(ecckey + 1, pubKeyInfo->PublicKey.pbData + 1, pubKeyInfo->PublicKey.cbData - 1); status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, key, (BYTE*)ecckey, ecckey_len, 0); + CryptMemFree(ecckey); done: if (alg) BCryptCloseAlgorithmProvider(alg, 0);

1 0