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

Józef Kucia : wined3d: Implement vertex blending in glsl_vertex_pipe.
by Alexandre Julliard July 3, 2015

July 3, 2015

Module: wine Branch: master Commit: 1f680c52fe14ce744f257d89d3660a9e33c0a197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f680c52fe14ce744f257d89d… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri Jul 3 01:04:13 2015 +0200 wined3d: Implement vertex blending in glsl_vertex_pipe. --- dlls/wined3d/cs.c | 2 +- dlls/wined3d/directx.c | 3 +- dlls/wined3d/glsl_shader.c | 79 +++++++++++++++++++++++++++++++----------- dlls/wined3d/state.c | 4 +-- dlls/wined3d/utils.c | 21 +++++++++-- dlls/wined3d/wined3d_private.h | 46 +++++++++++++----------- 6 files changed, 107 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f680c52fe14ce744f257…

1 0

Michael Stefaniuc : dmime: Implement the E_NOTIMPL methods in DMLyricsTrack.
by Alexandre Julliard July 3, 2015

July 3, 2015

Module: wine Branch: master Commit: 1637360fa8261cb25c3a4c428fc57eaaac322546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1637360fa8261cb25c3a4c428… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 10:10:37 2015 +0200 dmime: Implement the E_NOTIMPL methods in DMLyricsTrack. --- dlls/dmime/lyricstrack.c | 58 +++++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c index 7323532..408ba5d 100644 --- a/dlls/dmime/lyricstrack.c +++ b/dlls/dmime/lyricstrack.c @@ -88,6 +88,11 @@ static const IUnknownVtbl DirectMusicLyricsTrack_Unknown_Vtbl = { }; /* IDirectMusicLyricsTrack IDirectMusicTrack8 part: */ +static inline IDirectMusicLyricsTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicLyricsTrack, TrackVtbl); +} + static HRESULT WINAPI IDirectMusicLyricsTrack_IDirectMusicTrack_QueryInterface (LPDIRECTMUSICTRACK8 iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicLyricsTrack, TrackVtbl, iface); return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); @@ -152,16 +157,22 @@ static HRESULT WINAPI IDirectMusicLyricsTrack_IDirectMusicTrack_IsParamSupported return DMUS_E_TYPE_UNSUPPORTED; } -static HRESULT WINAPI IDirectMusicLyricsTrack_IDirectMusicTrack_AddNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicLyricsTrack, TrackVtbl, iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface, + REFGUID notiftype) +{ + IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype)); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicLyricsTrack_IDirectMusicTrack_RemoveNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicLyricsTrack, TrackVtbl, iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface, + REFGUID notiftype) +{ + IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype)); + return E_NOTIMPL; } static HRESULT WINAPI IDirectMusicLyricsTrack_IDirectMusicTrack_Clone (LPDIRECTMUSICTRACK8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack** ppTrack) { @@ -191,16 +202,23 @@ static HRESULT WINAPI IDirectMusicLyricsTrack_IDirectMusicTrack_SetParamEx (LPDI return S_OK; } -static HRESULT WINAPI IDirectMusicLyricsTrack_IDirectMusicTrack_Compose (LPDIRECTMUSICTRACK8 iface, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) { - ICOM_THIS_MULTI(IDirectMusicLyricsTrack, TrackVtbl, iface); - FIXME("(%p, %p, %d, %p): stub\n", This, pContext, dwTrackGroup, ppResultTrack); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, IUnknown *context, + DWORD trackgroup, IDirectMusicTrack **track) +{ + IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicLyricsTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8 iface, IDirectMusicTrack* pNewTrack, MUSIC_TIME mtJoin, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) { - ICOM_THIS_MULTI(IDirectMusicLyricsTrack, TrackVtbl, iface); - FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface, + IDirectMusicTrack *newtrack, MUSIC_TIME join, IUnknown *context, DWORD trackgroup, + IDirectMusicTrack **resulttrack) +{ + IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); + TRACE("(%p, %p, %d, %p, %d, %p): stub\n", This, newtrack, join, context, trackgroup, + resulttrack); + return E_NOTIMPL; } static const IDirectMusicTrack8Vtbl DirectMusicLyricsTrack_Track_Vtbl = { @@ -214,14 +232,14 @@ static const IDirectMusicTrack8Vtbl DirectMusicLyricsTrack_Track_Vtbl = { IDirectMusicLyricsTrack_IDirectMusicTrack_GetParam, IDirectMusicLyricsTrack_IDirectMusicTrack_SetParam, IDirectMusicLyricsTrack_IDirectMusicTrack_IsParamSupported, - IDirectMusicLyricsTrack_IDirectMusicTrack_AddNotificationType, - IDirectMusicLyricsTrack_IDirectMusicTrack_RemoveNotificationType, + IDirectMusicTrack8Impl_AddNotificationType, + IDirectMusicTrack8Impl_RemoveNotificationType, IDirectMusicLyricsTrack_IDirectMusicTrack_Clone, IDirectMusicLyricsTrack_IDirectMusicTrack_PlayEx, IDirectMusicLyricsTrack_IDirectMusicTrack_GetParamEx, IDirectMusicLyricsTrack_IDirectMusicTrack_SetParamEx, - IDirectMusicLyricsTrack_IDirectMusicTrack_Compose, - IDirectMusicLyricsTrack_IDirectMusicTrack_Join + IDirectMusicTrack8Impl_Compose, + IDirectMusicTrack8Impl_Join }; /* IDirectMusicLyricsTrack IPersistStream part: */

1 0

Józef Kucia : wined3d: Implement normals transformation for vertex blending.
by Alexandre Julliard July 3, 2015

July 3, 2015

Module: wine Branch: master Commit: 4a8e0ec3d639e68a5f04dfdf40841b08722d65aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a8e0ec3d639e68a5f04dfdf4… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri Jul 3 01:04:14 2015 +0200 wined3d: Implement normals transformation for vertex blending. --- dlls/wined3d/glsl_shader.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4170b28..b465c0f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1072,6 +1072,9 @@ static void shader_glsl_ffp_vertex_normalmatrix_uniform(const struct wined3d_con struct wined3d_matrix mv; unsigned int i, j; + if (prog->vs.normal_matrix_location == -1) + return; + get_modelview_matrix(context, state, 0, &mv); if (context->swapchain->device->wined3d->flags & WINED3D_LEGACY_FFP_LIGHTING) invert_matrix_3d(&mv, &mv); @@ -5671,6 +5674,8 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct wined3d_string_buffe } } + shader_addline(buffer, "ffp_attrib_blendweight[%u] = 1.0;\n", settings->vertexblends); + if (settings->transformed) { shader_addline(buffer, "vec4 ec_pos = vec4(ffp_attrib_position.xyz, 1.0);\n"); @@ -5679,7 +5684,6 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct wined3d_string_buffe } else { - shader_addline(buffer, "ffp_attrib_blendweight[%u] = 1.0;\n", settings->vertexblends); for (i = 0; i < settings->vertexblends; ++i) shader_addline(buffer, "ffp_attrib_blendweight[%u] -= ffp_attrib_blendweight[%u];\n", settings->vertexblends, i); @@ -5693,12 +5697,22 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct wined3d_string_buffe shader_addline(buffer, "ec_pos /= ec_pos.w;\n"); } - if (!settings->normal) - shader_addline(buffer, "vec3 normal = vec3(0.0);\n"); - else if (settings->normalize) - shader_addline(buffer, "vec3 normal = normalize(ffp_normal_matrix * ffp_attrib_normal);\n"); - else - shader_addline(buffer, "vec3 normal = ffp_normal_matrix * ffp_attrib_normal;\n"); + shader_addline(buffer, "vec3 normal = vec3(0.0);\n"); + if (settings->normal) + { + if (!settings->vertexblends) + { + shader_addline(buffer, "normal = ffp_normal_matrix * ffp_attrib_normal;\n"); + } + else + { + for (i = 0; i < settings->vertexblends + 1; ++i) + shader_addline(buffer, "normal += ffp_attrib_blendweight[%u] * (mat3(ffp_modelview_matrix[%u]) * ffp_attrib_normal);\n", i, i); + } + + if (settings->normalize) + shader_addline(buffer, "normal = normalize(normal);\n"); + } shader_glsl_ffp_vertex_lighting(buffer, settings, legacy_lighting);

