wine-commits October 2018

wine-commits@winehq.org

1 participants
602 discussions

Daniel Ansorregui : d2d1: Use default NULL argument in SetBlendState call.
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: e55aca8f498536af974a031c2e9a4d905de9a7cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=e55aca8f498536af974a031c… Author: Daniel Ansorregui <mailszeros(a)gmail.com> Date: Mon Oct 15 20:17:15 2018 +0100 d2d1: Use default NULL argument in SetBlendState call. Signed-off-by: Daniel Ansorregui <mailszeros(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index ff5caac..2593413 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -131,8 +131,6 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en D3D10_VIEWPORT vp; HRESULT hr; - static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; - vp.TopLeftX = 0; vp.TopLeftY = 0; vp.Width = render_target->pixel_size.width; @@ -180,7 +178,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en ID3D10Device_OMSetRenderTargets(device, 1, &render_target->target->rtv, NULL); if (brush) { - ID3D10Device_OMSetBlendState(device, render_target->bs, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); + ID3D10Device_OMSetBlendState(device, render_target->bs, NULL, D3D10_DEFAULT_SAMPLE_MASK); d2d_brush_bind_resources(brush, device, 0); } if (opacity_brush)

1 0

Henri Verbeet : wined3d: Avoid accessing the device after deactivation some more.
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: a4104c7c6085e42a97594eafb8726acfc82e1230 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4104c7c6085e42a97594eaf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 16 21:04:11 2018 +0330 wined3d: Avoid accessing the device after deactivation some more. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 70d43e0..b90df20 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5315,9 +5315,13 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL } else if (message == WM_ACTIVATEAPP) { - UINT i; + unsigned int i = device->swapchain_count; - for (i = 0; i < device->swapchain_count; i++) + /* Deactivating the implicit swapchain may cause the application + * (e.g. Deus Ex: GOTY) to destroy the device, so take care to + * deactivate the implicit swapchain last, and to avoid accessing the + * "device" pointer afterwards. */ + while (i--) wined3d_swapchain_activate(device->swapchains[i], wparam); } else if (message == WM_SYSCOMMAND)

1 0

