September 2020 - Wine-commits

Piotr Caban : imm32: Exit early in ImmTranslateMessage when there was no new input.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: c9988c885d22a911301cf4df681d9d033ecfb5fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9988c885d22a911301cf4df… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 25 18:44:56 2020 +0200 imm32: Exit early in ImmTranslateMessage when there was no new input. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 2 +- dlls/imm32/tests/imm32.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 5f68c1d27d..0f3d7d5f8c 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -3045,7 +3045,7 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lKeyD else return FALSE; - if (!data->immKbd->hIME || !data->immKbd->pImeToAsciiEx) + if (!data->immKbd->hIME || !data->immKbd->pImeToAsciiEx || data->lastVK == VK_PROCESSKEY) return FALSE; GetKeyboardState(state); diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 040a43fc05..827b31eec2 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -1643,6 +1643,8 @@ static void test_ime_processkey(void) trace("ProcessKey was correctly found\n"); } TranslateMessage(&msg); + /* test calling TranslateMessage multiple times */ + TranslateMessage(&msg); DispatchMessageW(&msg); }

1 0

Zebediah Figura : wined3d: Free cached depth/stencil states in wined3d_device_uninit_3d().
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 9bfc0f7094fac7d5c225d68220895c23ba976974 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bfc0f7094fac7d5c225d682… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Sep 25 16:01:21 2020 -0500 wined3d: Free cached depth/stencil states in wined3d_device_uninit_3d(). 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/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 38b488cba8..13d9057f3a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1213,6 +1213,7 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) wine_rb_clear(&device->samplers, device_free_sampler, NULL); wine_rb_clear(&device->rasterizer_states, device_free_rasterizer_state, NULL); wine_rb_clear(&device->blend_states, device_free_blend_state, NULL); + wine_rb_clear(&device->depth_stencil_states, device_free_depth_stencil_state, NULL); LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) {

1 0

Zebediah Figura : wined3d: Move the depth write enable state to wined3d_depth_stencil_state.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 4a5760b28b356bdbeac18677d5bde772f3e46a32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a5760b28b356bdbeac18677… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Sep 25 16:01:22 2020 -0500 wined3d: Move the depth write enable state to wined3d_depth_stencil_state. 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/d3d11/device.c | 4 ---- dlls/d3d11/state.c | 1 + dlls/wined3d/adapter_vk.c | 29 ++++++++++++++--------------- dlls/wined3d/context_gl.c | 2 +- dlls/wined3d/context_vk.c | 5 +++-- dlls/wined3d/device.c | 2 ++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 29 ++++++++++++----------------- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/wined3d_private.h | 5 +++-- include/wine/wined3d.h | 1 + 11 files changed, 39 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4a5760b28b356bdbeac1…

1 0

Zebediah Figura : wined3d: Move the stencil enable state to wined3d_depth_stencil_state.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 94becf6fc692b2100008325b301362811170df6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=94becf6fc692b2100008325b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Sep 25 16:01:23 2020 -0500 wined3d: Move the stencil enable state to wined3d_depth_stencil_state. 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/d3d11/device.c | 2 -- dlls/d3d11/state.c | 1 + dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/context_gl.c | 5 ++-- dlls/wined3d/context_vk.c | 66 ++++++++++++++++++++++++----------------------- dlls/wined3d/cs.c | 1 - dlls/wined3d/device.c | 5 +++- dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 46 +++++++++++++++------------------ include/wine/wined3d.h | 1 + 10 files changed, 63 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=94becf6fc692b2100008…

1 0

Zebediah Figura : wined3d: Move the stencil read mask to wined3d_depth_stencil_state.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 92ca89b4a538935033cc99d89447ec598e771654 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92ca89b4a538935033cc99d8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Sep 25 16:01:24 2020 -0500 wined3d: Move the stencil read mask to wined3d_depth_stencil_state. 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/d3d11/device.c | 1 - dlls/d3d11/state.c | 1 + dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/context_vk.c | 4 ++-- dlls/wined3d/device.c | 2 ++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 4 ++-- include/wine/wined3d.h | 1 + 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index cac72e614e..7ed8dc8bd7 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -761,7 +761,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3 if (desc->StencilEnable) { - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILMASK, desc->StencilReadMask); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILWRITEMASK, desc->StencilWriteMask); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILREF, stencil_ref); diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 609c5e4c10..78540d3511 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -797,6 +797,7 @@ HRESULT d3d_depthstencil_state_create(struct d3d_device *device, const D3D11_DEP wined3d_desc.depth = desc->DepthEnable; wined3d_desc.depth_write = desc->DepthWriteMask; wined3d_desc.stencil = desc->StencilEnable; + wined3d_desc.stencil_read_mask = desc->StencilReadMask; /* We cannot fail after creating a wined3d_depth_stencil_state object. It * would lead to double free. */ diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 9c9da41840..ee5390006a 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -122,7 +122,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_RENDER(WINED3D_RS_STENCILPASS), {STATE_RENDER(WINED3D_RS_ZFUNC)}}, {STATE_RENDER(WINED3D_RS_STENCILFUNC), {STATE_RENDER(WINED3D_RS_ZFUNC)}}, {STATE_RENDER(WINED3D_RS_STENCILREF), {STATE_RENDER(WINED3D_RS_ZFUNC)}}, - {STATE_RENDER(WINED3D_RS_STENCILMASK), {STATE_RENDER(WINED3D_RS_ZFUNC)}}, {STATE_RENDER(WINED3D_RS_STENCILWRITEMASK), {STATE_RENDER(WINED3D_RS_ZFUNC)}}, {STATE_RENDER(WINED3D_RS_TWOSIDEDSTENCILMODE), {STATE_RENDER(WINED3D_RS_ZFUNC)}}, {STATE_RENDER(WINED3D_RS_BACK_STENCILFAIL), {STATE_RENDER(WINED3D_RS_ZFUNC)}}, diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 6eaee71c54..f91a1e2e8e 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2051,7 +2051,7 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte key->ds_desc.front.depthFailOp = vk_stencil_op_from_wined3d( state->render_states[WINED3D_RS_STENCILZFAIL]); key->ds_desc.front.compareOp = vk_compare_op_from_wined3d(state->render_states[WINED3D_RS_STENCILFUNC]); - key->ds_desc.front.compareMask = state->render_states[WINED3D_RS_STENCILMASK]; + key->ds_desc.front.compareMask = d->desc.stencil_read_mask; key->ds_desc.front.writeMask = state->render_states[WINED3D_RS_STENCILWRITEMASK]; key->ds_desc.front.reference = state->render_states[WINED3D_RS_STENCILREF] & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); @@ -2066,7 +2066,7 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte state->render_states[WINED3D_RS_BACK_STENCILZFAIL]); key->ds_desc.back.compareOp = vk_compare_op_from_wined3d( state->render_states[WINED3D_RS_BACK_STENCILFUNC]); - key->ds_desc.back.compareMask = state->render_states[WINED3D_RS_STENCILMASK]; + key->ds_desc.back.compareMask = d->desc.stencil_read_mask; key->ds_desc.back.writeMask = state->render_states[WINED3D_RS_STENCILWRITEMASK]; key->ds_desc.back.reference = state->render_states[WINED3D_RS_STENCILREF] & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1dcf4fcb93..054fc52838 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3686,6 +3686,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, break; case WINED3D_RS_STENCILENABLE: + case WINED3D_RS_STENCILMASK: case WINED3D_RS_ZENABLE: case WINED3D_RS_ZWRITEENABLE: set_depth_stencil_state = TRUE; @@ -3843,6 +3844,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, } desc.depth_write = state->rs[WINED3D_RS_ZWRITEENABLE]; desc.stencil = state->rs[WINED3D_RS_STENCILENABLE]; + desc.stencil_read_mask = state->rs[WINED3D_RS_STENCILMASK]; if ((entry = wine_rb_get(&device->depth_stencil_states, &desc))) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ed5900fed0..49b1422846 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2448,7 +2448,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_STENCILPASS), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_STENCILFUNC), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_STENCILREF), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_STENCILMASK), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_STENCILWRITEMASK), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_TWOSIDEDSTENCILMODE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_BACK_STENCILFAIL), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 0f88b4a267..32076289ac 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1082,7 +1082,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ func = GL_ALWAYS; if (!(func_back = wined3d_gl_compare_func(state->render_states[WINED3D_RS_BACK_STENCILFUNC]))) func_back = GL_ALWAYS; - mask = state->render_states[WINED3D_RS_STENCILMASK]; + mask = d->desc.stencil_read_mask; ref = state->render_states[WINED3D_RS_STENCILREF] & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); stencilFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILFAIL]); depthFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILZFAIL]); @@ -4758,7 +4758,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_STENCILPASS), { STATE_DEPTH_STENCIL, NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_STENCILFUNC), { STATE_DEPTH_STENCIL, NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_STENCILREF), { STATE_DEPTH_STENCIL, NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_STENCILMASK), { STATE_DEPTH_STENCIL, NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_STENCILWRITEMASK), { STATE_RENDER(WINED3D_RS_STENCILWRITEMASK), state_stencilwrite2s_ext}, EXT_STENCIL_TWO_SIDE }, { STATE_RENDER(WINED3D_RS_STENCILWRITEMASK), { STATE_RENDER(WINED3D_RS_STENCILWRITEMASK), state_stencilwrite }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_TWOSIDEDSTENCILMODE), { STATE_DEPTH_STENCIL, NULL }, WINED3D_GL_EXT_NONE }, @@ -5565,6 +5564,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 42, 45}, { 47, 47}, { 52, 52}, + { 58, 58}, { 61, 127}, {149, 150}, {162, 162}, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ad860a1eae..e2db42766f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2041,6 +2041,7 @@ struct wined3d_depth_stencil_state_desc BOOL depth; BOOL depth_write; BOOL stencil; + unsigned int stencil_read_mask; }; struct wined3d_rasterizer_state_desc

