July 2012 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Get rid of some unused PCI IDs.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 15b41f01816d0e2d7e2816f05cc4b2d2ad2e1f1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=15b41f01816d0e2d7e2816f05… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 20 00:24:26 2012 +0200 wined3d: Get rid of some unused PCI IDs. In case of e.g. CARD_AMD_RADEON_HD4650 and CARD_AMD_RADEON_HD4670 these are wrong too, because you can't distinguish one HD46xx card from another based on PCI ID. --- dlls/wined3d/wined3d_private.h | 19 +++---------------- 1 files changed, 3 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bc9523f..70245a7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1315,25 +1315,13 @@ enum wined3d_pci_device CARD_AMD_RADEON_HD2900 = 0x9400, CARD_AMD_RADEON_HD3200 = 0x9620, CARD_AMD_RADEON_HD4350 = 0x954f, - CARD_AMD_RADEON_HD4550 = 0x9540, CARD_AMD_RADEON_HD4600 = 0x9495, - CARD_AMD_RADEON_HD4650 = 0x9498, - CARD_AMD_RADEON_HD4670 = 0x9490, CARD_AMD_RADEON_HD4700 = 0x944e, - CARD_AMD_RADEON_HD4770 = 0x94b3, - CARD_AMD_RADEON_HD4800 = 0x944c, /* Picked one value between 9440, 944c, 9442, 9460 */ - CARD_AMD_RADEON_HD4830 = 0x944c, - CARD_AMD_RADEON_HD4850 = 0x9442, - CARD_AMD_RADEON_HD4870 = 0x9440, - CARD_AMD_RADEON_HD4890 = 0x9460, + CARD_AMD_RADEON_HD4800 = 0x944c, CARD_AMD_RADEON_HD5400 = 0x68f9, CARD_AMD_RADEON_HD5600 = 0x68d8, - CARD_AMD_RADEON_HD5700 = 0x68BE, /* Picked HD5750 */ - CARD_AMD_RADEON_HD5750 = 0x68BE, - CARD_AMD_RADEON_HD5770 = 0x68B8, - CARD_AMD_RADEON_HD5800 = 0x6898, /* Picked HD5850 */ - CARD_AMD_RADEON_HD5850 = 0x6898, - CARD_AMD_RADEON_HD5870 = 0x6899, + CARD_AMD_RADEON_HD5700 = 0x68be, + CARD_AMD_RADEON_HD5800 = 0x6898, CARD_AMD_RADEON_HD5900 = 0x689c, CARD_AMD_RADEON_HD6300 = 0x9803, CARD_AMD_RADEON_HD6400 = 0x6770, @@ -1365,7 +1353,6 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_7300 = 0x01d7, /* GeForce Go 7300 */ CARD_NVIDIA_GEFORCE_7600 = 0x0391, CARD_NVIDIA_GEFORCE_7800GT = 0x0092, - CARD_NVIDIA_GEFORCE_8100 = 0x084F, CARD_NVIDIA_GEFORCE_8200 = 0x0849, /* Other PCI ID 0x084B */ CARD_NVIDIA_GEFORCE_8300GS = 0x0423, CARD_NVIDIA_GEFORCE_8400GS = 0x0404,

1 0

