December 2011 - Wine-commits

Henri Verbeet : ddraw/tests: Remove a redundant IDirect3DDevice7_SetViewport() call.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: bd09f63bff4a3dbe0fab376184156c2cff49cd2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd09f63bff4a3dbe0fab37618… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 19 15:16:50 2011 +0100 ddraw/tests: Remove a redundant IDirect3DDevice7_SetViewport() call. --- dlls/ddraw/tests/d3d.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 962bfad..dc88a84 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -651,16 +651,6 @@ static void ProcessVerticesTest(void) ok(rc==D3D_OK , "IDirect3DVertexBuffer::Lock returned: %x\n", rc); if(!out) goto out; - /* Keep the viewport simpler, otherwise we get bad numbers to compare */ - vp.dwX = 0; - vp.dwY = 0; - vp.dwWidth = 100; - vp.dwHeight = 100; - vp.dvMinZ = 1.0; - vp.dvMaxZ = 0.0; - rc = IDirect3DDevice7_SetViewport(lpD3DDevice, &vp); - ok(rc==D3D_OK, "IDirect3DDevice7_SetViewport failed\n"); - /* Check the results */ ok(compare_vec4(&out[0], +2.560e+2f, +7.000e+1f, -2.000e+0f, +3.333e-1f, 4096), "Got unexpected vertex 0 {%.8e, %.8e, %.8e, %.8e}.\n",

1 0

Henri Verbeet : ddraw/tests: Introduce proper vector types.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: fb28e7f5965fb8396d34bf35c1fda5d7cb5e198e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb28e7f5965fb8396d34bf35c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 19 15:16:51 2011 +0100 ddraw/tests: Introduce proper vector types. --- dlls/ddraw/tests/d3d.c | 49 +++++++++++++++++++++++------------------------ 1 files changed, 24 insertions(+), 25 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index dc88a84..a151a08 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -71,16 +71,15 @@ typedef struct static HRESULT (WINAPI *pDirectDrawCreateEx)(LPGUID,LPVOID*,REFIID,LPUNKNOWN); -typedef struct _VERTEX +struct vec3 { - float x, y, z; /* position */ -} VERTEX, *LPVERTEX; + float x, y, z; +}; -typedef struct _TVERTEX +struct vec4 { - float x, y, z; /* position */ - float rhw; -} TVERTEX, *LPTVERTEX; + float x, y, z, w; +}; static BOOL compare_float(float f, float g, unsigned int ulps) { @@ -98,19 +97,19 @@ static BOOL compare_float(float f, float g, unsigned int ulps) return TRUE; } -static BOOL compare_vec3(VERTEX *vec, float x, float y, float z, unsigned int ulps) +static BOOL compare_vec3(struct vec3 *vec, float x, float y, float z, unsigned int ulps) { return compare_float(vec->x, x, ulps) && compare_float(vec->y, y, ulps) && compare_float(vec->z, z, ulps); } -static BOOL compare_vec4(TVERTEX *vec, float x, float y, float z, float w, unsigned int ulps) +static BOOL compare_vec4(struct vec4 *vec, float x, float y, float z, float w, unsigned int ulps) { return compare_float(vec->x, x, ulps) && compare_float(vec->y, y, ulps) && compare_float(vec->z, z, ulps) - && compare_float(vec->rhw, w, ulps); + && compare_float(vec->w, w, ulps); } static void init_function_pointers(void) @@ -457,10 +456,10 @@ static void LightTest(void) static void ProcessVerticesTest(void) { D3DVERTEXBUFFERDESC desc; + struct vec4 *out; + struct vec3 *out2; + struct vec3 *in; HRESULT rc; - VERTEX *in; - TVERTEX *out; - VERTEX *out2; D3DVIEWPORT7 vp; D3DMATRIX view = { 2.0, 0.0, 0.0, 0.0, 0.0, -1.0, 0.0, 0.0, @@ -566,16 +565,16 @@ static void ProcessVerticesTest(void) /* Check the results */ ok(compare_vec4(&out[0], +1.280e+2f, +1.280e+2f, +0.000e+0f, +1.000e+0f, 4096), "Got unexpected vertex 0 {%.8e, %.8e, %.8e, %.8e}.\n", - out[0].x, out[0].y, out[0].z, out[0].rhw); + out[0].x, out[0].y, out[0].z, out[0].w); ok(compare_vec4(&out[1], +1.920e+2f, +6.400e+1f, +1.000e+0f, +1.000e+0f, 4096), "Got unexpected vertex 1 {%.8e, %.8e, %.8e, %.8e}.\n", - out[1].x, out[1].y, out[1].z, out[1].rhw); + out[1].x, out[1].y, out[1].z, out[1].w); ok(compare_vec4(&out[2], +6.400e+1f, +1.920e+2f, +5.000e-1f, +1.000e+0f, 4096), "Got unexpected vertex 2 {%.8e, %.8e, %.8e, %.8e}.\n", - out[2].x, out[2].y, out[2].z, out[2].rhw); + out[2].x, out[2].y, out[2].z, out[2].w); ok(compare_vec4(&out[3], +1.600e+2f, +1.600e+2f, +2.500e-1f, +1.000e+0f, 4096), "Got unexpected vertex 3 {%.8e, %.8e, %.8e, %.8e}.\n", - out[3].x, out[3].y, out[3].z, out[3].rhw); + out[3].x, out[3].y, out[3].z, out[3].w); rc = IDirect3DVertexBuffer7_Unlock(lpVBufDest1); ok(rc==D3D_OK , "IDirect3DVertexBuffer::Unlock returned: %x\n", rc); @@ -618,16 +617,16 @@ static void ProcessVerticesTest(void) /* Check the results */ ok(compare_vec4(&out[0], +1.330e+2f, +7.000e+1f, -2.000e+0f, +1.000e+0f, 4096), "Got unexpected vertex 0 {%.8e, %.8e, %.8e, %.8e}.\n", - out[0].x, out[0].y, out[0].z, out[0].rhw); + out[0].x, out[0].y, out[0].z, out[0].w); ok(compare_vec4(&out[1], +2.560e+2f, +5.000e+0f, +4.000e+0f, +1.000e+0f, 4096), "Got unexpected vertex 1 {%.8e, %.8e, %.8e, %.8e}.\n", - out[1].x, out[1].y, out[1].z, out[1].rhw); + out[1].x, out[1].y, out[1].z, out[1].w); ok(compare_vec4(&out[2], +1.000e+1f, +1.350e+2f, +1.000e+0f, +1.000e+0f, 4096), "Got unexpected vertex 2 {%.8e, %.8e, %.8e, %.8e}.\n", - out[2].x, out[2].y, out[2].z, out[2].rhw); + out[2].x, out[2].y, out[2].z, out[2].w); ok(compare_vec4(&out[3], +1.945e+2f, +1.025e+2f, -5.000e-1f, +1.000e+0f, 4096), "Got unexpected vertex 3 {%.8e, %.8e, %.8e, %.8e}.\n", - out[3].x, out[3].y, out[3].z, out[3].rhw); + out[3].x, out[3].y, out[3].z, out[3].w); rc = IDirect3DVertexBuffer7_Unlock(lpVBufDest1); ok(rc==D3D_OK , "IDirect3DVertexBuffer::Unlock returned: %x\n", rc); @@ -654,16 +653,16 @@ static void ProcessVerticesTest(void) /* Check the results */ ok(compare_vec4(&out[0], +2.560e+2f, +7.000e+1f, -2.000e+0f, +3.333e-1f, 4096), "Got unexpected vertex 0 {%.8e, %.8e, %.8e, %.8e}.\n", - out[0].x, out[0].y, out[0].z, out[0].rhw); + out[0].x, out[0].y, out[0].z, out[0].w); ok(compare_vec4(&out[1], +2.560e+2f, +7.813e+1f, -2.750e+0f, +1.250e-1f, 4096), "Got unexpected vertex 1 {%.8e, %.8e, %.8e, %.8e}.\n", - out[1].x, out[1].y, out[1].z, out[1].rhw); + out[1].x, out[1].y, out[1].z, out[1].w); ok(compare_vec4(&out[2], +2.560e+2f, +4.400e+1f, +4.000e-1f, +4.000e-1f, 4096), "Got unexpected vertex 2 {%.8e, %.8e, %.8e, %.8e}.\n", - out[2].x, out[2].y, out[2].z, out[2].rhw); + out[2].x, out[2].y, out[2].z, out[2].w); ok(compare_vec4(&out[3], +2.560e+2f, +8.182e+1f, -3.091e+0f, +3.636e-1f, 4096), "Got unexpected vertex 3 {%.8e, %.8e, %.8e, %.8e}.\n", - out[3].x, out[3].y, out[3].z, out[3].rhw); + out[3].x, out[3].y, out[3].z, out[3].w); rc = IDirect3DVertexBuffer7_Unlock(lpVBufDest1); ok(rc==D3D_OK , "IDirect3DVertexBuffer::Unlock returned: %x\n", rc);

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DBLEND typedef.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: b39125d2f09b1916bd759817ce771dca4a9d84db URL: http://source.winehq.org/git/wine.git/?a=commit;h=b39125d2f09b1916bd759817c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 19 15:16:52 2011 +0100 wined3d: Get rid of the WINED3DBLEND typedef. --- dlls/wined3d/state.c | 46 ++++++++++++++++++++++---------------------- dlls/wined3d/stateblock.c | 8 +++--- include/wine/wined3d.h | 35 ++++++++++++++++----------------- 3 files changed, 44 insertions(+), 45 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d7b86dc..7d8c6a4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -292,41 +292,41 @@ static void state_blendop(struct wined3d_context *context, const struct wined3d_ } } -static GLenum gl_blend_factor(WINED3DBLEND factor, const struct wined3d_format *dst_format) +static GLenum gl_blend_factor(enum wined3d_blend factor, const struct wined3d_format *dst_format) { switch (factor) { - case WINED3DBLEND_ZERO: + case WINED3D_BLEND_ZERO: return GL_ZERO; - case WINED3DBLEND_ONE: + case WINED3D_BLEND_ONE: return GL_ONE; - case WINED3DBLEND_SRCCOLOR: + case WINED3D_BLEND_SRCCOLOR: return GL_SRC_COLOR; - case WINED3DBLEND_INVSRCCOLOR: + case WINED3D_BLEND_INVSRCCOLOR: return GL_ONE_MINUS_SRC_COLOR; - case WINED3DBLEND_SRCALPHA: + case WINED3D_BLEND_SRCALPHA: return GL_SRC_ALPHA; - case WINED3DBLEND_INVSRCALPHA: + case WINED3D_BLEND_INVSRCALPHA: return GL_ONE_MINUS_SRC_ALPHA; - case WINED3DBLEND_DESTCOLOR: + case WINED3D_BLEND_DESTCOLOR: return GL_DST_COLOR; - case WINED3DBLEND_INVDESTCOLOR: + case WINED3D_BLEND_INVDESTCOLOR: return GL_ONE_MINUS_DST_COLOR; /* To compensate for the lack of format switching with backbuffer * offscreen rendering, and with onscreen rendering, we modify the * alpha test parameters for (INV)DESTALPHA if the render target * doesn't support alpha blending. A nonexistent alpha channel - * returns 1.0, so WINED3DBLEND_DESTALPHA becomes GL_ONE, and - * WINED3DBLEND_INVDESTALPHA becomes GL_ZERO. */ - case WINED3DBLEND_DESTALPHA: + * returns 1.0, so WINED3D_BLEND_DESTALPHA becomes GL_ONE, and + * WINED3D_BLEND_INVDESTALPHA becomes GL_ZERO. */ + case WINED3D_BLEND_DESTALPHA: return dst_format->alpha_mask ? GL_DST_ALPHA : GL_ONE; - case WINED3DBLEND_INVDESTALPHA: + case WINED3D_BLEND_INVDESTALPHA: return dst_format->alpha_mask ? GL_ONE_MINUS_DST_ALPHA : GL_ZERO; - case WINED3DBLEND_SRCALPHASAT: + case WINED3D_BLEND_SRCALPHASAT: return GL_SRC_ALPHA_SATURATE; - case WINED3DBLEND_BLENDFACTOR: + case WINED3D_BLEND_BLENDFACTOR: return GL_CONSTANT_COLOR_EXT; - case WINED3DBLEND_INVBLENDFACTOR: + case WINED3D_BLEND_INVBLENDFACTOR: return GL_ONE_MINUS_CONSTANT_COLOR_EXT; default: FIXME("Unhandled blend factor %#x.\n", factor); @@ -339,7 +339,7 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st const struct wined3d_surface *target = state->fb->render_targets[0]; const struct wined3d_gl_info *gl_info = context->gl_info; GLenum srcBlend, dstBlend; - WINED3DBLEND d3d_blend; + enum wined3d_blend d3d_blend; /* According to the red book, GL_LINE_SMOOTH needs GL_BLEND with specific * blending parameters to work. */ @@ -367,16 +367,16 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st return; }; - /* WINED3DBLEND_BOTHSRCALPHA and WINED3DBLEND_BOTHINVSRCALPHA are legacy + /* WINED3D_BLEND_BOTHSRCALPHA and WINED3D_BLEND_BOTHINVSRCALPHA are legacy * source blending values which are still valid up to d3d9. They should * not occur as dest blend values. */ d3d_blend = state->render_states[WINED3DRS_SRCBLEND]; - if (d3d_blend == WINED3DBLEND_BOTHSRCALPHA) + if (d3d_blend == WINED3D_BLEND_BOTHSRCALPHA) { srcBlend = GL_SRC_ALPHA; dstBlend = GL_ONE_MINUS_SRC_ALPHA; } - else if (d3d_blend == WINED3DBLEND_BOTHINVSRCALPHA) + else if (d3d_blend == WINED3D_BLEND_BOTHINVSRCALPHA) { srcBlend = GL_ONE_MINUS_SRC_ALPHA; dstBlend = GL_SRC_ALPHA; @@ -419,16 +419,16 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st return; } - /* WINED3DBLEND_BOTHSRCALPHA and WINED3DBLEND_BOTHINVSRCALPHA are legacy + /* WINED3D_BLEND_BOTHSRCALPHA and WINED3D_BLEND_BOTHINVSRCALPHA are legacy * source blending values which are still valid up to d3d9. They should * not occur as dest blend values. */ d3d_blend = state->render_states[WINED3DRS_SRCBLENDALPHA]; - if (d3d_blend == WINED3DBLEND_BOTHSRCALPHA) + if (d3d_blend == WINED3D_BLEND_BOTHSRCALPHA) { srcBlendAlpha = GL_SRC_ALPHA; dstBlendAlpha = GL_ONE_MINUS_SRC_ALPHA; } - else if (d3d_blend == WINED3DBLEND_BOTHINVSRCALPHA) + else if (d3d_blend == WINED3D_BLEND_BOTHINVSRCALPHA) { srcBlendAlpha = GL_ONE_MINUS_SRC_ALPHA; dstBlendAlpha = GL_SRC_ALPHA; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 401aa69..54dd551 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1131,8 +1131,8 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3DRS_ZWRITEENABLE] = TRUE; state->render_states[WINED3DRS_ALPHATESTENABLE] = FALSE; state->render_states[WINED3DRS_LASTPIXEL] = TRUE; - state->render_states[WINED3DRS_SRCBLEND] = WINED3DBLEND_ONE; - state->render_states[WINED3DRS_DESTBLEND] = WINED3DBLEND_ZERO; + state->render_states[WINED3DRS_SRCBLEND] = WINED3D_BLEND_ONE; + state->render_states[WINED3DRS_DESTBLEND] = WINED3D_BLEND_ZERO; state->render_states[WINED3DRS_CULLMODE] = WINED3DCULL_CCW; state->render_states[WINED3DRS_ZFUNC] = WINED3DCMP_LESSEQUAL; state->render_states[WINED3DRS_ALPHAFUNC] = WINED3DCMP_ALWAYS; @@ -1245,8 +1245,8 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3DRS_WRAP14] = 0; state->render_states[WINED3DRS_WRAP15] = 0; state->render_states[WINED3DRS_SEPARATEALPHABLENDENABLE] = FALSE; - state->render_states[WINED3DRS_SRCBLENDALPHA] = WINED3DBLEND_ONE; - state->render_states[WINED3DRS_DESTBLENDALPHA] = WINED3DBLEND_ZERO; + state->render_states[WINED3DRS_SRCBLENDALPHA] = WINED3D_BLEND_ONE; + state->render_states[WINED3DRS_DESTBLENDALPHA] = WINED3D_BLEND_ZERO; state->render_states[WINED3DRS_BLENDOPALPHA] = WINED3DBLENDOP_ADD; /* Texture Stage States - Put directly into state block, we will call function below */ diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9f43271..9a8c131 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -385,25 +385,24 @@ typedef enum _WINED3DRENDERSTATETYPE } WINED3DRENDERSTATETYPE; #define WINEHIGHEST_RENDER_STATE WINED3DRS_BLENDOPALPHA -typedef enum _WINED3DBLEND -{ - WINED3DBLEND_ZERO = 1, - WINED3DBLEND_ONE = 2, - WINED3DBLEND_SRCCOLOR = 3, - WINED3DBLEND_INVSRCCOLOR = 4, - WINED3DBLEND_SRCALPHA = 5, - WINED3DBLEND_INVSRCALPHA = 6, - WINED3DBLEND_DESTALPHA = 7, - WINED3DBLEND_INVDESTALPHA = 8, - WINED3DBLEND_DESTCOLOR = 9, - WINED3DBLEND_INVDESTCOLOR = 10, - WINED3DBLEND_SRCALPHASAT = 11, - WINED3DBLEND_BOTHSRCALPHA = 12, - WINED3DBLEND_BOTHINVSRCALPHA = 13, - WINED3DBLEND_BLENDFACTOR = 14, - WINED3DBLEND_INVBLENDFACTOR = 15, - WINED3DBLEND_FORCE_DWORD = 0x7fffffff -} WINED3DBLEND; +enum wined3d_blend +{ + WINED3D_BLEND_ZERO = 1, + WINED3D_BLEND_ONE = 2, + WINED3D_BLEND_SRCCOLOR = 3, + WINED3D_BLEND_INVSRCCOLOR = 4, + WINED3D_BLEND_SRCALPHA = 5, + WINED3D_BLEND_INVSRCALPHA = 6, + WINED3D_BLEND_DESTALPHA = 7, + WINED3D_BLEND_INVDESTALPHA = 8, + WINED3D_BLEND_DESTCOLOR = 9, + WINED3D_BLEND_INVDESTCOLOR = 10, + WINED3D_BLEND_SRCALPHASAT = 11, + WINED3D_BLEND_BOTHSRCALPHA = 12, + WINED3D_BLEND_BOTHINVSRCALPHA = 13, + WINED3D_BLEND_BLENDFACTOR = 14, + WINED3D_BLEND_INVBLENDFACTOR = 15, +}; typedef enum _WINED3DBLENDOP {

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DBLENDOP typedef.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: 969f3be73f1e2594d4bb1d0726b8c6825408aba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=969f3be73f1e2594d4bb1d072… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 19 15:16:53 2011 +0100 wined3d: Get rid of the WINED3DBLENDOP typedef. --- dlls/wined3d/state.c | 12 ++++++------ dlls/wined3d/stateblock.c | 4 ++-- include/wine/wined3d.h | 15 +++++++-------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 7d8c6a4..390519f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -242,19 +242,19 @@ static void state_blendop_w(struct wined3d_context *context, const struct wined3 WARN("Unsupported in local OpenGL implementation: glBlendEquation\n"); } -static GLenum gl_blend_op(WINED3DBLENDOP op) +static GLenum gl_blend_op(enum wined3d_blend_op op) { switch (op) { - case WINED3DBLENDOP_ADD: + case WINED3D_BLEND_OP_ADD: return GL_FUNC_ADD_EXT; - case WINED3DBLENDOP_SUBTRACT: + case WINED3D_BLEND_OP_SUBTRACT: return GL_FUNC_SUBTRACT_EXT; - case WINED3DBLENDOP_REVSUBTRACT: + case WINED3D_BLEND_OP_REVSUBTRACT: return GL_FUNC_REVERSE_SUBTRACT_EXT; - case WINED3DBLENDOP_MIN: + case WINED3D_BLEND_OP_MIN: return GL_MIN_EXT; - case WINED3DBLENDOP_MAX: + case WINED3D_BLEND_OP_MAX: return GL_MAX_EXT; default: FIXME("Unhandled blend op %#x.\n", op); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 54dd551..e4acd54 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1207,7 +1207,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3DRS_COLORWRITEENABLE] = 0x0000000f; tmpfloat.f = 0.0f; state->render_states[WINED3DRS_TWEENFACTOR] = tmpfloat.d; - state->render_states[WINED3DRS_BLENDOP] = WINED3DBLENDOP_ADD; + state->render_states[WINED3DRS_BLENDOP] = WINED3D_BLEND_OP_ADD; state->render_states[WINED3DRS_POSITIONDEGREE] = WINED3DDEGREE_CUBIC; state->render_states[WINED3DRS_NORMALDEGREE] = WINED3DDEGREE_LINEAR; /* states new in d3d9 */ @@ -1247,7 +1247,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3DRS_SEPARATEALPHABLENDENABLE] = FALSE; state->render_states[WINED3DRS_SRCBLENDALPHA] = WINED3D_BLEND_ONE; state->render_states[WINED3DRS_DESTBLENDALPHA] = WINED3D_BLEND_ZERO; - state->render_states[WINED3DRS_BLENDOPALPHA] = WINED3DBLENDOP_ADD; + state->render_states[WINED3DRS_BLENDOPALPHA] = WINED3D_BLEND_OP_ADD; /* Texture Stage States - Put directly into state block, we will call function below */ for (i = 0; i < MAX_TEXTURES; ++i) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9a8c131..a3e9971 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -404,15 +404,14 @@ enum wined3d_blend WINED3D_BLEND_INVBLENDFACTOR = 15, }; -typedef enum _WINED3DBLENDOP -{ - WINED3DBLENDOP_ADD = 1, - WINED3DBLENDOP_SUBTRACT = 2, - WINED3DBLENDOP_REVSUBTRACT = 3, - WINED3DBLENDOP_MIN = 4, - WINED3DBLENDOP_MAX = 5, - WINED3DBLENDOP_FORCE_DWORD = 0x7fffffff -} WINED3DBLENDOP; +enum wined3d_blend_op +{ + WINED3D_BLEND_OP_ADD = 1, + WINED3D_BLEND_OP_SUBTRACT = 2, + WINED3D_BLEND_OP_REVSUBTRACT = 3, + WINED3D_BLEND_OP_MIN = 4, + WINED3D_BLEND_OP_MAX = 5, +}; typedef enum _WINED3DVERTEXBLENDFLAGS {

1 0

Hans Leidekker : winhttp/tests: Avoid crashes on some win2k systems.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: 3a204f50ae3d0f49d145597f94cc318f0f57c94d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a204f50ae3d0f49d145597f9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 19 15:41:21 2011 +0100 winhttp/tests: Avoid crashes on some win2k systems. --- dlls/winhttp/tests/winhttp.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 0155539..cf4ad92 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2524,12 +2524,14 @@ static void test_WinHttpDetectAutoProxyConfigUrl(void) WCHAR *url; DWORD error; +if (0) /* crashes on some win2k systems */ +{ SetLastError(0xdeadbeef); ret = WinHttpDetectAutoProxyConfigUrl( 0, NULL ); error = GetLastError(); ok( !ret, "expected failure\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); - +} url = NULL; SetLastError(0xdeadbeef); ret = WinHttpDetectAutoProxyConfigUrl( 0, &url ); @@ -2537,12 +2539,14 @@ static void test_WinHttpDetectAutoProxyConfigUrl(void) ok( !ret, "expected failure\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); +if (0) /* crashes on some win2k systems */ +{ SetLastError(0xdeadbeef); ret = WinHttpDetectAutoProxyConfigUrl( WINHTTP_AUTO_DETECT_TYPE_DNS_A, NULL ); error = GetLastError(); ok( !ret, "expected failure\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); - +} url = NULL; SetLastError(0xdeadbeef); ret = WinHttpDetectAutoProxyConfigUrl( WINHTTP_AUTO_DETECT_TYPE_DNS_A, &url );

1 0

Hans Leidekker : iphlpapi: Add a stub implementation of GetExtendedTcpTable .
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: 895e7a5f5be6d0cbdab14039aa755f82ddefceb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=895e7a5f5be6d0cbdab14039a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 19 15:41:48 2011 +0100 iphlpapi: Add a stub implementation of GetExtendedTcpTable. --- dlls/iphlpapi/iphlpapi.spec | 1 + dlls/iphlpapi/iphlpapi_main.c | 16 ++++++++++++++++ include/iphlpapi.h | 3 +++ include/iprtrmib.h | 13 +++++++++++++ 4 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 1c33625..cb00df4 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -26,6 +26,7 @@ @ stub GetBestInterfaceFromStack @ stdcall GetBestRoute( long long long ) @ stub GetBestRouteFromStack +@ stdcall GetExtendedTcpTable( ptr ptr long long long long ) @ stdcall GetFriendlyIfIndex( long ) @ stdcall GetIcmpStatistics( ptr ) @ stub GetIcmpStatsFromStack diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index be37bb0..d43f644 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1877,6 +1877,22 @@ DWORD WINAPI GetTcpTable(PMIB_TCPTABLE pTcpTable, PDWORD pdwSize, BOOL bOrder) return ret; } +/****************************************************************** + * GetExtendedTcpTable (IPHLPAPI.@) + */ +DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, + ULONG ulAf, TCP_TABLE_CLASS TableClass, ULONG Reserved) +{ + TRACE("pTcpTable %p, pdwSize %p, bOrder %d, ulAf %u, TableClass %u, Reserved %u\n", + pTcpTable, pdwSize, bOrder, ulAf, TableClass, Reserved); + + if (ulAf == AF_INET6 || TableClass != TCP_TABLE_BASIC_ALL) + { + FIXME("ulAf = %u, TableClass = %u not supportted\n", ulAf, TableClass); + return ERROR_NOT_SUPPORTED; + } + return GetTcpTable(pTcpTable, pdwSize, bOrder); +} /****************************************************************** * GetUdpTable (IPHLPAPI.@) diff --git a/include/iphlpapi.h b/include/iphlpapi.h index 0a8def5..4390903 100644 --- a/include/iphlpapi.h +++ b/include/iphlpapi.h @@ -26,6 +26,9 @@ extern "C" { #include <ipexport.h> #include <iptypes.h> +DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, + ULONG ulAf, TCP_TABLE_CLASS TableClass, ULONG Reserved); + DWORD WINAPI GetNumberOfInterfaces(PDWORD pdwNumIf); DWORD WINAPI GetIfEntry(PMIB_IFROW pIfRow); diff --git a/include/iprtrmib.h b/include/iprtrmib.h index 477f1dd..3d4e65e 100644 --- a/include/iprtrmib.h +++ b/include/iprtrmib.h @@ -25,4 +25,17 @@ #include <tcpmib.h> #include <udpmib.h> +typedef enum _TCP_TABLE_CLASS +{ + TCP_TABLE_BASIC_LISTENER, + TCP_TABLE_BASIC_CONNECTIONS, + TCP_TABLE_BASIC_ALL, + TCP_TABLE_OWNER_PID_LISTENER, + TCP_TABLE_OWNER_PID_CONNECTIONS, + TCP_TABLE_OWNER_PID_ALL, + TCP_TABLE_OWNER_MODULE_LISTENER, + TCP_TABLE_OWNER_MODULE_CONNECTIONS, + TCP_TABLE_OWNER_MODULE_ALL +} TCP_TABLE_CLASS, *PTCP_TABLE_CLASS; + #endif /* WINE_IPRTRMIB_H__ */

1 0

Hans Leidekker : ws2_32: Return the right value for SO_CONNECT_TIME if the socket is not connected.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: c42989ed9a101a59dc186863b7acd0f307649a4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c42989ed9a101a59dc186863b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 19 15:42:08 2011 +0100 ws2_32: Return the right value for SO_CONNECT_TIME if the socket is not connected. --- dlls/ws2_32/socket.c | 11 +++++++++-- dlls/ws2_32/tests/sock.c | 16 ++++++++++++++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b3a79f3..0e9524e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2548,14 +2548,21 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_SO_CONNECT_TIME: { static int pretendtime = 0; + struct WS_sockaddr addr; + int len = sizeof(addr); - if (!pretendtime) FIXME("WS_SO_CONNECT_TIME - faking results\n"); if (!optlen || *optlen < sizeof(DWORD) || !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; } - *(DWORD*)optval = pretendtime++; + if (WS_getpeername(s, &addr, &len) == SOCKET_ERROR) + *(DWORD *)optval = ~0u; + else + { + if (!pretendtime) FIXME("WS_SO_CONNECT_TIME - faking results\n"); + *(DWORD *)optval = pretendtime++; + } *optlen = sizeof(DWORD); return ret; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 4e5bb52..2cb56a6 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4496,14 +4496,14 @@ static void test_AcceptEx(void) SOCKET connector = INVALID_SOCKET; SOCKET connector2 = INVALID_SOCKET; struct sockaddr_in bindAddress, peerAddress, *readBindAddress, *readRemoteAddress; - int socklen; + int socklen, optlen; GUID acceptExGuid = WSAID_ACCEPTEX, getAcceptExGuid = WSAID_GETACCEPTEXSOCKADDRS; LPFN_ACCEPTEX pAcceptEx = NULL; LPFN_GETACCEPTEXSOCKADDRS pGetAcceptExSockaddrs = NULL; fd_set fds_accept, fds_send; struct timeval timeout = {0,10}; /* wait for 10 milliseconds */ int got, conn1, i; - DWORD bytesReturned; + DWORD bytesReturned, connect_time; char buffer[1024]; OVERLAPPED overlapped; int iret, localSize = sizeof(struct sockaddr_in), remoteSize = localSize; @@ -4695,9 +4695,21 @@ static void test_AcceptEx(void) &bytesReturned, &overlapped); ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); + connect_time = 0xdeadbeef; + optlen = sizeof(connect_time); + iret = getsockopt(connector, SOL_SOCKET, SO_CONNECT_TIME, (char *)&connect_time, &optlen); + ok(!iret, "getsockopt failed %d\n", WSAGetLastError()); + ok(connect_time == ~0u, "unexpected connect time %u\n", connect_time); + iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); ok(iret == 0, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); + connect_time = 0xdeadbeef; + optlen = sizeof(connect_time); + iret = getsockopt(connector, SOL_SOCKET, SO_CONNECT_TIME, (char *)&connect_time, &optlen); + ok(!iret, "getsockopt failed %d\n", WSAGetLastError()); + ok(connect_time < 0xdeadbeef, "unexpected connect time %u\n", connect_time); + dwret = WaitForSingleObject(overlapped.hEvent, 0); ok(dwret == WAIT_TIMEOUT, "Waiting for accept event timeout failed with %d + errno %d\n", dwret, GetLastError());

