wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Alexandre Julliard : gdi32: Fix skipping of zero-length dashes.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: 618425ac4c405aaa28aa30d787e119ae6c605996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=618425ac4c405aaa28aa30d78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 4 14:57:52 2012 +0100 gdi32: Fix skipping of zero-length dashes. --- dlls/gdi32/dibdrv/objects.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index dffea12..ee58192 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -779,7 +779,7 @@ void reset_dash_origin(dibdrv_physdev *pdev) static inline void skip_dash(dibdrv_physdev *pdev, unsigned int skip) { skip %= pdev->pen_pattern.total_len; - while(skip) + do { if(pdev->dash_pos.left_in_dash > skip) { @@ -792,6 +792,7 @@ static inline void skip_dash(dibdrv_physdev *pdev, unsigned int skip) pdev->dash_pos.left_in_dash = pdev->pen_pattern.dashes[pdev->dash_pos.cur_dash]; pdev->dash_pos.mark = !pdev->dash_pos.mark; } + while (skip); } static void dashed_pen_line_callback(dibdrv_physdev *pdev, INT x, INT y)

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DSTENCILOP typedef.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: fd8597b2bfba7063157bbf2059add9bd675fd777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8597b2bfba7063157bbf205… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 3 23:06:55 2012 +0100 wined3d: Get rid of the WINED3DSTENCILOP typedef. --- dlls/wined3d/state.c | 38 ++++++++++++++++++++++++++++++++------ dlls/wined3d/stateblock.c | 12 ++++++------ dlls/wined3d/utils.c | 19 ------------------- dlls/wined3d/wined3d_private.h | 2 -- include/wine/wined3d.h | 21 ++++++++++----------- 5 files changed, 48 insertions(+), 44 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c10997c..a68fae9 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -801,6 +801,32 @@ static void renderstate_stencil_twosided(struct wined3d_context *context, GLint checkGLcall("glStencilOp(...)"); } +static GLenum gl_stencil_op(enum wined3d_stencil_op op) +{ + switch (op) + { + case WINED3D_STENCIL_OP_KEEP: + return GL_KEEP; + case WINED3D_STENCIL_OP_ZERO: + return GL_ZERO; + case WINED3D_STENCIL_OP_REPLACE: + return GL_REPLACE; + case WINED3D_STENCIL_OP_INCR_SAT: + return GL_INCR; + case WINED3D_STENCIL_OP_DECR_SAT: + return GL_DECR; + case WINED3D_STENCIL_OP_INVERT: + return GL_INVERT; + case WINED3D_STENCIL_OP_INCR: + return GL_INCR_WRAP_EXT; + case WINED3D_STENCIL_OP_DECR: + return GL_DECR_WRAP_EXT; + default: + FIXME("Unrecognized stencil op %#x.\n", op); + return GL_KEEP; + } +} + static void state_stencil(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -833,12 +859,12 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ func_ccw = GL_ALWAYS; ref = state->render_states[WINED3D_RS_STENCILREF]; mask = state->render_states[WINED3D_RS_STENCILMASK]; - stencilFail = StencilOp(state->render_states[WINED3D_RS_STENCILFAIL]); - depthFail = StencilOp(state->render_states[WINED3D_RS_STENCILZFAIL]); - stencilPass = StencilOp(state->render_states[WINED3D_RS_STENCILPASS]); - stencilFail_ccw = StencilOp(state->render_states[WINED3D_RS_CCW_STENCILFAIL]); - depthFail_ccw = StencilOp(state->render_states[WINED3D_RS_CCW_STENCILZFAIL]); - stencilPass_ccw = StencilOp(state->render_states[WINED3D_RS_CCW_STENCILPASS]); + stencilFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILFAIL]); + depthFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILZFAIL]); + stencilPass = gl_stencil_op(state->render_states[WINED3D_RS_STENCILPASS]); + stencilFail_ccw = gl_stencil_op(state->render_states[WINED3D_RS_CCW_STENCILFAIL]); + depthFail_ccw = gl_stencil_op(state->render_states[WINED3D_RS_CCW_STENCILZFAIL]); + stencilPass_ccw = gl_stencil_op(state->render_states[WINED3D_RS_CCW_STENCILPASS]); TRACE("(onesided %d, twosided %d, ref %x, mask %x, " "GL_FRONT: func: %x, fail %x, zfail %x, zpass %x " diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 8da32c2..0f9d07c 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1153,9 +1153,9 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3D_RS_EDGEANTIALIAS] = FALSE; state->render_states[WINED3D_RS_RANGEFOGENABLE] = FALSE; state->render_states[WINED3D_RS_STENCILENABLE] = FALSE; - state->render_states[WINED3D_RS_STENCILFAIL] = WINED3DSTENCILOP_KEEP; - state->render_states[WINED3D_RS_STENCILZFAIL] = WINED3DSTENCILOP_KEEP; - state->render_states[WINED3D_RS_STENCILPASS] = WINED3DSTENCILOP_KEEP; + state->render_states[WINED3D_RS_STENCILFAIL] = WINED3D_STENCIL_OP_KEEP; + state->render_states[WINED3D_RS_STENCILZFAIL] = WINED3D_STENCIL_OP_KEEP; + state->render_states[WINED3D_RS_STENCILPASS] = WINED3D_STENCIL_OP_KEEP; state->render_states[WINED3D_RS_STENCILREF] = 0; state->render_states[WINED3D_RS_STENCILMASK] = 0xffffffff; state->render_states[WINED3D_RS_STENCILFUNC] = WINED3D_CMP_ALWAYS; @@ -1226,9 +1226,9 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3D_RS_ADAPTIVETESS_W] = tmpfloat.d; state->render_states[WINED3D_RS_ENABLEADAPTIVETESSELLATION] = FALSE; state->render_states[WINED3D_RS_TWOSIDEDSTENCILMODE] = FALSE; - state->render_states[WINED3D_RS_CCW_STENCILFAIL] = WINED3DSTENCILOP_KEEP; - state->render_states[WINED3D_RS_CCW_STENCILZFAIL] = WINED3DSTENCILOP_KEEP; - state->render_states[WINED3D_RS_CCW_STENCILPASS] = WINED3DSTENCILOP_KEEP; + state->render_states[WINED3D_RS_CCW_STENCILFAIL] = WINED3D_STENCIL_OP_KEEP; + state->render_states[WINED3D_RS_CCW_STENCILZFAIL] = WINED3D_STENCIL_OP_KEEP; + state->render_states[WINED3D_RS_CCW_STENCILPASS] = WINED3D_STENCIL_OP_KEEP; state->render_states[WINED3D_RS_CCW_STENCILFUNC] = WINED3D_CMP_ALWAYS; state->render_states[WINED3D_RS_COLORWRITEENABLE1] = 0x0000000f; state->render_states[WINED3D_RS_COLORWRITEENABLE2] = 0x0000000f; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a521f4b..2b00765 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2477,25 +2477,6 @@ const char *debug_surflocation(DWORD flag) { return wine_dbg_sprintf("%s", buf[0] ? buf + 3 : "0"); } -/***************************************************************************** - * Useful functions mapping GL <-> D3D values - */ -GLenum StencilOp(DWORD op) { - switch(op) { - case WINED3DSTENCILOP_KEEP : return GL_KEEP; - case WINED3DSTENCILOP_ZERO : return GL_ZERO; - case WINED3DSTENCILOP_REPLACE : return GL_REPLACE; - case WINED3DSTENCILOP_INCRSAT : return GL_INCR; - case WINED3DSTENCILOP_DECRSAT : return GL_DECR; - case WINED3DSTENCILOP_INVERT : return GL_INVERT; - case WINED3DSTENCILOP_INCR : return GL_INCR_WRAP_EXT; - case WINED3DSTENCILOP_DECR : return GL_DECR_WRAP_EXT; - default: - FIXME("Unrecognized stencil op %d\n", op); - return GL_KEEP; - } -} - BOOL is_invalid_op(const struct wined3d_state *state, int stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1602bdd..fd21187 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2515,8 +2515,6 @@ const char *debug_d3dtop(WINED3DTEXTUREOP d3dtop) DECLSPEC_HIDDEN; void dump_color_fixup_desc(struct color_fixup_desc fixup) DECLSPEC_HIDDEN; const char *debug_surflocation(DWORD flag) DECLSPEC_HIDDEN; -/* Routines for GL <-> D3D values */ -GLenum StencilOp(DWORD op) DECLSPEC_HIDDEN; BOOL is_invalid_op(const struct wined3d_state *state, int stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3) DECLSPEC_HIDDEN; void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6c06fc6..cb09168 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -469,18 +469,17 @@ enum wined3d_cull WINED3D_CULL_CCW = 3, }; -typedef enum _WINED3DSTENCILOP -{ - WINED3DSTENCILOP_KEEP = 1, - WINED3DSTENCILOP_ZERO = 2, - WINED3DSTENCILOP_REPLACE = 3, - WINED3DSTENCILOP_INCRSAT = 4, - WINED3DSTENCILOP_DECRSAT = 5, - WINED3DSTENCILOP_INVERT = 6, - WINED3DSTENCILOP_INCR = 7, - WINED3DSTENCILOP_DECR = 8, - WINED3DSTENCILOP_FORCE_DWORD = 0x7fffffff -} WINED3DSTENCILOP; +enum wined3d_stencil_op +{ + WINED3D_STENCIL_OP_KEEP = 1, + WINED3D_STENCIL_OP_ZERO = 2, + WINED3D_STENCIL_OP_REPLACE = 3, + WINED3D_STENCIL_OP_INCR_SAT = 4, + WINED3D_STENCIL_OP_DECR_SAT = 5, + WINED3D_STENCIL_OP_INVERT = 6, + WINED3D_STENCIL_OP_INCR = 7, + WINED3D_STENCIL_OP_DECR = 8, +}; typedef enum _WINED3DMATERIALCOLORSOURCE {

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DCULL typedef.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: 808e92678398a0b56f2054a27e5e2676194c8aea URL: http://source.winehq.org/git/wine.git/?a=commit;h=808e92678398a0b56f2054a27… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 3 23:06:54 2012 +0100 wined3d: Get rid of the WINED3DCULL typedef. --- dlls/wined3d/state.c | 8 ++++---- dlls/wined3d/stateblock.c | 2 +- include/wine/wined3d.h | 11 +++++------ 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a392f1f..c10997c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -129,24 +129,24 @@ static void state_cullmode(struct wined3d_context *context, const struct wined3d * offscreen / onscreen rendering switch. */ switch (state->render_states[WINED3D_RS_CULLMODE]) { - case WINED3DCULL_NONE: + case WINED3D_CULL_NONE: glDisable(GL_CULL_FACE); checkGLcall("glDisable GL_CULL_FACE"); break; - case WINED3DCULL_CW: + case WINED3D_CULL_CW: glEnable(GL_CULL_FACE); checkGLcall("glEnable GL_CULL_FACE"); glCullFace(GL_FRONT); checkGLcall("glCullFace(GL_FRONT)"); break; - case WINED3DCULL_CCW: + case WINED3D_CULL_CCW: glEnable(GL_CULL_FACE); checkGLcall("glEnable GL_CULL_FACE"); glCullFace(GL_BACK); checkGLcall("glCullFace(GL_BACK)"); break; default: - FIXME("Unrecognized/Unhandled WINED3DCULL value %#x.\n", + FIXME("Unrecognized cull mode %#x.\n", state->render_states[WINED3D_RS_CULLMODE]); } } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index feabe3d..8da32c2 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1133,7 +1133,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3D_RS_LASTPIXEL] = TRUE; state->render_states[WINED3D_RS_SRCBLEND] = WINED3D_BLEND_ONE; state->render_states[WINED3D_RS_DESTBLEND] = WINED3D_BLEND_ZERO; - state->render_states[WINED3D_RS_CULLMODE] = WINED3DCULL_CCW; + state->render_states[WINED3D_RS_CULLMODE] = WINED3D_CULL_CCW; state->render_states[WINED3D_RS_ZFUNC] = WINED3D_CMP_LESSEQUAL; state->render_states[WINED3D_RS_ALPHAFUNC] = WINED3D_CMP_ALWAYS; state->render_states[WINED3D_RS_ALPHAREF] = 0; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 312b63c..6c06fc6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -462,13 +462,12 @@ enum wined3d_fill_mode WINED3D_FILL_SOLID = 3, }; -typedef enum _WINED3DCULL +enum wined3d_cull { - WINED3DCULL_NONE = 1, - WINED3DCULL_CW = 2, - WINED3DCULL_CCW = 3, - WINED3DCULL_FORCE_DWORD = 0x7fffffff -} WINED3DCULL; + WINED3D_CULL_NONE = 1, + WINED3D_CULL_CW = 2, + WINED3D_CULL_CCW = 3, +}; typedef enum _WINED3DSTENCILOP {

1 0

Henri Verbeet : d3d10: Handle D3D10_SVT_BUFFER.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: 863578cc29322803f9e4d678faa87c53d8a09647 URL: http://source.winehq.org/git/wine.git/?a=commit;h=863578cc29322803f9e4d678f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 3 23:06:53 2012 +0100 d3d10: Handle D3D10_SVT_BUFFER. --- dlls/d3d10/effect.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index ab04a9e..b9d5cd9 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -361,6 +361,7 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object) case 19: return D3D10_SVT_RENDERTARGETVIEW; case 20: return D3D10_SVT_DEPTHSTENCILVIEW; case 21: return D3D10_SVT_SAMPLER; + case 22: return D3D10_SVT_BUFFER; default: FIXME("Unknown variable type %#x.\n", t); return D3D10_SVT_VOID; @@ -648,6 +649,7 @@ static void set_variable_vtbl(struct d3d10_effect_variable *v) case D3D10_SVT_TEXTURE2DMSARRAY: case D3D10_SVT_TEXTURE3D: case D3D10_SVT_TEXTURECUBE: + case D3D10_SVT_BUFFER: /* Either resource or constant buffer. */ v->vtbl = (const ID3D10EffectVariableVtbl *)&d3d10_effect_shader_resource_variable_vtbl; break; @@ -1222,6 +1224,7 @@ static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const case D3D10_SVT_TEXTURECUBE: case D3D10_SVT_RENDERTARGETVIEW: case D3D10_SVT_DEPTHSTENCILVIEW: + case D3D10_SVT_BUFFER: TRACE("SVT could not have elements.\n"); break;

1 0

Henri Verbeet : d3d10: Return D3D10_SVT_VOID instead of 0 from d3d10_variable_type().
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: 79d1b2733368ff51ec6b1bd0253841c19a609af8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79d1b2733368ff51ec6b1bd02… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 3 23:06:52 2012 +0100 d3d10: Return D3D10_SVT_VOID instead of 0 from d3d10_variable_type(). This is the same value, but makes it more obvious where e.g. an "Unhandled basetype D3D10_SVT_VOID." message would come from. --- dlls/d3d10/effect.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 350f63b..ab04a9e 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -363,7 +363,7 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object) case 21: return D3D10_SVT_SAMPLER; default: FIXME("Unknown variable type %#x.\n", t); - return 0; + return D3D10_SVT_VOID; } } else @@ -376,7 +376,7 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object) case 4: return D3D10_SVT_BOOL; default: FIXME("Unknown variable type %#x.\n", t); - return 0; + return D3D10_SVT_VOID; } } }

