April 2015 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : msctf: Always return FALSE in DllCanUnloadNow.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: 46198a5fa669f617ec4b6acd85f77430584948b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46198a5fa669f617ec4b6acd8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 2 12:30:48 2015 +1100 msctf: Always return FALSE in DllCanUnloadNow. --- dlls/msctf/msctf.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 1ce3b8e..4ea6a0a 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -41,8 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msctf); -static LONG MSCTF_refCount; - static HINSTANCE MSCTF_hinstance; typedef struct @@ -110,7 +108,6 @@ static void ClassFactory_Destructor(ClassFactory *This) { TRACE("Destroying class factory %p\n", This); HeapFree(GetProcessHeap(),0,This); - InterlockedDecrement(&MSCTF_refCount); } static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppvOut) @@ -163,11 +160,6 @@ static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) TRACE("(%p)->(%x)\n", This, fLock); - if(fLock) - InterlockedIncrement(&MSCTF_refCount); - else - InterlockedDecrement(&MSCTF_refCount); - return S_OK; } @@ -190,7 +182,6 @@ static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) This->ctor = ctor; *ppvOut = This; TRACE("Created class factory %p\n", This); - InterlockedIncrement(&MSCTF_refCount); return S_OK; } @@ -539,7 +530,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) */ HRESULT WINAPI DllCanUnloadNow(void) { - return MSCTF_refCount ? S_FALSE : S_OK; + return S_FALSE; } /***********************************************************************

1 0

Bruno Jesus : ws2_32: Better trace setsockopt/getsockopt.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: 846febbc3d47213fb31e47004dd47b6a133b4f15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=846febbc3d47213fb31e47004… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Apr 2 00:17:39 2015 -0300 ws2_32: Better trace setsockopt/getsockopt. --- dlls/ws2_32/socket.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 130 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 52fd03b..09c8416 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -322,6 +322,130 @@ static inline const char *debugstr_sockaddr( const struct WS_sockaddr *a ) } } +static inline const char *debugstr_sockopt(int level, int optname) +{ + const char *stropt = NULL, *strlevel = NULL; + +#define DEBUG_SOCKLEVEL(x) case (x): strlevel = #x +#define DEBUG_SOCKOPT(x) case (x): stropt = #x; break + + switch(level) + { + DEBUG_SOCKLEVEL(WS_SOL_SOCKET); + switch(optname) + { + DEBUG_SOCKOPT(WS_SO_ACCEPTCONN); + DEBUG_SOCKOPT(WS_SO_BROADCAST); + DEBUG_SOCKOPT(WS_SO_BSP_STATE); + DEBUG_SOCKOPT(WS_SO_CONDITIONAL_ACCEPT); + DEBUG_SOCKOPT(WS_SO_CONNECT_TIME); + DEBUG_SOCKOPT(WS_SO_DEBUG); + DEBUG_SOCKOPT(WS_SO_DONTLINGER); + DEBUG_SOCKOPT(WS_SO_DONTROUTE); + DEBUG_SOCKOPT(WS_SO_ERROR); + DEBUG_SOCKOPT(WS_SO_EXCLUSIVEADDRUSE); + DEBUG_SOCKOPT(WS_SO_GROUP_ID); + DEBUG_SOCKOPT(WS_SO_GROUP_PRIORITY); + DEBUG_SOCKOPT(WS_SO_KEEPALIVE); + DEBUG_SOCKOPT(WS_SO_LINGER); + DEBUG_SOCKOPT(WS_SO_MAX_MSG_SIZE); + DEBUG_SOCKOPT(WS_SO_OOBINLINE); + DEBUG_SOCKOPT(WS_SO_OPENTYPE); + DEBUG_SOCKOPT(WS_SO_PROTOCOL_INFOA); + DEBUG_SOCKOPT(WS_SO_PROTOCOL_INFOW); + DEBUG_SOCKOPT(WS_SO_RCVBUF); + DEBUG_SOCKOPT(WS_SO_RCVTIMEO); + DEBUG_SOCKOPT(WS_SO_REUSEADDR); + DEBUG_SOCKOPT(WS_SO_SNDBUF); + DEBUG_SOCKOPT(WS_SO_SNDTIMEO); + DEBUG_SOCKOPT(WS_SO_TYPE); + } + break; + + DEBUG_SOCKLEVEL(WS_NSPROTO_IPX); + switch(optname) + { + DEBUG_SOCKOPT(WS_IPX_PTYPE); + DEBUG_SOCKOPT(WS_IPX_FILTERPTYPE); + DEBUG_SOCKOPT(WS_IPX_DSTYPE); + DEBUG_SOCKOPT(WS_IPX_RECVHDR); + DEBUG_SOCKOPT(WS_IPX_MAXSIZE); + DEBUG_SOCKOPT(WS_IPX_ADDRESS); + DEBUG_SOCKOPT(WS_IPX_MAX_ADAPTER_NUM); + } + break; + + DEBUG_SOCKLEVEL(WS_SOL_IRLMP); + switch(optname) + { + DEBUG_SOCKOPT(WS_IRLMP_ENUMDEVICES); + } + break; + + DEBUG_SOCKLEVEL(WS_IPPROTO_TCP); + switch(optname) + { + DEBUG_SOCKOPT(WS_TCP_BSDURGENT); + DEBUG_SOCKOPT(WS_TCP_EXPEDITED_1122); + DEBUG_SOCKOPT(WS_TCP_NODELAY); + } + break; + + DEBUG_SOCKLEVEL(WS_IPPROTO_IP); + switch(optname) + { + DEBUG_SOCKOPT(WS_IP_ADD_MEMBERSHIP); + DEBUG_SOCKOPT(WS_IP_DROP_MEMBERSHIP); + DEBUG_SOCKOPT(WS_IP_HDRINCL); + DEBUG_SOCKOPT(WS_IP_MULTICAST_IF); + DEBUG_SOCKOPT(WS_IP_MULTICAST_LOOP); + DEBUG_SOCKOPT(WS_IP_MULTICAST_TTL); + DEBUG_SOCKOPT(WS_IP_OPTIONS); + DEBUG_SOCKOPT(WS_IP_PKTINFO); + DEBUG_SOCKOPT(WS_IP_TOS); + DEBUG_SOCKOPT(WS_IP_TTL); + DEBUG_SOCKOPT(WS_IP_UNICAST_IF); + DEBUG_SOCKOPT(WS_IP_DONTFRAGMENT); + } + break; + + DEBUG_SOCKLEVEL(WS_IPPROTO_IPV6); + switch(optname) + { + DEBUG_SOCKOPT(WS_IPV6_ADD_MEMBERSHIP); + DEBUG_SOCKOPT(WS_IPV6_DROP_MEMBERSHIP); + DEBUG_SOCKOPT(WS_IPV6_MULTICAST_IF); + DEBUG_SOCKOPT(WS_IPV6_MULTICAST_HOPS); + DEBUG_SOCKOPT(WS_IPV6_MULTICAST_LOOP); + DEBUG_SOCKOPT(WS_IPV6_UNICAST_HOPS); + DEBUG_SOCKOPT(WS_IPV6_V6ONLY); + DEBUG_SOCKOPT(WS_IPV6_UNICAST_IF); + DEBUG_SOCKOPT(WS_IPV6_DONTFRAG); + } + break; + } +#undef DEBUG_SOCKLEVEL +#undef DEBUG_SOCKOPT + + if (!strlevel) + strlevel = wine_dbg_sprintf("WS_0x%x", level); + if (!stropt) + stropt = wine_dbg_sprintf("WS_0x%x", optname); + + return wine_dbg_sprintf("level %s, name %s", strlevel + 3, stropt + 3); +} + +static inline const char *debugstr_optval(const char *optval, int optlenval) +{ + if (optval && !IS_INTRESOURCE(optval) && optlenval >= 1 && optlenval <= sizeof(DWORD)) + { + DWORD value = 0; + memcpy(&value, optval, optlenval); + return wine_dbg_sprintf("%p (%u)", optval, value); + } + return wine_dbg_sprintf("%p", optval); +} + /* HANDLE<->SOCKET conversion (SOCKET is UINT_PTR). */ #define SOCKET2HANDLE(s) ((HANDLE)(s)) #define HANDLE2SOCKET(h) ((SOCKET)(h)) @@ -3147,8 +3271,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, int fd; INT ret = 0; - TRACE("socket %04lx, level 0x%x, name 0x%x, ptr %p, len %d\n", - s, level, optname, optval, optlen ? *optlen : 0); + TRACE("(socket %04lx, %s, optval %s, optlen %p (%d))\n", s, + debugstr_sockopt(level, optname), debugstr_optval(optval, 0), + optlen, optlen ? *optlen : 0); switch(level) { @@ -4955,8 +5080,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, struct linger linger; struct timeval tval; - TRACE("socket %04lx, level 0x%x, name 0x%x, ptr %p, len %d\n", - s, level, optname, optval, optlen); + TRACE("(socket %04lx, %s, optval %s, optlen %d)\n", s, + debugstr_sockopt(level, optname), debugstr_optval(optval, optlen), + optlen); /* some broken apps pass the value directly instead of a pointer to it */ if(optlen && IS_INTRESOURCE(optval))