1 0

Francois Gouget : user32: Avoid hardcoding the Unicode string literal lengths.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: 8defd5fc3ace1c8542931ff7a2d058da3524015d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8defd5fc3ace1c8542931ff7a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 16 13:06:35 2011 +0100 user32: Avoid hardcoding the Unicode string literal lengths. --- dlls/user32/uitools.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index 1c1c679..2a3b9e4 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -932,7 +932,7 @@ static BOOL UITOOLS95_DrawFrameCaption(HDC dc, LPRECT r, UINT uFlags) int colorIdx = uFlags & DFCS_INACTIVE ? COLOR_BTNSHADOW : COLOR_BTNTEXT; int xc = (myr.left+myr.right)/2; int yc = (myr.top+myr.bottom)/2; - WCHAR str[2] = {0, 0}; + WCHAR str[] = {0, 0}; static const WCHAR glyphFontName[] = { 'M','a','r','l','e','t','t',0 }; UINT alignsave; int bksave;

1 0

Aric Stewart : usp10: N'Ko uses the Ebrima font as a fallback.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: 6589516db136dd02c990130e96081400edcf42c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6589516db136dd02c990130e9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Dec 16 14:46:29 2011 -0600 usp10: N'Ko uses the Ebrima font as a fallback. --- dlls/usp10/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 6cdf740..ad1764a 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -564,7 +564,7 @@ static const scriptData scriptInformation[] = { {{Script_NKo, 1, 1, 0, 0, 0, 0, { 1,0,0,0,0,0,0,0,0,0,0}}, {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('n','k','o',' '), - {0}}, + {'E','b','r','i','m','a'}}, {{Script_Vai, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('v','a','i',' '),

1 0

Nikolay Sivov : msxml3: Skip leading space characters when loading from BSTR.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: e736c3e9837fc818ad5154e14be56fb09f11eef5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e736c3e9837fc818ad5154e14… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 18 01:21:09 2011 +0300 msxml3: Skip leading space characters when loading from BSTR. --- dlls/msxml3/domdoc.c | 20 +++++--- dlls/msxml3/factory.c | 26 +++++----- dlls/msxml3/msxml_private.h | 8 ++- dlls/msxml3/tests/domdoc.c | 107 +++++++++++++++++++++++++++++++++---------- 4 files changed, 114 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e736c3e9837fc818ad515…

1 0