November 2007 - Wine-commits

Alexandre Julliard : wined3d: Add printf format checking to the shader_addline function and fix resulting warnings .
by Alexandre Julliard 28 Nov '07

28 Nov '07

Module: wine Branch: master Commit: 57d1548b5162822d6d5cf9e0b26714abc6b93e84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d1548b5162822d6d5cf9e0b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 28 12:55:11 2007 +0100 wined3d: Add printf format checking to the shader_addline function and fix resulting warnings. --- dlls/wined3d/arb_program_shader.c | 8 ++++---- dlls/wined3d/glsl_shader.c | 34 +++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 8 +++++++- 3 files changed, 28 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b044f31..a228f64 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1020,8 +1020,8 @@ void pshader_hw_texkill(SHADER_OPCODE_ARG* arg) { * copy the register into our general purpose TMP variable, overwrite .w and pass TMP to KIL */ shader_addline(buffer, "MOV TMP, %s;\n", reg_dest); - shader_addline(buffer, "MOV TMP.w, one.w;\n", reg_dest); - shader_addline(buffer, "KIL TMP;\n", reg_dest); + shader_addline(buffer, "MOV TMP.w, one.w;\n"); + shader_addline(buffer, "KIL TMP;\n"); } } @@ -1374,8 +1374,8 @@ void pshader_hw_texdepth(SHADER_OPCODE_ARG* arg) { */ shader_addline(buffer, "RCP %s.g, %s.g;\n", dst_name, dst_name); shader_addline(buffer, "MUL TMP.x, %s.r, %s.g;\n", dst_name, dst_name); - shader_addline(buffer, "MIN TMP.x, TMP.x, one.r;\n", dst_name, dst_name); - shader_addline(buffer, "MAX result.depth, TMP.x, 0.0;\n", dst_name, dst_name); + shader_addline(buffer, "MIN TMP.x, TMP.x, one.r;\n"); + shader_addline(buffer, "MAX result.depth, TMP.x, 0.0;\n"); } /** Process the WINED3DSIO_TEXDP3TEX instruction in ARB: diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0dd306f..1ba609f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -478,7 +478,7 @@ void shader_generate_glsl_declarations( /* Prototype the subroutines */ for (i = 0; i < This->baseShader.limits.label; i++) { if (reg_maps->labels[i]) - shader_addline(buffer, "void subroutine%lu();\n", i); + shader_addline(buffer, "void subroutine%u();\n", i); } /* Declare the constants (aka uniforms) */ @@ -573,19 +573,19 @@ void shader_generate_glsl_declarations( switch (stype) { case WINED3DSTT_1D: - shader_addline(buffer, "uniform sampler1D %csampler%lu;\n", prefix, i); + shader_addline(buffer, "uniform sampler1D %csampler%u;\n", prefix, i); break; case WINED3DSTT_2D: - shader_addline(buffer, "uniform sampler2D %csampler%lu;\n", prefix, i); + shader_addline(buffer, "uniform sampler2D %csampler%u;\n", prefix, i); break; case WINED3DSTT_CUBE: - shader_addline(buffer, "uniform samplerCube %csampler%lu;\n", prefix, i); + shader_addline(buffer, "uniform samplerCube %csampler%u;\n", prefix, i); break; case WINED3DSTT_VOLUME: - shader_addline(buffer, "uniform sampler3D %csampler%lu;\n", prefix, i); + shader_addline(buffer, "uniform sampler3D %csampler%u;\n", prefix, i); break; default: - shader_addline(buffer, "uniform unsupported_sampler %csampler%lu;\n", prefix, i); + shader_addline(buffer, "uniform unsupported_sampler %csampler%u;\n", prefix, i); FIXME("Unrecognized sampler type: %#x\n", stype); break; } @@ -601,7 +601,7 @@ void shader_generate_glsl_declarations( /* Declare texture coordinate temporaries and initialize them */ for (i = 0; i < This->baseShader.limits.texcoord; i++) { if (reg_maps->texcoord[i]) - shader_addline(buffer, "vec4 T%lu = gl_TexCoord[%lu];\n", i, i); + shader_addline(buffer, "vec4 T%u = gl_TexCoord[%u];\n", i, i); } /* Declare input register varyings. Only pixel shader, vertex shaders have that declared in the @@ -609,25 +609,25 @@ void shader_generate_glsl_declarations( */ if(pshader && This->baseShader.hex_version >= WINED3DVS_VERSION(3, 0)) { if(use_vs(device)) { - shader_addline(buffer, "varying vec4 IN[%lu];\n", GL_LIMITS(glsl_varyings) / 4); + shader_addline(buffer, "varying vec4 IN[%u];\n", GL_LIMITS(glsl_varyings) / 4); } else { /* TODO: Write a replacement shader for the fixed function vertex pipeline, so this isn't needed. * For fixed function vertex processing + 3.0 pixel shader we need a separate function in the * pixel shader that reads the fixed function color into the packed input registers. */ - shader_addline(buffer, "vec4 IN[%lu];\n", GL_LIMITS(glsl_varyings) / 4); + shader_addline(buffer, "vec4 IN[%u];\n", GL_LIMITS(glsl_varyings) / 4); } } /* Declare output register temporaries */ if(This->baseShader.limits.packed_output) { - shader_addline(buffer, "vec4 OUT[%lu];\n", This->baseShader.limits.packed_output); + shader_addline(buffer, "vec4 OUT[%u];\n", This->baseShader.limits.packed_output); } /* Declare temporary variables */ for(i = 0; i < This->baseShader.limits.temporary; i++) { if (reg_maps->temporary[i]) - shader_addline(buffer, "vec4 R%lu;\n", i); + shader_addline(buffer, "vec4 R%u;\n", i); } /* Declare attributes */ @@ -2009,12 +2009,12 @@ void shader_glsl_label(SHADER_OPCODE_ARG* arg) { DWORD snum = (arg->src[0]) & WINED3DSP_REGNUM_MASK; shader_addline(arg->buffer, "}\n"); - shader_addline(arg->buffer, "void subroutine%lu () {\n", snum); + shader_addline(arg->buffer, "void subroutine%u () {\n", snum); } void shader_glsl_call(SHADER_OPCODE_ARG* arg) { DWORD snum = (arg->src[0]) & WINED3DSP_REGNUM_MASK; - shader_addline(arg->buffer, "subroutine%lu();\n", snum); + shader_addline(arg->buffer, "subroutine%u();\n", snum); } void shader_glsl_callnz(SHADER_OPCODE_ARG* arg) { @@ -2022,7 +2022,7 @@ void shader_glsl_callnz(SHADER_OPCODE_ARG* arg) { DWORD snum = (arg->src[0]) & WINED3DSP_REGNUM_MASK; shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], WINED3DSP_WRITEMASK_0, &src1_param); - shader_addline(arg->buffer, "if (%s) subroutine%lu();\n", src1_param.param_str, snum); + shader_addline(arg->buffer, "if (%s) subroutine%u();\n", src1_param.param_str, snum); } /********************************************* @@ -2273,7 +2273,7 @@ void pshader_glsl_texdepth(SHADER_OPCODE_ARG* arg) { * too is irrelevant, since if x = 0, any y value < 1.0 (and > 1.0 is not allowed) results in a result * >= 1.0 or < 0.0 */ - shader_addline(arg->buffer, "gl_FragDepth = clamp((%s.x / min(%s.y, 1.0)), 0.0, 1.0);\n", dst_param.reg_name, dst_param.reg_name, dst_param.reg_name); + shader_addline(arg->buffer, "gl_FragDepth = clamp((%s.x / min(%s.y, 1.0)), 0.0, 1.0);\n", dst_param.reg_name, dst_param.reg_name); } /** Process the WINED3DSIO_TEXM3X2DEPTH instruction in GLSL: @@ -2901,7 +2901,7 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs semantics_in = ps->semantics_in; /* This one is tricky: a 3.0 pixel shader reads from a 3.0 vertex shader */ - shader_addline(&buffer, "varying vec4 IN[%lu];\n", GL_LIMITS(glsl_varyings) / 4); + shader_addline(&buffer, "varying vec4 IN[%u];\n", GL_LIMITS(glsl_varyings) / 4); shader_addline(&buffer, "void order_ps_input(in vec4 OUT[%u]) {\n", MAX_REG_OUTPUT); /* First, sort out position and point size. Those are not passed to the pixel shader */ @@ -2935,7 +2935,7 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs } else if(ps_major >= 3 && vs_major < 3) { semantics_in = ps->semantics_in; - shader_addline(&buffer, "varying vec4 IN[%lu];\n", GL_LIMITS(glsl_varyings) / 4); + shader_addline(&buffer, "varying vec4 IN[%u];\n", GL_LIMITS(glsl_varyings) / 4); shader_addline(&buffer, "void order_ps_input() {\n"); /* The vertex shader wrote to the builtin varyings. There is no need to figure out position and * point size, but we depend on the optimizers kindness to find out that the pixel shader doesn't diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 37908a7..f1a4287 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1745,11 +1745,17 @@ typedef struct SHADER_PARSE_STATE { DWORD texcoord_w[2]; } SHADER_PARSE_STATE; +#ifdef __GNUC__ +#define PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) +#else +#define PRINTF_ATTR(fmt,args) +#endif + /* Base Shader utility functions. * (may move callers into the same file in the future) */ extern int shader_addline( SHADER_BUFFER* buffer, - const char* fmt, ...); + const char* fmt, ...) PRINTF_ATTR(2,3); extern const SHADER_OPCODE* shader_get_opcode( IWineD3DBaseShader *iface,

1 0

Stefan Dösinger : wined3d: Allow using a different internal format for fbos.
by Alexandre Julliard 28 Nov '07

28 Nov '07

Module: wine Branch: master Commit: a0127f2e1fe819fbe78cece3636c77cff559dce8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0127f2e1fe819fbe78cece36… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 23 14:17:21 2007 +0100 wined3d: Allow using a different internal format for fbos. OpenGL drivers do not support some low precision internal formats like GL_RGB5 for fbo color targets. Direct3D application depend on them, so provide a fallback format for render targets if the requested format itself is not supported. --- dlls/wined3d/surface.c | 9 ++- dlls/wined3d/utils.c | 168 ++++++++++++++++++++++++++++----------------- include/wine/wined3d_gl.h | 2 +- 3 files changed, 113 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0127f2e1fe819fbe78ce…

1 0

Stefan Dösinger : wined3d: Do not try to disable unsupported texture units.
by Alexandre Julliard 28 Nov '07

28 Nov '07

Module: wine Branch: master Commit: 3f3284749441d3e9db84e43204673e67d8edeef1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f3284749441d3e9db84e4320… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 28 12:13:08 2007 +0100 wined3d: Do not try to disable unsupported texture units. --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ce1453d..1e61e1a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2353,7 +2353,7 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont state_alpha(WINED3DRS_COLORKEYENABLE, stateblock, context); } } - } else if(sampler < GL_LIMITS(texture_stages)) { + } else if(mapped_stage < GL_LIMITS(textures)) { if(sampler < stateblock->lowest_disabled_stage) { /* TODO: What should I do with pixel shaders here ??? */ if(!isStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3DTSS_COLOROP))) {

1 0

Stefan Dösinger : wined3d: Report some more geforce 7 cards as geforce 7.
by Alexandre Julliard 28 Nov '07

28 Nov '07

Module: wine Branch: master Commit: 28170c144046d51ee77f1701f8eab36ed89610cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=28170c144046d51ee77f1701f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 23 01:53:02 2007 +0100 wined3d: Report some more geforce 7 cards as geforce 7. --- dlls/wined3d/directx.c | 16 ++++++++++++---- include/wine/wined3d_gl.h | 2 ++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 36d7ebc..3bc5712 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -968,10 +968,18 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { gl_info->gl_card = CARD_NVIDIA_GEFORCE_7800GT; vidmem = 256; /* A 7800GT uses 256MB while highend 7900 cards can use 512MB */ } - /* Geforce7 midend / Geforce6 highend */ - else if(strstr(gl_info->gl_renderer, "6800") || - strstr(gl_info->gl_renderer, "7600") || - strstr(gl_info->gl_renderer, "7700")) + /* Geforce7 midend */ + else if(strstr(gl_info->gl_renderer, "7600") || + strstr(gl_info->gl_renderer, "7700")) { + gl_info->gl_card = CARD_NVIDIA_GEFORCE_7600; + vidmem = 256; /* The 7600 uses 256-512MB */ + /* Geforce7 lower medium */ + } else if(strstr(gl_info->gl_renderer, "7400")) { + gl_info->gl_card = CARD_NVIDIA_GEFORCE_7400; + vidmem = 256; /* The 7400 uses 256-512MB */ + } + /* Geforce6 highend */ + else if(strstr(gl_info->gl_renderer, "6800")) { gl_info->gl_card = CARD_NVIDIA_GEFORCE_6800; vidmem = 128; /* The 6800 uses 128-256MB, the 7600 uses 256-512MB */ diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index b346064..36ebd90 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -3102,6 +3102,8 @@ typedef enum _GL_Cards { CARD_NVIDIA_GEFORCE_6200 = 0x014f, CARD_NVIDIA_GEFORCE_6600GT = 0x0140, CARD_NVIDIA_GEFORCE_6800 = 0x0041, + CARD_NVIDIA_GEFORCE_7400 = 0x01d8, + CARD_NVIDIA_GEFORCE_7600 = 0x0391, CARD_NVIDIA_GEFORCE_7800GT = 0x0092, CARD_NVIDIA_GEFORCE_8300GS = 0x0423, CARD_NVIDIA_GEFORCE_8600GT = 0x0402,

1 0

Stefan Dösinger : wined3d: Add some missing checkGLcall calls.
by Alexandre Julliard 28 Nov '07

28 Nov '07

Module: wine Branch: master Commit: 0353d031bc39393f59d47214eec3231fd2bc3554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0353d031bc39393f59d47214e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 23 00:22:00 2007 +0100 wined3d: Add some missing checkGLcall calls. --- dlls/wined3d/state.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 0d735cb..ce1453d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1688,6 +1688,7 @@ static void activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock, case GL_TEXTURE_2D: if(GL_SUPPORT(NV_TEXTURE_SHADER2)) { glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, bumpmap ? GL_OFFSET_TEXTURE_2D_NV : GL_TEXTURE_2D); + checkGLcall("glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, ...)"); } else { glDisable(GL_TEXTURE_3D); checkGLcall("glDisable(GL_TEXTURE_3D)"); @@ -1702,6 +1703,7 @@ static void activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock, case GL_TEXTURE_3D: if(GL_SUPPORT(NV_TEXTURE_SHADER2)) { glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_TEXTURE_3D); + checkGLcall("glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_TEXTURE_3D)"); } else { if(GL_SUPPORT(ARB_TEXTURE_CUBE_MAP)) { glDisable(GL_TEXTURE_CUBE_MAP_ARB); @@ -1716,6 +1718,7 @@ static void activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock, case GL_TEXTURE_CUBE_MAP_ARB: if(GL_SUPPORT(NV_TEXTURE_SHADER2)) { glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_TEXTURE_CUBE_MAP_ARB); + checkGLcall("glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_TEXTURE_CUBE_MAP_ARB)"); } else { glDisable(GL_TEXTURE_2D); checkGLcall("glDisable(GL_TEXTURE_2D)"); @@ -1729,6 +1732,7 @@ static void activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock, } else { if(GL_SUPPORT(NV_TEXTURE_SHADER2)) { glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_NONE); + checkGLcall("glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_NONE)"); } else { glEnable(GL_TEXTURE_2D); checkGLcall("glEnable(GL_TEXTURE_2D)");

1 0

Rob Shearman : advapi32: Make the credential registry key stay around if a persist value longer than session is specified .
by Alexandre Julliard 28 Nov '07

28 Nov '07

Module: wine Branch: master Commit: f96ff7d46e64c4d522aa674a639de107cfd42659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f96ff7d46e64c4d522aa674a6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Nov 28 05:48:09 2007 +0000 advapi32: Make the credential registry key stay around if a persist value longer than session is specified. --- dlls/advapi32/cred.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index f604425..b5c99f6 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -1645,7 +1645,8 @@ BOOL WINAPI CredWriteW(PCREDENTIALW Credential, DWORD Flags) } key_name = get_key_name_for_target(Credential->TargetName, Credential->Type); - ret = RegCreateKeyExW(hkeyMgr, key_name, 0, NULL, REG_OPTION_VOLATILE, + ret = RegCreateKeyExW(hkeyMgr, key_name, 0, NULL, + Credential->Persist == CRED_PERSIST_SESSION ? REG_OPTION_VOLATILE : REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE, NULL, &hkeyCred, NULL); HeapFree(GetProcessHeap(), 0, key_name); if (ret != ERROR_SUCCESS)

1 0

Stefan Dösinger : wined3d: Inform the texture about filtering changes.
by Alexandre Julliard 28 Nov '07

28 Nov '07

Module: wine Branch: master Commit: b91c19af874f8d2a340995d26dfa8e4b8bb0290f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b91c19af874f8d2a340995d26… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 27 23:43:11 2007 +0100 wined3d: Inform the texture about filtering changes. The surface_blt_to_drawable function changes the filtering settings of the texture object, but without informing the container about this change. This patch makes sure that the basetexture knows about this and reapplies the changed states to the settings chosen by the app. --- dlls/wined3d/surface.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index df617dd..34a32c2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3510,6 +3510,7 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT struct coords coords[4]; RECT rect; IWineD3DSwapChain *swapchain = NULL; + IWineD3DBaseTexture *texture = NULL; HRESULT hr; IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; @@ -3640,6 +3641,17 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT glFlush(); IWineD3DSwapChain_Release(swapchain); + } else { + /* We changed the filtering settings on the texture. Inform the container about this to get the filters + * reset properly next draw + */ + hr = IWineD3DSurface_GetContainer((IWineD3DSurface*)This, &IID_IWineD3DBaseTexture, (void **) &texture); + if(hr == WINED3D_OK && texture) { + ((IWineD3DBaseTextureImpl *) texture)->baseTexture.states[WINED3DTEXSTA_MAGFILTER] = WINED3DTEXF_POINT; + ((IWineD3DBaseTextureImpl *) texture)->baseTexture.states[WINED3DTEXSTA_MINFILTER] = WINED3DTEXF_POINT; + ((IWineD3DBaseTextureImpl *) texture)->baseTexture.states[WINED3DTEXSTA_MIPFILTER] = WINED3DTEXF_NONE; + IWineD3DBaseTexture_Release(texture); + } } LEAVE_GL(); }

1 0

Stefan Dösinger : wined3d: Work around nvidia beta driver bug.
by Alexandre Julliard 28 Nov '07

28 Nov '07

Module: wine Branch: master Commit: c66a3be49b755c8e881f8a2405ed63b272022848 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c66a3be49b755c8e881f8a240… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 22 22:18:53 2007 +0100 wined3d: Work around nvidia beta driver bug. --- dlls/wined3d/glsl_shader.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d9e525b..0dd306f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3005,6 +3005,15 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use int max_attribs = 16; /* TODO: Will this always be the case? It is at the moment... */ char tmp_name[10]; + reorder_shader_id = generate_param_reorder_function(vshader, pshader, gl_info); + TRACE("Attaching GLSL shader object %u to program %u\n", reorder_shader_id, programId); + GL_EXTCALL(glAttachObjectARB(programId, reorder_shader_id)); + checkGLcall("glAttachObjectARB"); + /* Flag the reorder function for deletion, then it will be freed automatically when the program + * is destroyed + */ + GL_EXTCALL(glDeleteObjectARB(reorder_shader_id)); + TRACE("Attaching GLSL shader object %u to program %u\n", vshader_id, programId); GL_EXTCALL(glAttachObjectARB(programId, vshader_id)); checkGLcall("glAttachObjectARB"); @@ -3027,15 +3036,6 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use checkGLcall("glBindAttribLocationARB"); list_add_head(&((IWineD3DBaseShaderImpl *)vshader)->baseShader.linked_programs, &entry->vshader_entry); - - reorder_shader_id = generate_param_reorder_function(vshader, pshader, gl_info); - TRACE("Attaching GLSL shader object %u to program %u\n", reorder_shader_id, programId); - GL_EXTCALL(glAttachObjectARB(programId, reorder_shader_id)); - checkGLcall("glAttachObjectARB"); - /* Flag the reorder function for deletion, then it will be freed automatically when the program - * is destroyed - */ - GL_EXTCALL(glDeleteObjectARB(reorder_shader_id)); } /* Attach GLSL pshader */

1 0

Juan Lang : crypt32: Add CERT_STORE_ADD_NEWER support to CertAddCertificateContextToStore.
by Alexandre Julliard 28 Nov '07

28 Nov '07

Module: wine Branch: master Commit: fa6b64d6fc4f7d0ae93734ec1b1dbfa9fdd5d45d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa6b64d6fc4f7d0ae93734ec1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 26 11:59:51 2007 -0800 crypt32: Add CERT_STORE_ADD_NEWER support to CertAddCertificateContextToStore. --- dlls/crypt32/store.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 7f79ec9..1158feb 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -837,6 +837,22 @@ BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore, else toAdd = CertDuplicateCertificateContext(pCertContext); break; + case CERT_STORE_ADD_NEWER: + if (existing) + { + if (CompareFileTime(&existing->pCertInfo->NotBefore, + &pCertContext->pCertInfo->NotBefore) >= 0) + { + TRACE("existing certificate is newer, not adding\n"); + SetLastError(CRYPT_E_EXISTS); + ret = FALSE; + } + else + toAdd = CertDuplicateCertificateContext(pCertContext); + } + else + toAdd = CertDuplicateCertificateContext(pCertContext); + break; default: FIXME("Unimplemented add disposition %d\n", dwAddDisposition); ret = FALSE;

1 0

Juan Lang : rsaenh: Empty container names are allowed for CRYPT_VERIFYCONTEXT contexts.
by Alexandre Julliard 28 Nov '07

28 Nov '07

Module: wine Branch: master Commit: 749a7adaf4673e8d510a49b14ed476e0093d1661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=749a7adaf4673e8d510a49b14… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 27 14:38:08 2007 -0800 rsaenh: Empty container names are allowed for CRYPT_VERIFYCONTEXT contexts. --- dlls/rsaenh/rsaenh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index fcf3dcf..b099f77 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1583,8 +1583,8 @@ BOOL WINAPI RSAENH_CPAcquireContext(HCRYPTPROV *phProv, LPSTR pszContainer, case CRYPT_VERIFYCONTEXT|CRYPT_NEWKEYSET: case CRYPT_VERIFYCONTEXT: - if (pszContainer) { - TRACE("pszContainer should be NULL\n"); + if (pszContainer && *pszContainer) { + TRACE("pszContainer should be empty\n"); SetLastError(NTE_BAD_FLAGS); return FALSE; }

1 0