1 0

Matteo Bruni : wined3d: Improve NP2 fixups in GLSL PS texture sampling code.
by Alexandre Julliard July 3, 2015

July 3, 2015

Module: wine Branch: master Commit: 4f575813100de1ab397f7ed3079ae2a7f0aa29d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f575813100de1ab397f7ed30… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 2 17:41:34 2015 +0200 wined3d: Improve NP2 fixups in GLSL PS texture sampling code. --- dlls/wined3d/glsl_shader.c | 57 ++++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 06afa65..15cf873 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2710,13 +2710,8 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; fixup = priv->cur_ps_args->color_fixup[sampler]; - if(priv->cur_ps_args->np2_fixup & (1 << sampler)) { - if(bias) { - FIXME("Biased sampling from NP2 textures is unsupported\n"); - } else { - np2_fixup = TRUE; - } - } + if (priv->cur_ps_args->np2_fixup & (1 << sampler)) + np2_fixup = TRUE; } else { @@ -2739,25 +2734,42 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s break; } - if(bias) { - shader_addline(ins->ctx->buffer, ", %s)%s);\n", bias, dst_swizzle); - } else { - if (np2_fixup) { - const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; - const unsigned char idx = priv->cur_np2fixup_info->idx[sampler]; - - shader_addline(ins->ctx->buffer, " * ps_samplerNP2Fixup[%u].%s)%s);\n", idx >> 1, - (idx % 2) ? "zw" : "xy", dst_swizzle); - } else if(dx && dy) { - shader_addline(ins->ctx->buffer, ", %s, %s)%s);\n", dx, dy, dst_swizzle); - } else { - shader_addline(ins->ctx->buffer, ")%s);\n", dst_swizzle); + if (np2_fixup) + { + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + const unsigned char idx = priv->cur_np2fixup_info->idx[sampler]; + + switch (shader_glsl_get_write_mask_size(sample_function->coord_mask)) + { + case 1: + shader_addline(ins->ctx->buffer, " * ps_samplerNP2Fixup[%u].%s", + idx >> 1, (idx % 2) ? "z" : "x"); + break; + case 2: + shader_addline(ins->ctx->buffer, " * ps_samplerNP2Fixup[%u].%s", + idx >> 1, (idx % 2) ? "zw" : "xy"); + break; + case 3: + shader_addline(ins->ctx->buffer, " * vec3(ps_samplerNP2Fixup[%u].%s, 1.0)", + idx >> 1, (idx % 2) ? "zw" : "xy"); + break; + case 4: + shader_addline(ins->ctx->buffer, " * vec4(ps_samplerNP2Fixup[%u].%s, 1.0, 1.0)", + idx >> 1, (idx % 2) ? "zw" : "xy"); + break; } } + if (dx && dy) + shader_addline(ins->ctx->buffer, ", %s, %s)", dx, dy); + else if (bias) + shader_addline(ins->ctx->buffer, ", %s)", bias); + else + shader_addline(ins->ctx->buffer, ")"); - if(!is_identity_fixup(fixup)) { + shader_addline(ins->ctx->buffer, "%s);\n", dst_swizzle); + + if (!is_identity_fixup(fixup)) shader_glsl_color_correction(ins, fixup); - } } /***************************************************************************** @@ -3989,6 +4001,7 @@ static void shader_glsl_tex(const struct wined3d_shader_instruction *ins) shader_glsl_get_sample_function(ins->ctx, resource_idx, sample_flags, &sample_function); mask |= sample_function.coord_mask; + sample_function.coord_mask = mask; if (shader_version < WINED3D_SHADER_VERSION(2,0)) swizzle = WINED3DSP_NOSWIZZLE; else swizzle = ins->src[1].swizzle;

1 0

Matteo Bruni : wined3d: Replace an open-coded implementation of LIST_FOR_EACH_ENTRY_SAFE.
by Alexandre Julliard July 3, 2015

July 3, 2015

Module: wine Branch: master Commit: 30031f6da48ac76fdb9f4c400b5091177e910165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30031f6da48ac76fdb9f4c400… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 2 17:41:32 2015 +0200 wined3d: Replace an open-coded implementation of LIST_FOR_EACH_ENTRY_SAFE. --- dlls/wined3d/shader.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 5b32528..e9be51e 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -409,16 +409,10 @@ static unsigned int shader_get_float_offset(enum wined3d_shader_register_type re static void shader_delete_constant_list(struct list *clist) { - struct wined3d_shader_lconst *constant; - struct list *ptr; + struct wined3d_shader_lconst *constant, *constant_next; - ptr = list_head(clist); - while (ptr) - { - constant = LIST_ENTRY(ptr, struct wined3d_shader_lconst, entry); - ptr = list_next(clist, ptr); + LIST_FOR_EACH_ENTRY_SAFE(constant, constant_next, clist, struct wined3d_shader_lconst, entry) HeapFree(GetProcessHeap(), 0, constant); - } list_init(clist); } @@ -2046,6 +2040,11 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *b TRACE("shader %p, byte_code %p, output_signature %p, float_const_count %u.\n", shader, byte_code, output_signature, float_const_count); + list_init(&shader->constantsF); + list_init(&shader->constantsB); + list_init(&shader->constantsI); + shader->lconst_inf_or_nan = FALSE; + fe = shader_select_frontend(*byte_code); if (!fe) { @@ -2064,12 +2063,6 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *b if (TRACE_ON(d3d_shader)) shader_trace_init(fe, shader->frontend_data, byte_code); - /* Initialize immediate constant lists. */ - list_init(&shader->constantsF); - list_init(&shader->constantsB); - list_init(&shader->constantsI); - shader->lconst_inf_or_nan = FALSE; - /* Second pass: figure out which registers are used, what the semantics are, etc. */ if (FAILED(hr = shader_get_registers_used(shader, fe, reg_maps, &shader->input_signature, &shader->output_signature, byte_code, float_const_count)))

1 0

Sebastian Lackner : kernel32/tests: Fix leak of threadpool object.
by Alexandre Julliard July 3, 2015

July 3, 2015

Module: wine Branch: master Commit: d2a3c9c20ef25e399046ce21d3b9d75e97702905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2a3c9c20ef25e399046ce21d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 3 02:00:59 2015 +0200 kernel32/tests: Fix leak of threadpool object. --- dlls/kernel32/tests/thread.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 25801b2..35e978e 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -86,6 +86,7 @@ static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); static BOOL (WINAPI *pGetCurrentActCtx)(HANDLE *); static void (WINAPI *pReleaseActCtx)(HANDLE); static PTP_POOL (WINAPI *pCreateThreadpool)(PVOID); +static void (WINAPI *pCloseThreadpool)(PTP_POOL); static PTP_WORK (WINAPI *pCreateThreadpoolWork)(PTP_WORK_CALLBACK,PVOID,PTP_CALLBACK_ENVIRON); static void (WINAPI *pSubmitThreadpoolWork)(PTP_WORK); static void (WINAPI *pWaitForThreadpoolWorkCallbacks)(PTP_WORK,BOOL); @@ -1641,6 +1642,7 @@ static void test_threadpool(void) pool = pCreateThreadpool(NULL); ok (pool != NULL, "CreateThreadpool failed\n"); + pCloseThreadpool(pool); } static void test_reserved_tls(void) @@ -1705,6 +1707,7 @@ static void init_funcs(void) X(ReleaseActCtx); X(CreateThreadpool); + X(CloseThreadpool); X(CreateThreadpoolWork); X(SubmitThreadpoolWork); X(WaitForThreadpoolWorkCallbacks);

