November 2019 - Wine-Commits

Liam Middlebrook : winevulkan: Update to VK spec version 1.1.126.
by Alexandre Julliard Nov. 11, 2019

Nov. 11, 2019

Module: wine Branch: master Commit: 0425b6ad64791088adc13b74626dd8ac6e192420 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0425b6ad64791088adc13b74… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Wed Oct 30 13:00:05 2019 -0700 winevulkan: Update to VK spec version 1.1.126. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 222 +++++++ dlls/winevulkan/vulkan_thunks.h | 53 +- include/wine/vulkan.h | 1401 +++++++++++++++++++++++---------------- 4 files changed, 1097 insertions(+), 581 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0425b6ad64791088adc1…

1 0

Andrew Sheldon : wined3d: Add Navi 10 PCI id and device description.
by Alexandre Julliard Nov. 11, 2019

Nov. 11, 2019

Module: wine Branch: master Commit: da5a80879f165e773f0c9f3d87929c9d9c6f01d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da5a80879f165e773f0c9f3d… Author: Andrew Sheldon <asheldon55(a)gmail.com> Date: Mon Nov 11 18:07:12 2019 +1100 wined3d: Add Navi 10 PCI id and device description. Signed-off-by: Andrew Sheldon <asheldon55(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 ++ dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 4 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 52f0fd7ae1..7018c6da1d 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1686,6 +1686,8 @@ cards_intel[] = * drivers: R700, RV790, R680, RV535, RV516, R410, RS485, RV360, RV351. */ cards_amd_mesa[] = { + /* Navi 10 */ + {"NAVI10", CARD_AMD_RADEON_RX_NAVI_10}, /* Polaris 10/11 */ {"POLARIS10", CARD_AMD_RADEON_RX_480}, {"POLARIS11", CARD_AMD_RADEON_RX_460}, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0688e49c8c..902cc444ce 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -482,6 +482,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_10, "Radeon RX Vega", DRIVER_AMD_RX, 8192}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_12, "Radeon Pro Vega 20", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_20, "Radeon RX Vega 20", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_10, "Radeon RX 5700 / 5700 XT", DRIVER_AMD_RX, 8192}, /* Red Hat */ {HW_VENDOR_REDHAT, CARD_REDHAT_VIRGL, "Red Hat VirtIO GPU", DRIVER_REDHAT_VIRGL, 1024}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 61096a0345..f86853e9c9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2422,6 +2422,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_RX_VEGA_10 = 0x687f, CARD_AMD_RADEON_RX_VEGA_12 = 0x69af, CARD_AMD_RADEON_RX_VEGA_20 = 0x66af, + CARD_AMD_RADEON_RX_NAVI_10 = 0x731f, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0

Zhiyi Zhang : d3d8: Fix incorrect types.
by Alexandre Julliard Nov. 11, 2019

Nov. 11, 2019

Module: wine Branch: master Commit: fca49ddcc94b69993a2bfc0a7a20de24a3b6c422 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fca49ddcc94b69993a2bfc0a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Nov 11 16:20:50 2019 +0800 d3d8: Fix incorrect types. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index c5239844c3..742117bd71 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -101,15 +101,15 @@ static HRESULT WINAPI d3d8_RegisterSoftwareDevice(IDirect3D8 *iface, void *init_ static UINT WINAPI d3d8_GetAdapterCount(IDirect3D8 *iface) { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); - HRESULT hr; + UINT count; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_get_adapter_count(d3d8->wined3d); + count = wined3d_get_adapter_count(d3d8->wined3d); wined3d_mutex_unlock(); - return hr; + return count; } static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, @@ -146,16 +146,16 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, static UINT WINAPI d3d8_GetAdapterModeCount(IDirect3D8 *iface, UINT adapter) { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); - HRESULT hr; + UINT count; TRACE("iface %p, adapter %u.\n", iface, adapter); wined3d_mutex_lock(); - hr = wined3d_get_adapter_mode_count(d3d8->wined3d, adapter, + count = wined3d_get_adapter_mode_count(d3d8->wined3d, adapter, WINED3DFMT_UNKNOWN, WINED3D_SCANLINE_ORDERING_UNKNOWN); wined3d_mutex_unlock(); - return hr; + return count; } static HRESULT WINAPI d3d8_EnumAdapterModes(IDirect3D8 *iface, UINT adapter, UINT mode_idx, D3DDISPLAYMODE *mode)

1 0