Henri Verbeet : wined3d: Convert some uppercase hex constants to lowercase.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: ea8dfe640db7fcba8d7904ba70a971183a2a23b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea8dfe640db7fcba8d7904ba7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 20 00:24:27 2012 +0200 wined3d: Convert some uppercase hex constants to lowercase. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/surface.c | 16 ++++++++-------- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/wined3d_private.h | 29 +++++++++++++++-------------- 7 files changed, 30 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0ed6230..332e0d3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3337,7 +3337,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO warned = TRUE; } - *( (DWORD *) dest_ptr) = 0xFF000000; + *(DWORD *)dest_ptr = 0xff000000; dest_ptr += sizeof(DWORD); } else diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7aa2d25..2a6b83b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4914,8 +4914,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DVTXPCAPS_VERTEXFOG | WINED3DVTXPCAPS_TEXGEN; - caps->MaxPrimitiveCount = 0xFFFFF; /* For now set 2^20-1 which is used by most >=Geforce3/Radeon8500 cards */ - caps->MaxVertexIndex = 0xFFFFF; + caps->MaxPrimitiveCount = 0xfffff; /* For now set 2^20-1 which is used by most >=Geforce3/Radeon8500 cards */ + caps->MaxVertexIndex = 0xfffff; caps->MaxStreams = MAX_STREAMS; caps->MaxStreamStride = 1024; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ce239b4..f4a9f13 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -586,7 +586,7 @@ static void shaderconstant(struct wined3d_context *context, const struct wined3d static void state_clipping(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - DWORD enable = 0xFFFFFFFF; + DWORD enable = 0xffffffff; DWORD disable = 0x00000000; if (use_vs(state)) @@ -3819,7 +3819,7 @@ static void transform_worldex(struct wined3d_context *context, const struct wine * GL_MODELVIEW2_ARB: 0x8722 * GL_MODELVIEW3_ARB: 0x8723 * etc - * GL_MODELVIEW31_ARB: 0x873F + * GL_MODELVIEW31_ARB: 0x873f */ if(matrix == 1) glMat = GL_MODELVIEW1_ARB; else glMat = GL_MODELVIEW2_ARB - 2 + matrix; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index a09c2f9..9660f2e 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1228,7 +1228,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3D_RS_COLORWRITEENABLE1] = 0x0000000f; state->render_states[WINED3D_RS_COLORWRITEENABLE2] = 0x0000000f; state->render_states[WINED3D_RS_COLORWRITEENABLE3] = 0x0000000f; - state->render_states[WINED3D_RS_BLENDFACTOR] = 0xFFFFFFFF; + state->render_states[WINED3D_RS_BLENDFACTOR] = 0xffffffff; state->render_states[WINED3D_RS_SRGBWRITEENABLE] = 0; state->render_states[WINED3D_RS_DEPTHBIAS] = 0; state->render_states[WINED3D_RS_WRAP8] = 0; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5eb4085..49c0f33 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3820,9 +3820,9 @@ do { \ BYTE *d = buf; for (x = 0; x < width; ++x, d += 3) { - d[0] = (color ) & 0xFF; - d[1] = (color >> 8) & 0xFF; - d[2] = (color >> 16) & 0xFF; + d[0] = (color ) & 0xff; + d[1] = (color >> 8) & 0xff; + d[2] = (color >> 16) & 0xff; } break; } @@ -4635,7 +4635,7 @@ void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[25 else if (pal->flags & WINEDDPCAPS_ALPHA) table[i][3] = pal->palents[i].peFlags; else - table[i][3] = 0xFF; + table[i][3] = 0xff; } } } @@ -4704,7 +4704,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI Dest = (WORD *) (dst + y * outpitch); for (x = 0; x < width; x++ ) { WORD color = *Source++; - *Dest = ((color & 0xFFC0) | ((color & 0x1F) << 1)); + *Dest = ((color & 0xffc0) | ((color & 0x1f) << 1)); if (!color_in_range(&surface->src_blt_color_key, color)) *Dest |= 0x0001; Dest++; @@ -6757,7 +6757,7 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * case BLACKNESS: hr = _Blt_ColorFill(dbuf, dstwidth, dstheight, bpp, dst_map.row_pitch, 0); break; - case 0xAA0029: /* No-op */ + case 0xaa0029: /* No-op */ break; case WHITENESS: hr = _Blt_ColorFill(dbuf, dstwidth, dstheight, bpp, dst_map.row_pitch, ~0U); @@ -6916,8 +6916,8 @@ do { \ else { LONG dstyinc = dst_map.row_pitch, dstxinc = bpp; - DWORD keylow = 0xFFFFFFFF, keyhigh = 0, keymask = 0xFFFFFFFF; - DWORD destkeylow = 0x0, destkeyhigh = 0xFFFFFFFF, destkeymask = 0xFFFFFFFF; + DWORD keylow = 0xffffffff, keyhigh = 0, keymask = 0xffffffff; + DWORD destkeylow = 0x0, destkeyhigh = 0xffffffff, destkeymask = 0xffffffff; if (flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYDEST | WINEDDBLT_KEYSRCOVERRIDE | WINEDDBLT_KEYDESTOVERRIDE)) { /* The color keying flags are checked for correctness in ddraw */ diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index f3b42ff..ff8c07c 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -315,7 +315,7 @@ static unsigned int convert_fvf_to_declaration(const struct wined3d_gl_info *gl_ BOOL has_specular = !!(fvf & WINED3DFVF_SPECULAR); DWORD num_textures = (fvf & WINED3DFVF_TEXCOUNT_MASK) >> WINED3DFVF_TEXCOUNT_SHIFT; - DWORD texcoords = (fvf & 0xFFFF0000) >> 16; + DWORD texcoords = (fvf & 0xffff0000) >> 16; struct wined3d_fvf_convert_state state; unsigned int size; unsigned int idx; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 70245a7..38f4147 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -187,10 +187,11 @@ static inline GLenum wined3d_gl_min_mip_filter(const struct min_lookup min_mip_l * * See GL_NV_half_float for a reference of the FLOAT16 / GL_HALF format */ -static inline float float_16_to_32(const unsigned short *in) { +static inline float float_16_to_32(const unsigned short *in) +{ const unsigned short s = ((*in) & 0x8000); - const unsigned short e = ((*in) & 0x7C00) >> 10; - const unsigned short m = (*in) & 0x3FF; + const unsigned short e = ((*in) & 0x7c00) >> 10; + const unsigned short m = (*in) & 0x3ff; const float sgn = (s ? -1.0f : 1.0f); if(e == 0) { @@ -800,15 +801,15 @@ extern int num_lock DECLSPEC_HIDDEN; /* ------------------ */ #define GL_EXTCALL(f) (gl_info->f) -#define D3DCOLOR_B_R(dw) (((dw) >> 16) & 0xFF) -#define D3DCOLOR_B_G(dw) (((dw) >> 8) & 0xFF) -#define D3DCOLOR_B_B(dw) (((dw) >> 0) & 0xFF) -#define D3DCOLOR_B_A(dw) (((dw) >> 24) & 0xFF) +#define D3DCOLOR_B_R(dw) (((dw) >> 16) & 0xff) +#define D3DCOLOR_B_G(dw) (((dw) >> 8) & 0xff) +#define D3DCOLOR_B_B(dw) (((dw) >> 0) & 0xff) +#define D3DCOLOR_B_A(dw) (((dw) >> 24) & 0xff) -#define D3DCOLOR_R(dw) (((float) (((dw) >> 16) & 0xFF)) / 255.0f) -#define D3DCOLOR_G(dw) (((float) (((dw) >> 8) & 0xFF)) / 255.0f) -#define D3DCOLOR_B(dw) (((float) (((dw) >> 0) & 0xFF)) / 255.0f) -#define D3DCOLOR_A(dw) (((float) (((dw) >> 24) & 0xFF)) / 255.0f) +#define D3DCOLOR_R(dw) (((float) (((dw) >> 16) & 0xff)) / 255.0f) +#define D3DCOLOR_G(dw) (((float) (((dw) >> 8) & 0xff)) / 255.0f) +#define D3DCOLOR_B(dw) (((float) (((dw) >> 0) & 0xff)) / 255.0f) +#define D3DCOLOR_A(dw) (((float) (((dw) >> 24) & 0xff)) / 255.0f) #define D3DCOLORTOGLFLOAT4(dw, vec) do { \ (vec)[0] = D3DCOLOR_R(dw); \ @@ -1329,10 +1330,10 @@ enum wined3d_pci_device CARD_AMD_RADEON_HD6550D = 0x9640, CARD_AMD_RADEON_HD6600 = 0x6758, CARD_AMD_RADEON_HD6600M = 0x6741, - CARD_AMD_RADEON_HD6700 = 0x68BA, + CARD_AMD_RADEON_HD6700 = 0x68ba, CARD_AMD_RADEON_HD6800 = 0x6739, CARD_AMD_RADEON_HD6900 = 0x6719, - CARD_AMD_RADEON_HD7900 = 0x679A, + CARD_AMD_RADEON_HD7900 = 0x679a, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020, @@ -1353,7 +1354,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_7300 = 0x01d7, /* GeForce Go 7300 */ CARD_NVIDIA_GEFORCE_7600 = 0x0391, CARD_NVIDIA_GEFORCE_7800GT = 0x0092, - CARD_NVIDIA_GEFORCE_8200 = 0x0849, /* Other PCI ID 0x084B */ + CARD_NVIDIA_GEFORCE_8200 = 0x0849, /* Other PCI ID 0x084b */ CARD_NVIDIA_GEFORCE_8300GS = 0x0423, CARD_NVIDIA_GEFORCE_8400GS = 0x0404, CARD_NVIDIA_GEFORCE_8500GT = 0x0421,

1 0

Henri Verbeet : d3d10/tests: Add a test for default state values.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: b15e7d7e237bd26f16c8bb69fe23dc5663339546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b15e7d7e237bd26f16c8bb69f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 20 00:24:28 2012 +0200 d3d10/tests: Add a test for default state values. --- dlls/d3d10/tests/effect.c | 177 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 177 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b15e7d7e237bd26f16c8b…

1 0

Henri Verbeet : d3d10: Add support for parsing rasterizer states.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: a1fcb537993693f4d04be0ce89b65b523d1b2af2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1fcb537993693f4d04be0ce8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 20 00:24:29 2012 +0200 d3d10: Add support for parsing rasterizer states. --- dlls/d3d10/effect.c | 182 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 175 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1fcb537993693f4d04be…

1 0

Henri Verbeet : d3d10: Implement d3d10_effect_rasterizer_variable_GetBackingStore().
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 31fc68146cc2c65880c71ea1ab74884905d3c918 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31fc68146cc2c65880c71ea1a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 20 00:24:30 2012 +0200 d3d10: Implement d3d10_effect_rasterizer_variable_GetBackingStore(). --- dlls/d3d10/effect.c | 14 ++++++++++++-- dlls/d3d10/tests/effect.c | 26 ++++++++++++-------------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 8faa7eb..cba50e2 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -6250,9 +6250,19 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_rasterizer_variable_GetRasterizerS static HRESULT STDMETHODCALLTYPE d3d10_effect_rasterizer_variable_GetBackingStore(ID3D10EffectRasterizerVariable *iface, UINT index, D3D10_RASTERIZER_DESC *desc) { - FIXME("iface %p, index %u, desc %p stub!\n", iface, index, desc); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); + + if (index >= max(v->type->element_count, 1)) + { + WARN("Invalid index %u.\n", index); + return E_FAIL; + } + + *desc = ((D3D10_RASTERIZER_DESC *)v->data)[index]; + + return S_OK; } diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 196b3c8..089ded6 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3894,20 +3894,19 @@ static void test_effect_state_groups(ID3D10Device *device) v = effect->lpVtbl->GetVariableByName(effect, "rast_state"); r = v->lpVtbl->AsRasterizer(v); - memset(&rast_desc, 0, sizeof(rast_desc)); r->lpVtbl->GetBackingStore(r, 0, &rast_desc); - todo_wine ok(rast_desc.FillMode == D3D10_FILL_WIREFRAME, "Got unexpected FillMode %#x.\n", rast_desc.FillMode); - todo_wine ok(rast_desc.CullMode == D3D10_CULL_FRONT, "Got unexpected CullMode %#x.\n", rast_desc.CullMode); - todo_wine ok(rast_desc.FrontCounterClockwise, "Got unexpected FrontCounterClockwise %#x.\n", + ok(rast_desc.FillMode == D3D10_FILL_WIREFRAME, "Got unexpected FillMode %#x.\n", rast_desc.FillMode); + ok(rast_desc.CullMode == D3D10_CULL_FRONT, "Got unexpected CullMode %#x.\n", rast_desc.CullMode); + ok(rast_desc.FrontCounterClockwise, "Got unexpected FrontCounterClockwise %#x.\n", rast_desc.FrontCounterClockwise); - todo_wine ok(rast_desc.DepthBias == -4, "Got unexpected DepthBias %#x.\n", rast_desc.DepthBias); - todo_wine ok(rast_desc.DepthBiasClamp == 0.5f, "Got unexpected DepthBiasClamp %.8e.\n", rast_desc.DepthBiasClamp); - todo_wine ok(rast_desc.SlopeScaledDepthBias == 0.25f, "Got unexpected SlopeScaledDepthBias %.8e.\n", + ok(rast_desc.DepthBias == -4, "Got unexpected DepthBias %#x.\n", rast_desc.DepthBias); + ok(rast_desc.DepthBiasClamp == 0.5f, "Got unexpected DepthBiasClamp %.8e.\n", rast_desc.DepthBiasClamp); + ok(rast_desc.SlopeScaledDepthBias == 0.25f, "Got unexpected SlopeScaledDepthBias %.8e.\n", rast_desc.SlopeScaledDepthBias); ok(!rast_desc.DepthClipEnable, "Got unexpected DepthClipEnable %#x.\n", rast_desc.DepthClipEnable); - todo_wine ok(rast_desc.ScissorEnable, "Got unexpected ScissorEnable %#x.\n", rast_desc.ScissorEnable); - todo_wine ok(rast_desc.MultisampleEnable, "Got unexpected MultisampleEnable %#x.\n", rast_desc.MultisampleEnable); - todo_wine ok(rast_desc.AntialiasedLineEnable, "Got unexpected AntialiasedLineEnable %#x.\n", + ok(rast_desc.ScissorEnable, "Got unexpected ScissorEnable %#x.\n", rast_desc.ScissorEnable); + ok(rast_desc.MultisampleEnable, "Got unexpected MultisampleEnable %#x.\n", rast_desc.MultisampleEnable); + ok(rast_desc.AntialiasedLineEnable, "Got unexpected AntialiasedLineEnable %#x.\n", rast_desc.AntialiasedLineEnable); technique = effect->lpVtbl->GetTechniqueByName(effect, "tech0"); @@ -4145,17 +4144,16 @@ static void test_effect_state_group_defaults(ID3D10Device *device) v = effect->lpVtbl->GetVariableByName(effect, "rast_state"); r = v->lpVtbl->AsRasterizer(v); - memset(&rast_desc, 0, sizeof(rast_desc)); r->lpVtbl->GetBackingStore(r, 0, &rast_desc); - todo_wine ok(rast_desc.FillMode == D3D10_FILL_SOLID, "Got unexpected FillMode %#x.\n", rast_desc.FillMode); - todo_wine ok(rast_desc.CullMode == D3D10_CULL_BACK, "Got unexpected CullMode %#x.\n", rast_desc.CullMode); + ok(rast_desc.FillMode == D3D10_FILL_SOLID, "Got unexpected FillMode %#x.\n", rast_desc.FillMode); + ok(rast_desc.CullMode == D3D10_CULL_BACK, "Got unexpected CullMode %#x.\n", rast_desc.CullMode); ok(!rast_desc.FrontCounterClockwise, "Got unexpected FrontCounterClockwise %#x.\n", rast_desc.FrontCounterClockwise); ok(rast_desc.DepthBias == 0, "Got unexpected DepthBias %#x.\n", rast_desc.DepthBias); ok(rast_desc.DepthBiasClamp == 0.0f, "Got unexpected DepthBiasClamp %.8e.\n", rast_desc.DepthBiasClamp); ok(rast_desc.SlopeScaledDepthBias == 0.0f, "Got unexpected SlopeScaledDepthBias %.8e.\n", rast_desc.SlopeScaledDepthBias); - todo_wine ok(rast_desc.DepthClipEnable, "Got unexpected DepthClipEnable %#x.\n", rast_desc.DepthClipEnable); + ok(rast_desc.DepthClipEnable, "Got unexpected DepthClipEnable %#x.\n", rast_desc.DepthClipEnable); ok(!rast_desc.ScissorEnable, "Got unexpected ScissorEnable %#x.\n", rast_desc.ScissorEnable); ok(!rast_desc.MultisampleEnable, "Got unexpected MultisampleEnable %#x.\n", rast_desc.MultisampleEnable); ok(!rast_desc.AntialiasedLineEnable, "Got unexpected AntialiasedLineEnable %#x.\n",

1 0

Nikolay Sivov : kernel32: Partial CompareStringEx implementation.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 0e234f3c25383b8576deab5d7c8517edb03c100b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e234f3c25383b8576deab5d7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 20 10:30:46 2012 +0400 kernel32: Partial CompareStringEx implementation. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 31 ++++++++++++++++++++++--------- include/winnls.h | 1 + 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7c8f9e2..c5518ce 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -200,6 +200,7 @@ @ stdcall CompareFileTime(ptr ptr) @ stdcall CompareStringA(long long str long str long) @ stdcall CompareStringW(long long wstr long wstr long) +@ stdcall CompareStringEx(wstr long wstr long wstr long ptr ptr long) @ stdcall ConnectNamedPipe(long ptr) @ stub ConsoleMenuControl @ stub ConsoleSubst diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 748969e..d627bdb 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2865,18 +2865,31 @@ INT WINAPI FoldStringW(DWORD dwFlags, LPCWSTR src, INT srclen, * * See CompareStringA. */ -INT WINAPI CompareStringW(LCID lcid, DWORD style, +INT WINAPI CompareStringW(LCID lcid, DWORD flags, LPCWSTR str1, INT len1, LPCWSTR str2, INT len2) { + return CompareStringEx(NULL, flags, str1, len1, str2, len2, NULL, NULL, 0); +} + +/****************************************************************************** + * CompareStringEx (KERNEL32.@) + */ +INT WINAPI CompareStringEx(LPCWSTR locale, DWORD flags, LPCWSTR str1, INT len1, + LPCWSTR str2, INT len2, LPNLSVERSIONINFO version, LPVOID reserved, LPARAM lParam) +{ INT ret; + if (version) FIXME("unexpected version parameter\n"); + if (reserved) FIXME("unexpected reserved value\n"); + if (lParam) FIXME("unexpected lParam\n"); + if (!str1 || !str2) { SetLastError(ERROR_INVALID_PARAMETER); return 0; } - if( style & ~(NORM_IGNORECASE|NORM_IGNORENONSPACE|NORM_IGNORESYMBOLS| + if( flags & ~(NORM_IGNORECASE|NORM_IGNORENONSPACE|NORM_IGNORESYMBOLS| SORT_STRINGSORT|NORM_IGNOREKANATYPE|NORM_IGNOREWIDTH|LOCALE_USE_CP_ACP|0x10000000) ) { SetLastError(ERROR_INVALID_FLAGS); @@ -2884,13 +2897,13 @@ INT WINAPI CompareStringW(LCID lcid, DWORD style, } /* this style is related to diacritics in Arabic, Japanese, and Hebrew */ - if (style & 0x10000000) - WARN("Ignoring unknown style 0x10000000\n"); + if (flags & 0x10000000) + WARN("Ignoring unknown flags 0x10000000\n"); if (len1 < 0) len1 = strlenW(str1); if (len2 < 0) len2 = strlenW(str2); - ret = wine_compare_string(style, str1, len1, str2, len2); + ret = wine_compare_string(flags, str1, len1, str2, len2); if (ret) /* need to translate result */ return (ret < 0) ? CSTR_LESS_THAN : CSTR_GREATER_THAN; @@ -2904,7 +2917,7 @@ INT WINAPI CompareStringW(LCID lcid, DWORD style, * * PARAMS * lcid [I] LCID for the comparison - * style [I] Flags for the comparison (NORM_ constants from "winnls.h"). + * flags [I] Flags for the comparison (NORM_ constants from "winnls.h"). * str1 [I] First string to compare * len1 [I] Length of str1, or -1 if str1 is NUL terminated * str2 [I] Second string to compare @@ -2915,7 +2928,7 @@ INT WINAPI CompareStringW(LCID lcid, DWORD style, * str1 is less than, equal to or greater than str2 respectively. * Failure: FALSE. Use GetLastError() to determine the cause. */ -INT WINAPI CompareStringA(LCID lcid, DWORD style, +INT WINAPI CompareStringA(LCID lcid, DWORD flags, LPCSTR str1, INT len1, LPCSTR str2, INT len2) { WCHAR *buf1W = NtCurrentTeb()->StaticUnicodeBuffer; @@ -2932,7 +2945,7 @@ INT WINAPI CompareStringA(LCID lcid, DWORD style, if (len1 < 0) len1 = strlen(str1); if (len2 < 0) len2 = strlen(str2); - if (!(style & LOCALE_USE_CP_ACP)) locale_cp = get_lcid_codepage( lcid ); + if (!(flags & LOCALE_USE_CP_ACP)) locale_cp = get_lcid_codepage( lcid ); if (len1) { @@ -2981,7 +2994,7 @@ INT WINAPI CompareStringA(LCID lcid, DWORD style, str2W = buf2W; } - ret = CompareStringW(lcid, style, str1W, len1W, str2W, len2W); + ret = CompareStringEx(NULL, flags, str1W, len1W, str2W, len2W, NULL, NULL, 0); if (str1W != buf1W) HeapFree(GetProcessHeap(), 0, str1W); if (str2W != buf2W) HeapFree(GetProcessHeap(), 0, str2W); diff --git a/include/winnls.h b/include/winnls.h index b52209c..d6bbc13 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -772,6 +772,7 @@ enum SYSGEOCLASS WINBASEAPI INT WINAPI CompareStringA(LCID,DWORD,LPCSTR,INT,LPCSTR,INT); WINBASEAPI INT WINAPI CompareStringW(LCID,DWORD,LPCWSTR,INT,LPCWSTR,INT); #define CompareString WINELIB_NAME_AW(CompareString) +WINBASEAPI INT WINAPI CompareStringEx(LPCWSTR,DWORD,LPCWSTR,INT,LPCWSTR,INT,LPNLSVERSIONINFO,LPVOID,LPARAM); WINBASEAPI LCID WINAPI ConvertDefaultLocale(LCID); WINBASEAPI BOOL WINAPI EnumCalendarInfoA(CALINFO_ENUMPROCA,LCID,CALID,CALTYPE); WINBASEAPI BOOL WINAPI EnumCalendarInfoW(CALINFO_ENUMPROCW,LCID,CALID,CALTYPE);

1 0

Thomas Faber : comdlg32: Do not modify dialog resource directly.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: bbf2cce16041e90d621a1f5889ea1bd760e21a0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbf2cce16041e90d621a1f588… Author: Thomas Faber <thfabba(a)gmx.de> Date: Fri Jul 20 08:33:08 2012 +0200 comdlg32: Do not modify dialog resource directly. --- dlls/comdlg32/filedlg.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 3e7ee4f..c49ed20 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -252,7 +252,9 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) { LRESULT lRes; - LPVOID template; + LPCVOID origTemplate; + DWORD dwSize; + LPDLGTEMPLATEW template; HRSRC hRes; HANDLE hDlgTmpl = 0; HRESULT hr; @@ -271,12 +273,19 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE); return FALSE; } - if (!(hDlgTmpl = LoadResource(COMDLG32_hInstance, hRes )) || - !(template = LockResource( hDlgTmpl ))) + if (!(dwSize = SizeofResource(COMDLG32_hInstance, hRes)) || + !(hDlgTmpl = LoadResource(COMDLG32_hInstance, hRes)) || + !(origTemplate = LockResource(hDlgTmpl))) { COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); return FALSE; } + if (!(template = HeapAlloc(GetProcessHeap(), 0, dwSize))) + { + COMDLG32_SetCommDlgExtendedError(CDERR_MEMALLOCFAILURE); + return FALSE; + } + memcpy(template, origTemplate, dwSize); /* msdn: explorer style dialogs permit sizing by default. * The OFN_ENABLESIZING flag is only needed when a hook or @@ -287,12 +296,12 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) { - ((LPDLGTEMPLATEW)template)->style |= WS_SIZEBOX; + template->style |= WS_SIZEBOX; fodInfos->sizedlg.cx = fodInfos->sizedlg.cy = 0; fodInfos->initial_size.x = fodInfos->initial_size.y = 0; } else - ((LPDLGTEMPLATEW)template)->style &= ~WS_SIZEBOX; + template->style &= ~WS_SIZEBOX; /* old style hook messages */ @@ -322,6 +331,8 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) if (SUCCEEDED(hr)) OleUninitialize(); + HeapFree(GetProcessHeap(), 0, template); + /* Unable to create the dialog */ if( lRes == -1) return FALSE;

1 0

Alexandre Julliard : opengl32: Declare input pointers as const in function prototypes.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 782e96b910ca2c90b2518c14db7f6c9358eef010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=782e96b910ca2c90b2518c14d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 19 22:17:14 2012 +0200 opengl32: Declare input pointers as const in function prototypes. --- dlls/opengl32/make_opengl | 5 +- dlls/opengl32/opengl_ext.c | 1626 +++++++++++++++++++------------------- dlls/opengl32/opengl_norm.c | 484 ++++++------ include/wine/wgl_driver.h | 1868 +++++++++++++++++++++--------------------- 4 files changed, 1992 insertions(+), 1991 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=782e96b910ca2c90b2518…

1 0

Alexandre Julliard : opengl32: Move the wgl functions to the main OpenGL function table.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 4c0779006efa0f491d13c6df42b26bb44258ff51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c0779006efa0f491d13c6df4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 18 23:58:41 2012 +0200 opengl32: Move the wgl functions to the main OpenGL function table. --- dlls/gdi32/driver.c | 73 +----------------------------------------- dlls/gdi32/opengl.c | 4 +- dlls/opengl32/make_opengl | 46 ++++++++++++++++++++++++-- dlls/opengl32/opengl_norm.c | 28 +++++++++++++++- dlls/opengl32/wgl.c | 56 +++++++++++++++++--------------- dlls/wined3d/directx.c | 10 ++++-- dlls/winex11.drv/opengl.c | 41 ++++++++++++------------ include/wine/gdi_driver.h | 26 ++------------- include/wine/wgl_driver.h | 20 +++++++++++- 9 files changed, 152 insertions(+), 152 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c0779006efa0f491d13c…

1 0

Alexandre Julliard : gdi32: Remove left-over debug trace.
by Alexandre Julliard 19 Jul '12

19 Jul '12

Module: wine Branch: master Commit: 6a8ded433bcabee8b50b333c161aa3387d688cf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a8ded433bcabee8b50b333c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 19 20:27:39 2012 +0200 gdi32: Remove left-over debug trace. --- dlls/gdi32/dibdrv/objects.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index b3f058d..04548ce 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1991,10 +1991,6 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, static BOOL null_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, int num, const RECT *rects, INT rop) { - if (rop == 1) - { - ERR("(%p, %s, BLACKNESS)\n", pdev, wine_dbgstr_rect(rects)); - } return TRUE; }

1 0