1 0

Matteo Bruni : wined3d: Don' t hardcode WINED3DPTEXTURECAPS_NONPOW2CONDITIONAL cap flag.
by Alexandre Julliard July 3, 2015

July 3, 2015

Module: wine Branch: master Commit: 13ceb3fddc21b57cdd35fe821644c05aad71e737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13ceb3fddc21b57cdd35fe821… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 2 17:41:35 2015 +0200 wined3d: Don't hardcode WINED3DPTEXTURECAPS_NONPOW2CONDITIONAL cap flag. --- dlls/wined3d/directx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 243f5ae..e21f52f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4882,8 +4882,9 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) { - caps->TextureCaps |= WINED3DPTEXTURECAPS_POW2 | - WINED3DPTEXTURECAPS_NONPOW2CONDITIONAL; + caps->TextureCaps |= WINED3DPTEXTURECAPS_POW2; + if (gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] || gl_info->supported[ARB_TEXTURE_RECTANGLE]) + caps->TextureCaps |= WINED3DPTEXTURECAPS_NONPOW2CONDITIONAL; } if (gl_info->supported[EXT_TEXTURE3D])

1 0

Sebastian Lackner : kernel32: Forward threadpool cleanup group functions to ntdll.
by Alexandre Julliard July 3, 2015

