June 2013 - Wine-commits - list.winehq.org

Piotr Caban : msvcrt: Don' t call invalid parameter handler when string to be tokenized and context are not set in mbstok .
by Alexandre Julliard 21 Jun '13

21 Jun '13

Module: wine Branch: master Commit: 779c1f8049879f67077cd64be42b3f8c097a3a47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=779c1f8049879f67077cd64be… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 21 12:17:33 2013 +0200 msvcrt: Don't call invalid parameter handler when string to be tokenized and context are not set in mbstok. --- dlls/msvcr100/msvcr100.c | 6 ++++++ dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 7 ++++++- include/msvcrt/mbstring.h | 1 + 9 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index d425455..28d4d6e 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -25,6 +25,7 @@ #include "stdlib.h" #include "errno.h" #include "malloc.h" +#include "mbstring.h" #include "limits.h" #include "sys/stat.h" #include "windef.h" @@ -489,6 +490,11 @@ int CDECL MSVCR100_atoi(const char *str) return _atoi_l(str, NULL); } +unsigned char* CDECL MSVCR100__mbstok(unsigned char *str, const unsigned char *delim) +{ + return _mbstok_l(str, delim, NULL); +} + /********************************************************************* * DllMain (MSVCR100.@) */ diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 63a0caa..8e728c1 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1182,7 +1182,7 @@ @ stub _mbsspnp_l @ cdecl _mbsstr(str str) msvcrt._mbsstr @ stub _mbsstr_l -@ cdecl _mbstok(str str) msvcrt._mbstok +@ cdecl _mbstok(str str) MSVCR100__mbstok @ cdecl _mbstok_l(str str ptr) msvcrt._mbstok_l @ cdecl _mbstok_s(str str ptr) msvcrt._mbstok_s @ cdecl _mbstok_s_l(str str ptr ptr) msvcrt._mbstok_s_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index e82f100..7b43159 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1544,7 +1544,7 @@ @ stub _mbsspnp_l @ cdecl _mbsstr(str str) msvcrt._mbsstr @ stub _mbsstr_l -@ cdecl _mbstok(str str) msvcrt._mbstok +@ cdecl _mbstok(str str) msvcr100._mbstok #don't forward to msvcrt @ cdecl _mbstok_l(str str ptr) msvcrt._mbstok_l @ cdecl _mbstok_s(str str ptr) msvcrt._mbstok_s @ cdecl _mbstok_s_l(str str ptr ptr) msvcrt._mbstok_s_l diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 1a33fbb..dc6dc03 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -468,7 +468,7 @@ @ cdecl _mbsspn(str str) msvcrt._mbsspn @ cdecl _mbsspnp(str str) msvcrt._mbsspnp @ cdecl _mbsstr(str str) msvcrt._mbsstr -@ cdecl _mbstok(str str) msvcrt._mbstok +@ cdecl _mbstok(str str) msvcr100._mbstok #don't forward to msvcrt @ cdecl _mbstrlen(str) msvcrt._mbstrlen @ cdecl _mbsupr(str) msvcrt._mbsupr @ cdecl _memccpy(ptr ptr long long) msvcrt._memccpy diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index afdab05..3e3cf6f 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -463,7 +463,7 @@ @ cdecl _mbsspn(str str) msvcrt._mbsspn @ cdecl _mbsspnp(str str) msvcrt._mbsspnp @ cdecl _mbsstr(str str) msvcrt._mbsstr -@ cdecl _mbstok(str str) msvcrt._mbstok +@ cdecl _mbstok(str str) msvcr100._mbstok #don't forward to msvcrt @ cdecl _mbstrlen(str) msvcrt._mbstrlen @ cdecl _mbsupr(str) msvcrt._mbsupr @ cdecl _memccpy(ptr ptr long long) msvcrt._memccpy diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 521a69d..2344f0f 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -853,7 +853,7 @@ @ stub _mbsspnp_l @ cdecl _mbsstr(str str) msvcrt._mbsstr @ stub _mbsstr_l -@ cdecl _mbstok(str str) msvcrt._mbstok +@ cdecl _mbstok(str str) msvcr100._mbstok #don't forward to msvcrt @ cdecl _mbstok_l(str str ptr) msvcrt._mbstok_l @ cdecl _mbstok_s(str str ptr) msvcrt._mbstok_s @ cdecl _mbstok_s_l(str str ptr ptr) msvcrt._mbstok_s_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index fd71ef4..e31da91 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -831,7 +831,7 @@ @ stub _mbsspnp_l @ cdecl _mbsstr(str str) msvcrt._mbsstr @ stub _mbsstr_l -@ cdecl _mbstok(str str) msvcrt._mbstok +@ cdecl _mbstok(str str) msvcr100._mbstok #don't forward to msvcrt @ cdecl _mbstok_l(str str ptr) msvcrt._mbstok_l @ cdecl _mbstok_s(str str ptr) msvcrt._mbstok_s @ cdecl _mbstok_s_l(str str ptr ptr) msvcrt._mbstok_s_l diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index b70ffa0..b25649b6 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1149,7 +1149,12 @@ unsigned char* CDECL _mbstok_l(unsigned char *str, */ unsigned char* CDECL _mbstok(unsigned char *str, const unsigned char *delim) { - return _mbstok_s_l(str, delim, &msvcrt_get_thread_data()->mbstok_next, NULL); + thread_data_t *data = msvcrt_get_thread_data(); + + if(!str && !data->mbstok_next) + return NULL; + + return _mbstok_s_l(str, delim, &data->mbstok_next, NULL); } /********************************************************************* diff --git a/include/msvcrt/mbstring.h b/include/msvcrt/mbstring.h index a4d0746..7a40f7b 100644 --- a/include/msvcrt/mbstring.h +++ b/include/msvcrt/mbstring.h @@ -102,6 +102,7 @@ size_t __cdecl _mbsspn(const unsigned char*,const unsigned char*); unsigned char* __cdecl _mbsspnp(const unsigned char*,const unsigned char*); unsigned char* __cdecl _mbsstr(const unsigned char*,const unsigned char*); unsigned char* __cdecl _mbstok(unsigned char*,const unsigned char*); +unsigned char* __cdecl _mbstok_l(unsigned char*,const unsigned char*,_locale_t); unsigned char* __cdecl _mbsupr(unsigned char*); #ifndef _MBLEADTRAIL_DEFINED