1 0

Stefan Dösinger : wined3d: Give tex_type and its values a better name.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: 844c4efb4736dd3ee42369a2a6add2cc8162855a URL: http://source.winehq.org/git/wine.git/?a=commit;h=844c4efb4736dd3ee42369a2a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 2 00:30:49 2015 +0200 wined3d: Give tex_type and its values a better name. --- dlls/wined3d/arb_program_shader.c | 65 +++++++++++++++++++++++---------------- dlls/wined3d/glsl_shader.c | 55 +++++++++++++++++---------------- dlls/wined3d/shader.c | 2 +- dlls/wined3d/surface.c | 18 +++++------ dlls/wined3d/utils.c | 16 +++++----- dlls/wined3d/wined3d_private.h | 21 ++++++------- 6 files changed, 95 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=844c4efb4736dd3ee4236…

1 0

Stefan Dösinger : wined3d: Pass a wined3d_ffp_texture_type enum to blit shader functions.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: da7abd29b429fbc5ed6cc59b58ccc24b06907624 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da7abd29b429fbc5ed6cc59b5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 2 00:30:50 2015 +0200 wined3d: Pass a wined3d_ffp_texture_type enum to blit shader functions. --- dlls/wined3d/arb_program_shader.c | 117 +++++++++++++++++++++++++++----------- 1 file changed, 85 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da7abd29b429fbc5ed6cc…