July 3, 2015

Module: wine Branch: master Commit: a54d972868f03ed38bb98c3a0d9888a777e9b7ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a54d972868f03ed38bb98c3a0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 3 01:59:22 2015 +0200 kernel32: Forward threadpool cleanup group functions to ntdll. --- dlls/kernel32/kernel32.spec | 6 +++--- dlls/kernel32/thread.c | 20 ++++++++++++++++++++ include/winternl.h | 6 ++++++ 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 3c40975..b48ea3b 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -229,8 +229,8 @@ @ stdcall CloseProfileUserMapping() @ stub CloseSystemHandle # @ stub CloseThreadpool -# @ stub CloseThreadpoolCleanupGroup -# @ stub CloseThreadpoolCleanupGroupMembers +@ stdcall CloseThreadpoolCleanupGroup(ptr) ntdll.TpReleaseCleanupGroup +@ stdcall CloseThreadpoolCleanupGroupMembers(ptr long ptr) ntdll.TpReleaseCleanupGroupMembers # @ stub CloseThreadpoolIo # @ stub CloseThreadpoolTimer # @ stub CloseThreadpoolWait @@ -332,7 +332,7 @@ @ stdcall CreateTapePartition(long long long long) @ stdcall CreateThread(ptr long ptr long long ptr) # @ stub CreateThreadpool -# @ stub CreateThreadpoolCleanupGroup +@ stdcall CreateThreadpoolCleanupGroup() # @ stub CreateThreadpoolIo # @ stub CreateThreadpoolTimer # @ stub CreateThreadpoolWait diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 3dabf94..b2b9def 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -860,3 +860,23 @@ BOOL WINAPI GetThreadPreferredUILanguages( DWORD flags, PULONG count, PCZZWSTR b *buffersize = 0; return TRUE; } + +/*********************************************************************** + * CreateThreadpoolCleanupGroup (KERNEL32.@) + */ +PTP_CLEANUP_GROUP WINAPI CreateThreadpoolCleanupGroup( void ) +{ + TP_CLEANUP_GROUP *group; + NTSTATUS status; + + TRACE( "\n" ); + + status = TpAllocCleanupGroup( &group ); + if (status) + { + SetLastError( RtlNtStatusToDosError(status) ); + return NULL; + } + + return group; +} diff --git a/include/winternl.h b/include/winternl.h index a84c6d4..c918e09 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2616,6 +2616,12 @@ NTSYSAPI LONGLONG WINAPI RtlLargeIntegerSubtract(LONGLONG,LONGLONG); NTSYSAPI NTSTATUS WINAPI RtlLargeIntegerToChar(const ULONGLONG *,ULONG,ULONG,PCHAR); #endif +/* Threadpool functions */ + +NTSYSAPI NTSTATUS WINAPI TpAllocCleanupGroup(TP_CLEANUP_GROUP **); +NTSYSAPI void WINAPI TpReleaseCleanupGroup(TP_CLEANUP_GROUP *); +NTSYSAPI void WINAPI TpReleaseCleanupGroupMembers(TP_CLEANUP_GROUP *,BOOL,PVOID); + /* Wine internal functions */ NTSYSAPI NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRING *unix_name_ret,