1 0

Henri Verbeet : d3d10: Add a D3D10CompileEffectFromMemory() stub.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: 110aa65e0d0103a605b43c0037f7664f3dd62dfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=110aa65e0d0103a605b43c003… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 3 23:06:51 2012 +0100 d3d10: Add a D3D10CompileEffectFromMemory() stub. --- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/d3d10_main.c | 18 ++++++++++++++++++ include/d3d10effect.h | 3 +++ 3 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index d1b2b98..9f6210b 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -1,4 +1,4 @@ -@ stub D3D10CompileEffectFromMemory +@ stdcall D3D10CompileEffectFromMemory(ptr long ptr ptr ptr long long ptr ptr) @ stdcall D3D10CompileShader(ptr long str ptr ptr str str long ptr ptr) @ stdcall D3D10CreateBlob(long ptr) d3dcompiler_43.D3DCreateBlob @ stdcall D3D10CreateDevice(ptr long ptr long long ptr) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index af792d4..5c3eec8 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -243,6 +243,24 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl return S_OK; } +HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3D10Include *include, UINT hlsl_flags, UINT fx_flags, + ID3D10Blob **effect, ID3D10Blob **errors) +{ + FIXME("data %p, data_size %lu, filename %s, defines %p, include %p," + " hlsl_flags %#x, fx_flags %#x, effect %p, errors %p stub!\n", + data, data_size, wine_dbgstr_a(filename), defines, include, + hlsl_flags, fx_flags, effect, errors); + + if (effect) + *effect = NULL; + if (errors) + *errors = NULL; + + return E_NOTIMPL; +} + + LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device) { FIXME("device %p stub!\n", device); diff --git a/include/d3d10effect.h b/include/d3d10effect.h index 5dbf31b..521cd4b 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -827,6 +827,9 @@ DECLARE_INTERFACE_(ID3D10StateBlock, IUnknown) extern "C" { #endif +HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3D10Include *include, UINT hlsl_flags, UINT fx_flags, + ID3D10Blob **effect, ID3D10Blob **errors); HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT flags, ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect); HRESULT WINAPI D3D10CreateStateBlock(ID3D10Device *device,

1 0

Alexandre Julliard : secur32/tests: Don' t compare the encrypted results if the session key is different.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: ee1e1f0fdbf7313bfd1ac1c7145be20b8530f882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee1e1f0fdbf7313bfd1ac1c71… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 3 23:28:13 2012 +0100 secur32/tests: Don't compare the encrypted results if the session key is different. --- dlls/secur32/tests/ntlm.c | 82 ++++++++++++++++++-------------------------- 1 files changed, 34 insertions(+), 48 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index d3cd915..7533899 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -1058,47 +1058,43 @@ static void testSignSeal(void) ok(sec_status == SEC_E_OK, "EncryptMessage returned %s, not SEC_E_OK.\n", getSecError(sec_status)); - ok(!memcmp(crypt.pBuffers[0].pvBuffer, crypt_trailer_client, - crypt.pBuffers[0].cbBuffer), "Crypt trailer not as expected.\n"); - if (memcmp(crypt.pBuffers[0].pvBuffer, crypt_trailer_client, - crypt.pBuffers[0].cbBuffer)) - { - int i; - for (i = 0; i < crypt.pBuffers[0].cbBuffer; i++) - { - if (i % 8 == 0) printf(" "); - printf("0x%02x,", ((unsigned char *)crypt.pBuffers[0].pvBuffer)[i]); - if (i % 8 == 7) printf("\n"); - } - printf("\n"); - } - ok(!memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client, - crypt.pBuffers[1].cbBuffer), "Crypt message not as expected.\n"); - if (memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client, - crypt.pBuffers[1].cbBuffer)) + /* first 8 bytes must always be the same */ + ok(!memcmp(crypt.pBuffers[0].pvBuffer, crypt_trailer_client, 8), "Crypt trailer not as expected.\n"); + + /* the rest depends on the session key */ + if (!memcmp(crypt.pBuffers[0].pvBuffer, crypt_trailer_client, crypt.pBuffers[0].cbBuffer)) { - int i; - for (i = 0; i < crypt.pBuffers[1].cbBuffer; i++) + ok(!memcmp(crypt.pBuffers[0].pvBuffer, crypt_trailer_client, + crypt.pBuffers[0].cbBuffer), "Crypt trailer not as expected.\n"); + ok(!memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client, + crypt.pBuffers[1].cbBuffer), "Crypt message not as expected.\n"); + if (memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client, + crypt.pBuffers[1].cbBuffer)) { - if (i % 8 == 0) printf(" "); - printf("0x%02x,", ((unsigned char *)crypt.pBuffers[1].pvBuffer)[i]); - if (i % 8 == 7) printf("\n"); + int i; + for (i = 0; i < crypt.pBuffers[1].cbBuffer; i++) + { + if (i % 8 == 0) printf(" "); + printf("0x%02x,", ((unsigned char *)crypt.pBuffers[1].pvBuffer)[i]); + if (i % 8 == 7) printf("\n"); + } + printf("\n"); } - printf("\n"); - } - data[0].cbBuffer = sizeof(crypt_trailer_server); - data[1].cbBuffer = sizeof(crypt_message_server); - memcpy(data[0].pvBuffer, crypt_trailer_server, data[0].cbBuffer); - memcpy(data[1].pvBuffer, crypt_message_server, data[1].cbBuffer); + data[0].cbBuffer = sizeof(crypt_trailer_server); + data[1].cbBuffer = sizeof(crypt_message_server); + memcpy(data[0].pvBuffer, crypt_trailer_server, data[0].cbBuffer); + memcpy(data[1].pvBuffer, crypt_message_server, data[1].cbBuffer); - sec_status = pDecryptMessage(&client.ctxt, &crypt, 0, &qop); + sec_status = pDecryptMessage(&client.ctxt, &crypt, 0, &qop); - ok(sec_status == SEC_E_OK, "DecryptMessage returned %s, not SEC_E_OK.\n", - getSecError(sec_status)); - ok(!memcmp(crypt.pBuffers[1].pvBuffer, message_binary, - crypt.pBuffers[1].cbBuffer), - "Failed to decrypt message correctly.\n"); + ok(sec_status == SEC_E_OK, "DecryptMessage returned %s, not SEC_E_OK.\n", + getSecError(sec_status)); + ok(!memcmp(crypt.pBuffers[1].pvBuffer, message_binary, + crypt.pBuffers[1].cbBuffer), + "Failed to decrypt message correctly.\n"); + } + else trace( "A different session key is being used\n" ); trace("Testing with more than one buffer.\n"); @@ -1139,20 +1135,10 @@ static void testSignSeal(void) ok(sec_status == SEC_E_OK, "EncryptMessage returned %s, not SEC_E_OK.\n", getSecError(sec_status)); - ok(!memcmp(crypt.pBuffers[3].pvBuffer, crypt_trailer_client2, - crypt.pBuffers[3].cbBuffer), "Crypt trailer not as expected.\n"); + ok(!memcmp(crypt.pBuffers[3].pvBuffer, crypt_trailer_client2, 8), "Crypt trailer not as expected.\n"); + if (memcmp(crypt.pBuffers[3].pvBuffer, crypt_trailer_client2, - crypt.pBuffers[3].cbBuffer)) - { - int i; - for (i = 0; i < crypt.pBuffers[3].cbBuffer; i++) - { - if (i % 8 == 0) printf(" "); - printf("0x%02x,", ((unsigned char *)crypt.pBuffers[3].pvBuffer)[i]); - if (i % 8 == 7) printf("\n"); - } - printf("\n"); - } + crypt.pBuffers[3].cbBuffer)) goto end; ok(!memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client2, crypt.pBuffers[1].cbBuffer), "Crypt message not as expected.\n");