1 0

Stefan Dösinger : wined3d: Use bitfields in struct arbfp_blit_type.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: 6cf421399bbf9710ceb3aaf0bef7c1f2aa145689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cf421399bbf9710ceb3aaf0b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 2 00:30:51 2015 +0200 wined3d: Use bitfields in struct arbfp_blit_type. --- dlls/wined3d/arb_program_shader.c | 52 ++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index eed6cb3..67c4c04 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6824,8 +6824,9 @@ const struct fragment_pipeline arbfp_fragment_pipeline = { struct arbfp_blit_type { - enum complex_fixup fixup; - GLenum textype; + enum complex_fixup fixup : 4; + enum wined3d_gl_resource_type res_type : 3; + DWORD padding : 25; }; struct arbfp_blit_desc @@ -6846,11 +6847,7 @@ static int arbfp_blit_type_compare(const void *key, const struct wine_rb_entry * const struct arbfp_blit_type *ka = key; const struct arbfp_blit_type *kb = &WINE_RB_ENTRY_VALUE(entry, const struct arbfp_blit_desc, entry)->type; - if (ka->fixup != kb->fixup) - return ka->fixup < kb->fixup ? -1 : 1; - if (ka->textype != kb->textype) - return ka->textype < kb->textype ? -1 : 1; - return 0; + return memcmp(ka, kb, sizeof(*ka)); } /* Context activation is done by the caller. */ @@ -7563,16 +7560,15 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, struct arbfp_blit_priv *priv = blit_priv; enum complex_fixup fixup; const struct wined3d_gl_info *gl_info = context->gl_info; - GLenum textype = surface->container->target; + GLenum gl_texture_type = surface->container->target; struct wine_rb_entry *entry; struct arbfp_blit_type type; struct arbfp_blit_desc *desc; - enum wined3d_gl_resource_type res_type; if (surface->container->flags & WINED3D_TEXTURE_CONVERTED) { - gl_info->gl_ops.gl.p_glEnable(textype); - checkGLcall("glEnable(textype)"); + gl_info->gl_ops.gl.p_glEnable(gl_texture_type); + checkGLcall("glEnable(gl_texture_type)"); return WINED3D_OK; } @@ -7581,41 +7577,42 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, TRACE("Fixup:\n"); dump_color_fixup_desc(surface->resource.format->color_fixup); /* Don't bother setting up a shader for unconverted formats */ - gl_info->gl_ops.gl.p_glEnable(textype); - checkGLcall("glEnable(textype)"); + gl_info->gl_ops.gl.p_glEnable(gl_texture_type); + checkGLcall("glEnable(gl_texture_type)"); return WINED3D_OK; } fixup = get_complex_fixup(surface->resource.format->color_fixup); - switch (textype) + switch (gl_texture_type) { case GL_TEXTURE_1D: - res_type = WINED3D_GL_RES_TYPE_TEX_1D; + type.res_type = WINED3D_GL_RES_TYPE_TEX_1D; break; case GL_TEXTURE_2D: - res_type = WINED3D_GL_RES_TYPE_TEX_2D; + type.res_type = WINED3D_GL_RES_TYPE_TEX_2D; break; case GL_TEXTURE_3D: - res_type = WINED3D_GL_RES_TYPE_TEX_3D; + type.res_type = WINED3D_GL_RES_TYPE_TEX_3D; break; case GL_TEXTURE_CUBE_MAP_ARB: - res_type = WINED3D_GL_RES_TYPE_TEX_CUBE; + type.res_type = WINED3D_GL_RES_TYPE_TEX_CUBE; break; case GL_TEXTURE_RECTANGLE_ARB: - res_type = WINED3D_GL_RES_TYPE_TEX_RECT; + type.res_type = WINED3D_GL_RES_TYPE_TEX_RECT; break; default: - ERR("Unexpected GL texture type %x.\n", textype); - res_type = WINED3D_GL_RES_TYPE_TEX_2D; + ERR("Unexpected GL texture type %x.\n", gl_texture_type); + type.res_type = WINED3D_GL_RES_TYPE_TEX_2D; } type.fixup = fixup; - type.textype = textype; + type.padding = 0; + entry = wine_rb_get(&priv->shaders, &type); if (entry) { @@ -7627,19 +7624,19 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, switch (fixup) { case COMPLEX_FIXUP_P8: - shader = gen_p8_shader(priv, gl_info, res_type); + shader = gen_p8_shader(priv, gl_info, type.res_type); break; default: - shader = gen_yuv_shader(priv, gl_info, fixup, res_type); + shader = gen_yuv_shader(priv, gl_info, fixup, type.res_type); break; } if (!shader) { FIXME("Unsupported complex fixup %#x, not setting a shader\n", fixup); - gl_info->gl_ops.gl.p_glEnable(textype); - checkGLcall("glEnable(textype)"); + gl_info->gl_ops.gl.p_glEnable(gl_texture_type); + checkGLcall("glEnable(gl_texture_type)"); return E_NOTIMPL; } @@ -7647,8 +7644,7 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, if (!desc) goto err_out; - desc->type.textype = textype; - desc->type.fixup = fixup; + desc->type = type; desc->shader = shader; if (wine_rb_put(&priv->shaders, &desc->type, &desc->entry) == -1) {

1 0

Stefan Dösinger : wined3d: Pass a struct arbfp_blit_type to the blit shader generation functions.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: ad50f872ae870b3c1ca8d31c90c307b4116aea84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad50f872ae870b3c1ca8d31c9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 2 00:30:52 2015 +0200 wined3d: Pass a struct arbfp_blit_type to the blit shader generation functions. --- dlls/wined3d/arb_program_shader.c | 57 ++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 67c4c04..523fc62 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6904,21 +6904,24 @@ static void arbfp_blit_free(struct wined3d_device *device) device->blit_priv = NULL; } -static BOOL gen_planar_yuv_read(struct wined3d_shader_buffer *buffer, enum complex_fixup fixup, - enum wined3d_gl_resource_type res_type, char *luminance) +static BOOL gen_planar_yuv_read(struct wined3d_shader_buffer *buffer, const struct arbfp_blit_type *type, + char *luminance) { char chroma; const char *tex, *texinstr; - if (fixup == COMPLEX_FIXUP_UYVY) { + if (type->fixup == COMPLEX_FIXUP_UYVY) + { chroma = 'x'; *luminance = 'w'; - } else { + } + else + { chroma = 'w'; *luminance = 'x'; } - switch(res_type) + switch (type->res_type) { case WINED3D_GL_RES_TYPE_TEX_2D: tex = "2D"; @@ -6950,7 +6953,7 @@ static BOOL gen_planar_yuv_read(struct wined3d_shader_buffer *buffer, enum compl * * So we have to get the sampling x position in non-normalized coordinates in integers */ - if (res_type != WINED3D_GL_RES_TYPE_TEX_RECT) + if (type->res_type != WINED3D_GL_RES_TYPE_TEX_RECT) { shader_addline(buffer, "MUL texcrd.xy, fragment.texcoord[0], size.x;\n"); shader_addline(buffer, "MOV texcrd.w, size.x;\n"); @@ -7005,14 +7008,14 @@ static BOOL gen_planar_yuv_read(struct wined3d_shader_buffer *buffer, enum compl return TRUE; } -static BOOL gen_yv12_read(struct wined3d_shader_buffer *buffer, - enum wined3d_gl_resource_type res_type, char *luminance) +static BOOL gen_yv12_read(struct wined3d_shader_buffer *buffer, const struct arbfp_blit_type *type, + char *luminance) { const char *tex; static const float yv12_coef[] = {2.0f / 3.0f, 1.0f / 6.0f, (2.0f / 3.0f) + (1.0f / 6.0f), 1.0f / 3.0f}; - switch (res_type) + switch (type->res_type) { case WINED3D_GL_RES_TYPE_TEX_2D: tex = "2D"; @@ -7079,7 +7082,7 @@ static BOOL gen_yv12_read(struct wined3d_shader_buffer *buffer, * Don't forget to clamp the y values in into the range, otherwise we'll get filtering * bleeding */ - if (res_type == WINED3D_GL_RES_TYPE_TEX_2D) + if (type->res_type == WINED3D_GL_RES_TYPE_TEX_2D) { shader_addline(buffer, "RCP chroma.w, size.y;\n"); @@ -7132,7 +7135,7 @@ static BOOL gen_yv12_read(struct wined3d_shader_buffer *buffer, /* The other chroma value is 1/6th of the texture lower, from 5/6th to 6/6th * No need to clamp because we're just reusing the already clamped value from above */ - if (res_type == WINED3D_GL_RES_TYPE_TEX_2D) + if (type->res_type == WINED3D_GL_RES_TYPE_TEX_2D) shader_addline(buffer, "ADD texcrd.y, texcrd.y, yv12_coef.y;\n"); else shader_addline(buffer, "MAD texcrd.y, size.y, coef.w, texcrd.y;\n"); @@ -7144,7 +7147,7 @@ static BOOL gen_yv12_read(struct wined3d_shader_buffer *buffer, * values due to filtering */ shader_addline(buffer, "MOV texcrd, fragment.texcoord[0];\n"); - if (res_type == WINED3D_GL_RES_TYPE_TEX_2D) + if (type->res_type == WINED3D_GL_RES_TYPE_TEX_2D) { /* Multiply the y coordinate by 2/3 and clamp it */ shader_addline(buffer, "MUL texcrd.y, texcrd.y, yv12_coef.x;\n"); @@ -7167,14 +7170,14 @@ static BOOL gen_yv12_read(struct wined3d_shader_buffer *buffer, return TRUE; } -static BOOL gen_nv12_read(struct wined3d_shader_buffer *buffer, enum wined3d_gl_resource_type res_type, +static BOOL gen_nv12_read(struct wined3d_shader_buffer *buffer, const struct arbfp_blit_type *type, char *luminance) { const char *tex; static const float nv12_coef[] = {2.0f / 3.0f, 1.0f / 3.0f, 1.0f, 1.0f}; - switch (res_type) + switch (type->res_type) { case WINED3D_GL_RES_TYPE_TEX_2D: tex = "2D"; @@ -7225,7 +7228,7 @@ static BOOL gen_nv12_read(struct wined3d_shader_buffer *buffer, enum wined3d_gl_ /* We only have half the number of chroma pixels. */ shader_addline(buffer, "MUL texcrd.x, texcrd.x, coef.y;\n"); - if (res_type == WINED3D_GL_RES_TYPE_TEX_2D) + if (type->res_type == WINED3D_GL_RES_TYPE_TEX_2D) { shader_addline(buffer, "RCP chroma.w, size.x;\n"); shader_addline(buffer, "RCP chroma.z, size.y;\n"); @@ -7274,7 +7277,7 @@ static BOOL gen_nv12_read(struct wined3d_shader_buffer *buffer, enum wined3d_gl_ shader_addline(buffer, "TEX temp, texcrd, texture[0], %s;\n", tex); shader_addline(buffer, "MOV chroma.y, temp.w;\n"); - if (res_type == WINED3D_GL_RES_TYPE_TEX_2D) + if (type->res_type == WINED3D_GL_RES_TYPE_TEX_2D) { /* Add 1/size.x */ shader_addline(buffer, "ADD texcrd.x, texcrd.x, chroma.w;\n"); @@ -7291,7 +7294,7 @@ static BOOL gen_nv12_read(struct wined3d_shader_buffer *buffer, enum wined3d_gl_ * Clamp the y coordinate to prevent the chroma values from bleeding into the sampled luminance * values due to filtering. */ shader_addline(buffer, "MOV texcrd, fragment.texcoord[0];\n"); - if (res_type == WINED3D_GL_RES_TYPE_TEX_2D) + if (type->res_type == WINED3D_GL_RES_TYPE_TEX_2D) { /* Multiply the y coordinate by 2/3 and clamp it */ shader_addline(buffer, "MUL texcrd.y, texcrd.y, nv12_coef.x;\n"); @@ -7316,7 +7319,7 @@ static BOOL gen_nv12_read(struct wined3d_shader_buffer *buffer, enum wined3d_gl_ /* Context activation is done by the caller. */ static GLuint gen_p8_shader(struct arbfp_blit_priv *priv, - const struct wined3d_gl_info *gl_info, enum wined3d_gl_resource_type res_type) + const struct wined3d_gl_info *gl_info, const struct arbfp_blit_type *type) { GLenum shader; struct wined3d_shader_buffer buffer; @@ -7344,7 +7347,7 @@ static GLuint gen_p8_shader(struct arbfp_blit_priv *priv, shader_addline(&buffer, "PARAM constants = { 0.996, 0.00195, 0, 0 };\n"); /* The alpha-component contains the palette index */ - if (res_type == WINED3D_GL_RES_TYPE_TEX_RECT) + if (type->res_type == WINED3D_GL_RES_TYPE_TEX_RECT) shader_addline(&buffer, "TEX index, fragment.texcoord[0], texture[0], RECT;\n"); else shader_addline(&buffer, "TEX index, fragment.texcoord[0], texture[0], 2D;\n"); @@ -7413,7 +7416,7 @@ static void upload_palette(const struct wined3d_texture *texture, struct wined3d /* Context activation is done by the caller. */ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_gl_info *gl_info, - enum complex_fixup yuv_fixup, enum wined3d_gl_resource_type res_type) + const struct arbfp_blit_type *type) { GLenum shader; struct wined3d_shader_buffer buffer; @@ -7482,11 +7485,11 @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_ shader_addline(&buffer, "PARAM yuv_coef = {1.403, 0.344, 0.714, 1.770};\n"); shader_addline(&buffer, "PARAM size = program.local[0];\n"); - switch (yuv_fixup) + switch (type->fixup) { case COMPLEX_FIXUP_UYVY: case COMPLEX_FIXUP_YUY2: - if (!gen_planar_yuv_read(&buffer, yuv_fixup, res_type, &luminance_component)) + if (!gen_planar_yuv_read(&buffer, type, &luminance_component)) { shader_buffer_free(&buffer); return 0; @@ -7494,7 +7497,7 @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_ break; case COMPLEX_FIXUP_YV12: - if (!gen_yv12_read(&buffer, res_type, &luminance_component)) + if (!gen_yv12_read(&buffer, type, &luminance_component)) { shader_buffer_free(&buffer); return 0; @@ -7502,7 +7505,7 @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_ break; case COMPLEX_FIXUP_NV12: - if (!gen_nv12_read(&buffer, res_type, &luminance_component)) + if (!gen_nv12_read(&buffer, type, &luminance_component)) { shader_buffer_free(&buffer); return 0; @@ -7510,7 +7513,7 @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_ break; default: - FIXME("Unsupported YUV fixup %#x\n", yuv_fixup); + FIXME("Unsupported YUV fixup %#x\n", type->fixup); shader_buffer_free(&buffer); return 0; } @@ -7624,11 +7627,11 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, switch (fixup) { case COMPLEX_FIXUP_P8: - shader = gen_p8_shader(priv, gl_info, type.res_type); + shader = gen_p8_shader(priv, gl_info, &type); break; default: - shader = gen_yuv_shader(priv, gl_info, fixup, type.res_type); + shader = gen_yuv_shader(priv, gl_info, &type); break; }

1 0

Stefan Dösinger : wined3d: Define a constant for the blit texture size parameter.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: e8b9f8134d7a1cb294b30e5ef6fe58bb64e0dd51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8b9f8134d7a1cb294b30e5ef… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 2 00:30:53 2015 +0200 wined3d: Define a constant for the blit texture size parameter. --- dlls/wined3d/arb_program_shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 523fc62..719e8e5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6836,6 +6836,8 @@ struct arbfp_blit_desc struct wine_rb_entry entry; }; +#define ARBFP_BLIT_PARAM_SIZE 0 + struct arbfp_blit_priv { struct wine_rb_tree shaders; @@ -7483,7 +7485,7 @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_ shader_addline(&buffer, "TEMP texcrd2;\n"); shader_addline(&buffer, "PARAM coef = {1.0, 0.5, 2.0, 0.25};\n"); shader_addline(&buffer, "PARAM yuv_coef = {1.403, 0.344, 0.714, 1.770};\n"); - shader_addline(&buffer, "PARAM size = program.local[0];\n"); + shader_addline(&buffer, "PARAM size = program.local[%u];\n", ARBFP_BLIT_PARAM_SIZE); switch (type->fixup) { @@ -7669,7 +7671,7 @@ err_out: checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB)"); GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, shader)); checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, shader)"); - GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, 0, size)); + GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARBFP_BLIT_PARAM_SIZE, size)); checkGLcall("glProgramLocalParameter4fvARB"); return WINED3D_OK;

1 0

Andrew Cook : server: Implement job limit flags.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: ecd41d1de7461b9601e61ee387b24a9610e22b96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd41d1de7461b9601e61ee38… Author: Andrew Cook <ariscop(a)gmail.com> Date: Thu Apr 2 20:40:15 2015 +1100 server: Implement job limit flags. --- dlls/kernel32/tests/process.c | 1 + dlls/ntdll/sync.c | 42 ++++++++++++++++++++++++++++++++++++++++-- include/wine/server_protocol.h | 19 ++++++++++++++++++- include/winnt.h | 4 ++++ server/process.c | 13 +++++++++++++ server/protocol.def | 7 +++++++ server/request.h | 5 +++++ server/trace.c | 9 +++++++++ 8 files changed, 97 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index fd47951..c991108 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2387,6 +2387,7 @@ static void test_CompletionPort(void) port_info.CompletionKey = job; port_info.CompletionPort = port; ret = pSetInformationJobObject(job, JobObjectAssociateCompletionPortInformation, &port_info, sizeof(port_info)); + todo_wine ok(ret, "SetInformationJobObject error %u\n", GetLastError()); create_process("wait", &pi); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index ce1a635..fff38c9 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -634,8 +634,46 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c */ NTSTATUS WINAPI NtSetInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS class, PVOID info, ULONG len ) { - FIXME( "stub: %p %u %p %u\n", handle, class, info, len ); - return STATUS_SUCCESS; + NTSTATUS status = STATUS_SUCCESS; + JOBOBJECT_BASIC_LIMIT_INFORMATION *basic_limit; + ULONG info_size = sizeof(JOBOBJECT_BASIC_LIMIT_INFORMATION); + DWORD limit_flags = JOB_OBJECT_BASIC_LIMIT_VALID_FLAGS; + + TRACE( "(%p, %u, %p, %u)\n", handle, class, info, len ); + + if (class >= MaxJobObjectInfoClass) + return STATUS_INVALID_PARAMETER; + + switch (class) + { + + case JobObjectExtendedLimitInformation: + info_size = sizeof(JOBOBJECT_EXTENDED_LIMIT_INFORMATION); + limit_flags = JOB_OBJECT_EXTENDED_LIMIT_VALID_FLAGS; + /* fallthrough */ + case JobObjectBasicLimitInformation: + if (len != info_size) + return STATUS_INVALID_PARAMETER; + + basic_limit = info; + if (basic_limit->LimitFlags & ~limit_flags) + return STATUS_INVALID_PARAMETER; + + SERVER_START_REQ( set_job_limits ) + { + req->handle = wine_server_obj_handle( handle ); + req->limit_flags = basic_limit->LimitFlags; + status = wine_server_call( req ); + } + SERVER_END_REQ; + break; + + default: + FIXME( "stub: %p %u %p %u\n", handle, class, info, len ); + return STATUS_NOT_IMPLEMENTED; + } + + return status; } /****************************************************************************** diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 5a9f3ab..6e113e7 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5127,6 +5127,20 @@ struct process_in_job_reply }; + +struct set_job_limits_request +{ + struct request_header __header; + obj_handle_t handle; + unsigned int limit_flags; + char __pad_20[4]; +}; +struct set_job_limits_reply +{ + struct reply_header __header; +}; + + enum request { REQ_new_process, @@ -5388,6 +5402,7 @@ enum request REQ_create_job, REQ_assign_job, REQ_process_in_job, + REQ_set_job_limits, REQ_NB_REQUESTS }; @@ -5654,6 +5669,7 @@ union generic_request struct create_job_request create_job_request; struct assign_job_request assign_job_request; struct process_in_job_request process_in_job_request; + struct set_job_limits_request set_job_limits_request; }; union generic_reply { @@ -5918,8 +5934,9 @@ union generic_reply struct create_job_reply create_job_reply; struct assign_job_reply assign_job_reply; struct process_in_job_reply process_in_job_reply; + struct set_job_limits_reply set_job_limits_reply; }; -#define SERVER_PROTOCOL_VERSION 463 +#define SERVER_PROTOCOL_VERSION 464 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/include/winnt.h b/include/winnt.h index 4b06b2c..c2aa50e 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5610,6 +5610,10 @@ typedef struct _JOBOBJECT_EXTENDED_LIMIT_INFORMATION { #define JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE 0x00002000 #define JOB_OBJECT_LIMIT_SUBSET_AFFINITY 0x00004000 +#define JOB_OBJECT_LIMIT_VALID_FLAGS 0x0007ffff +#define JOB_OBJECT_BASIC_LIMIT_VALID_FLAGS 0x000000ff +#define JOB_OBJECT_EXTENDED_LIMIT_VALID_FLAGS 0x00007fff + typedef enum _LOGICAL_PROCESSOR_RELATIONSHIP { RelationProcessorCore = 0, diff --git a/server/process.c b/server/process.c index 9534f90..84c6c82 100644 --- a/server/process.c +++ b/server/process.c @@ -146,6 +146,7 @@ struct job struct object obj; /* object header */ struct list process_list; /* list of all processes */ int num_processes; /* count of running processes */ + unsigned int limit_flags; /* limit flags */ }; static const struct object_ops job_ops = @@ -184,6 +185,7 @@ static struct job *create_job_object( struct directory *root, const struct unico SACL_SECURITY_INFORMATION ); list_init( &job->process_list ); job->num_processes = 0; + job->limit_flags = 0; } } return job; @@ -1506,3 +1508,14 @@ DECL_HANDLER(process_in_job) } release_object( process ); } + +/* update limits of the job object */ +DECL_HANDLER(set_job_limits) +{ + struct job *job = get_job_obj( current->process, req->handle, JOB_OBJECT_SET_ATTRIBUTES ); + + if (!job) return; + + job->limit_flags = req->limit_flags; + release_object( job ); +} diff --git a/server/protocol.def b/server/protocol.def index b85adca..35de6ff 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3528,3 +3528,10 @@ enum coords_relative obj_handle_t job; /* handle to the job */ obj_handle_t process; /* handle to the process */ @END + + +/* Set limit flags on a job */ +(a)REQ(set_job_limits) + obj_handle_t handle; /* handle to the job */ + unsigned int limit_flags; /* new limit flags */ +(a)END diff --git a/server/request.h b/server/request.h index aef316a..d76ddea 100644 --- a/server/request.h +++ b/server/request.h @@ -365,6 +365,7 @@ DECL_HANDLER(set_suspend_context); DECL_HANDLER(create_job); DECL_HANDLER(assign_job); DECL_HANDLER(process_in_job); +DECL_HANDLER(set_job_limits); #ifdef WANT_REQUEST_HANDLERS @@ -630,6 +631,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_create_job, (req_handler)req_assign_job, (req_handler)req_process_in_job, + (req_handler)req_set_job_limits, }; C_ASSERT( sizeof(affinity_t) == 8 ); @@ -2221,6 +2223,9 @@ C_ASSERT( sizeof(struct assign_job_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct process_in_job_request, job) == 12 ); C_ASSERT( FIELD_OFFSET(struct process_in_job_request, process) == 16 ); C_ASSERT( sizeof(struct process_in_job_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct set_job_limits_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct set_job_limits_request, limit_flags) == 16 ); +C_ASSERT( sizeof(struct set_job_limits_request) == 24 ); #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/trace.c b/server/trace.c index cba15a3..3d8e349 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4119,6 +4119,12 @@ static void dump_process_in_job_request( const struct process_in_job_request *re fprintf( stderr, ", process=%04x", req->process ); } +static void dump_set_job_limits_request( const struct set_job_limits_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); + fprintf( stderr, ", limit_flags=%08x", req->limit_flags ); +} + static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, (dump_func)dump_get_new_process_info_request, @@ -4379,6 +4385,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_create_job_request, (dump_func)dump_assign_job_request, (dump_func)dump_process_in_job_request, + (dump_func)dump_set_job_limits_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -4641,6 +4648,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_create_job_reply, NULL, NULL, + NULL, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -4903,6 +4911,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "create_job", "assign_job", "process_in_job", + "set_job_limits", }; static const struct

1 0

Andrew Cook : server: Implement job inheritance.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: 0dbe5adc2117e943c66009dd2b9a744c9a833e72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dbe5adc2117e943c66009dd2… Author: Andrew Cook <ariscop(a)gmail.com> Date: Thu Apr 2 08:56:40 2015 +1100 server: Implement job inheritance. --- dlls/kernel32/tests/process.c | 3 --- server/process.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index c991108..a6f86e8 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2485,7 +2485,6 @@ static void test_jobInheritance(HANDLE job) out = FALSE; ret = pIsProcessInJob(pi.hProcess, job, &out); ok(ret, "IsProcessInJob error %u\n", GetLastError()); - todo_wine ok(out, "IsProcessInJob returned out=%u\n", out); dwret = WaitForSingleObject(pi.hProcess, 1000); @@ -2513,9 +2512,7 @@ static void test_BreakawayOk(HANDLE job) snprintf(buffer, MAX_PATH, "\"%s\" tests/process.c %s", selfname, "exit"); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi); - todo_wine ok(!ret, "CreateProcessA expected failure\n"); - todo_wine expect_eq_d(ERROR_ACCESS_DENIED, GetLastError()); if (ret) diff --git a/server/process.c b/server/process.c index 84c6c82..c124705 100644 --- a/server/process.c +++ b/server/process.c @@ -1039,6 +1039,14 @@ DECL_HANDLER(new_process) return; } + if (parent->job && (req->create_flags & CREATE_BREAKAWAY_FROM_JOB) && + !(parent->job->limit_flags & (JOB_OBJECT_LIMIT_BREAKAWAY_OK | JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK))) + { + set_error( STATUS_ACCESS_DENIED ); + close( socket_fd ); + return; + } + if (!req->info_size) /* create an orphaned process */ { create_process( socket_fd, NULL, 0 ); @@ -1109,6 +1117,13 @@ DECL_HANDLER(new_process) && !(req->create_flags & DEBUG_ONLY_THIS_PROCESS); process->startup_info = (struct startup_info *)grab_object( info ); + if (parent->job + && !(req->create_flags & CREATE_BREAKAWAY_FROM_JOB) + && !(parent->job->limit_flags & JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK)) + { + add_job_process( parent->job, process ); + } + /* connect to the window station */ connect_process_winstation( process, current );

1 0

Andrew Cook : server: Implement io completion messages for job objects.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: 47ffeaee7406e41708d9d5523308e3b2f4850f9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=47ffeaee7406e41708d9d5523… Author: Andrew Cook <ariscop(a)gmail.com> Date: Thu Apr 2 08:56:55 2015 +1100 server: Implement io completion messages for job objects. --- dlls/kernel32/tests/process.c | 4 ---- dlls/ntdll/sync.c | 15 +++++++++++++++ include/wine/server_protocol.h | 20 +++++++++++++++++++- server/process.c | 37 +++++++++++++++++++++++++++++++++++++ server/protocol.def | 8 ++++++++ server/request.h | 6 ++++++ server/trace.c | 10 ++++++++++ 7 files changed, 95 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=47ffeaee7406e41708d9d…

1 0