1 0

Jacek Caban : mshtml: Added nsIIOService:: NewChannelFromURI2 semi-stub implementation.
by Alexandre Julliard July 3, 2015

July 3, 2015

Module: wine Branch: master Commit: 7f7e460a7505b59e965be742567c135a07dc17c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f7e460a7505b59e965be7425… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 2 17:50:10 2015 +0200 mshtml: Added nsIIOService::NewChannelFromURI2 semi-stub implementation. --- dlls/mshtml/nsio.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index fa56de6..fd811e9 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -3580,28 +3580,16 @@ static nsresult NSAPI nsIOService_NewFileURI(nsIIOService *iface, nsIFile *aFile return nsIIOService_NewFileURI(nsio, aFile, _retval); } -static nsresult NSAPI nsIOService_NewChannelFromURI2(nsIIOService *iface, nsIURI *aURI, - nsIDOMNode *aLoadingNode, nsIPrincipal *aLoadingPrincipal, nsIPrincipal *aTriggeringPrincipal, - UINT32 aSecurityFlags, UINT32 aContentPolicyType, nsIChannel **_retval) -{ - FIXME("(%p %p %p %p %x %d %p)\n", aURI, aLoadingNode, aLoadingPrincipal, aTriggeringPrincipal, - aSecurityFlags, aContentPolicyType, _retval); - return NS_ERROR_NOT_IMPLEMENTED; -} - -static nsresult NSAPI nsIOService_NewChannelFromURI(nsIIOService *iface, nsIURI *aURI, - nsIChannel **_retval) +static nsresult new_channel_from_uri(nsIURI *uri, nsIChannel **_retval) { nsWineURI *wine_uri; nsChannel *ret; nsresult nsres; - TRACE("(%p %p)\n", aURI, _retval); - - nsres = nsIURI_QueryInterface(aURI, &IID_nsWineURI, (void**)&wine_uri); + nsres = nsIURI_QueryInterface(uri, &IID_nsWineURI, (void**)&wine_uri); if(NS_FAILED(nsres)) { TRACE("Could not get nsWineURI: %08x\n", nsres); - return nsIIOService_NewChannelFromURI(nsio, aURI, _retval); + return nsIIOService_NewChannelFromURI(nsio, uri, _retval); } nsres = create_nschannel(wine_uri, &ret); @@ -3609,13 +3597,29 @@ static nsresult NSAPI nsIOService_NewChannelFromURI(nsIIOService *iface, nsIURI if(NS_FAILED(nsres)) return nsres; - nsIURI_AddRef(aURI); - ret->original_uri = aURI; + nsIURI_AddRef(uri); + ret->original_uri = uri; *_retval = (nsIChannel*)&ret->nsIHttpChannel_iface; return NS_OK; } +static nsresult NSAPI nsIOService_NewChannelFromURI2(nsIIOService *iface, nsIURI *aURI, + nsIDOMNode *aLoadingNode, nsIPrincipal *aLoadingPrincipal, nsIPrincipal *aTriggeringPrincipal, + UINT32 aSecurityFlags, UINT32 aContentPolicyType, nsIChannel **_retval) +{ + FIXME("(%p %p %p %p %x %d %p) semi-stub\n", aURI, aLoadingNode, aLoadingPrincipal, aTriggeringPrincipal, + aSecurityFlags, aContentPolicyType, _retval); + return new_channel_from_uri(aURI, _retval); +} + +static nsresult NSAPI nsIOService_NewChannelFromURI(nsIIOService *iface, nsIURI *aURI, + nsIChannel **_retval) +{ + TRACE("(%p %p)\n", aURI, _retval); + return new_channel_from_uri(aURI, _retval); +} + static nsresult NSAPI nsIOService_NewChannel2(nsIIOService *iface, const nsACString *aSpec, const char *aOriginCharset, nsIURI *aBaseURI, nsIDOMNode *aLoadingNode, nsIPrincipal *aLoadingPrincipal, nsIPrincipal *aTriggeringPrincipal, UINT32 aSecurityFlags, UINT32 aContentPolicyType, nsIChannel **_retval)

1 0

Jacek Caban : secur32: Added SECPKG_ATTR_SUPPORTED_ALGS tests.
by Alexandre Julliard July 3, 2015

July 3, 2015

Module: wine Branch: master Commit: bca49f1403aa904b097a4222dfcb21806a265d5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bca49f1403aa904b097a4222d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 2 17:50:00 2015 +0200 secur32: Added SECPKG_ATTR_SUPPORTED_ALGS tests. --- dlls/secur32/tests/schannel.c | 158 +++++++++++++++++++++++++++++++++++------- 1 file changed, 132 insertions(+), 26 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 585ba21..35100f7 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -22,6 +22,7 @@ #include <windef.h> #include <winsock2.h> #include <ws2tcpip.h> +#include <stdio.h> #define SECURITY_WIN32 #include <security.h> #include <schannel.h> @@ -114,6 +115,8 @@ static const BYTE selfSignedCert[] = { 0x0a, 0x8c, 0xb4, 0x5c, 0x34, 0x78, 0xe0, 0x3c, 0x9c, 0xe9, 0xf3, 0x30, 0x9f, 0xa8, 0x76, 0x57, 0x92, 0x36 }; +static CHAR unisp_name_a[] = UNISP_NAME_A; + static void InitFunctionPtrs(void) { HMODULE advapi32dll; @@ -153,6 +156,81 @@ static void InitFunctionPtrs(void) #undef GET_PROC } +static const char *algid_to_str(ALG_ID alg) +{ + static char buf[12]; + switch(alg) { +#define X(x) case x: return #x + X(CALG_MD2); + X(CALG_MD4); + X(CALG_MD5); + X(CALG_SHA1); /* same as CALG_SHA */ + X(CALG_MAC); + X(CALG_RSA_SIGN); + X(CALG_DSS_SIGN); + X(CALG_NO_SIGN); + X(CALG_RSA_KEYX); + X(CALG_DES); + X(CALG_3DES_112); + X(CALG_3DES); + X(CALG_DESX); + X(CALG_RC2); + X(CALG_RC4); + X(CALG_SEAL); + X(CALG_DH_SF); + X(CALG_DH_EPHEM); + X(CALG_AGREEDKEY_ANY); + X(CALG_KEA_KEYX); + X(CALG_HUGHES_MD5); + X(CALG_SKIPJACK); + X(CALG_TEK); + X(CALG_CYLINK_MEK); + X(CALG_SSL3_SHAMD5); + X(CALG_SSL3_MASTER); + X(CALG_SCHANNEL_MASTER_HASH); + X(CALG_SCHANNEL_MAC_KEY); + X(CALG_SCHANNEL_ENC_KEY); + X(CALG_PCT1_MASTER); + X(CALG_SSL2_MASTER); + X(CALG_TLS1_MASTER); + X(CALG_RC5); + X(CALG_HMAC); + X(CALG_TLS1PRF); + X(CALG_HASH_REPLACE_OWF); + X(CALG_AES_128); + X(CALG_AES_192); + X(CALG_AES_256); + X(CALG_AES); + X(CALG_SHA_256); + X(CALG_SHA_384); + X(CALG_SHA_512); + X(CALG_ECDH); + X(CALG_ECMQV); + X(CALG_ECDSA); +#undef X + } + + sprintf(buf, "%x", alg); + return buf; +} + +static void init_cred(SCHANNEL_CRED *cred) +{ + cred->dwVersion = SCHANNEL_CRED_VERSION; + cred->cCreds = 0; + cred->paCred = 0; + cred->hRootStore = NULL; + cred->cMappers = 0; + cred->aphMappers = NULL; + cred->cSupportedAlgs = 0; + cred->palgSupportedAlgs = NULL; + cred->grbitEnabledProtocols = 0; + cred->dwMinimumCipherStrength = 0; + cred->dwMaximumCipherStrength = 0; + cred->dwSessionLifespan = 0; + cred->dwFlags = 0; +} + static void test_strength(PCredHandle handle) { SecPkgCred_CipherStrengths strength = {-1,-1}; @@ -190,6 +268,57 @@ static void test_supported_protocols(CredHandle *handle, unsigned exprots) trace("Unknown flags: %x\n", protocols.grbitProtocol); } +static void test_supported_algs(CredHandle *handle) +{ + SecPkgCred_SupportedAlgs algs; + SECURITY_STATUS status; + unsigned i; + + status = pQueryCredentialsAttributesA(handle, SECPKG_ATTR_SUPPORTED_ALGS, &algs); + todo_wine ok(status == SEC_E_OK, "QueryCredentialsAttributes failed: %08x\n", status); + if(status != SEC_E_OK) + return; + + trace("Supported algorithms (%d):\n", algs.cSupportedAlgs); + for(i=0; i < algs.cSupportedAlgs; i++) + trace(" %s\n", algid_to_str(algs.palgSupportedAlgs[i])); + + pFreeContextBuffer(algs.palgSupportedAlgs); +} + +static void test_cread_attrs(void) +{ + SCHANNEL_CRED schannel_cred; + SECURITY_STATUS status; + CredHandle cred; + + status = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, + NULL, NULL, NULL, NULL, &cred, NULL); + ok(status == SEC_E_OK, "AcquireCredentialsHandleA failed: %x\n", status); + + test_supported_protocols(&cred, 0); + test_supported_algs(&cred); + + status = pQueryCredentialsAttributesA(&cred, SECPKG_ATTR_SUPPORTED_PROTOCOLS, NULL); + ok(status == SEC_E_INTERNAL_ERROR, "QueryCredentialsAttributes failed: %08x, expected SEC_E_INTERNAL_ERROR\n", status); + + status = pQueryCredentialsAttributesA(&cred, SECPKG_ATTR_SUPPORTED_ALGS, NULL); + ok(status == SEC_E_INTERNAL_ERROR, "QueryCredentialsAttributes failed: %08x, expected SEC_E_INTERNAL_ERROR\n", status); + + pFreeCredentialsHandle(&cred); + + init_cred(&schannel_cred); + schannel_cred.grbitEnabledProtocols = SP_PROT_TLS1_CLIENT; + status = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, + NULL, &schannel_cred, NULL, NULL, &cred, NULL); + ok(status == SEC_E_OK, "AcquireCredentialsHandleA failed: %x\n", status); + + test_supported_protocols(&cred, SP_PROT_TLS1_CLIENT); + test_supported_algs(&cred); + + pFreeCredentialsHandle(&cred); +} + static void testAcquireSecurityContext(void) { BOOL has_schannel = FALSE; @@ -202,7 +331,6 @@ static void testAcquireSecurityContext(void) SCHANNEL_CRED schanCred; PCCERT_CONTEXT certs[2]; HCRYPTPROV csp; - static CHAR unisp_name_a[] = UNISP_NAME_A; WCHAR ms_def_prov_w[MAX_PATH]; BOOL ret; HCRYPTKEY key; @@ -286,13 +414,8 @@ static void testAcquireSecurityContext(void) st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, NULL, NULL, NULL, &cred, NULL); ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st); - if(st == SEC_E_OK) { - st = pQueryCredentialsAttributesA(&cred, SECPKG_ATTR_SUPPORTED_PROTOCOLS, NULL); - ok(st == SEC_E_INTERNAL_ERROR, "QueryCredentialsAttributes failed: %08x, expected SEC_E_INTERNAL_ERROR\n", st); - - test_supported_protocols(&cred, 0); + if(st == SEC_E_OK) pFreeCredentialsHandle(&cred); - } memset(&cred, 0, sizeof(cred)); st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, NULL, NULL, NULL, &cred, &exp); @@ -523,23 +646,6 @@ static void test_remote_cert(PCCERT_CONTEXT remote_cert) static const char http_request[] = "HEAD /test.html HTTP/1.1\r\nHost: www.winehq.org\r\nConnection: close\r\n\r\n"; -static void init_cred(SCHANNEL_CRED *cred) -{ - cred->dwVersion = SCHANNEL_CRED_VERSION; - cred->cCreds = 0; - cred->paCred = 0; - cred->hRootStore = NULL; - cred->cMappers = 0; - cred->aphMappers = NULL; - cred->cSupportedAlgs = 0; - cred->palgSupportedAlgs = NULL; - cred->grbitEnabledProtocols = SP_PROT_TLS1_CLIENT; - cred->dwMinimumCipherStrength = 0; - cred->dwMaximumCipherStrength = 0; - cred->dwSessionLifespan = 0; - cred->dwFlags = 0; -} - static void init_buffers(SecBufferDesc *desc, unsigned count, unsigned size) { desc->ulVersion = SECBUFFER_VERSION; @@ -678,6 +784,7 @@ static void test_communication(void) /* Create client credentials */ init_cred(&cred); + cred.grbitEnabledProtocols = SP_PROT_TLS1_CLIENT; cred.dwFlags = SCH_CRED_NO_DEFAULT_CREDS|SCH_CRED_MANUAL_CRED_VALIDATION; status = pAcquireCredentialsHandleA(NULL, (SEC_CHAR *)UNISP_NAME_A, SECPKG_CRED_OUTBOUND, NULL, @@ -685,8 +792,6 @@ static void test_communication(void) ok(status == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", status); if (status != SEC_E_OK) return; - test_supported_protocols(&cred_handle, SP_PROT_TLS1_CLIENT); - /* Initialize the connection */ init_buffers(&buffers[0], 4, buf_size); init_buffers(&buffers[1], 4, buf_size); @@ -916,6 +1021,7 @@ START_TEST(schannel) { InitFunctionPtrs(); + test_cread_attrs(); testAcquireSecurityContext(); test_communication();

1 0