July 2016 - Wine-Commits - list.winehq.org

Sebastian Lackner : jscript: Use list_head get first entry of list.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: b2e58b4c7c15815840b563df7b2d0ca8bdd7017e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2e58b4c7c15815840b563df7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 7 05:40:55 2016 +0200 jscript: Use list_head get first entry of list. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 59dbc65..447b7c6 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -148,7 +148,7 @@ void heap_pool_clear(heap_pool_t *heap) if(!heap) return; - while((tmp = list_next(&heap->custom_blocks, &heap->custom_blocks))) { + while((tmp = list_head(&heap->custom_blocks))) { list_remove(tmp); heap_free(tmp); }

1 0

Nikolay Sivov : mmdevapi: Use regular list iterator.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: c5b6e31438df20b8ab6edb543a16e22ae4607522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5b6e31438df20b8ab6edb543… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 6 23:42:42 2016 +0300 mmdevapi: Use regular list iterator. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/devenum.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 1694bee..9e8d8a5 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -1281,7 +1281,7 @@ static HRESULT WINAPI MMDevEnum_RegisterEndpointNotificationCallback(IMMDeviceEn static HRESULT WINAPI MMDevEnum_UnregisterEndpointNotificationCallback(IMMDeviceEnumerator *iface, IMMNotificationClient *client) { MMDevEnumImpl *This = impl_from_IMMDeviceEnumerator(iface); - struct NotificationClientWrapper *wrapper, *wrapper2; + struct NotificationClientWrapper *wrapper; TRACE("(%p)->(%p)\n", This, client); @@ -1290,8 +1290,7 @@ static HRESULT WINAPI MMDevEnum_UnregisterEndpointNotificationCallback(IMMDevice EnterCriticalSection(&g_notif_lock); - LIST_FOR_EACH_ENTRY_SAFE(wrapper, wrapper2, &g_notif_clients, - struct NotificationClientWrapper, entry){ + LIST_FOR_EACH_ENTRY(wrapper, &g_notif_clients, struct NotificationClientWrapper, entry){ if(wrapper->client == client){ list_remove(&wrapper->entry); HeapFree(GetProcessHeap(), 0, wrapper);

1 0

Józef Kucia : wined3d: Implement SM5 emit_stream instruction for stream 0.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: df557182be860eb3b323ff4b0233784a2300dfe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df557182be860eb3b323ff4b0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 7 12:22:34 2016 +0200 wined3d: Implement SM5 emit_stream instruction for stream 0. 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/glsl_shader.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c9c0773..9a2025f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4307,9 +4307,15 @@ static void shader_glsl_else(const struct wined3d_shader_instruction *ins) static void shader_glsl_emit(const struct wined3d_shader_instruction *ins) { + unsigned int stream = ins->handler_idx == WINED3DSIH_EMIT ? 0 : ins->src[0].reg.idx[0].offset; + shader_addline(ins->ctx->buffer, "setup_gs_output(gs_out);\n"); shader_glsl_fixup_position(ins->ctx->buffer); - shader_addline(ins->ctx->buffer, "EmitVertex();\n"); + + if (!stream) + shader_addline(ins->ctx->buffer, "EmitVertex();\n"); + else + FIXME("Unhandled primitive stream %u.\n", stream); } static void shader_glsl_break(const struct wined3d_shader_instruction *ins) @@ -8644,7 +8650,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DSY_FINE */ NULL, /* WINED3DSIH_ELSE */ shader_glsl_else, /* WINED3DSIH_EMIT */ shader_glsl_emit, - /* WINED3DSIH_EMIT_STREAM */ NULL, + /* WINED3DSIH_EMIT_STREAM */ shader_glsl_emit, /* WINED3DSIH_ENDIF */ shader_glsl_end, /* WINED3DSIH_ENDLOOP */ shader_glsl_end, /* WINED3DSIH_ENDREP */ shader_glsl_end,

1 0

Józef Kucia : d3d10core/tests: Port test_timestamp_query() from d3d9.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: 93f589df0d8601ca011d25b1ba83943675bc02a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93f589df0d8601ca011d25b1b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 7 12:22:32 2016 +0200 d3d10core/tests: Port test_timestamp_query() from d3d9. 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/d3d10core/tests/device.c | 155 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 155 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 7067ee6..4ef1b49 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -3443,6 +3443,160 @@ static void test_create_query(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_timestamp_query(void) +{ + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + + D3D10_QUERY_DATA_TIMESTAMP_DISJOINT disjoint, prev_disjoint; + ID3D10Query *timestamp_query, *timestamp_disjoint_query; + struct d3d10core_test_context test_context; + D3D10_QUERY_DESC query_desc; + unsigned int data_size, i; + ID3D10Device *device; + UINT64 timestamp; + HRESULT hr; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + query_desc.Query = D3D10_QUERY_TIMESTAMP; + query_desc.MiscFlags = 0; + hr = ID3D10Device_CreateQuery(device, &query_desc, &timestamp_query); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + data_size = ID3D10Query_GetDataSize(timestamp_query); + ok(data_size == sizeof(UINT64), "Got unexpected data size %u.\n", data_size); + + query_desc.Query = D3D10_QUERY_TIMESTAMP_DISJOINT; + query_desc.MiscFlags = 0; + hr = ID3D10Device_CreateQuery(device, &query_desc, &timestamp_disjoint_query); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + data_size = ID3D10Query_GetDataSize(timestamp_disjoint_query); + ok(data_size == sizeof(disjoint), "Got unexpected data size %u.\n", data_size); + + /* Test a TIMESTAMP_DISJOINT query. */ + ID3D10Query_Begin(timestamp_disjoint_query); + ID3D10Query_End(timestamp_disjoint_query); + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D10Query_GetData(timestamp_disjoint_query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + disjoint.Frequency = 0xdeadbeef; + disjoint.Disjoint = 0xff; + hr = ID3D10Query_GetData(timestamp_disjoint_query, &disjoint, sizeof(disjoint), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(disjoint.Frequency != 0xdeadbeef, "Frequency data was not modified.\n"); + ok(disjoint.Disjoint == TRUE || disjoint.Disjoint == FALSE, "Got unexpected disjoint %#x.\n", disjoint.Disjoint); + + prev_disjoint = disjoint; + + disjoint.Frequency = 0xdeadbeef; + disjoint.Disjoint = 0xff; + hr = ID3D10Query_GetData(timestamp_disjoint_query, &disjoint, sizeof(disjoint) - 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(timestamp_disjoint_query, &disjoint, sizeof(disjoint) + 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(timestamp_disjoint_query, &disjoint, sizeof(disjoint) / 2, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(timestamp_disjoint_query, &disjoint, sizeof(disjoint) * 2, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(disjoint.Frequency == 0xdeadbeef, "Frequency data was modified.\n"); + ok(disjoint.Disjoint == 0xff, "Disjoint data was modified.\n"); + + hr = ID3D10Query_GetData(timestamp_disjoint_query, NULL, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(timestamp_disjoint_query, &disjoint, sizeof(disjoint), D3D10_ASYNC_GETDATA_DONOTFLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!memcmp(&disjoint, &prev_disjoint, sizeof(disjoint)), "Disjoint data mismatch.\n"); + + hr = ID3D10Query_GetData(timestamp_query, NULL, 0, 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(timestamp_query, &timestamp, sizeof(timestamp), 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + /* Test a TIMESTAMP query inside a TIMESTAMP_DISJOINT query. */ + ID3D10Query_Begin(timestamp_disjoint_query); + + hr = ID3D10Query_GetData(timestamp_query, &timestamp, sizeof(timestamp), 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + draw_color_quad(&test_context, &red); + + ID3D10Query_End(timestamp_query); + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D10Query_GetData(timestamp_query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + timestamp = 0xdeadbeef; + hr = ID3D10Query_GetData(timestamp_query, &timestamp, sizeof(timestamp) / 2, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(timestamp == 0xdeadbeef, "Timestamp was modified.\n"); + + hr = ID3D10Query_GetData(timestamp_query, &timestamp, sizeof(timestamp), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(timestamp != 0xdeadbeef, "Timestamp was not modified.\n"); + + timestamp = 0xdeadbeef; + hr = ID3D10Query_GetData(timestamp_query, &timestamp, sizeof(timestamp) - 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(timestamp_query, &timestamp, sizeof(timestamp) + 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(timestamp_query, &timestamp, sizeof(timestamp) / 2, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(timestamp_query, &timestamp, sizeof(timestamp) * 2, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(timestamp == 0xdeadbeef, "Timestamp was modified.\n"); + + ID3D10Query_End(timestamp_disjoint_query); + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D10Query_GetData(timestamp_disjoint_query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + disjoint.Frequency = 0xdeadbeef; + disjoint.Disjoint = 0xff; + hr = ID3D10Query_GetData(timestamp_disjoint_query, &disjoint, sizeof(disjoint), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(disjoint.Frequency != 0xdeadbeef, "Frequency data was not modified.\n"); + ok(disjoint.Disjoint == TRUE || disjoint.Disjoint == FALSE, "Got unexpected disjoint %#x.\n", disjoint.Disjoint); + + /* It's not strictly necessary for the TIMESTAMP query to be inside a TIMESTAMP_DISJOINT query. */ + ID3D10Query_Release(timestamp_query); + query_desc.Query = D3D10_QUERY_TIMESTAMP; + query_desc.MiscFlags = 0; + hr = ID3D10Device_CreateQuery(device, &query_desc, &timestamp_query); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + draw_color_quad(&test_context, &red); + + ID3D10Query_End(timestamp_query); + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D10Query_GetData(timestamp_query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(timestamp_query, &timestamp, sizeof(timestamp), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID3D10Query_Release(timestamp_query); + ID3D10Query_Release(timestamp_disjoint_query); + release_test_context(&test_context); +} + static void test_device_removed_reason(void) { ID3D10Device *device; @@ -8257,6 +8411,7 @@ START_TEST(device) test_create_depthstencil_state(); test_create_rasterizer_state(); test_create_query(); + test_timestamp_query(); test_device_removed_reason(); test_scissor(); test_clear_state();

1 0

Huw Davies : gdi32: Precompute the destination colours for sources with a colour table.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: f7b6a7d77afef6a176233ae79a15819d692a29f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7b6a7d77afef6a176233ae79… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 7 08:44:32 2016 +0100 gdi32: Precompute the destination colours for sources with a colour table. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/primitives.c | 269 ++++++++++++++++++++++++++++------------- 1 file changed, 187 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7b6a7d77afef6a176233…

1 0

Andrew Eikum : xaudio2: Always set current OpenAL context before making AL calls.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: 49078e00a51876df38d0c572193195be6700bad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49078e00a51876df38d0c5721… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 6 14:48:18 2016 -0500 xaudio2: Always set current OpenAL context before making AL calls. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index e83bc22..b2a5e3b 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -36,6 +36,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); static ALCdevice *(ALC_APIENTRY *palcLoopbackOpenDeviceSOFT)(const ALCchar*); static void (ALC_APIENTRY *palcRenderSamplesSOFT)(ALCdevice*, ALCvoid*, ALCsizei); +static ALCboolean (ALC_APIENTRY *palcSetThreadContext)(ALCcontext*); static HINSTANCE instance; @@ -101,6 +102,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) return FALSE; } + if(!alcIsExtensionPresent(NULL, "ALC_EXT_thread_local_context") || + !(palcSetThreadContext = alcGetProcAddress(NULL, "alcSetThreadContext"))){ + ERR("XAudio2 requires the ALC_EXT_thread_local_context extension (OpenAL-Soft >= 1.12)\n"); + return FALSE; + } + break; } return TRUE; @@ -313,6 +320,8 @@ static HRESULT WINAPI XA2SRC_SetVolume(IXAudio2SourceVoice *iface, float Volume, al_gain = Volume; + palcSetThreadContext(This->xa2->al_ctx); + alSourcef(This->al_src, AL_GAIN, al_gain); return S_OK; @@ -366,6 +375,8 @@ static void WINAPI XA2SRC_DestroyVoice(IXAudio2SourceVoice *iface) TRACE("%p\n", This); + palcSetThreadContext(This->xa2->al_ctx); + EnterCriticalSection(&This->lock); if(!This->in_use){ @@ -728,6 +739,8 @@ static HRESULT WINAPI XA2SRC_SetFrequencyRatio(IXAudio2SourceVoice *iface, else r = Ratio; + palcSetThreadContext(This->xa2->al_ctx); + alSourcef(This->al_src, AL_PITCH, r); return S_OK; @@ -740,6 +753,8 @@ static void WINAPI XA2SRC_GetFrequencyRatio(IXAudio2SourceVoice *iface, float *p TRACE("%p, %p\n", This, pRatio); + palcSetThreadContext(This->xa2->al_ctx); + alGetSourcef(This->al_src, AL_PITCH, &ratio); *pRatio = ratio; @@ -1377,6 +1392,8 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, dump_fmt(pSourceFormat); + palcSetThreadContext(This->al_ctx); + EnterCriticalSection(&This->lock); LIST_FOR_EACH_ENTRY(src, &This->source_voices, XA2SourceImpl, entry){ @@ -1752,12 +1769,6 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface, goto exit; } - if(alcMakeContextCurrent(This->al_ctx) == ALC_FALSE){ - WARN("alcMakeContextCurrent failed\n"); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } - hr = IAudioClient_Start(This->aclient); if (FAILED(hr)) { @@ -2415,6 +2426,8 @@ static DWORD WINAPI engine_threadproc(void *arg) continue; } + palcSetThreadContext(This->al_ctx); + do_engine_tick(This); LeaveCriticalSection(&This->lock);

1 0

Jacek Caban : mshtml: Export IElementSelector for all elements in compatibility mode >= IE8.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: d72d640308ce015b50a8b26c6bf6baeb560d9527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d72d640308ce015b50a8b26c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 7 12:50:18 2016 +0200 mshtml: Export IElementSelector for all elements in compatibility mode >= IE8. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlanchor.c | 3 ++- dlls/mshtml/htmlarea.c | 3 ++- dlls/mshtml/htmlbody.c | 3 ++- dlls/mshtml/htmlcomment.c | 3 ++- dlls/mshtml/htmlelem.c | 13 ++++++++++--- dlls/mshtml/htmlembed.c | 3 ++- dlls/mshtml/htmlform.c | 3 ++- dlls/mshtml/htmlframe.c | 3 ++- dlls/mshtml/htmlgeneric.c | 3 ++- dlls/mshtml/htmlhead.c | 9 ++++++--- dlls/mshtml/htmliframe.c | 3 ++- dlls/mshtml/htmlimg.c | 3 ++- dlls/mshtml/htmlinput.c | 9 ++++++--- dlls/mshtml/htmllink.c | 3 ++- dlls/mshtml/htmlmeta.c | 3 ++- dlls/mshtml/htmlobject.c | 3 ++- dlls/mshtml/htmloption.c | 6 ++++-- dlls/mshtml/htmlscript.c | 3 ++- dlls/mshtml/htmlselect.c | 3 ++- dlls/mshtml/htmlstyleelem.c | 3 ++- dlls/mshtml/htmltable.c | 3 ++- dlls/mshtml/htmltablecell.c | 3 ++- dlls/mshtml/htmltablerow.c | 3 ++- dlls/mshtml/htmltextarea.c | 3 ++- dlls/mshtml/mshtml_private.h | 4 ++-- dlls/mshtml/tests/documentmode.js | 20 +++++++++++++++++++- 26 files changed, 87 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d72d640308ce015b50a8b…

1 0

Jacek Caban : mshtml: Added support for exposing different sets of properties from DispatchEx depending on compatibility mode.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: 91e7a0284561ab74fc6fdded108b5be946d96005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91e7a0284561ab74fc6fdded1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 7 12:49:45 2016 +0200 mshtml: Added support for exposing different sets of properties from DispatchEx depending on compatibility mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 16 +++++++++------- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 11 ++++++++--- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 791f361..d934f56 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -362,7 +362,7 @@ static int func_name_cmp(const void *p1, const void *p2) return strcmpiW((*(func_info_t* const*)p1)->name, (*(func_info_t* const*)p2)->name); } -static dispex_data_t *preprocess_dispex_data(const dispex_static_data_t *desc) +static dispex_data_t *preprocess_dispex_data(const dispex_static_data_t *desc, compat_mode_t compat_mode) { const tid_t *tid; dispex_data_t *data; @@ -396,7 +396,7 @@ static dispex_data_t *preprocess_dispex_data(const dispex_static_data_t *desc) list_add_tail(&dispex_data_list, &data->entry); if(desc->init_info) - desc->init_info(data); + desc->init_info(data, compat_mode); for(tid = desc->iface_tids; *tid; tid++) { hres = process_interface(data, *tid, dti); @@ -1745,17 +1745,19 @@ void release_dispex(DispatchEx *This) heap_free(This->dynamic_data); } -void init_dispex(DispatchEx *dispex, IUnknown *outer, dispex_static_data_t *data) +void init_dispex_with_compat_mode(DispatchEx *dispex, IUnknown *outer, dispex_static_data_t *data, compat_mode_t compat_mode) { - if(!data->data) { + assert(compat_mode < COMPAT_MODE_CNT); + + if(!data->info_cache[compat_mode]) { EnterCriticalSection(&cs_dispex_static_data); - if(!data->data) - data->data = preprocess_dispex_data(data); + if(!data->info_cache[compat_mode]) + data->info_cache[compat_mode] = preprocess_dispex_data(data, compat_mode); LeaveCriticalSection(&cs_dispex_static_data); } dispex->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; dispex->outer = outer; - dispex->info = data->data; + dispex->info = data->info_cache[compat_mode]; dispex->dynamic_data = NULL; } diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 54cd078..2b79226 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2936,7 +2936,7 @@ static void HTMLWindow_bind_event(DispatchEx *dispex, int eid) dispex_get_vtbl(&This->doc->node.event_target.dispex)->bind_event(&This->doc->node.event_target.dispex, eid); } -static void HTMLWindow_init_dispex_info(dispex_data_t *info) +static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compat_mode) { dispex_info_add_interface(info, IHTMLWindow5_tid); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 412db24..d34f9cb 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -265,8 +265,8 @@ typedef struct { const dispex_static_data_vtbl_t *vtbl; const tid_t disp_tid; const tid_t* const iface_tids; - void (*init_info)(dispex_data_t*); - dispex_data_t *data; + void (*init_info)(dispex_data_t*,compat_mode_t); + dispex_data_t *info_cache[COMPAT_MODE_CNT]; } dispex_static_data_t; struct DispatchEx { @@ -305,7 +305,7 @@ void (__cdecl *ccp_init)(ExternalCycleCollectionParticipant*,const CCObjCallback void (__cdecl *describe_cc_node)(nsCycleCollectingAutoRefCnt*,const char*,nsCycleCollectionTraversalCallback*) DECLSPEC_HIDDEN; void (__cdecl *note_cc_edge)(nsISupports*,const char*,nsCycleCollectionTraversalCallback*) DECLSPEC_HIDDEN; -void init_dispex(DispatchEx*,IUnknown*,dispex_static_data_t*) DECLSPEC_HIDDEN; +void init_dispex_with_compat_mode(DispatchEx*,IUnknown*,dispex_static_data_t*,compat_mode_t) DECLSPEC_HIDDEN; void release_dispex(DispatchEx*) DECLSPEC_HIDDEN; BOOL dispex_query_interface(DispatchEx*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT dispex_get_dprop_ref(DispatchEx*,const WCHAR*,BOOL,VARIANT**) DECLSPEC_HIDDEN; @@ -319,6 +319,11 @@ HRESULT get_htmldoc_classinfo(ITypeInfo **typeinfo) DECLSPEC_HIDDEN; const dispex_static_data_vtbl_t *dispex_get_vtbl(DispatchEx*) DECLSPEC_HIDDEN; void dispex_info_add_interface(dispex_data_t*,tid_t) DECLSPEC_HIDDEN; +static inline void init_dispex(DispatchEx *dispex, IUnknown *outer, dispex_static_data_t *desc) +{ + init_dispex_with_compat_mode(dispex, outer, desc, COMPAT_MODE_NONE); +} + typedef enum { DISPEXPROP_CUSTOM, DISPEXPROP_DYNAMIC,

1 0

Józef Kucia : d3d11: Implement d3d10_query_GetDataSize().
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: cc6be0c49e7507a4352a72d1dcdc65f5b32b4cee URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc6be0c49e7507a4352a72d1d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 7 12:22:28 2016 +0200 d3d11: Implement d3d10_query_GetDataSize(). 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/d3d11/async.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 38c8a28..323a348 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -283,9 +283,16 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *d static UINT STDMETHODCALLTYPE d3d10_query_GetDataSize(ID3D10Query *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d_query *query = impl_from_ID3D10Query(iface); + unsigned int data_size; + + TRACE("iface %p.\n", iface); - return 0; + wined3d_mutex_lock(); + data_size = wined3d_query_get_data_size(query->wined3d_query); + wined3d_mutex_unlock(); + + return data_size; } /* ID3D10Query methods */

1 0

Michael Müller : wininet/tests: Fix some typos in ok( ) messages.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: 9e4df5ef79dbd352d6c5381da305f91f04b092bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e4df5ef79dbd352d6c5381da… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Jul 7 06:55:53 2016 +0200 wininet/tests: Fix some typos in ok() messages. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/url.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 1deae67..00a457a 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -246,9 +246,9 @@ static void test_crack_url(const crack_url_test_t *test) test->url, url.dwPasswordLength, test->pass_len); if(test->path_off == -1) - ok(!url.lpszUrlPath, "[%s] url.lpszPath = %p, expected NULL\n", test->url, url.lpszUrlPath); + ok(!url.lpszUrlPath, "[%s] url.lpszUrlPath = %p, expected NULL\n", test->url, url.lpszUrlPath); else - ok(url.lpszUrlPath == test->url+test->path_off, "[%s] url.lpszPath = %p, expected %p\n", + ok(url.lpszUrlPath == test->url+test->path_off, "[%s] url.lpszUrlPath = %p, expected %p\n", test->url, url.lpszUrlPath, test->url+test->path_off); ok(url.dwUrlPathLength == test->path_len, "[%s] url.lpszUrlPathLength = %d, expected %d\n", test->url, url.dwUrlPathLength, test->path_len); @@ -326,9 +326,9 @@ static void test_crack_url(const crack_url_test_t *test) } if(test->path_off == -1) - ok(!urlw.lpszUrlPath, "[%s] urlw.lpszPath = %p, expected NULL\n", test->url, urlw.lpszUrlPath); + ok(!urlw.lpszUrlPath, "[%s] urlw.lpszUrlPath = %p, expected NULL\n", test->url, urlw.lpszUrlPath); else - ok(urlw.lpszUrlPath == buf+test->path_off, "[%s] urlw.lpszPath = %p, expected %p\n", + ok(urlw.lpszUrlPath == buf+test->path_off, "[%s] urlw.lpszUrlPath = %p, expected %p\n", test->url, urlw.lpszUrlPath, buf+test->path_off); ok(urlw.dwUrlPathLength == test->path_len, "[%s] urlw.lpszUrlPathLength = %d, expected %d\n", test->url, urlw.dwUrlPathLength, test->path_len);

1 0