1 0

Piotr Caban : msvcrt: Add some _mbstok tests.
by Alexandre Julliard 21 Jun '13

21 Jun '13

Module: wine Branch: master Commit: eb13a49de9e153a2a9e3b436198cf17313b0fb13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb13a49de9e153a2a9e3b4361… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 21 12:17:43 2013 +0200 msvcrt: Add some _mbstok tests. --- dlls/msvcr90/tests/msvcr90.c | 5 +++++ dlls/msvcrt/tests/string.c | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index fe3fa58..e4eee04 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -93,6 +93,7 @@ static __msvcrt_ulong* (__cdecl *p_doserrno)(void); static void (__cdecl *p_srand)(unsigned int); static char* (__cdecl *p_strtok)(char*, const char*); static wchar_t* (__cdecl *p_wcstok)(wchar_t*, const wchar_t*); +static unsigned char* (__cdecl *p__mbstok)(unsigned char*, const unsigned char*); static char* (__cdecl *p_strerror)(int); static wchar_t* (__cdecl *p_wcserror)(int); static char* (__cdecl *p_tmpnam)(char*); @@ -279,6 +280,7 @@ static BOOL init(void) SET(p_srand, "srand"); SET(p_strtok, "strtok"); SET(p_wcstok, "wcstok"); + SET(p__mbstok, "_mbstok"); SET(p_strerror, "strerror"); SET(p_wcserror, "_wcserror"); SET(p_tmpnam, "tmpnam"); @@ -1038,6 +1040,7 @@ static void test_getptd(void) DWORD tid = GetCurrentThreadId(); wchar_t testW[] = {'t','e','s','t',0}, tW[] = {'t',0}, *wp; char test[] = "test", *p; + unsigned char mbstok_test[] = "test", *up; struct tm time; __time64_t secs = 0; int dec, sign; @@ -1053,6 +1056,8 @@ static void test_getptd(void) ok(ptd->strtok_next == p+3, "ptd->strtok_next is incorrect\n"); wp = p_wcstok(testW, tW); ok(ptd->wcstok_next == wp+3, "ptd->wcstok_next is incorrect\n"); + up = p__mbstok(mbstok_test, (unsigned char*)"t"); + ok(ptd->mbstok_next == up+3, "ptd->mbstok_next is incorrect\n"); ok(p_strerror(0) == ptd->strerror_buffer, "ptd->strerror_buffer is incorrect\n"); ok(p_wcserror(0) == ptd->wcserror_buffer, "ptd->wcserror_buffer is incorrect\n"); ok(p_tmpnam(NULL) == ptd->tmpnam_buffer, "ptd->tmpnam_buffer is incorrect\n"); diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 6115377..15b6e4d 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2193,6 +2193,24 @@ static void test__mbslwr_s(void) buffer); } +static void test__mbstok(void) +{ + const unsigned char delim[] = "t"; + + char str[] = "!.!test"; + unsigned char *ret; + + strtok(str, "!"); + + ret = _mbstok(NULL, delim); + /* most versions of msvcrt use the same buffer for strtok and _mbstok */ + ok(!ret || broken((char*)ret==str+4), + "_mbstok(NULL, \"t\") = %p, expected NULL (%p)\n", ret, str); + + ret = _mbstok(NULL, delim); + ok(!ret, "_mbstok(NULL, \"t\") = %p, expected NULL\n", ret); +} + static void test__ultoa_s(void) { errno_t ret; @@ -2615,6 +2633,7 @@ START_TEST(string) test_mbctombb(); test_ismbclegal(); test_strtok(); + test__mbstok(); test_wcscpy_s(); test__wcsupr_s(); test_strtol();

1 0

Piotr Caban : msvcrt: Don't forward memchr to ntdll.
by Alexandre Julliard 21 Jun '13

21 Jun '13

Module: wine Branch: master Commit: bba1db09051f954e5eb0468c5e70b9ee8274b8b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bba1db09051f954e5eb0468c5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 21 15:39:23 2013 +0200 msvcrt: Don't forward memchr to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 55ebba9..afb12bf 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1367,7 +1367,7 @@ @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc -@ cdecl memchr(ptr long long) ntdll.memchr +@ cdecl memchr(ptr long long) MSVCRT_memchr @ cdecl memcmp(ptr ptr long) ntdll.memcmp @ cdecl memcpy(ptr ptr long) MSVCRT_memcpy @ cdecl memcpy_s(ptr long ptr long) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index f2d1e20..c5d0e18 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1616,6 +1616,14 @@ char* __cdecl MSVCRT_strchr(const char *str, int c) } /********************************************************************* + * memchr (MSVCRT.@) + */ +void* __cdecl MSVCRT_memchr(const void *ptr, int c, MSVCRT_size_t n) +{ + return memchr(ptr, c, n); +} + +/********************************************************************* * strncmp (MSVCRT.@) */ int __cdecl MSVCRT_strncmp(const char *str1, const char *str2, MSVCRT_size_t len)

1 0

Stefan Dösinger : wined3d: Fix the TMP_COLOR optimization with custom fog.
by Alexandre Julliard 21 Jun '13

21 Jun '13

Module: wine Branch: master Commit: 248f4b74150b1517996396340cfe6c0c7d43cfcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=248f4b74150b1517996396340… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jun 21 12:06:50 2013 +0200 wined3d: Fix the TMP_COLOR optimization with custom fog. --- dlls/wined3d/arb_program_shader.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8984e91..a9894da 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -278,7 +278,7 @@ struct shader_arb_ctx_priv BOOL muted; unsigned int num_loops, loop_depth, num_ifcs; int aL; - BOOL custom_linear_fog; + BOOL ps_post_process; unsigned int vs_clipplanes; BOOL footer_written; @@ -1161,8 +1161,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction break; case WINED3DSPR_COLOROUT: - if ((ctx->cur_ps_args->super.srgb_correction || ctx->custom_linear_fog) - && !reg->idx[0].offset) + if (ctx->ps_post_process && !reg->idx[0].offset) { strcpy(register_name, "TMP_COLOR"); } @@ -1852,9 +1851,9 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) } else if (ins->dst[0].reg.type == WINED3DSPR_COLOROUT && !ins->dst[0].reg.idx[0].offset && pshader) { - if (ctx->cur_ps_args->super.srgb_correction && shader->u.ps.color0_mov) + if (ctx->ps_post_process && shader->u.ps.color0_mov) { - shader_addline(buffer, "#mov handled in srgb write code\n"); + shader_addline(buffer, "#mov handled in srgb write or fog code\n"); return; } shader_hw_map2gl(ins); @@ -3585,6 +3584,7 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, struct arb_pshader_private *shader_priv = shader->backend_data; GLint errPos; DWORD map; + BOOL custom_linear_fog = FALSE; char srgbtmp[4][4]; unsigned int i, found = 0; @@ -3632,7 +3632,7 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, priv_ctx.cur_np2fixup_info = &compiled->np2fixup_info; init_ps_input(shader, args, &priv_ctx); list_init(&priv_ctx.control_frames); - priv_ctx.custom_linear_fog = FALSE; + priv_ctx.ps_post_process = args->super.srgb_correction; /* Avoid enabling NV_fragment_program* if we do not need it. * @@ -3687,7 +3687,8 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, case WINED3D_FFP_PS_FOG_LINEAR: if (gl_info->quirks & WINED3D_QUIRK_BROKEN_ARB_FOG) { - priv_ctx.custom_linear_fog = TRUE; + custom_linear_fog = TRUE; + priv_ctx.ps_post_process = TRUE; break; } shader_addline(buffer, "OPTION ARB_fog_linear;\n"); @@ -3719,7 +3720,7 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, } else { - if (args->super.srgb_correction || priv_ctx.custom_linear_fog) + if (priv_ctx.ps_post_process) { if (shader->u.ps.color0_mov) { @@ -3870,7 +3871,7 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, priv_ctx.target_version >= NV2); } - if (priv_ctx.custom_linear_fog) + if (custom_linear_fog) arbfp_add_linear_fog(buffer, fragcolor, "TA"); if(strcmp(fragcolor, "result.color")) {

1 0

Stefan Dösinger : ddraw: Send device2_Draw* through device3_Draw*.
by Alexandre Julliard 20 Jun '13

20 Jun '13

Module: wine Branch: master Commit: 669611b4bea5e4d03f883095c89d80c194ca4556 URL: http://source.winehq.org/git/wine.git/?a=commit;h=669611b4bea5e4d03f883095c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 20 14:00:01 2013 +0200 ddraw: Send device2_Draw* through device3_Draw*. --- dlls/ddraw/device.c | 78 +++++++++++++++++++++++++------------------------- 1 files changed, 39 insertions(+), 39 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 7235949..b9058b0 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2190,43 +2190,6 @@ static HRESULT WINAPI d3d_device2_Index(IDirect3DDevice2 *iface, WORD index) } /***************************************************************************** - * IDirect3DDevice3::End - * - * Ends a draw begun with IDirect3DDevice3::Begin or - * IDirect3DDevice::BeginIndexed. The vertices specified with - * IDirect3DDevice::Vertex or IDirect3DDevice::Index are drawn using - * the IDirect3DDevice7::DrawPrimitive method. So far only - * non-indexed mode is supported - * - * Version 2 and 3 - * - * Params: - * Flags: Some flags, as usual. Don't know which are defined - * - * Returns: - * The return value of IDirect3DDevice7::DrawPrimitive - * - *****************************************************************************/ -static HRESULT WINAPI d3d_device3_End(IDirect3DDevice3 *iface, DWORD flags) -{ - struct d3d_device *device = impl_from_IDirect3DDevice3(iface); - - TRACE("iface %p, flags %#x.\n", iface, flags); - - return IDirect3DDevice7_DrawPrimitive(&device->IDirect3DDevice7_iface, device->primitive_type, - device->vertex_type, device->sysmem_vertex_buffer, device->nb_vertices, device->render_flags); -} - -static HRESULT WINAPI d3d_device2_End(IDirect3DDevice2 *iface, DWORD flags) -{ - struct d3d_device *device = impl_from_IDirect3DDevice2(iface); - - TRACE("iface %p, flags %#x.\n", iface, flags); - - return d3d_device3_End(&device->IDirect3DDevice3_iface, flags); -} - -/***************************************************************************** * IDirect3DDevice7::GetRenderState * * Returns the value of a render state. The possible render states are @@ -3545,7 +3508,7 @@ static HRESULT WINAPI d3d_device2_DrawPrimitive(IDirect3DDevice2 *iface, return DDERR_INVALIDPARAMS; /* Should never happen */ } - return IDirect3DDevice7_DrawPrimitive(&device->IDirect3DDevice7_iface, + return d3d_device3_DrawPrimitive(&device->IDirect3DDevice3_iface, primitive_type, fvf, vertices, vertex_count, flags); } @@ -3728,11 +3691,48 @@ static HRESULT WINAPI d3d_device2_DrawIndexedPrimitive(IDirect3DDevice2 *iface, return DDERR_INVALIDPARAMS; /* Should never happen */ } - return IDirect3DDevice7_DrawIndexedPrimitive(&device->IDirect3DDevice7_iface, + return d3d_device3_DrawIndexedPrimitive(&device->IDirect3DDevice3_iface, primitive_type, fvf, vertices, vertex_count, indices, index_count, flags); } /***************************************************************************** + * IDirect3DDevice3::End + * + * Ends a draw begun with IDirect3DDevice3::Begin or + * IDirect3DDevice::BeginIndexed. The vertices specified with + * IDirect3DDevice::Vertex or IDirect3DDevice::Index are drawn using + * the IDirect3DDevice3::DrawPrimitive method. So far only + * non-indexed mode is supported + * + * Version 2 and 3 + * + * Params: + * Flags: Some flags, as usual. Don't know which are defined + * + * Returns: + * The return value of IDirect3DDevice3::DrawPrimitive + * + *****************************************************************************/ +static HRESULT WINAPI d3d_device3_End(IDirect3DDevice3 *iface, DWORD flags) +{ + struct d3d_device *device = impl_from_IDirect3DDevice3(iface); + + TRACE("iface %p, flags %#x.\n", iface, flags); + + return d3d_device3_DrawPrimitive(&device->IDirect3DDevice3_iface, device->primitive_type, + device->vertex_type, device->sysmem_vertex_buffer, device->nb_vertices, device->render_flags); +} + +static HRESULT WINAPI d3d_device2_End(IDirect3DDevice2 *iface, DWORD flags) +{ + struct d3d_device *device = impl_from_IDirect3DDevice2(iface); + + TRACE("iface %p, flags %#x.\n", iface, flags); + + return d3d_device3_End(&device->IDirect3DDevice3_iface, flags); +} + +/***************************************************************************** * IDirect3DDevice7::SetClipStatus * * Sets the clip status. This defines things as clipping conditions and

1 0

Stefan Dösinger : ddraw: Device2 and Device3 do not have a lighting render state.
by Alexandre Julliard 20 Jun '13

20 Jun '13

Module: wine Branch: master Commit: c1663c55830f77d9648d8d06e936aaf6007bc6ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1663c55830f77d9648d8d06e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 20 14:00:02 2013 +0200 ddraw: Device2 and Device3 do not have a lighting render state. --- dlls/ddraw/device.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 15 ++------------- 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index b9058b0..09880dd 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1,7 +1,7 @@ /* * Copyright (c) 1998-2004 Lionel Ulmer * Copyright (c) 2002-2005 Christian Costa - * Copyright (c) 2006-2009, 2011-2012 Stefan Dösinger + * Copyright (c) 2006-2009, 2011-2013 Stefan Dösinger * Copyright (c) 2008 Alexander Dorofeyev * * This library is free software; you can redistribute it and/or @@ -2445,6 +2445,10 @@ static HRESULT WINAPI d3d_device3_GetRenderState(IDirect3DDevice3 *iface, return D3D_OK; } + case D3DRENDERSTATE_LIGHTING: + *value = 0xffffffff; + return D3D_OK; + default: return IDirect3DDevice7_GetRenderState(&device->IDirect3DDevice7_iface, state, value); } @@ -2800,6 +2804,10 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, break; } + case D3DRENDERSTATE_LIGHTING: + hr = D3D_OK; + break; + default: hr = IDirect3DDevice7_SetRenderState(&device->IDirect3DDevice7_iface, state, value); break; @@ -3475,6 +3483,22 @@ static HRESULT WINAPI d3d_device7_DrawPrimitive_FPUPreserve(IDirect3DDevice7 *if return hr; } +static void setup_lighting(const struct d3d_device *device, DWORD fvf, DWORD flags) +{ + BOOL enable; + + /* Ignore the D3DFVF_XYZRHW case here, wined3d takes care of that */ + if (flags & D3DDP_DONOTLIGHT) + enable = FALSE; + else if (!(fvf & D3DFVF_NORMAL)) + enable = FALSE; + else + enable = TRUE; + + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_LIGHTING, enable); +} + + static HRESULT WINAPI d3d_device3_DrawPrimitive(IDirect3DDevice3 *iface, D3DPRIMITIVETYPE primitive_type, DWORD fvf, void *vertices, DWORD vertex_count, DWORD flags) @@ -3484,6 +3508,8 @@ static HRESULT WINAPI d3d_device3_DrawPrimitive(IDirect3DDevice3 *iface, TRACE("iface %p, primitive_type %#x, fvf %#x, vertices %p, vertex_count %u, flags %#x.\n", iface, primitive_type, fvf, vertices, vertex_count, flags); + setup_lighting(device, fvf, flags); + return IDirect3DDevice7_DrawPrimitive(&device->IDirect3DDevice7_iface, primitive_type, fvf, vertices, vertex_count, flags); } @@ -3666,6 +3692,8 @@ static HRESULT WINAPI d3d_device3_DrawIndexedPrimitive(IDirect3DDevice3 *iface, "indices %p, index_count %u, flags %#x.\n", iface, primitive_type, fvf, vertices, vertex_count, indices, index_count, flags); + setup_lighting(device, fvf, flags); + return IDirect3DDevice7_DrawIndexedPrimitive(&device->IDirect3DDevice7_iface, primitive_type, fvf, vertices, vertex_count, indices, index_count, flags); } @@ -3972,6 +4000,8 @@ static HRESULT WINAPI d3d_device3_DrawPrimitiveStrided(IDirect3DDevice3 *iface, TRACE("iface %p, primitive_type %#x, FVF %#x, strided_data %p, vertex_count %u, flags %#x.\n", iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Flags); + setup_lighting(device, VertexType, Flags); + return IDirect3DDevice7_DrawPrimitiveStrided(&device->IDirect3DDevice7_iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Flags); } @@ -4097,6 +4127,8 @@ static HRESULT WINAPI d3d_device3_DrawIndexedPrimitiveStrided(IDirect3DDevice3 * TRACE("iface %p, primitive_type %#x, FVF %#x, strided_data %p, vertex_count %u, indices %p, index_count %u, flags %#x.\n", iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Indices, IndexCount, Flags); + setup_lighting(device, VertexType, Flags); + return IDirect3DDevice7_DrawIndexedPrimitiveStrided(&device->IDirect3DDevice7_iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Indices, IndexCount, Flags); } @@ -4189,6 +4221,8 @@ static HRESULT WINAPI d3d_device3_DrawPrimitiveVB(IDirect3DDevice3 *iface, D3DPR TRACE("iface %p, primitive_type %#x, vb %p, start_vertex %u, vertex_count %u, flags %#x.\n", iface, PrimitiveType, D3DVertexBuf, StartVertex, NumVertices, Flags); + setup_lighting(device, vb->fvf, Flags); + return IDirect3DDevice7_DrawPrimitiveVB(&device->IDirect3DDevice7_iface, PrimitiveType, &vb->IDirect3DVertexBuffer7_iface, StartVertex, NumVertices, Flags); } @@ -4320,6 +4354,8 @@ static HRESULT WINAPI d3d_device3_DrawIndexedPrimitiveVB(IDirect3DDevice3 *iface TRACE("iface %p, primitive_type %#x, vb %p, indices %p, index_count %u, flags %#x.\n", iface, PrimitiveType, D3DVertexBuf, Indices, IndexCount, Flags); + setup_lighting(device, vb->fvf, Flags); + return IDirect3DDevice7_DrawIndexedPrimitiveVB(&device->IDirect3DDevice7_iface, PrimitiveType, &vb->IDirect3DVertexBuffer7_iface, 0, IndexCount, Indices, IndexCount, Flags); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 80a2b27..178900f 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -902,13 +902,6 @@ static void test_depth_blit(void) {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}, {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}, }; - static const BOOL todo[4][4] = - { - {FALSE, FALSE, TRUE, TRUE}, - {FALSE, FALSE, TRUE, TRUE}, - {TRUE, TRUE, TRUE, TRUE}, - {TRUE, TRUE, TRUE, TRUE}, - }; DDSURFACEDESC ddsd_new, ddsd_existing; IDirect3DDevice2 *device; @@ -1056,12 +1049,8 @@ static void test_depth_blit(void) unsigned int x = 80 * ((2 * j) + 1); unsigned int y = 60 * ((2 * i) + 1); color = get_surface_color(rt, x, y); - if (todo[i][j]) - todo_wine ok(compare_color(color, expected_colors[i][j], 1), - "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected_colors[i][j], x, y, color); - else - ok(compare_color(color, expected_colors[i][j], 1), - "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected_colors[i][j], x, y, color); + ok(compare_color(color, expected_colors[i][j], 1), + "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected_colors[i][j], x, y, color); } } IDirectDrawSurface_Release(rt);

1 0

Stefan Dösinger : ddraw/tests: Test lighting control in different interface versions.
by Alexandre Julliard 20 Jun '13

20 Jun '13

Module: wine Branch: master Commit: 4b93cf707d44940f99b94d781c66f608f423feb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b93cf707d44940f99b94d781… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 20 14:00:03 2013 +0200 ddraw/tests: Test lighting control in different interface versions. --- dlls/ddraw/tests/ddraw2.c | 162 +++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 236 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 222 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 620 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b93cf707d44940f99b94…

1 0

Stefan Dösinger : ddraw/tests: Get rid of D3DRENDERSTATE_LIGHTING hacks in ddraw4.c.
by Alexandre Julliard 20 Jun '13

20 Jun '13

Module: wine Branch: master Commit: cf1e6a487a9a7250698d5496b067bd1bcfce3335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf1e6a487a9a7250698d5496b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 20 14:00:04 2013 +0200 ddraw/tests: Get rid of D3DRENDERSTATE_LIGHTING hacks in ddraw4.c. --- dlls/ddraw/tests/ddraw4.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index c31bc62..45c399b 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1127,8 +1127,6 @@ static void test_depth_blit(void) ok(SUCCEEDED(hr), "Failed to enable z testing, hr %#x.\n", hr); hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_ZFUNC, D3DCMP_LESSEQUAL); ok(SUCCEEDED(hr), "Failed to set the z function, hr %#x.\n", hr); - hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); - ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); U1(d3drect).x1 = U2(d3drect).y1 = 0; U3(d3drect).x2 = ddsd_existing.dwWidth; U4(d3drect).y2 = ddsd_existing.dwHeight; @@ -3243,8 +3241,6 @@ static void test_draw_strided(void) hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, D3DCLEAR_TARGET, 0x00000000, 0.0f, 0); ok(SUCCEEDED(hr), "Failed to clear the viewport, hr %#x.\n", hr); - hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); - ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); hr = IDirect3DDevice3_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr);