1 0

Zebediah Figura : wined3d: Move the stencil write mask to wined3d_depth_stencil_state.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 690ff3dbea5748b5a503981447f8efe3b6d93cdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=690ff3dbea5748b5a5039814… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Sep 25 16:01:25 2020 -0500 wined3d: Move the stencil write mask to wined3d_depth_stencil_state. 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/d3d11/device.c | 1 - dlls/d3d11/state.c | 1 + dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/context_vk.c | 4 +-- dlls/wined3d/cs.c | 1 - dlls/wined3d/device.c | 2 ++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 69 +++++++++++++++++++++++++++-------------------- dlls/wined3d/texture.c | 4 +-- include/wine/wined3d.h | 1 + 10 files changed, 48 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=690ff3dbea5748b5a503…

1 0

Alexandre Julliard : ws2_32: Retrieve the FQDN only when necessary in getaddrinfo().
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 9fff80d87655ae9f70094b34661abc2a399395be URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fff80d87655ae9f70094b34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 16:18:57 2020 +0200 ws2_32: Retrieve the FQDN only when necessary in getaddrinfo(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5089029f4b..a52b708f8e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6759,9 +6759,8 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr struct addrinfo *unixaires = NULL; int result; struct addrinfo unixhints, *punixhints = NULL; - char *dot, *nodeV6 = NULL, *fqdn; + char *nodeV6 = NULL, *fqdn = NULL; const char *node; - size_t hostname_len = 0; *res = NULL; if (!nodename && !servname) @@ -6770,16 +6769,13 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr return WSAHOST_NOT_FOUND; } - fqdn = get_fqdn(); - if (!fqdn) return WSA_NOT_ENOUGH_MEMORY; - dot = strchr(fqdn, '.'); - if (dot) - hostname_len = dot - fqdn; - if (!nodename) node = NULL; else if (!nodename[0]) + { + if (!(fqdn = get_fqdn())) return WSA_NOT_ENOUGH_MEMORY; node = fqdn; + } else { node = nodename; @@ -6792,11 +6788,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr if (node[0] == '[' && (close_bracket = strchr(node + 1, ']'))) { nodeV6 = HeapAlloc(GetProcessHeap(), 0, close_bracket - node); - if (!nodeV6) - { - HeapFree(GetProcessHeap(), 0, fqdn); - return WSA_NOT_ENOUGH_MEMORY; - } + if (!nodeV6) return WSA_NOT_ENOUGH_MEMORY; lstrcpynA(nodeV6, node + 1, close_bracket - node); node = nodeV6; } @@ -6847,14 +6839,21 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr /* getaddrinfo(3) is thread safe, no need to wrap in CS */ result = getaddrinfo(node, servname, punixhints, &unixaires); - if (result && (!hints || !(hints->ai_flags & WS_AI_NUMERICHOST)) - && node && (!strcmp(fqdn, node) || (!strncmp(fqdn, node, hostname_len) && !node[hostname_len]))) + if (result && (!hints || !(hints->ai_flags & WS_AI_NUMERICHOST)) && node) { - /* If it didn't work it means the host name IP is not in /etc/hosts, try again - * by sending a NULL host and avoid sending a NULL servname too because that - * is invalid */ - ERR_(winediag)("Failed to resolve your host name IP\n"); - result = getaddrinfo(NULL, servname ? servname : "0", punixhints, &unixaires); + if (!fqdn && !(fqdn = get_fqdn())) + { + HeapFree(GetProcessHeap(), 0, nodeV6); + return WSA_NOT_ENOUGH_MEMORY; + } + if (!strcmp(fqdn, node) || (!strncmp(fqdn, node, strlen(node)) && fqdn[strlen(node)] == '.')) + { + /* If it didn't work it means the host name IP is not in /etc/hosts, try again + * by sending a NULL host and avoid sending a NULL servname too because that + * is invalid */ + ERR_(winediag)("Failed to resolve your host name IP\n"); + result = getaddrinfo(NULL, servname ? servname : "0", punixhints, &unixaires); + } } TRACE("%s, %s %p -> %p %d\n", debugstr_a(nodename), debugstr_a(servname), hints, res, result); HeapFree(GetProcessHeap(), 0, fqdn);

1 0

Alexandre Julliard : wineboot: Set the computer name keys.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 6a19b999f7877f5b0052c77d09a41635769ce441 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a19b999f7877f5b0052c77d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 16:20:04 2020 +0200 wineboot: Set the computer name keys. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/Makefile.in | 2 +- programs/wineboot/wineboot.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index 3921fa9644..2552f69990 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -1,6 +1,6 @@ MODULE = wineboot.exe APPMODE = -mconsole -IMPORTS = uuid advapi32 +IMPORTS = uuid advapi32 ws2_32 DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev EXTRADLLFLAGS = -mno-cygwin diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 2f8b7169cf..fa1c459035 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -64,6 +64,7 @@ #include <ntstatus.h> #define WIN32_NO_STATUS #include <windows.h> +#include <ws2tcpip.h> #include <winternl.h> #include <ddk/wdm.h> #include <sddl.h> @@ -815,6 +816,42 @@ static void create_environment_registry_keys( void ) RegCloseKey( env_key ); } +/* create the ComputerName registry keys */ +static void create_computer_name_keys(void) +{ + struct addrinfo hints = {0}, *res; + char *dot, buffer[256]; + HKEY key, subkey; + + if (gethostname( buffer, sizeof(buffer) )) return; + hints.ai_flags = AI_CANONNAME; + if (getaddrinfo( buffer, NULL, &hints, &res )) return; + dot = strchr( res->ai_canonname, '.' ); + if (dot) *dot++ = 0; + else dot = res->ai_canonname + strlen(res->ai_canonname); + SetComputerNameExA( ComputerNamePhysicalDnsDomain, dot ); + SetComputerNameExA( ComputerNamePhysicalDnsHostname, res->ai_canonname ); + freeaddrinfo( res ); + + if (RegOpenKeyW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\ComputerName", &key )) + return; + + if (!RegOpenKeyW( key, L"ComputerName", &subkey )) + { + DWORD type, size = sizeof(buffer); + + if (RegQueryValueExW( subkey, L"ComputerName", NULL, &type, (BYTE *)buffer, &size )) size = 0; + RegCloseKey( subkey ); + if (size && !RegCreateKeyExW( key, L"ActiveComputerName", 0, NULL, REG_OPTION_VOLATILE, + KEY_ALL_ACCESS, NULL, &subkey, NULL )) + { + RegSetValueExW( subkey, L"ComputerName", 0, type, (const BYTE *)buffer, size ); + RegCloseKey( subkey ); + } + } + RegCloseKey( key ); +} + static void create_volatile_environment_registry_key(void) { WCHAR path[MAX_PATH]; @@ -1657,6 +1694,7 @@ int __cdecl main( int argc, char *argv[] ) create_hardware_registry_keys(); create_dynamic_registry_keys(); create_environment_registry_keys(); + create_computer_name_keys(); wininit(); pendingRename();

1 0

Alexandre Julliard : kernel32: Remove the setting of the computer name keys.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 48e88074cdd09513164f8669b270d13425f4584c URL: https://source.winehq.org/git/wine.git/?a=commit;h=48e88074cdd09513164f8669… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 16:20:43 2020 +0200 kernel32: Remove the setting of the computer name keys. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/computername.c | 153 ----------------------------------------- dlls/kernel32/kernel_main.c | 3 - dlls/kernel32/kernel_private.h | 3 - 3 files changed, 159 deletions(-) diff --git a/dlls/kernel32/computername.c b/dlls/kernel32/computername.c index f4b56335dd..949db04985 100644 --- a/dlls/kernel32/computername.c +++ b/dlls/kernel32/computername.c @@ -25,14 +25,7 @@ #include <stdarg.h> #include <string.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif #include <stdlib.h> -#include <errno.h> -#ifdef HAVE_NETDB_H -#include <netdb.h> -#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -43,155 +36,9 @@ #include "winternl.h" #include "wine/unicode.h" #include "wine/exception.h" -#include "wine/debug.h" #include "kernel_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(computername); - -/* Registry key and value names */ -static const WCHAR ComputerW[] = {'\\','R','e','g','i','s','t','r','y','\\', - 'M','a','c','h','i','n','e','\\', - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'C','o','m','p','u','t','e','r','N','a','m','e',0}; -static const WCHAR ActiveComputerNameW[] = {'A','c','t','i','v','e','C','o','m','p','u','t','e','r','N','a','m','e',0}; -static const WCHAR ComputerNameW[] = {'C','o','m','p','u','t','e','r','N','a','m','e',0}; - -static const WCHAR default_ComputerName[] = {'W','I','N','E',0}; - -/*********************************************************************** - * dns_gethostbyname (INTERNAL) - * - * From hostname(1): - * "The FQDN is the name gethostbyname(2) returns for the host name returned by gethostname(2)." - * - * Wine can use this technique only if the thread-safe gethostbyname_r is available. - */ -static void dns_gethostbyname ( char *name, int size ) -{ -#ifdef HAVE_LINUX_GETHOSTBYNAME_R_6 - struct hostent* host = NULL; - char *extrabuf; - int ebufsize = 1024; - struct hostent hostentry; - int locerr = ENOBUFS, res; - - for (;;) - { - if (!(extrabuf = HeapAlloc( GetProcessHeap(), 0, ebufsize ))) return; - res = gethostbyname_r ( name, &hostentry, extrabuf, ebufsize, &host, &locerr ); - if( res != ERANGE ) break; - ebufsize *= 2; - HeapFree( GetProcessHeap(), 0, extrabuf ); - } - - if ( res ) - WARN ("Error in gethostbyname_r %d (%d)\n", res, locerr); - else if ( !host ) - WARN ("gethostbyname_r returned NULL host, locerr = %d\n", locerr); - else - if (strlen( host->h_name ) < size) strcpy( name, host->h_name ); - - HeapFree( GetProcessHeap(), 0, extrabuf ); -#endif -} - -/*********************************************************************** - * dns_fqdn (INTERNAL) - */ -static BOOL dns_fqdn ( char *name, int size ) -{ - if (gethostname( name, size )) - { - switch( errno ) - { - case ENAMETOOLONG: - SetLastError ( ERROR_MORE_DATA ); - break; - default: - SetLastError ( ERROR_INVALID_PARAMETER ); - break; - } - return FALSE; - } - dns_gethostbyname( name, size ); - return TRUE; -} - -/*********************************************************************** - * COMPUTERNAME_Init (INTERNAL) - */ -void COMPUTERNAME_Init (void) -{ - HANDLE hkey = INVALID_HANDLE_VALUE, hsubkey = INVALID_HANDLE_VALUE; - OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW; - char buf[offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ) + (MAX_COMPUTERNAME_LENGTH + 1) * sizeof( WCHAR )]; - DWORD len = sizeof( buf ); - const WCHAR *computer_name = (WCHAR *)(buf + offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data )); - NTSTATUS st = STATUS_INTERNAL_ERROR; - char hbuf[256]; - WCHAR *dot, bufW[256]; - - if (dns_fqdn( hbuf, sizeof(hbuf) )) - { - MultiByteToWideChar( CP_UNIXCP, 0, hbuf, -1, bufW, ARRAY_SIZE(bufW) ); - dot = strchrW( bufW, '.' ); - if (dot) *dot++ = 0; - else dot = bufW + strlenW(bufW); - SetComputerNameExW( ComputerNamePhysicalDnsDomain, dot ); - SetComputerNameExW( ComputerNamePhysicalDnsHostname, bufW ); - } - - TRACE("(void)\n"); - InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL ); - RtlInitUnicodeString( &nameW, ComputerW ); - if ( ( st = NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ) ) != STATUS_SUCCESS ) - goto out; - - attr.RootDirectory = hkey; - RtlInitUnicodeString( &nameW, ComputerNameW ); - if ( (st = NtCreateKey( &hsubkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ) ) != STATUS_SUCCESS ) - goto out; - - st = NtQueryValueKey( hsubkey, &nameW, KeyValuePartialInformation, buf, len, &len ); - - if ( st != STATUS_SUCCESS) - { - computer_name = default_ComputerName; - len = sizeof(default_ComputerName); - } - else - { - len = (len - offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data )); - } - - NtClose( hsubkey ); - TRACE(" ComputerName: %s (%u)\n", debugstr_w (computer_name), len); - - RtlInitUnicodeString( &nameW, ActiveComputerNameW ); - if ( ( st = NtCreateKey( &hsubkey, KEY_ALL_ACCESS, &attr, 0, NULL, REG_OPTION_VOLATILE, NULL ) ) - != STATUS_SUCCESS ) - goto out; - - RtlInitUnicodeString( &nameW, ComputerNameW ); - st = NtSetValueKey( hsubkey, &nameW, 0, REG_SZ, computer_name, len ); - -out: - NtClose( hsubkey ); - NtClose( hkey ); - - if ( st == STATUS_SUCCESS ) - TRACE( "success\n" ); - else - { - WARN( "status trying to set ComputerName: %x\n", st ); - SetLastError ( RtlNtStatusToDosError ( st ) ); - } -} - /*********************************************************************** * GetComputerNameW (KERNEL32.@) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 6f60768cbd..1823c8e650 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -132,9 +132,6 @@ static BOOL process_attach( HMODULE module ) NtQuerySystemInformation( SystemBasicInformation, &system_info, sizeof(system_info), NULL ); - /* Setup computer name */ - COMPUTERNAME_Init(); - CONSOLE_Init(params); copy_startup_info(); diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 5fb66d34ca..fe19e2ed5c 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -58,7 +58,4 @@ extern const WCHAR DIR_System[] DECLSPEC_HIDDEN; extern WCHAR *FILE_name_AtoW( LPCSTR name, BOOL alloc ) DECLSPEC_HIDDEN; extern DWORD FILE_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ) DECLSPEC_HIDDEN; -/* computername.c */ -extern void COMPUTERNAME_Init(void) DECLSPEC_HIDDEN; - #endif

1 0

Alexandre Julliard : ntdll: Delay ntdll.dll loading until more initialization is done.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 20e0fd6e991edf5c6b5c6c7c22632d16d346a690 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20e0fd6e991edf5c6b5c6c7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 19:38:17 2020 +0200 ntdll: Delay ntdll.dll loading until more initialization is done. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index e7a7c96a97..b8500b5772 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1577,6 +1577,8 @@ static void start_main_thread(void) init_cpu_info(); init_files(); NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); + load_ntdll(); + load_libwine(); status = p__wine_set_unix_funcs( NTDLL_UNIXLIB_VERSION, &unix_funcs ); if (status) exec_process( status ); server_init_process_done(); @@ -1785,10 +1787,7 @@ void __wine_main( int argc, char *argv[], char *envp[] ) #endif virtual_init(); - load_ntdll(); - init_environment( argc, argv, envp ); - load_libwine(); #ifdef __APPLE__ apple_main_thread();

1 0