Zebediah Figura : d3d8: Handle stateblocks in d3d8_device_SetIndices().
by Alexandre Julliard Nov. 11, 2019

Nov. 11, 2019

Module: wine Branch: master Commit: 8d54ca4f4e7002de7e6f77f863ebe7d8295eaa11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d54ca4f4e7002de7e6f77f8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 7 18:28:56 2019 -0600 d3d8: Handle stateblocks in d3d8_device_SetIndices(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 8cd85776f1..5f2235fb72 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3063,10 +3063,14 @@ static HRESULT WINAPI d3d8_device_SetIndices(IDirect3DDevice8 *iface, * problem) */ wined3d_mutex_lock(); - wined3d_device_set_base_vertex_index(device->wined3d_device, base_vertex_idx); - wined3d_device_set_index_buffer(device->wined3d_device, wined3d_buffer, ib ? ib->format : WINED3DFMT_UNKNOWN, 0); + wined3d_stateblock_set_base_vertex_index(device->update_state, base_vertex_idx); + wined3d_stateblock_set_index_buffer(device->update_state, wined3d_buffer, ib ? ib->format : WINED3DFMT_UNKNOWN); if (!device->recording) + { + wined3d_device_set_base_vertex_index(device->wined3d_device, base_vertex_idx); + wined3d_device_set_index_buffer(device->wined3d_device, wined3d_buffer, ib ? ib->format : WINED3DFMT_UNKNOWN, 0); device->sysmem_ib = ib && ib->draw_buffer; + } wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_scissor_rect().
by Alexandre Julliard Nov. 11, 2019

Nov. 11, 2019

Module: wine Branch: master Commit: 0383f62b3ced50ca372190b4331f3df7fca05336 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0383f62b3ced50ca372190b4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 7 18:28:51 2019 -0600 wined3d: Introduce wined3d_stateblock_set_scissor_rect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 8 ++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 10 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1d522ad89b..df0bca33b0 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1555,6 +1555,14 @@ void CDECL wined3d_stateblock_set_viewport(struct wined3d_stateblock *stateblock stateblock->changed.viewport = TRUE; } +void CDECL wined3d_stateblock_set_scissor_rect(struct wined3d_stateblock *stateblock, const RECT *rect) +{ + TRACE("stateblock %p, rect %s.\n", stateblock, wine_dbgstr_rect(rect)); + + stateblock->stateblock_state.scissor_rect = *rect; + stateblock->changed.scissorRect = TRUE; +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 48e5ea954b..4041db56da 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -272,6 +272,7 @@ @ cdecl wined3d_stateblock_set_ps_consts_i(ptr long long ptr) @ cdecl wined3d_stateblock_set_render_state(ptr long long) @ cdecl wined3d_stateblock_set_sampler_state(ptr long long long) +@ cdecl wined3d_stateblock_set_scissor_rect(ptr ptr) @ cdecl wined3d_stateblock_set_texture(ptr long ptr) @ cdecl wined3d_stateblock_set_texture_stage_state(ptr long long long) @ cdecl wined3d_stateblock_set_transform(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c311ded731..e723678601 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2684,6 +2684,7 @@ void __cdecl wined3d_stateblock_set_render_state(struct wined3d_stateblock *stat enum wined3d_render_state state, DWORD value); void __cdecl wined3d_stateblock_set_sampler_state(struct wined3d_stateblock *stateblock, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value); +void __cdecl wined3d_stateblock_set_scissor_rect(struct wined3d_stateblock *stateblock, const RECT *rect); void __cdecl wined3d_stateblock_set_texture(struct wined3d_stateblock *stateblock, UINT stage, struct wined3d_texture *texture); void __cdecl wined3d_stateblock_set_texture_stage_state(struct wined3d_stateblock *stateblock, UINT stage, enum wined3d_texture_stage_state state, DWORD value);

1 0

Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_SetScissorRect().
by Alexandre Julliard Nov. 11, 2019

Nov. 11, 2019

Module: wine Branch: master Commit: 08ae44e82d643e371c8be65323411d67a5e2745c URL: https://source.winehq.org/git/wine.git/?a=commit;h=08ae44e82d643e371c8be653… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 7 18:28:52 2019 -0600 d3d9: Handle stateblocks in d3d9_device_SetScissorRect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b4ba9223e0..d83c24a640 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2685,7 +2685,9 @@ static HRESULT WINAPI d3d9_device_SetScissorRect(IDirect3DDevice9Ex *iface, cons TRACE("iface %p, rect %p.\n", iface, rect); wined3d_mutex_lock(); - wined3d_device_set_scissor_rects(device->wined3d_device, 1, rect); + wined3d_stateblock_set_scissor_rect(device->update_state, rect); + if (!device->recording) + wined3d_device_set_scissor_rects(device->wined3d_device, 1, rect); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_base_vertex_index().
by Alexandre Julliard Nov. 11, 2019

Nov. 11, 2019

Module: wine Branch: master Commit: 056a2440b5892d1f492c31a49bbf83adc3978b18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=056a2440b5892d1f492c31a4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 7 18:28:55 2019 -0600 wined3d: Introduce wined3d_stateblock_set_base_vertex_index(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 7 +++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 9 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 7d2dcffba5..f8724da967 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1577,6 +1577,13 @@ void CDECL wined3d_stateblock_set_index_buffer(struct wined3d_stateblock *stateb stateblock->changed.indices = TRUE; } +void CDECL wined3d_stateblock_set_base_vertex_index(struct wined3d_stateblock *stateblock, INT base_index) +{ + TRACE("stateblock %p, base_index %d.\n", stateblock, base_index); + + stateblock->stateblock_state.base_vertex_index = base_index; +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 614886cc4a..8a9c9858e9 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -263,6 +263,7 @@ @ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_stateblock_reset(ptr) +@ cdecl wined3d_stateblock_set_base_vertex_index(ptr long) @ cdecl wined3d_stateblock_set_blend_factor(ptr ptr) @ cdecl wined3d_stateblock_set_clip_plane(ptr long ptr) @ cdecl wined3d_stateblock_set_index_buffer(ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7c6b2ef107..10e2ae70eb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2668,6 +2668,7 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_reset(struct wined3d_stateblock *stateblock); +void __cdecl wined3d_stateblock_set_base_vertex_index(struct wined3d_stateblock *stateblock, INT base_index); void __cdecl wined3d_stateblock_set_blend_factor(struct wined3d_stateblock *stateblock, const struct wined3d_color *blend_factor); HRESULT __cdecl wined3d_stateblock_set_clip_plane(struct wined3d_stateblock *stateblock,

1 0

Paul Gofman : wined3d: Check if destination texture has GPU access in glsl_blitter_supported().
by Alexandre Julliard Nov. 11, 2019

Nov. 11, 2019

Module: wine Branch: master Commit: 3c9b843175b34b737f74e2fd347ce1ae66c24d30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c9b843175b34b737f74e2fd… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Nov 8 14:57:22 2019 +0300 wined3d: Check if destination texture has GPU access in glsl_blitter_supported(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b1930d9a88..f05631ec59 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12937,14 +12937,20 @@ static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wi return FALSE; } + if (!(dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) + { + TRACE("Destination resource does not have GPU access.\n"); + return FALSE; + } + /* We don't necessarily want to blit from resources without * WINED3D_RESOURCE_ACCESS_GPU, but that may be the only way to decompress * compressed textures. */ decompress = (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); - if (!decompress && !(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) + if (!decompress && !(src_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) { - TRACE("Source or destination resource does not have GPU access.\n"); + TRACE("Source resource does not have GPU access.\n"); return FALSE; }

1 0

Sven Baars : wintrust/tests: Initialize cbStruct in the ObjectTrust tests.
by Alexandre Julliard Nov. 11, 2019

Nov. 11, 2019

Module: wine Branch: master Commit: 55a5818106e312b5e421ed6c2a20fa726cbb238d URL: https://source.winehq.org/git/wine.git/?a=commit;h=55a5818106e312b5e421ed6c… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Nov 10 15:03:09 2019 +0100 wintrust/tests: Initialize cbStruct in the ObjectTrust tests. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/tests/softpub.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 2a4f4f4b25..5a150e684d 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -317,6 +317,8 @@ static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) /* Crashes ret = funcs->pfnObjectTrust(NULL); */ + + data.cbStruct = sizeof(data); data.pSigState = &sig_state; data.pWintrustData = &wintrust_data; data.padwTrustStepErrors =

1 0

Alexandre Julliard : server: Get rid of the unused file parameter in exec_process.
by Alexandre Julliard Nov. 11, 2019

Nov. 11, 2019

Module: wine Branch: master Commit: 8c4a1cc7920c00940b459eab535f2f22ed1374fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c4a1cc7920c00940b459eab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 11 20:02:36 2019 +0100 server: Get rid of the unused file parameter in exec_process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 10 ++++------ include/wine/server_protocol.h | 4 ++-- server/protocol.def | 1 - server/request.h | 3 +-- server/trace.c | 1 - 5 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index b539737ead..76a33f7161 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1430,8 +1430,7 @@ static NTSTATUS alloc_object_attributes( const SECURITY_ATTRIBUTES *attr, struct * * Replace the existing process by exec'ing a new one. */ -static BOOL replace_process( HANDLE handle, const RTL_USER_PROCESS_PARAMETERS *params, - const pe_image_info_t *pe_info ) +static BOOL replace_process( const RTL_USER_PROCESS_PARAMETERS *params, const pe_image_info_t *pe_info ) { NTSTATUS status; int socketfd[2]; @@ -1454,7 +1453,6 @@ static BOOL replace_process( HANDLE handle, const RTL_USER_PROCESS_PARAMETERS *p SERVER_START_REQ( exec_process ) { req->socket_fd = socketfd[1]; - req->exe_file = wine_server_obj_handle( handle ); req->cpu = pe_info->cpu; status = wine_server_call( req ); } @@ -2124,11 +2122,11 @@ static void exec_process( LPCWSTR name ) debugstr_w(name), is_64bit_arch(pe_info.cpu) ? 64 : 32, wine_dbgstr_longlong(pe_info.base), wine_dbgstr_longlong(pe_info.base + pe_info.map_size), cpu_names[pe_info.cpu] ); - replace_process( hFile, params, &pe_info ); + replace_process( params, &pe_info ); break; case BINARY_UNIX_LIB: TRACE( "%s is a Unix library, starting as Winelib app\n", debugstr_w(name) ); - replace_process( hFile, params, &pe_info ); + replace_process( params, &pe_info ); break; case BINARY_UNKNOWN: /* check for .com or .pif extension */ @@ -2138,7 +2136,7 @@ static void exec_process( LPCWSTR name ) case BINARY_WIN16: TRACE( "starting %s as Win16/DOS binary\n", debugstr_w(name) ); if (!(new_params = get_vdm_params( params, &pe_info ))) break; - replace_process( 0, new_params, &pe_info ); + replace_process( new_params, &pe_info ); RtlDestroyProcessParameters( new_params ); break; default: diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 83ce56ca25..d8f9816422 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -795,8 +795,8 @@ struct exec_process_request { struct request_header __header; int socket_fd; - obj_handle_t exe_file; client_cpu_t cpu; + char __pad_20[4]; }; struct exec_process_reply { @@ -6691,6 +6691,6 @@ union generic_reply struct resume_process_reply resume_process_reply; }; -#define SERVER_PROTOCOL_VERSION 588 +#define SERVER_PROTOCOL_VERSION 589 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 984f2a10fd..3a0df20bdb 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -803,7 +803,6 @@ struct rawinput_device /* Execute a process, replacing the current one */ @REQ(exec_process) int socket_fd; /* file descriptor for process socket */ - obj_handle_t exe_file; /* file handle for main exe */ client_cpu_t cpu; /* CPU that the new process will use */ @END diff --git a/server/request.h b/server/request.h index be65a237dd..1303b35ef7 100644 --- a/server/request.h +++ b/server/request.h @@ -757,8 +757,7 @@ C_ASSERT( FIELD_OFFSET(struct new_process_reply, pid) == 12 ); C_ASSERT( FIELD_OFFSET(struct new_process_reply, handle) == 16 ); C_ASSERT( sizeof(struct new_process_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct exec_process_request, socket_fd) == 12 ); -C_ASSERT( FIELD_OFFSET(struct exec_process_request, exe_file) == 16 ); -C_ASSERT( FIELD_OFFSET(struct exec_process_request, cpu) == 20 ); +C_ASSERT( FIELD_OFFSET(struct exec_process_request, cpu) == 16 ); C_ASSERT( sizeof(struct exec_process_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_new_process_info_request, info) == 12 ); C_ASSERT( sizeof(struct get_new_process_info_request) == 16 ); diff --git a/server/trace.c b/server/trace.c index 0acfc92b27..55d5e68962 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1265,7 +1265,6 @@ static void dump_new_process_reply( const struct new_process_reply *req ) static void dump_exec_process_request( const struct exec_process_request *req ) { fprintf( stderr, " socket_fd=%d", req->socket_fd ); - fprintf( stderr, ", exe_file=%04x", req->exe_file ); dump_client_cpu( ", cpu=", &req->cpu ); }

1 0