1 0

Stefan Leichter : msvcp100/tests: Fix dynamically loaded functions for platform arm.
by Alexandre Julliard 20 Jun '13

20 Jun '13

Module: wine Branch: master Commit: 9e3e9b49a5232ebf2d41bad84cb98be58e9ab068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3e9b49a5232ebf2d41bad84… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Jun 19 23:04:36 2013 +0200 msvcp100/tests: Fix dynamically loaded functions for platform arm. --- dlls/msvcp100/tests/string.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp100/tests/string.c b/dlls/msvcp100/tests/string.c index b33b145..5fb2003 100644 --- a/dlls/msvcp100/tests/string.c +++ b/dlls/msvcp100/tests/string.c @@ -100,11 +100,19 @@ static BOOL init(void) SET(_Yarn_char_c_str, "?_C_str@?$_Yarn(a)D@std@@QEBAPEBDXZ"); SET(_Yarn_char_empty, "?_Empty@?$_Yarn(a)D@std@@QEBA_NXZ"); }else { +#ifdef __arm__ + SET(_Yarn_char_ctor_cstr, "??0?$_Yarn(a)D@std@@QAA(a)PBD@Z"); + SET(_Yarn_char_copy_ctor, "??0?$_Yarn(a)D@std@@QAA(a)ABV01@@Z"); + SET(_Yarn_char_dtor, "??1?$_Yarn(a)D@std@@QAA(a)XZ"); + SET(_Yarn_char_c_str, "?_C_str@?$_Yarn(a)D@std@@QBAPBDXZ"); + SET(_Yarn_char_empty, "?_Empty@?$_Yarn(a)D@std@@QBA_NXZ"); +#else SET(_Yarn_char_ctor_cstr, "??0?$_Yarn(a)D@std@@QAE(a)PBD@Z"); SET(_Yarn_char_copy_ctor, "??0?$_Yarn(a)D@std@@QAE(a)ABV01@@Z"); SET(_Yarn_char_dtor, "??1?$_Yarn(a)D@std@@QAE(a)XZ"); SET(_Yarn_char_c_str, "?_C_str@?$_Yarn(a)D@std@@QBEPBDXZ"); SET(_Yarn_char_empty, "?_Empty@?$_Yarn(a)D@std@@QBE_NXZ"); +#endif /* __arm__ */ } init_thiscall_thunk();

1 0

Ken Thomases : winemac: Don' t complain that WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS is unrecognized.
by Alexandre Julliard 20 Jun '13

20 Jun '13

Module: wine Branch: master Commit: 92a67d4259404e98a1971ac75076e34905fdc166 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92a67d4259404e98a1971ac75… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 19 19:08:48 2013 -0500 winemac: Don't complain that WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS is unrecognized. --- dlls/winemac.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 5328489..3c0041b 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1239,7 +1239,7 @@ LRESULT CDECL macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) activate_on_focus_time = GetTickCount(); if (!activate_on_focus_time) activate_on_focus_time = 1; TRACE("WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS time %u\n", activate_on_focus_time); - break; + return 0; } FIXME("unrecognized window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp);

1 0