Jacek Caban : jscript: Allow trailing comma in object literals.
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: 4cabe3612fa3bd1188f17b244c635c950a831bbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cabe3612fa3bd1188f17b24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 17:22:03 2018 +0200 jscript: Allow trailing comma in object literals. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/parser.y | 8 ++++++++ dlls/jscript/tests/lang.js | 14 ++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index a40b813..0bb8856 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -778,6 +778,14 @@ ObjectLiteral : '{' '}' { $$ = new_prop_and_value_expression(ctx, NULL); } | '{' PropertyNameAndValueList '}' { $$ = new_prop_and_value_expression(ctx, $2); } + | '{' PropertyNameAndValueList ',' '}' + { + if(ctx->script->version < 2) { + WARN("Trailing comma in object literal is illegal in legacy mode.\n"); + YYABORT; + } + $$ = new_prop_and_value_expression(ctx, $2); + } /* ECMA-262 3rd Edition 11.1.5 */ PropertyNameAndValueList diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index badb6a8..1cd5668 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -480,6 +480,20 @@ ok(obj3.prop1 === 1, "obj3.prop1 is not 1"); ok(obj3.prop2 === "boolean", "obj3.prop2 is not \"boolean\""); ok(obj3.constructor === Object, "unexpected obj3.constructor"); +if(invokeVersion >= 2) { + eval("tmp = {prop: 'value',}"); + ok(tmp.prop === "value", "tmp.prop = " + tmp.prop); + eval("tmp = {prop: 'value',second:2,}"); + ok(tmp.prop === "value", "tmp.prop = " + tmp.prop); +}else { + try { + eval("tmp = {prop: 'value',}"); + }catch(e) { + tmp = true; + } + ok(tmp === true, "exception not fired"); +} + { var blockVar = 1; blockVar = 2;

1 0

Jacek Caban : mshtml: Try to avoid use_event_quirks in call_event_handlers if possible.
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: adcb2162089ce1dd98bf793410abac44a923bf24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adcb2162089ce1dd98bf7934… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 17:21:47 2018 +0200 mshtml: Try to avoid use_event_quirks in call_event_handlers if possible. It may cause an unintended lock on document mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 1a93ae2..f2c24a4 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2301,25 +2301,27 @@ static BOOL is_cp_event(cp_static_data_t *data, DISPID dispid) static void call_event_handlers(EventTarget *event_target, DOMEvent *event, dispatch_mode_t dispatch_mode) { const listener_container_t *container = get_listener_container(event_target, event->type, FALSE); - const BOOL use_quirks = use_event_quirks(event_target); event_listener_t *listener, listeners_buf[8], *listeners = listeners_buf; unsigned listeners_cnt, listeners_size; ConnectionPointContainer *cp_container = NULL; const event_target_vtbl_t *vtbl = NULL; + BOOL skip_onevent_listener = FALSE; VARIANT v; HRESULT hres; assert(!event->current_target); event->current_target = event_target; - if(use_quirks && container && !list_empty(&container->listeners) - && event->phase != DEP_CAPTURING_PHASE) { + if(container && !list_empty(&container->listeners) && event->phase != DEP_CAPTURING_PHASE) { listener = LIST_ENTRY(list_tail(&container->listeners), event_listener_t, entry); - if(listener && listener->function && listener->type == LISTENER_TYPE_ONEVENT) { + if(listener && listener->function && listener->type == LISTENER_TYPE_ONEVENT + && use_event_quirks(event_target)) { DISPID named_arg = DISPID_THIS; VARIANTARG arg; DISPPARAMS dp = {&arg, &named_arg, 1, 1}; + skip_onevent_listener = TRUE; + V_VT(&arg) = VT_DISPATCH; V_DISPATCH(&arg) = (IDispatch*)&event_target->dispex.IDispatchEx_iface; V_VT(&v) = VT_EMPTY; @@ -2353,7 +2355,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event, disp continue; switch(listener->type) { case LISTENER_TYPE_ONEVENT: - if(use_quirks || event->phase == DEP_CAPTURING_PHASE) + if(skip_onevent_listener || event->phase == DEP_CAPTURING_PHASE) continue; break; case LISTENER_TYPE_CAPTURE:

1 0

Jacek Caban : rpcrt4: Try reconnecting when to server in IRpcSend on broken connection.
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: 3099fda2547096c3d4b258ec1cc010dabffe0b8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3099fda2547096c3d4b258ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 14:38:49 2018 +0200 rpcrt4: Try reconnecting when to server in IRpcSend on broken connection. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_assoc.c | 12 +++++++++--- dlls/rpcrt4/rpc_assoc.h | 2 +- dlls/rpcrt4/rpc_binding.c | 4 ++-- dlls/rpcrt4/rpc_binding.h | 3 ++- dlls/rpcrt4/rpc_message.c | 42 ++++++++++++++++++++++++++++-------------- 5 files changed, 42 insertions(+), 21 deletions(-) diff --git a/dlls/rpcrt4/rpc_assoc.c b/dlls/rpcrt4/rpc_assoc.c index 8a823f4..044ef09 100644 --- a/dlls/rpcrt4/rpc_assoc.c +++ b/dlls/rpcrt4/rpc_assoc.c @@ -391,14 +391,18 @@ static RpcConnection *RpcAssoc_GetIdleConnection(RpcAssoc *assoc, RPC_STATUS RpcAssoc_GetClientConnection(RpcAssoc *assoc, const RPC_SYNTAX_IDENTIFIER *InterfaceId, const RPC_SYNTAX_IDENTIFIER *TransferSyntax, RpcAuthInfo *AuthInfo, - RpcQualityOfService *QOS, LPCWSTR CookieAuth, RpcConnection **Connection) + RpcQualityOfService *QOS, LPCWSTR CookieAuth, + RpcConnection **Connection, BOOL *from_cache) { RpcConnection *NewConnection; RPC_STATUS status; *Connection = RpcAssoc_GetIdleConnection(assoc, InterfaceId, TransferSyntax, AuthInfo, QOS); - if (*Connection) + if (*Connection) { + TRACE("return idle connection %p for association %p\n", *Connection, assoc); + if (from_cache) *from_cache = TRUE; return RPC_S_OK; + } /* create a new connection */ status = RPCRT4_CreateConnection(&NewConnection, FALSE /* is this a server connection? */, @@ -424,8 +428,10 @@ RPC_STATUS RpcAssoc_GetClientConnection(RpcAssoc *assoc, } InterlockedIncrement(&assoc->connection_cnt); - *Connection = NewConnection; + TRACE("return new connection %p for association %p\n", *Connection, assoc); + *Connection = NewConnection; + if (from_cache) *from_cache = FALSE; return RPC_S_OK; } diff --git a/dlls/rpcrt4/rpc_assoc.h b/dlls/rpcrt4/rpc_assoc.h index f4c5f3a..c8c8772 100644 --- a/dlls/rpcrt4/rpc_assoc.h +++ b/dlls/rpcrt4/rpc_assoc.h @@ -50,7 +50,7 @@ typedef struct _RpcAssoc RPC_STATUS RPCRT4_GetAssociation(LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, RpcAssoc **assoc) DECLSPEC_HIDDEN; RPC_STATUS RpcAssoc_GetClientConnection(RpcAssoc *assoc, const RPC_SYNTAX_IDENTIFIER *InterfaceId, const RPC_SYNTAX_IDENTIFIER *TransferSyntax, RpcAuthInfo *AuthInfo, RpcQualityOfService *QOS, - LPCWSTR CookieAuth, RpcConnection **Connection) DECLSPEC_HIDDEN; + LPCWSTR CookieAuth, RpcConnection **Connection, BOOL *from_cache) DECLSPEC_HIDDEN; void RpcAssoc_ReleaseIdleConnection(RpcAssoc *assoc, RpcConnection *Connection) DECLSPEC_HIDDEN; ULONG RpcAssoc_Release(RpcAssoc *assoc) DECLSPEC_HIDDEN; RPC_STATUS RpcServerAssoc_GetAssociation(LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, ULONG assoc_gid, RpcAssoc **assoc_out) DECLSPEC_HIDDEN; diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index ec38b86..ae63abd 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -272,13 +272,13 @@ RPC_STATUS RPCRT4_ReleaseBinding(RpcBinding* Binding) RPC_STATUS RPCRT4_OpenBinding(RpcBinding* Binding, RpcConnection** Connection, const RPC_SYNTAX_IDENTIFIER *TransferSyntax, - const RPC_SYNTAX_IDENTIFIER *InterfaceId) + const RPC_SYNTAX_IDENTIFIER *InterfaceId, BOOL *from_cache) { TRACE("(Binding == ^%p)\n", Binding); if (!Binding->server) { return RpcAssoc_GetClientConnection(Binding->Assoc, InterfaceId, - TransferSyntax, Binding->AuthInfo, Binding->QOS, Binding->CookieAuth, Connection); + TransferSyntax, Binding->AuthInfo, Binding->QOS, Binding->CookieAuth, Connection, from_cache); } else { /* we already have a connection with acceptable binding, so use it */ if (Binding->FromConn) { diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index ca53887..8faacbd 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -174,7 +174,8 @@ RPC_STATUS RPCRT4_MakeBinding(RpcBinding** Binding, RpcConnection* Connection) D void RPCRT4_AddRefBinding(RpcBinding* Binding) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_ReleaseBinding(RpcBinding* Binding) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_OpenBinding(RpcBinding* Binding, RpcConnection** Connection, - const RPC_SYNTAX_IDENTIFIER *TransferSyntax, const RPC_SYNTAX_IDENTIFIER *InterfaceId) DECLSPEC_HIDDEN; + const RPC_SYNTAX_IDENTIFIER *TransferSyntax, const RPC_SYNTAX_IDENTIFIER *InterfaceId, + BOOL *from_cache) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_CloseBinding(RpcBinding* Binding, RpcConnection* Connection) DECLSPEC_HIDDEN; void rpcrt4_conn_release_and_wait(RpcConnection *connection) DECLSPEC_HIDDEN; diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 9642213..3eea88a 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -38,6 +38,7 @@ #include "rpc_binding.h" #include "rpc_defs.h" #include "rpc_message.h" +#include "rpc_assoc.h" #include "ncastatus.h" WINE_DEFAULT_DEBUG_CHANNEL(rpc); @@ -1598,7 +1599,7 @@ RPC_STATUS WINAPI I_RpcNegotiateTransferSyntax(PRPC_MESSAGE pMsg) } status = RPCRT4_OpenBinding(bind, &conn, &cif->TransferSyntax, - &cif->InterfaceId); + &cif->InterfaceId, NULL); if (status == RPC_S_OK) { @@ -1789,26 +1790,39 @@ static DWORD WINAPI async_notifier_proc(LPVOID p) RPC_STATUS WINAPI I_RpcSend(PRPC_MESSAGE pMsg) { RpcBinding* bind = pMsg->Handle; + RPC_CLIENT_INTERFACE *cif; RpcConnection* conn; RPC_STATUS status; RpcPktHdr *hdr; + BOOL from_cache = TRUE; TRACE("(%p)\n", pMsg); if (!bind || bind->server || !pMsg->ReservedForRuntime) return RPC_S_INVALID_BINDING; - conn = pMsg->ReservedForRuntime; - - hdr = RPCRT4_BuildRequestHeader(pMsg->DataRepresentation, - pMsg->BufferLength, - pMsg->ProcNum & ~RPC_FLAGS_VALID_BIT, - &bind->ObjectUuid); - if (!hdr) - return ERROR_OUTOFMEMORY; - hdr->common.call_id = conn->NextCallId++; - - status = RPCRT4_Send(conn, hdr, pMsg->Buffer, pMsg->BufferLength); - - RPCRT4_FreeHeader(hdr); + for (;;) + { + conn = pMsg->ReservedForRuntime; + hdr = RPCRT4_BuildRequestHeader(pMsg->DataRepresentation, + pMsg->BufferLength, + pMsg->ProcNum & ~RPC_FLAGS_VALID_BIT, + &bind->ObjectUuid); + if (!hdr) + return ERROR_OUTOFMEMORY; + + hdr->common.call_id = conn->NextCallId++; + status = RPCRT4_Send(conn, hdr, pMsg->Buffer, pMsg->BufferLength); + RPCRT4_FreeHeader(hdr); + if (status == RPC_S_OK || conn->server || !from_cache) + break; + + WARN("Send failed, trying to reconnect\n"); + cif = pMsg->RpcInterfaceInformation; + RPCRT4_ReleaseConnection(conn); + pMsg->ReservedForRuntime = NULL; + status = RPCRT4_OpenBinding(bind, &conn, &cif->TransferSyntax, &cif->InterfaceId, &from_cache); + if (status != RPC_S_OK) break; + pMsg->ReservedForRuntime = conn; + } if (status == RPC_S_OK && pMsg->RpcFlags & RPC_BUFFER_ASYNC) {

1 0

Jacek Caban : rpcrt4: Reset assoc_group_id on associations with no active connection.
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: 3b4f3ff397c7a50deec0d94c58654bc576254478 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b4f3ff397c7a50deec0d94c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 14:38:35 2018 +0200 rpcrt4: Reset assoc_group_id on associations with no active connection. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_assoc.c | 11 +++++++++++ dlls/rpcrt4/rpc_assoc.h | 2 ++ dlls/rpcrt4/rpc_transport.c | 1 + 3 files changed, 14 insertions(+) diff --git a/dlls/rpcrt4/rpc_assoc.c b/dlls/rpcrt4/rpc_assoc.c index 339ac12..8a823f4 100644 --- a/dlls/rpcrt4/rpc_assoc.c +++ b/dlls/rpcrt4/rpc_assoc.c @@ -80,6 +80,7 @@ static RPC_STATUS RpcAssoc_Alloc(LPCSTR Protseq, LPCSTR NetworkAddr, assoc->Endpoint = RPCRT4_strdupA(Endpoint); assoc->NetworkOptions = NetworkOptions ? RPCRT4_strdupW(NetworkOptions) : NULL; assoc->assoc_group_id = 0; + assoc->connection_cnt = 0; UuidCreate(&assoc->http_uuid); list_init(&assoc->entry); *assoc_out = assoc; @@ -422,6 +423,7 @@ RPC_STATUS RpcAssoc_GetClientConnection(RpcAssoc *assoc, return status; } + InterlockedIncrement(&assoc->connection_cnt); *Connection = NewConnection; return RPC_S_OK; @@ -437,6 +439,15 @@ void RpcAssoc_ReleaseIdleConnection(RpcAssoc *assoc, RpcConnection *Connection) LeaveCriticalSection(&assoc->cs); } +void RpcAssoc_ConnectionReleased(RpcAssoc *assoc) +{ + if (InterlockedDecrement(&assoc->connection_cnt)) + return; + + TRACE("Last %p connection released\n", assoc); + assoc->assoc_group_id = 0; +} + RPC_STATUS RpcServerAssoc_AllocateContextHandle(RpcAssoc *assoc, void *CtxGuard, NDR_SCONTEXT *SContext) { diff --git a/dlls/rpcrt4/rpc_assoc.h b/dlls/rpcrt4/rpc_assoc.h index 3d9b612..f4c5f3a 100644 --- a/dlls/rpcrt4/rpc_assoc.h +++ b/dlls/rpcrt4/rpc_assoc.h @@ -41,6 +41,7 @@ typedef struct _RpcAssoc /* client-only */ /* connections available to be used (protected by cs) */ struct list free_connection_pool; + LONG connection_cnt; /* server-only */ struct list context_handle_list; /* protected by cs */ @@ -59,3 +60,4 @@ RPC_STATUS RpcServerAssoc_UpdateContextHandle(RpcAssoc *assoc, NDR_SCONTEXT SCon unsigned int RpcServerAssoc_ReleaseContextHandle(RpcAssoc *assoc, NDR_SCONTEXT SContext, BOOL release_lock) DECLSPEC_HIDDEN; void RpcContextHandle_GetUuid(NDR_SCONTEXT SContext, UUID *uuid) DECLSPEC_HIDDEN; BOOL RpcContextHandle_IsGuardCorrect(NDR_SCONTEXT SContext, void *CtxGuard) DECLSPEC_HIDDEN; +void RpcAssoc_ConnectionReleased(RpcAssoc *assoc) DECLSPEC_HIDDEN; diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index c374ba1..4fd091c 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -3419,6 +3419,7 @@ void RPCRT4_ReleaseConnection(RpcConnection *connection) /* server-only */ if (connection->server_binding) RPCRT4_ReleaseBinding(connection->server_binding); + else if (connection->assoc) RpcAssoc_ConnectionReleased(connection->assoc); if (connection->wait_release) SetEvent(connection->wait_release);

1 0

Alexandre Julliard : kernel32: Get the current directory from the process parameters in create_cmd_process ().
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: c4d85843c08d72c4c15529a3a4c63a9611bf9bb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4d85843c08d72c4c15529a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 16 21:50:58 2018 +0200 kernel32: Get the current directory from the process parameters in create_cmd_process(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 6e3b51e..f9456ae 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2469,7 +2469,7 @@ static BOOL create_vdm_process( LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES * * Create a new cmd shell process for a .BAT file. */ -static BOOL create_cmd_process( LPCWSTR cur_dir, LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa, +static BOOL create_cmd_process( LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa, BOOL inherit, DWORD flags, LPSTARTUPINFOW startup, const RTL_USER_PROCESS_PARAMETERS *params, LPPROCESS_INFORMATION info ) @@ -2480,7 +2480,7 @@ static BOOL create_cmd_process( LPCWSTR cur_dir, LPSECURITY_ATTRIBUTES psa, LPSE static const WCHAR slashscW[] = {' ','/','s','/','c',' ',0}; static const WCHAR quotW[] = {'"',0}; WCHAR comspec[MAX_PATH]; - WCHAR *newcmdline; + WCHAR *newcmdline, *cur_dir = NULL; BOOL ret; if (!GetEnvironmentVariableW( comspecW, comspec, ARRAY_SIZE( comspec ))) @@ -2498,6 +2498,7 @@ static BOOL create_cmd_process( LPCWSTR cur_dir, LPSECURITY_ATTRIBUTES psa, LPSE strcatW( newcmdline, quotW ); strcatW( newcmdline, params->CommandLine.Buffer ); strcatW( newcmdline, quotW ); + if (params->CurrentDirectory.DosPath.Length) cur_dir = params->CurrentDirectory.DosPath.Buffer; ret = CreateProcessW( comspec, newcmdline, psa, tsa, inherit, flags | CREATE_UNICODE_ENVIRONMENT, params->Environment, cur_dir, startup, info ); @@ -2705,7 +2706,7 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A if (!strcmpiW( p, batW ) || !strcmpiW( p, cmdW ) ) { TRACE( "starting %s as batch binary\n", debugstr_w(name) ); - retv = create_cmd_process( cur_dir, process_attr, thread_attr, + retv = create_cmd_process( process_attr, thread_attr, inherit, flags, startup_info, params, info ); break; }

1 0

Alexandre Julliard : kernel32: Move environment Unicode conversion into create_process_params().
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: ec0c5a11fd4532a707489359cd2e62bac2a4f018 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec0c5a11fd4532a707489359… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 16 15:25:57 2018 +0200 kernel32: Move environment Unicode conversion into create_process_params(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 53 ++++++++++++++++++++----------------------------- 1 file changed, 22 insertions(+), 31 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index f56bb09..6e3b51e 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1843,18 +1843,31 @@ static startup_info_t *create_startup_info( const RTL_USER_PROCESS_PARAMETERS *p * create_process_params */ static RTL_USER_PROCESS_PARAMETERS *create_process_params( LPCWSTR filename, LPCWSTR cmdline, - LPCWSTR cur_dir, LPWSTR env, DWORD flags, + LPCWSTR cur_dir, void *env, DWORD flags, const STARTUPINFOW *startup ) { RTL_USER_PROCESS_PARAMETERS *params; UNICODE_STRING imageW, curdirW, cmdlineW, titleW, desktopW, runtimeW, newdirW; WCHAR imagepath[MAX_PATH]; + WCHAR *envW = env; if(!GetLongPathNameW( filename, imagepath, MAX_PATH )) lstrcpynW( imagepath, filename, MAX_PATH ); if(!GetFullPathNameW( imagepath, MAX_PATH, imagepath, NULL )) lstrcpynW( imagepath, filename, MAX_PATH ); + if (env && !(flags & CREATE_UNICODE_ENVIRONMENT)) /* convert environment to unicode */ + { + char *e = env; + DWORD lenW; + + while (*e) e += strlen(e) + 1; + e++; /* final null */ + lenW = MultiByteToWideChar( CP_ACP, 0, env, e - (char *)env, NULL, 0 ); + if ((envW = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) ))) + MultiByteToWideChar( CP_ACP, 0, env, e - (char *)env, envW, lenW ); + } + newdirW.Buffer = NULL; if (cur_dir) { @@ -1870,9 +1883,12 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( LPCWSTR filename, LPC RtlInitUnicodeString( &desktopW, startup->lpDesktop ); runtimeW.Buffer = (WCHAR *)startup->lpReserved2; runtimeW.Length = runtimeW.MaximumLength = startup->cbReserved2; - if (RtlCreateProcessParametersEx( &params, &imageW, NULL, &curdirW, &cmdlineW, env, &titleW, + if (RtlCreateProcessParametersEx( &params, &imageW, NULL, &curdirW, &cmdlineW, envW, &titleW, &desktopW, NULL, &runtimeW, PROCESS_PARAMS_FLAG_NORMALIZED )) + { + if (envW != env) HeapFree( GetProcessHeap(), 0, envW ); return NULL; + } if (flags & CREATE_NEW_PROCESS_GROUP) params->ConsoleFlags = 1; if (flags & CREATE_NEW_CONSOLE) params->ConsoleHandle = KERNEL32_CONSOLE_ALLOC; @@ -1920,6 +1936,7 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( LPCWSTR filename, LPC params->dwFlags = startup->dwFlags; params->wShowWindow = startup->wShowWindow; + if (envW != env) HeapFree( GetProcessHeap(), 0, envW ); return params; } @@ -2482,7 +2499,7 @@ static BOOL create_cmd_process( LPCWSTR cur_dir, LPSECURITY_ATTRIBUTES psa, LPSE strcatW( newcmdline, params->CommandLine.Buffer ); strcatW( newcmdline, quotW ); ret = CreateProcessW( comspec, newcmdline, psa, tsa, inherit, - flags, params->Environment, cur_dir, + flags | CREATE_UNICODE_ENVIRONMENT, params->Environment, cur_dir, startup, info ); HeapFree( GetProcessHeap(), 0, newcmdline ); return ret; @@ -2585,7 +2602,7 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A HANDLE hFile = 0; char *unixdir = NULL; WCHAR name[MAX_PATH]; - WCHAR *tidy_cmdline, *p, *envW = env; + WCHAR *tidy_cmdline, *p; RTL_USER_PROCESS_PARAMETERS *params = NULL; pe_image_info_t pe_info; enum binary_type type; @@ -2621,35 +2638,10 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A if (GetCurrentDirectoryW(MAX_PATH, buf)) unixdir = wine_get_unix_file_name( buf ); } - if (!env) - { - WCHAR *e; - - RtlAcquirePebLock(); - e = env = NtCurrentTeb()->Peb->ProcessParameters->Environment; - while (*e) e += strlenW(e) + 1; - e++; /* final null */ - envW = HeapAlloc( GetProcessHeap(), 0, (e - (WCHAR *)env) * sizeof(WCHAR) ); - memcpy( envW, env, (e - (WCHAR *)env) * sizeof(WCHAR) ); - RtlReleasePebLock(); - } - else if (!(flags & CREATE_UNICODE_ENVIRONMENT)) /* convert environment to unicode */ - { - char *e = env; - DWORD lenW; - - while (*e) e += strlen(e) + 1; - e++; /* final null */ - lenW = MultiByteToWideChar( CP_ACP, 0, env, e - (char*)env, NULL, 0 ); - envW = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, env, e - (char*)env, envW, lenW ); - } - flags |= CREATE_UNICODE_ENVIRONMENT; - info->hThread = info->hProcess = 0; info->dwProcessId = info->dwThreadId = 0; - if (!(params = create_process_params( name, tidy_cmdline, cur_dir, envW, flags, startup_info ))) + if (!(params = create_process_params( name, tidy_cmdline, cur_dir, env, flags, startup_info ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); goto done; @@ -2730,7 +2722,6 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A done: RtlDestroyProcessParameters( params ); if (tidy_cmdline != cmd_line) HeapFree( GetProcessHeap(), 0, tidy_cmdline ); - if (envW != env) HeapFree( GetProcessHeap(), 0, envW ); HeapFree( GetProcessHeap(), 0, unixdir ); if (retv) TRACE( "started process pid %04x tid %04x\n", info->dwProcessId, info->dwThreadId );

1 0

Alexandre Julliard : ntdll/tests: Add tests for RtlCreateProcessParameters ().
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: 76cbf12894b9ee83ea8dd6fb5b9443720a90fe19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76cbf12894b9ee83ea8dd6fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 16 20:25:02 2018 +0200 ntdll/tests: Add tests for RtlCreateProcessParameters(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/env.c | 198 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 187 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=76cbf12894b9ee83ea8d…

1 0

Alexandre Julliard : ntdll: Allocate process parameters on the heap in RtlCreateProcessParametersEx() .
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: b5d4484cd2993e0b7d9ecb15ca756d4b2ce983c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5d4484cd2993e0b7d9ecb15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 16 20:45:31 2018 +0200 ntdll: Allocate process parameters on the heap in RtlCreateProcessParametersEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 1d34e62..37224a4 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -460,10 +460,10 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu UNICODE_STRING curdir; const RTL_USER_PROCESS_PARAMETERS *cur_params; - SIZE_T size, env_size, total_size; + SIZE_T size, env_size; void *ptr; const WCHAR *env; - NTSTATUS status; + NTSTATUS status = STATUS_SUCCESS; RtlAcquirePebLock(); cur_params = NtCurrentTeb()->Peb->ProcessParameters; @@ -500,13 +500,10 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu + ROUND_SIZE( ShellInfo->MaximumLength ) + ROUND_SIZE( RuntimeInfo->MaximumLength )); - total_size = size + env_size; - ptr = NULL; - if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, 0, &total_size, - MEM_COMMIT, PAGE_READWRITE )) == STATUS_SUCCESS) + if ((ptr = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, size + env_size ))) { RTL_USER_PROCESS_PARAMETERS *params = ptr; - params->AllocationSize = total_size; + params->AllocationSize = size; params->Size = size; params->Flags = PROCESS_PARAMS_FLAG_NORMALIZED; params->ConsoleFlags = cur_params->ConsoleFlags; @@ -526,6 +523,8 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu *result = params; if (!(flags & PROCESS_PARAMS_FLAG_NORMALIZED)) RtlDeNormalizeProcessParams( params ); } + else status = STATUS_NO_MEMORY; + RtlReleasePebLock(); return status; } @@ -555,7 +554,5 @@ NTSTATUS WINAPI RtlCreateProcessParameters( RTL_USER_PROCESS_PARAMETERS **result */ void WINAPI RtlDestroyProcessParameters( RTL_USER_PROCESS_PARAMETERS *params ) { - void *ptr = params; - SIZE_T size = 0; - NtFreeVirtualMemory( NtCurrentProcess(), &ptr, &size, MEM_RELEASE ); + RtlFreeHeap( GetProcessHeap(), 0, params ); }

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2018