1 0

Francois Gouget : winmm: Don't include newlines in standard error messages.
by Alexandre Julliard 03 Jan '12

03 Jan '12

1 0

Francois Gouget : notepad: Remove unused resource strings.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: b60ff240d1091c63be13bb5aaad6dae7843f753a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b60ff240d1091c63be13bb5aa… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 3 12:26:49 2012 +0100 notepad: Remove unused resource strings. --- po/ar.po | 85 +++++++++++--------------------- po/bg.po | 95 +++++++++++++----------------------- po/ca.po | 84 +++++++++++-------------------- po/cs.po | 85 +++++++++++--------------------- po/da.po | 86 +++++++++++--------------------- po/de.po | 86 +++++++++++--------------------- po/el.po | 78 +++++++++++------------------ po/en.po | 80 +++++++++++------------------- po/en_US.po | 84 +++++++++++-------------------- po/eo.po | 86 +++++++++++--------------------- po/es.po | 96 +++++++++++++----------------------- po/fa.po | 86 +++++++++++--------------------- po/fi.po | 97 +++++++++++++----------------------- po/fr.po | 84 +++++++++++-------------------- po/he.po | 85 +++++++++++--------------------- po/hi.po | 78 +++++++++++------------------ po/hu.po | 85 +++++++++++--------------------- po/it.po | 85 +++++++++++--------------------- po/ja.po | 85 +++++++++++--------------------- po/ko.po | 85 +++++++++++--------------------- po/lt.po | 84 +++++++++++-------------------- po/ml.po | 78 +++++++++++------------------ po/nb_NO.po | 86 +++++++++++--------------------- po/nl.po | 85 +++++++++++--------------------- po/or.po | 78 +++++++++++------------------ po/pa.po | 78 +++++++++++------------------ po/pl.po | 84 +++++++++++-------------------- po/pt_BR.po | 85 +++++++++++--------------------- po/pt_PT.po | 85 +++++++++++--------------------- po/rm.po | 78 +++++++++++------------------ po/ro.po | 105 +++++++++++++++------------------------- po/ru.po | 84 +++++++++++-------------------- po/sk.po | 78 +++++++++++------------------ po/sl.po | 85 +++++++++++--------------------- po/sr_RS(a)cyrillic.po | 85 +++++++++++--------------------- po/sr_RS(a)latin.po | 105 +++++++++++++++------------------------- po/sv.po | 86 +++++++++++--------------------- po/te.po | 78 +++++++++++------------------ po/th.po | 83 +++++++++++-------------------- po/tr.po | 86 +++++++++++--------------------- po/uk.po | 85 +++++++++++--------------------- po/wa.po | 85 +++++++++++--------------------- po/wine.pot | 78 +++++++++++------------------ po/zh_CN.po | 83 +++++++++++-------------------- po/zh_TW.po | 95 +++++++++++++----------------------- programs/notepad/notepad.rc | 8 --- programs/notepad/notepad_res.h | 5 -- 47 files changed, 1390 insertions(+), 2460 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b60ff240d1091c63be13b…

1 0

Frédéric Delanoy : cmd: Avoid unreachable code ( Coverity).
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 0b358703ca54fa2fbb0769ac20cb46e5c39bf2ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b358703ca54fa2fbb0769ac2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jan 3 18:29:40 2012 +0100 cmd: Avoid unreachable code (Coverity). --- programs/cmd/wcmdmain.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 67a524d..6330ef6 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -725,8 +725,6 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCMD_strsubstW(start, endOfVar + 1, startCopy, substrlength); } - return start; - /* search and replace manipulation */ } else { WCHAR *equalspos = strstrW(colonpos, equalW); @@ -786,9 +784,8 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, HeapFree(GetProcessHeap(), 0, s); HeapFree(GetProcessHeap(), 0, searchIn); HeapFree(GetProcessHeap(), 0, searchFor); - return start; } - return start+1; + return start; } /*****************************************************************************

1 0

← Newer
1
...
87
88
89
90
91
92
93
...
98
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2012