March 2019 - Wine-commits - list.winehq.org

Józef Kucia : wined3d: Rename StateTable.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: 1d1511f66d19e93a2d62da88c17ae810467e6977 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d1511f66d19e93a2d62da88… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Mar 3 19:55:26 2019 +0100 wined3d: Rename StateTable. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 10 ++++----- dlls/wined3d/state.c | 49 +++++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 34 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 122ed70..37264a0 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1953,7 +1953,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, context->win_handle = swapchain->win_handle; context->gl_info = &device->adapter->gl_info; context->d3d_info = &device->adapter->d3d_info; - context->state_table = device->StateTable; + context->state_table = device->state_table; /* Mark all states dirty to force a proper initialization of the states on * the first use of the context. Compute states do not need initialization. */ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 61896a2..79a5b68 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5357,7 +5357,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, wine_rb_init(&device->samplers, wined3d_sampler_compare); if (vertex_pipeline->vp_states && fragment_pipeline->states - && FAILED(hr = compile_state_table(device->StateTable, device->multistate_funcs, + && FAILED(hr = compile_state_table(device->state_table, device->multistate_funcs, &adapter->d3d_info, adapter->gl_info.supported, vertex_pipeline, fragment_pipeline, misc_state_template))) { @@ -5396,11 +5396,9 @@ err: void device_invalidate_state(const struct wined3d_device *device, DWORD state) { - DWORD rep = device->StateTable[state].representative; + DWORD rep = device->state_table[state].representative; struct wined3d_context *context; - DWORD idx; - BYTE shift; - UINT i; + unsigned int i, idx, shift; wined3d_from_cs(device->cs); @@ -5414,7 +5412,7 @@ void device_invalidate_state(const struct wined3d_device *device, DWORD state) for (i = 0; i < device->context_count; ++i) { context = device->contexts[i]; - if(isStateDirty(context, rep)) continue; + if (isStateDirty(context, rep)) continue; context->dirtyArray[context->numDirtyEntries++] = rep; idx = rep / (sizeof(*context->isStateDirty) * CHAR_BIT); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 969dfc2..9dc9804 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5519,39 +5519,43 @@ static void validate_state_table(struct StateEntry *state_table) } } -HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs, +HRESULT compile_state_table(struct StateEntry *state_table, APPLYSTATEFUNC **dev_multistate_funcs, const struct wined3d_d3d_info *d3d_info, const BOOL *supported_extensions, const struct wined3d_vertex_pipe_ops *vertex, const struct fragment_pipeline *fragment, const struct StateEntryTemplate *misc) { - unsigned int i, type, handlers; APPLYSTATEFUNC multistate_funcs[STATE_HIGHEST + 1][3]; const struct StateEntryTemplate *cur; + unsigned int i, type, handlers; BOOL set[STATE_HIGHEST + 1]; memset(multistate_funcs, 0, sizeof(multistate_funcs)); - for(i = 0; i < STATE_HIGHEST + 1; i++) { - StateTable[i].representative = 0; - StateTable[i].apply = state_undefined; + for (i = 0; i < STATE_HIGHEST + 1; ++i) + { + state_table[i].representative = 0; + state_table[i].apply = state_undefined; } - for(type = 0; type < 3; type++) { + for (type = 0; type < 3; ++type) + { /* This switch decides the order in which the states are applied */ - switch(type) { + switch (type) + { case 0: cur = misc; break; case 1: cur = fragment->states; break; case 2: cur = vertex->vp_states; break; default: cur = NULL; /* Stupid compiler */ } - if(!cur) continue; + if (!cur) continue; /* GL extension filtering should not prevent multiple handlers being applied from different * pipeline parts */ memset(set, 0, sizeof(set)); - for(i = 0; cur[i].state; i++) { + for (i = 0; cur[i].state; ++i) + { APPLYSTATEFUNC *funcs_array; /* Only use the first matching state with the available extension from one template. @@ -5561,7 +5565,7 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ * * if GL_XYZ_fancy is supported, ignore the 2nd line */ - if(set[cur[i].state]) continue; + if (set[cur[i].state]) continue; /* Skip state lines depending on unsupported extensions */ if (!supported_extensions[cur[i].extension]) continue; set[cur[i].state] = TRUE; @@ -5576,12 +5580,13 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ handlers = num_handlers(multistate_funcs[cur[i].state]); multistate_funcs[cur[i].state][handlers] = cur[i].content.apply; - switch(handlers) { + switch (handlers) + { case 0: - StateTable[cur[i].state].apply = cur[i].content.apply; + state_table[cur[i].state].apply = cur[i].content.apply; break; case 1: - StateTable[cur[i].state].apply = multistate_apply_2; + state_table[cur[i].state].apply = multistate_apply_2; if (!(dev_multistate_funcs[cur[i].state] = heap_calloc(2, sizeof(**dev_multistate_funcs)))) goto out_of_mem; @@ -5589,7 +5594,7 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ dev_multistate_funcs[cur[i].state][1] = multistate_funcs[cur[i].state][1]; break; case 2: - StateTable[cur[i].state].apply = multistate_apply_3; + state_table[cur[i].state].apply = multistate_apply_3; if (!(funcs_array = heap_realloc(dev_multistate_funcs[cur[i].state], sizeof(**dev_multistate_funcs) * 3))) goto out_of_mem; @@ -5598,22 +5603,22 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ dev_multistate_funcs[cur[i].state][2] = multistate_funcs[cur[i].state][2]; break; default: - ERR("Unexpected amount of state handlers for state %u: %u\n", - cur[i].state, handlers + 1); + ERR("Unexpected amount of state handlers for state %u: %u.\n", + cur[i].state, handlers + 1); } - if (StateTable[cur[i].state].representative - && StateTable[cur[i].state].representative != cur[i].content.representative) + if (state_table[cur[i].state].representative + && state_table[cur[i].state].representative != cur[i].content.representative) { FIXME("State %s (%#x) has different representatives in different pipeline parts.\n", debug_d3dstate(cur[i].state), cur[i].state); } - StateTable[cur[i].state].representative = cur[i].content.representative; + state_table[cur[i].state].representative = cur[i].content.representative; } } - prune_invalid_states(StateTable, d3d_info); - validate_state_table(StateTable); + prune_invalid_states(state_table, d3d_info); + validate_state_table(state_table); return WINED3D_OK; @@ -5623,7 +5628,7 @@ out_of_mem: heap_free(dev_multistate_funcs[i]); } - memset(dev_multistate_funcs, 0, (STATE_HIGHEST + 1)*sizeof(*dev_multistate_funcs)); + memset(dev_multistate_funcs, 0, (STATE_HIGHEST + 1) * sizeof(*dev_multistate_funcs)); return E_OUTOFMEMORY; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 51b86a7..8fe3310 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2107,7 +2107,7 @@ extern const struct wined3d_vertex_pipe_ops ffp_vertex_pipe DECLSPEC_HIDDEN; extern const struct wined3d_vertex_pipe_ops glsl_vertex_pipe DECLSPEC_HIDDEN; /* "Base" state table */ -HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs, +HRESULT compile_state_table(struct StateEntry *state_table, APPLYSTATEFUNC **dev_multistate_funcs, const struct wined3d_d3d_info *d3d_info, const BOOL *supported_extensions, const struct wined3d_vertex_pipe_ops *vertex, const struct fragment_pipeline *fragment, const struct StateEntryTemplate *misc) DECLSPEC_HIDDEN; @@ -3038,7 +3038,7 @@ struct wined3d_device void *shader_priv; void *fragment_priv; void *vertex_priv; - struct StateEntry StateTable[STATE_HIGHEST + 1]; + struct StateEntry state_table[STATE_HIGHEST + 1]; /* Array of functions for states which are handled by more than one pipeline part */ APPLYSTATEFUNC *multistate_funcs[STATE_HIGHEST + 1]; struct wined3d_blitter *blitter;

1 0

Józef Kucia : wined3d: Rename state entry structures.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: 32c54006d275b75b9861e1180ace8abb3a0b3cc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32c54006d275b75b9861e118… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Mar 3 19:55:27 2019 +0100 wined3d: Rename state entry structures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ati_fragment_shader.c | 3 ++- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/state.c | 16 ++++++++-------- dlls/wined3d/wined3d_private.h | 26 +++++++++++++------------- 7 files changed, 29 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=32c54006d275b75b9861…

1 0

Gabriel Ivăncescu : include: Add CDRF_DOERASE and CDRF_SKIPPOSTPAINT definitions.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: c81db565a758a8703cabcd05ad78e8bcb5a38881 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c81db565a758a8703cabcd05… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 4 18:25:14 2019 +0200 include: Add CDRF_DOERASE and CDRF_SKIPPOSTPAINT definitions. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 73bb9fa..9b86bdb 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -216,11 +216,13 @@ typedef struct tagNMCHAR #define CDRF_DODEFAULT 0x0 #define CDRF_NEWFONT 0x00000002 #define CDRF_SKIPDEFAULT 0x00000004 +#define CDRF_DOERASE 0x00000008 #define CDRF_NOTIFYPOSTPAINT 0x00000010 #define CDRF_NOTIFYITEMDRAW 0x00000020 #define CDRF_NOTIFYSUBITEMDRAW 0x00000020 #define CDRF_NOTIFYPOSTERASE 0x00000040 #define CDRF_NOTIFYITEMERASE 0x00000080 /* obsolete ??? */ +#define CDRF_SKIPPOSTPAINT 0x00000100 /* drawstage flags */

1 0

Gijs Vermeulen : d3d8: Improve ValidatePixelShader().
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: 740102f33256c0274f6dfb4a357e2127705c487e URL: https://source.winehq.org/git/wine.git/?a=commit;h=740102f33256c0274f6dfb4a… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Mar 4 22:18:06 2019 +0330 d3d8: Improve ValidatePixelShader(). Based largely on a patch by Sebastian Lackner. Adapted from "Improve ValidateVertexShader()" by Henri Verbeet. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_main.c | 72 +++++++++++++++++++++------------------ dlls/d3d8/tests/device.c | 87 ++++++++++++++++++++++++++++++++++-------------- 2 files changed, 102 insertions(+), 57 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 17f35c9..62e8d31 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -103,41 +103,49 @@ done: return hr; } -/*********************************************************************** - * ValidatePixelShader (D3D8.@) - * - * PARAMS - * toto result? - */ -HRESULT WINAPI ValidatePixelShader(DWORD* pixelshader, DWORD* reserved1, BOOL boolean, DWORD* toto) +HRESULT WINAPI ValidatePixelShader(const DWORD *ps_code, + const D3DCAPS8 *caps, BOOL return_error, char **errors) { - HRESULT ret; - static BOOL warned; - - if (TRACE_ON(d3d8) || !warned) { - FIXME("(%p %p %d %p): stub\n", pixelshader, reserved1, boolean, toto); - warned = TRUE; - } - - if (!pixelshader) - return E_FAIL; - - if (reserved1) - return E_FAIL; - - switch(*pixelshader) { - case 0xFFFF0100: - case 0xFFFF0101: - case 0xFFFF0102: - case 0xFFFF0103: - case 0xFFFF0104: - ret=S_OK; + const char *message = ""; + SIZE_T message_size; + HRESULT hr = E_FAIL; + + TRACE("ps_code %p, caps %p, return_error %#x, errors %p.\n", + ps_code, caps, return_error, errors); + + if (!ps_code) + return E_FAIL; + + switch (*ps_code) + { + case D3DPS_VERSION(1, 4): + case D3DPS_VERSION(1, 3): + case D3DPS_VERSION(1, 2): + case D3DPS_VERSION(1, 1): + case D3DPS_VERSION(1, 0): break; + default: - WARN("Invalid shader version token %#x.\n", *pixelshader); - ret=E_FAIL; - } - return ret; + message = "Unsupported shader version.\n"; + goto done; + } + + if (caps && *ps_code > caps->PixelShaderVersion) + { + message = "Shader version not supported by caps.\n"; + goto done; + } + + hr = S_OK; + +done: + if (!return_error) + message = ""; + message_size = strlen(message) + 1; + if (errors && (*errors = heap_alloc(message_size))) + memcpy(*errors, message, message_size); + + return hr; } void d3d8_resource_cleanup(struct d3d8_resource *resource) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a647369..51dd3ae 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -53,7 +53,7 @@ struct device_desc static DEVMODEW registry_mode; static HRESULT (WINAPI *ValidateVertexShader)(const DWORD *, const DWORD *, const D3DCAPS8 *, BOOL, char **); -static HRESULT (WINAPI *ValidatePixelShader)(DWORD *, DWORD *, int, DWORD *); +static HRESULT (WINAPI *ValidatePixelShader)(const DWORD *, const D3DCAPS8 *, BOOL, char **); static BOOL (WINAPI *pGetCursorInfo)(PCURSORINFO); @@ -4506,43 +4506,80 @@ static void test_validate_vs(void) static void test_validate_ps(void) { - static DWORD ps[] = + static DWORD ps_1_1_code[] = { 0xffff0101, /* ps_1_1 */ - 0x00000051, 0xa00f0001, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, /* def c1 = 1.0, 0.0, 0.0, 0.0 */ - 0x00000042, 0xb00f0000, /* tex t0 */ - 0x00000008, 0x800f0000, 0xa0e40001, 0xa0e40000, /* dp3 r0, c1, c0 */ - 0x00000005, 0x800f0000, 0x90e40000, 0x80e40000, /* mul r0, v0, r0 */ - 0x00000005, 0x800f0000, 0xb0e40000, 0x80e40000, /* mul r0, t0, r0 */ - 0x0000ffff, /* end */ + 0x00000001, 0x800f0001, 0xa0e40001, /* mov r1, c1 */ + 0x00000002, 0x800f0000, 0x80e40001, 0xa0e40002, /* add r0, r1, c2 */ + 0x0000ffff /* end */ + }; + static const DWORD ps_2_0_code[] = + { + 0xffff0200, /* ps_2_0 */ + 0x02000001, 0x800f0001, 0xa0e40001, /* mov r1, c1 */ + 0x03000002, 0x800f0000, 0x80e40001, 0xa0e40002, /* add r0, r1, c2 */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff /* end */ }; + D3DCAPS8 caps; + char *errors; HRESULT hr; - hr = ValidatePixelShader(0, 0, 0, 0); + hr = ValidatePixelShader(NULL, NULL, FALSE, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = ValidatePixelShader(NULL, NULL, TRUE, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + errors = (void *)0xcafeface; + hr = ValidatePixelShader(NULL, NULL, FALSE, &errors); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - hr = ValidatePixelShader(0, 0, 1, 0); + ok(errors == (void *)0xcafeface, "Got unexpected errors %p.\n", errors); + errors = (void *)0xcafeface; + hr = ValidatePixelShader(NULL, NULL, TRUE, &errors); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - hr = ValidatePixelShader(ps, 0, 0, 0); + ok(errors == (void *)0xcafeface, "Got unexpected errors %p.\n", errors); + + hr = ValidatePixelShader(ps_1_1_code, NULL, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ValidatePixelShader(ps_1_1_code, NULL, TRUE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ValidatePixelShader(ps_1_1_code, NULL, TRUE, &errors); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!*errors, "Got unexpected string \"%s\".\n", errors); + heap_free(errors); - hr = ValidatePixelShader(ps, 0, 1, 0); + memset(&caps, 0, sizeof(caps)); + caps.PixelShaderVersion = D3DPS_VERSION(1, 1); + hr = ValidatePixelShader(ps_1_1_code, &caps, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - /* Seems to do some version checking. */ - *ps = 0xffff0105; /* bogus version */ - hr = ValidatePixelShader(ps, 0, 1, 0); + caps.PixelShaderVersion = D3DPS_VERSION(1, 0); + hr = ValidatePixelShader(ps_1_1_code, &caps, FALSE, NULL); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - /* I've seen that applications always pass the 2nd parameter as 0. - * Simple test with a non-zero parameter. */ - *ps = 0xffff0101; /* ps_1_1 */ - hr = ValidatePixelShader(ps, ps, 1, 0); - ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - /* I've seen the 3rd parameter always passed as either 0 or 1, but passing - * other values doesn't seem to hurt. */ - hr = ValidatePixelShader(ps, 0, 12345, 0); + caps.PixelShaderVersion = D3DPS_VERSION(1, 2); + hr = ValidatePixelShader(ps_1_1_code, &caps, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + caps.PixelShaderVersion = D3DPS_VERSION(8, 8); + hr = ValidatePixelShader(ps_1_1_code, &caps, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + *ps_1_1_code = D3DPS_VERSION(1, 0); + hr = ValidatePixelShader(ps_1_1_code, NULL, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - /* What is the 4th parameter? The following seems to work ok. */ - hr = ValidatePixelShader(ps, 0, 1, ps); + *ps_1_1_code = D3DPS_VERSION(1, 4); + hr = ValidatePixelShader(ps_1_1_code, NULL, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ValidatePixelShader(ps_2_0_code, NULL, FALSE, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + *ps_1_1_code = D3DPS_VERSION(1, 5); + hr = ValidatePixelShader(ps_1_1_code, NULL, TRUE, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = ValidatePixelShader(ps_1_1_code, NULL, FALSE, &errors); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!*errors, "Got unexpected string \"%s\".\n", errors); + heap_free(errors); + hr = ValidatePixelShader(ps_1_1_code, NULL, TRUE, &errors); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!!*errors, "Got unexpected empty string.\n"); + heap_free(errors); } static void test_volume_get_container(void)

1 0

Jacek Caban : mshtml.idl: Add IHTMLDOMImplementation2 and IDOMDocumentType declarations.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: d30e6c96c64b5532d1cb01261818ac0f57fab4aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=d30e6c96c64b5532d1cb0126… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 4 18:14:00 2019 +0100 mshtml.idl: Add IHTMLDOMImplementation2 and IDOMDocumentType declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 15 ++++++++ include/mshtml.idl | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 01a2f5a..e16bf9e 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -119,6 +119,7 @@ #define DISPID_DOMRANGE DISPID_NORMAL_FIRST #define DISPID_MEDIA DISPID_NORMAL_FIRST #define DISPID_STYLEMEDIA DISPID_NORMAL_FIRST +#define DISPID_DOCUMENTTYPE DISPID_NORMAL_FIRST #define DISPID_DOMEVENT DISPID_NORMAL_FIRST #define DISPID_DOMUIEVENT (DISPID_DOMEVENT+25) @@ -3203,9 +3204,23 @@ #define DISPID_IHTMLRENDERSTYLE_DEFAULTTEXTSELECTION DISPID_A_DEFAULTTEXTSELECTION #define DISPID_IHTMLRENDERSTYLE_TEXTDECORATION DISPID_A_STYLETEXTDECORATION +/* IDOMDocumentType */ +#define DISPID_IDOMDOCUMENTTYPE_NAME DISPID_DOCUMENTTYPE +#define DISPID_IDOMDOCUMENTTYPE_ENTITIES DISPID_DOCUMENTTYPE+1 +#define DISPID_IDOMDOCUMENTTYPE_NOTATIONS DISPID_DOCUMENTTYPE+2 +#define DISPID_IDOMDOCUMENTTYPE_PUBLICID DISPID_DOCUMENTTYPE+3 +#define DISPID_IDOMDOCUMENTTYPE_SYSTEMID DISPID_DOCUMENTTYPE+4 +#define DISPID_IDOMDOCUMENTTYPE_INTERNALSUBSET DISPID_DOCUMENTTYPE+5 + /* IHTMLDOMImplementation */ #define DISPID_IHTMLDOMIMPLEMENTATION_HASFEATURE DISPID_DOMIMPLEMENTATION +/* IHTMLDOMImplementation2 */ +#define DISPID_IHTMLDOMIMPLEMENTATION2_CREATEDOCUMENTTYPE DISPID_DOMIMPLEMENTATION+1 +#define DISPID_IHTMLDOMIMPLEMENTATION2_CREATEDOCUMENT DISPID_DOMIMPLEMENTATION+2 +#define DISPID_IHTMLDOMIMPLEMENTATION2_CREATEHTMLDOCUMENT DISPID_DOMIMPLEMENTATION+3 +#define DISPID_IHTMLDOMIMPLEMENTATION2_IE9_HASFEATURE DISPID_DOMIMPLEMENTATION+4 + /* IHTMLDOMAttribute */ #define DISPID_IHTMLDOMATTRIBUTE_NODENAME DISPID_DOMATTRIBUTE #define DISPID_IHTMLDOMATTRIBUTE_NODEVALUE DISPID_DOMATTRIBUTE+2 diff --git a/include/mshtml.idl b/include/mshtml.idl index b92955c..cb80073 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -246,6 +246,7 @@ interface IHTMLDOMConstructor : IDispatch IDispatch *constructor() interface IHTMLDocument2; +interface IHTMLDocument7; interface IHTMLElement2; interface IHTMLStyleSheetsCollection; interface IHTMLFrameBase; @@ -5988,6 +5989,36 @@ coclass HTMLDOMTextNode } /***************************************************************************** + * IDOMDocumentType interface + */ +[ + odl, + oleautomation, + dual, + uuid(30510738-98b5-11cf-bb82-00aa00bdce0b) + ] +interface IDOMDocumentType : IDispatch +{ + [propget, id(DISPID_IDOMDOCUMENTTYPE_NAME)] + HRESULT name([out, retval] BSTR *p); + + [propget, id(DISPID_IDOMDOCUMENTTYPE_ENTITIES)] + HRESULT entities([out, retval] IDispatch **p); + + [propget, id(DISPID_IDOMDOCUMENTTYPE_NOTATIONS)] + HRESULT notations([out, retval] IDispatch **p); + + [propget, id(DISPID_IDOMDOCUMENTTYPE_PUBLICID)] + HRESULT publicId([out, retval] VARIANT *p); + + [propget, id(DISPID_IDOMDOCUMENTTYPE_SYSTEMID)] + HRESULT systemId([out, retval] VARIANT *p); + + [propget, id(DISPID_IDOMDOCUMENTTYPE_INTERNALSUBSET)] + HRESULT internalSubset([out, retval] VARIANT *p); +} + +/***************************************************************************** * IHTMLDOMImplementation interface */ [ @@ -6006,6 +6037,83 @@ interface IHTMLDOMImplementation : IDispatch } /***************************************************************************** + * IHTMLDOMImplementation2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3051073c-98b5-11cf-bb82-00aa00bdce0b) + ] +interface IHTMLDOMImplementation2 : IDispatch +{ + [id(DISPID_IHTMLDOMIMPLEMENTATION2_CREATEDOCUMENTTYPE)] + HRESULT createDocumentType( + [in] BSTR bstrQualifiedName, + [in] VARIANT *pvarPublicId, + [in] VARIANT *pvarSystemId, + [out, retval] IDOMDocumentType **newDocumentType); + + [id(DISPID_IHTMLDOMIMPLEMENTATION2_CREATEDOCUMENT)] + HRESULT createDocument( + [in] VARIANT *pvarNS, + [in] VARIANT *pvarTagName, + [in] IDOMDocumentType *pDocumentType, + [out, retval] IHTMLDocument7 **ppnewDocument); + + [id(DISPID_IHTMLDOMIMPLEMENTATION2_CREATEHTMLDOCUMENT)] + HRESULT createHTMLDocument( + [in] BSTR bstrTitle, + [out, retval] IHTMLDocument7 **ppnewDocument); + + [id(DISPID_IHTMLDOMIMPLEMENTATION2_IE9_HASFEATURE)] + HRESULT hasFeature( + [in] BSTR bstrfeature, + [in, optional] VARIANT version, + [out, retval] VARIANT_BOOL *pfHasFeature); +} + +/***************************************************************************** + * DispHTMLDOMImplementation dispinterface + */ +[ + hidden, + uuid(3050f58f-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLDOMImplementation +{ +properties: +methods: + [id(DISPID_IHTMLDOMIMPLEMENTATION_HASFEATURE)] + VARIANT_BOOL hasFeature( + [in] BSTR bstrfeature, + [in, optional] VARIANT version); + + [id(DISPID_IHTMLDOMIMPLEMENTATION2_CREATEDOCUMENTTYPE)] + IDOMDocumentType *createDocumentType( + [in] BSTR bstrQualifiedName, + [in] VARIANT *pvarPublicId, + [in] VARIANT *pvarSystemId); + + [id(DISPID_IHTMLDOMIMPLEMENTATION2_CREATEDOCUMENT)] + IHTMLDocument7 *createDocument( + [in] VARIANT *pvarNS, + [in] VARIANT *pvarTagName, + [in] IDOMDocumentType *pDocumentType); + + [id(DISPID_IHTMLDOMIMPLEMENTATION2_CREATEHTMLDOCUMENT)] + IHTMLDocument7 *createHTMLDocument([in] BSTR bstrTitle); + + [id(DISPID_IHTMLDOMIMPLEMENTATION2_IE9_HASFEATURE)] + VARIANT_BOOL ie9_hasFeature( + [in] BSTR bstrfeature, + [in, optional] VARIANT version); + + [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] + IDispatch *constructor(); +} + +/***************************************************************************** * DispHTMLDOMAttribute dispinterface */ [

1 0

Jacek Caban : mshtml: Add IHTMLDOMImplementation2 stub implementation.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: bd0c7c7af43fbeef2c28fc6fe7537cce9e5898fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd0c7c7af43fbeef2c28fc6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 4 18:14:10 2019 +0100 mshtml: Add IHTMLDOMImplementation2 stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/omnavigator.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index e0b8f73..0f44004 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -47,6 +47,7 @@ typedef struct { typedef struct { DispatchEx dispex; IHTMLDOMImplementation IHTMLDOMImplementation_iface; + IHTMLDOMImplementation2 IHTMLDOMImplementation2_iface; LONG ref; } HTMLDOMImplementation; @@ -64,6 +65,8 @@ static HRESULT WINAPI HTMLDOMImplementation_QueryInterface(IHTMLDOMImplementatio if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IHTMLDOMImplementation, riid)) { *ppv = &This->IHTMLDOMImplementation_iface; + }else if(IsEqualGUID(&IID_IHTMLDOMImplementation2, riid)) { + *ppv = &This->IHTMLDOMImplementation2_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { @@ -157,6 +160,110 @@ static const IHTMLDOMImplementationVtbl HTMLDOMImplementationVtbl = { HTMLDOMImplementation_hasFeature }; +static inline HTMLDOMImplementation *impl_from_IHTMLDOMImplementation2(IHTMLDOMImplementation2 *iface) +{ + return CONTAINING_RECORD(iface, HTMLDOMImplementation, IHTMLDOMImplementation2_iface); +} + +static HRESULT WINAPI HTMLDOMImplementation2_QueryInterface(IHTMLDOMImplementation2 *iface, REFIID riid, void **ppv) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + return IHTMLDOMImplementation_QueryInterface(&This->IHTMLDOMImplementation_iface, riid, ppv); +} + +static ULONG WINAPI HTMLDOMImplementation2_AddRef(IHTMLDOMImplementation2 *iface) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + return IHTMLDOMImplementation_AddRef(&This->IHTMLDOMImplementation_iface); +} + +static ULONG WINAPI HTMLDOMImplementation2_Release(IHTMLDOMImplementation2 *iface) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + return IHTMLDOMImplementation_Release(&This->IHTMLDOMImplementation_iface); +} + +static HRESULT WINAPI HTMLDOMImplementation2_GetTypeInfoCount(IHTMLDOMImplementation2 *iface, UINT *pctinfo) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLDOMImplementation2_GetTypeInfo(IHTMLDOMImplementation2 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLDOMImplementation2_GetIDsOfNames(IHTMLDOMImplementation2 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, + cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLDOMImplementation2_Invoke(IHTMLDOMImplementation2 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLDOMImplementation2_createDocumentType(IHTMLDOMImplementation2 *iface, BSTR name, + VARIANT *public_id, VARIANT *system_id, IDOMDocumentType **new_type) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + FIXME("(%p)->(%s %s %s %p)\n", This, debugstr_w(name), debugstr_variant(public_id), + debugstr_variant(system_id), new_type); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMImplementation2_createDocument(IHTMLDOMImplementation2 *iface, VARIANT *ns, + VARIANT *tag_name, IDOMDocumentType *document_type, IHTMLDocument7 **new_document) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + FIXME("(%p)->(%s %s %p %p)\n", This, debugstr_variant(ns), debugstr_variant(tag_name), + document_type, new_document); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMImplementation2_createHTMLDocument(IHTMLDOMImplementation2 *iface, BSTR title, + IHTMLDocument7 **new_document) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(title), new_document); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMImplementation2_hasFeature(IHTMLDOMImplementation2 *iface, BSTR feature, + VARIANT version, VARIANT_BOOL *pfHasFeature) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + + FIXME("(%p)->(%s %s %p) returning false\n", This, debugstr_w(feature), debugstr_variant(&version), pfHasFeature); + + *pfHasFeature = VARIANT_FALSE; + return S_OK; +} + +static const IHTMLDOMImplementation2Vtbl HTMLDOMImplementation2Vtbl = { + HTMLDOMImplementation2_QueryInterface, + HTMLDOMImplementation2_AddRef, + HTMLDOMImplementation2_Release, + HTMLDOMImplementation2_GetTypeInfoCount, + HTMLDOMImplementation2_GetTypeInfo, + HTMLDOMImplementation2_GetIDsOfNames, + HTMLDOMImplementation2_Invoke, + HTMLDOMImplementation2_createDocumentType, + HTMLDOMImplementation2_createDocument, + HTMLDOMImplementation2_createHTMLDocument, + HTMLDOMImplementation2_hasFeature +}; + static const tid_t HTMLDOMImplementation_iface_tids[] = { IHTMLDOMImplementation_tid, 0 @@ -176,6 +283,7 @@ HRESULT create_dom_implementation(IHTMLDOMImplementation **ret) return E_OUTOFMEMORY; dom_implementation->IHTMLDOMImplementation_iface.lpVtbl = &HTMLDOMImplementationVtbl; + dom_implementation->IHTMLDOMImplementation2_iface.lpVtbl = &HTMLDOMImplementation2Vtbl; dom_implementation->ref = 1; init_dispex(&dom_implementation->dispex, (IUnknown*)&dom_implementation->IHTMLDOMImplementation_iface,

1 0

Michael Stefaniuc : d3dx9/tests: Remove useless cast to self.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: 9b0258f5756ed60b334ac20ca2f6e7f64eb5077e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b0258f5756ed60b334ac20c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 1 21:08:25 2019 +0100 d3dx9/tests: Remove useless cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 0c3e001..1b9e120 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2026,7 +2026,7 @@ static void D3DXVector2Test(void) D3DXVec2TransformCoord(&gotvec, &u, &mat); expect_vec2(&expectedvec, &gotvec, 1); gotvec.x = u.x; gotvec.y = u.y; - D3DXVec2TransformCoord(&gotvec, (D3DXVECTOR2 *)&gotvec, &mat); + D3DXVec2TransformCoord(&gotvec, &gotvec, &mat); expect_vec2(&expectedvec, &gotvec, 1); /*_______________D3DXVec2TransformNormal______________________*/

1 0

Michael Stefaniuc : d3dx9: Pass a struct d3dx_effect to the d3dx_parse helpers.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: d265afcd8fb15438961d26f0160103846144a58e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d265afcd8fb15438961d26f0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 3 20:19:44 2019 +0100 d3dx9: Pass a struct d3dx_effect to the d3dx_parse helpers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 75 ++++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d265afcd8fb15438961d…

1 0

Paul Gofman : ntdll: Avoid resetting x87 FPU state when saving context.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: c6cd92bedda4296ce3e666e28c470a5c4b618fee URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6cd92bedda4296ce3e666e2… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Mar 4 16:05:16 2019 +0300 ntdll: Avoid resetting x87 FPU state when saving context. 'FNSAVE' x87 instruction resets the FPU state to default values (like FINIT). This results in FPU state reset to default in any ntdll call which is getting x87 FPU state, e. g. obtaining context or raising an exception. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 18 ++++++++++++++++++ dlls/ntdll/tests/exception.c | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 0274a7d..f1deb1c 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -860,8 +860,26 @@ static inline void *init_handler( const ucontext_t *sigcontext, WORD *fs, WORD * static inline void save_fpu( CONTEXT *context ) { #ifdef __GNUC__ + struct + { + DWORD ControlWord; + DWORD StatusWord; + DWORD TagWord; + DWORD ErrorOffset; + DWORD ErrorSelector; + DWORD DataOffset; + DWORD DataSelector; + } + float_status; + context->ContextFlags |= CONTEXT_FLOATING_POINT; __asm__ __volatile__( "fnsave %0; fwait" : "=m" (context->FloatSave) ); + + /* Reset unmasked exceptions status to avoid firing an exception. */ + memcpy(&float_status, &context->FloatSave, sizeof(float_status)); + float_status.StatusWord &= float_status.ControlWord | 0xffffff80; + + __asm__ __volatile__( "fldenv %0" : "=m" (float_status) ); #endif } diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index f1a59f1..57ad30f 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1642,7 +1642,7 @@ static void test_thread_context(void) ok( LOWORD(context.FloatSave.ControlWord) == LOWORD(expect.x87_control), "wrong x87 control word %#x/%#x.\n", context.FloatSave.ControlWord, expect.x87_control ); - todo_wine ok( LOWORD(expect.x87_control) == LOWORD(new_x87_control), + ok( LOWORD(expect.x87_control) == LOWORD(new_x87_control), "x87 control word changed in NtGetContextThread() %#x/%#x.\n", LOWORD(expect.x87_control), LOWORD(new_x87_control) );

1 0

Michael Stefaniuc : dsound: Remove useless casts to self.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: 841541a6a6541e464241062e0d49db41056d394f URL: https://source.winehq.org/git/wine.git/?a=commit;h=841541a6a6541e464241062e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 28 00:50:29 2019 +0100 dsound: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/primary.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 9f41a2b4..852ec51 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -576,7 +576,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetVolume(IDirectSoundBuffer8 *iface, LO for (i = 0; i < DS_MAX_CHANNELS; i++) { if (device->pwfx->nChannels > i){ - fvol = (float)((DWORD)(device->volpan.dwTotalAmpFactor[i] & 0xFFFF) / (float)0xFFFF); + fvol = (float)((device->volpan.dwTotalAmpFactor[i] & 0xFFFF) / (float)0xFFFF); hr = IAudioStreamVolume_SetChannelVolume(device->volume, i, fvol); if (FAILED(hr)){ LeaveCriticalSection(&device->mixlock); @@ -932,7 +932,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetPan(IDirectSoundBuffer8 *iface, LONG for (i = 0; i < DS_MAX_CHANNELS; i++) { if (device->pwfx->nChannels > i) { - fvol = (float)((DWORD)(device->volpan.dwTotalAmpFactor[i] & 0xFFFF) / (float)0xFFFF); + fvol = (float)((device->volpan.dwTotalAmpFactor[i] & 0xFFFF) / (float)0xFFFF); hr = IAudioStreamVolume_SetChannelVolume(device->volume, i, fvol); if (FAILED(hr)){ LeaveCriticalSection(&device->mixlock);

1 0