wine-commits September 2020

wine-commits@winehq.org

1 participants
703 discussions

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

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

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 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 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: 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

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

Michael Stefaniuc : dswave: Simplify the stub WAVE IPersistStream_Load().
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: ef12437b690bb2f73fcb5abddb7a2932565d75c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef12437b690bb2f73fcb5abd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Sep 25 21:14:32 2020 +0200 dswave: Simplify the stub WAVE IPersistStream_Load(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dswave/dswave.c | 166 +++++-------------------------------------- dlls/dswave/dswave_private.h | 9 --- 2 files changed, 19 insertions(+), 156 deletions(-) diff --git a/dlls/dswave/dswave.c b/dlls/dswave/dswave.c index a561660cfa..349c7e2fda 100644 --- a/dlls/dswave/dswave.c +++ b/dlls/dswave/dswave.c @@ -21,8 +21,7 @@ #include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dswave); -WINE_DECLARE_DEBUG_CHANNEL(dmfile); - + /* an interface that is, according to my tests, obtained by loader after loading object; is it acting as some sort of bridge between object and loader? */ static const GUID IID_IDirectMusicWavePRIVATE = {0x69e934e4,0x97f1,0x4f1d,{0x88,0xe8,0xf2,0xac,0x88,0x67,0x13,0x27}}; @@ -144,151 +143,24 @@ static inline IDirectMusicWaveImpl *impl_from_IPersistStream(IPersistStream *ifa return CONTAINING_RECORD(iface, IDirectMusicWaveImpl, dmobj.IPersistStream_iface); } -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) +static HRESULT WINAPI wave_IPersistStream_Load(IPersistStream *iface, IStream *stream) { - IDirectMusicWaveImpl *This = impl_from_IPersistStream(iface); - DMUS_PRIVATE_CHUNK Chunk; - DWORD StreamSize, StreamCount, ListSize[1], ListCount[1]; - LARGE_INTEGER liMove; /* used when skipping chunks */ - - FIXME("(%p, %p): loading not implemented yet (only descriptor is loaded)\n", This, pStm); - - /* FIXME: should this be determined from stream? */ - This->dmobj.desc.dwValidData |= DMUS_OBJ_CLASS; - This->dmobj.desc.guidClass = CLSID_DirectMusicSegment; - - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case FOURCC_RIFF: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(Chunk.fccID)); - StreamSize = Chunk.dwSize - sizeof(FOURCC); - StreamCount = 0; - if (Chunk.fccID == mmioFOURCC('W','A','V','E')) { - TRACE_(dmfile)(": wave form\n"); - do { - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case DMUS_FOURCC_GUID_CHUNK: { - TRACE_(dmfile)(": GUID chunk\n"); - This->dmobj.desc.dwValidData |= DMUS_OBJ_OBJECT; - IStream_Read (pStm, &This->dmobj.desc.guidObject, Chunk.dwSize, NULL); - break; - } - case DMUS_FOURCC_VERSION_CHUNK: { - TRACE_(dmfile)(": version chunk\n"); - This->dmobj.desc.dwValidData |= DMUS_OBJ_VERSION; - IStream_Read (pStm, &This->dmobj.desc.vVersion, Chunk.dwSize, NULL); - break; - } - case DMUS_FOURCC_CATEGORY_CHUNK: { - TRACE_(dmfile)(": category chunk\n"); - This->dmobj.desc.dwValidData |= DMUS_OBJ_CATEGORY; - IStream_Read (pStm, This->dmobj.desc.wszCategory, Chunk.dwSize, NULL); - break; - } - case FOURCC_LIST: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(Chunk.fccID)); - ListSize[0] = Chunk.dwSize - sizeof(FOURCC); - ListCount[0] = 0; - switch (Chunk.fccID) { - /* evil M$ UNFO list, which can (!?) contain INFO elements */ - case DMUS_FOURCC_UNFO_LIST: { - TRACE_(dmfile)(": UNFO list\n"); - do { - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - /* don't ask me why, but M$ puts INFO elements in UNFO list sometimes - (though strings seem to be valid unicode) */ - case mmioFOURCC('I','N','A','M'): - case DMUS_FOURCC_UNAM_CHUNK: { - TRACE_(dmfile)(": name chunk\n"); - This->dmobj.desc.dwValidData |= DMUS_OBJ_NAME; - IStream_Read (pStm, This->dmobj.desc.wszName, Chunk.dwSize, NULL); - break; - } - case mmioFOURCC('I','A','R','T'): - case DMUS_FOURCC_UART_CHUNK: { - TRACE_(dmfile)(": artist chunk (ignored)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - case mmioFOURCC('I','C','O','P'): - case DMUS_FOURCC_UCOP_CHUNK: { - TRACE_(dmfile)(": copyright chunk (ignored)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - case mmioFOURCC('I','S','B','J'): - case DMUS_FOURCC_USBJ_CHUNK: { - TRACE_(dmfile)(": subject chunk (ignored)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - case mmioFOURCC('I','C','M','T'): - case DMUS_FOURCC_UCMT_CHUNK: { - TRACE_(dmfile)(": comment chunk (ignored)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); - } while (ListCount[0] < ListSize[0]); - break; - } - default: { - TRACE_(dmfile)(": unknown (skipping)\n"); - liMove.QuadPart = Chunk.dwSize - sizeof(FOURCC); - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - break; - } - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize); - } while (StreamCount < StreamSize); - } else { - TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); - liMove.QuadPart = StreamSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ - return E_FAIL; - } - - TRACE_(dmfile)(": reading finished\n"); - break; - } - default: { - TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ - return DMUS_E_INVALIDFILE; - } - } - - return S_OK; + IDirectMusicWaveImpl *This = impl_from_IPersistStream(iface); + struct chunk_entry riff = {0}; + + /* Without the private interface the implementation should go to dmime/segment.c */ + FIXME("(%p, %p): loading not implemented (only descriptor is loaded)\n", This, stream); + + if (!stream) + return E_POINTER; + + if (stream_get_chunk(stream, &riff) != S_OK || riff.id != FOURCC_RIFF || + riff.type != mmioFOURCC('W','A','V','E')) + return DMUS_E_UNSUPPORTED_STREAM; + stream_reset_chunk_start(stream, &riff); + + return IDirectMusicObject_ParseDescriptor(&This->dmobj.IDirectMusicObject_iface, stream, + &This->dmobj.desc); } static const IPersistStreamVtbl persiststream_vtbl = { @@ -297,7 +169,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_Release, dmobj_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IPersistStreamImpl_Load, + wave_IPersistStream_Load, unimpl_IPersistStream_Save, unimpl_IPersistStream_GetSizeMax }; diff --git a/dlls/dswave/dswave_private.h b/dlls/dswave/dswave_private.h index 10560d0254..5b5eb7a937 100644 --- a/dlls/dswave/dswave_private.h +++ b/dlls/dswave/dswave_private.h @@ -51,13 +51,4 @@ extern LONG DSWAVE_refCount DECLSPEC_HIDDEN; static inline void DSWAVE_LockModule(void) { InterlockedIncrement( &DSWAVE_refCount ); } static inline void DSWAVE_UnlockModule(void) { InterlockedDecrement( &DSWAVE_refCount ); } -/***************************************************************************** - * Misc. - */ -/* for simpler reading */ -typedef struct _DMUS_PRIVATE_CHUNK { - FOURCC fccID; /* FOURCC ID of the chunk */ - DWORD dwSize; /* size of the chunk */ -} DMUS_PRIVATE_CHUNK, *LPDMUS_PRIVATE_CHUNK; - #endif /* __WINE_DSWAVE_PRIVATE_H */

1 0

Huw Davies : include: Fix TXTVIEW_INACTIVE to be -1.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: fabef7ae2b53bb244ba9ad784d6e22c36f691a1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=fabef7ae2b53bb244ba9ad78… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Sep 28 11:16:59 2020 +0100 include: Fix TXTVIEW_INACTIVE to be -1. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/textserv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/textserv.h b/include/textserv.h index d3583f3a96..1272a6bba0 100644 --- a/include/textserv.h +++ b/include/textserv.h @@ -174,7 +174,7 @@ enum TXTNATURALSIZE { enum TXTVIEW { TXTVIEW_ACTIVE = 0, - TXTVIEW_INACTIVE = 1 + TXTVIEW_INACTIVE = -1 }; #define TXTBIT_RICHTEXT 0x000001

1 0

Alexandre Julliard : configure: Require 64-bit compare-and-swap support from gcc.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: e055a3ee0503a62d1d0c1391b01471c13fad6bd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e055a3ee0503a62d1d0c1391… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 14:35:32 2020 +0200 configure: Require 64-bit compare-and-swap support from gcc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49191 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 61 +++++++++++++++++++++++++++++++++++++ configure.ac | 26 ++++++++++++++++ dlls/ntdll/large_int.c | 23 -------------- dlls/ntdll/ntdll_misc.h | 4 --- dlls/ntdll/unix/unix_private.h | 4 --- include/winbase.h | 69 ++++++++---------------------------------- 6 files changed, 99 insertions(+), 88 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e055a3ee0503a62d1d0c…

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
71
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 September 2020