April 2010 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Use the rep instead of the apply function to determine if a state is used.
by Alexandre Julliard April 1, 2010

April 1, 2010

Module: wine Branch: master Commit: f70193b9156b2c2f2cb9912d29b56fe4dc2a2d13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f70193b9156b2c2f2cb9912d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 1 11:34:45 2010 +0200 wined3d: Use the rep instead of the apply function to determine if a state is used. --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 04de86f..3602b83 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5723,7 +5723,7 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ * applying later lines, but do not record anything in the state * table */ - if(!cur[i].content.apply) continue; + if (!cur[i].content.representative) continue; handlers = num_handlers(multistate_funcs[cur[i].state]); multistate_funcs[cur[i].state][handlers] = cur[i].content.apply;

1 0

Piotr Caban : msvcrt: Added implementation of _controlfp_s.
by Alexandre Julliard April 1, 2010

April 1, 2010

Module: wine Branch: master Commit: bfd0866be888d4f4e5e731615bad14aaa8a83616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfd0866be888d4f4e5e731615… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 1 12:41:06 2010 +0200 msvcrt: Added implementation of _controlfp_s. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/math.c | 21 +++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b48656e..b8876a4 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -327,7 +327,7 @@ @ stub _configthreadlocale @ cdecl _control87(long long) msvcrt._control87 @ cdecl _controlfp(long long) msvcrt._controlfp -@ stub _controlfp_s +@ cdecl _controlfp_s(ptr long long) msvcrt._controlfp_s @ cdecl _copysign( double double ) msvcrt._copysign @ varargs _cprintf(str) msvcrt._cprintf @ stub _cprintf_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index fd6c8df..dfb951c 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -319,7 +319,7 @@ @ stub _configthreadlocale @ cdecl _control87(long long) msvcrt._control87 @ cdecl _controlfp(long long) msvcrt._controlfp -@ stub _controlfp_s +@ cdecl _controlfp_s(ptr long long) msvcrt._controlfp_s @ cdecl _copysign( double double ) msvcrt._copysign @ varargs _cprintf(str) msvcrt._cprintf @ stub _cprintf_l diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 317c8eb..fb2cd86 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -702,6 +702,27 @@ unsigned int CDECL _controlfp(unsigned int newval, unsigned int mask) } /********************************************************************* + * _controlfp_s (MSVCRT.@) + */ +int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask) +{ + unsigned int flags; +#ifdef __i386__ + FIXME("(%p %u %u) semi-stub\n", cur, newval, mask); + + flags = _control87( newval, mask & ~MSVCRT__EM_DENORMAL ); + + if(cur) + *cur = flags; + + return 0; +#else + FIXME(":Not Implemented!\n"); + return 0; +#endif +} + +/********************************************************************* * _copysign (MSVCRT.@) */ double CDECL _copysign(double num, double sign) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 762563e..7205bd6 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -299,7 +299,7 @@ @ extern _commode MSVCRT__commode @ cdecl _control87(long long) @ cdecl _controlfp(long long) -# stub _controlfp_s +@ cdecl _controlfp_s(ptr long long) @ cdecl _copysign( double double ) @ varargs _cprintf(str) # stub _cprintf_l

1 0

Henri Verbeet : wined3d: Add a state table entry for WINED3DRS_INDEXEDVERTEXBLENDENABLE.
by Alexandre Julliard April 1, 2010

April 1, 2010

Module: wine Branch: master Commit: 8afeb34559ef89008270fbfa582817cade4c9f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8afeb34559ef89008270fbfa5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 1 11:34:48 2010 +0200 wined3d: Add a state table entry for WINED3DRS_INDEXEDVERTEXBLENDENABLE. --- dlls/wined3d/state.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4465b9d..ddf4f77 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5405,6 +5405,7 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), NULL }, EXT_POINT_PARAMETERS }, { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_TWEENFACTOR), { STATE_RENDER(WINED3DRS_VERTEXBLEND), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_RENDER(WINED3DRS_INDEXEDVERTEXBLENDENABLE), { STATE_RENDER(WINED3DRS_VERTEXBLEND), NULL }, WINED3D_GL_EXT_NONE }, /* Samplers for NP2 texture matrix adjustions. They are not needed if GL_ARB_texture_non_power_of_two is supported, * so register a NULL state handler in that case to get the vertex part of sampler() skipped(VTF is handled in the misc states.

1 0

Piotr Caban : msvcrt: Move invalid parameter tests to msvcr90.
by Alexandre Julliard April 1, 2010

April 1, 2010

Module: wine Branch: master Commit: f377e4be6b97db27d58a6da96d4867cd39fa2188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f377e4be6b97db27d58a6da96… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 1 12:39:50 2010 +0200 msvcrt: Move invalid parameter tests to msvcr90. --- dlls/msvcr90/tests/msvcr90.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/msvcrt/tests/string.c | 32 -------------------------------- 2 files changed, 36 insertions(+), 32 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 5fe00b2..3ff7135 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -35,6 +35,8 @@ static int *p_sys_nerr; static int* (__cdecl *p__sys_nerr)(void); static char **p_sys_errlist; static char** (__cdecl *p__sys_errlist)(void); +static __int64 (__cdecl *p_strtoi64)(const char *, char **, int); +static unsigned __int64 (__cdecl *p_strtoui64)(const char *, char **, int); int cb_called[4]; @@ -193,6 +195,37 @@ static void test_error_messages(void) ok(*p_sys_errlist == *(p__sys_errlist()), "p_sys_errlist != p__sys_errlist()\n"); } +static void test__strtoi64(void) +{ + __int64 res; + unsigned __int64 ures; + + if(!p_strtoi64 || !p_strtoui64) { + win_skip("_strtoi64 or _strtoui64 not found\n"); + return; + } + + if(!p_set_invalid_parameter_handler) { + win_skip("_set_invalid_parameter_handler not found\n"); + return; + } + + errno = 0xdeadbeef; + res = p_strtoi64(NULL, NULL, 10); + ok(res == 0, "res != 0\n"); + res = p_strtoi64("123", NULL, 1); + ok(res == 0, "res != 0\n"); + res = p_strtoi64("123", NULL, 37); + ok(res == 0, "res != 0\n"); + ures = p_strtoui64(NULL, NULL, 10); + ok(ures == 0, "res = %d\n", (int)ures); + ures = p_strtoui64("123", NULL, 1); + ok(ures == 0, "res = %d\n", (int)ures); + ures = p_strtoui64("123", NULL, 37); + ok(ures == 0, "res = %d\n", (int)ures); + ok(errno == 0xdeadbeef, "errno = %x\n", errno); +} + /* ########## */ START_TEST(msvcr90) @@ -219,8 +252,11 @@ START_TEST(msvcr90) p__sys_nerr = (void *) GetProcAddress(hcrt, "__sys_nerr"); p_sys_errlist = (void *) GetProcAddress(hcrt, "_sys_errlist"); p__sys_errlist = (void *) GetProcAddress(hcrt, "__sys_errlist"); + p_strtoi64 = (void *) GetProcAddress(hcrt, "_strtoi64"); + p_strtoui64 = (void *) GetProcAddress(hcrt, "_strtoui64"); test__initterm_e(); test__encode_pointer(); test_error_messages(); + test__strtoi64(); } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index a4926d9..c873d18 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -56,7 +56,6 @@ static int (__cdecl *p_wcsupr_s)(wchar_t *str, size_t size); static size_t (__cdecl *p_strnlen)(const char *, size_t); static __int64 (__cdecl *p_strtoi64)(const char *, char **, int); static unsigned __int64 (__cdecl *p_strtoui64)(const char *, char **, int); -static _invalid_parameter_handler *p_invalid_parameter; static int *p__mb_cur_max; static unsigned char *p_mbctype; @@ -65,17 +64,6 @@ static unsigned char *p_mbctype; HMODULE hMsvcrt; -void __cdecl test_invalid_parameter_handler(const wchar_t *expression, - const wchar_t *function, const wchar_t *file, - unsigned line, unsigned *res) -{ - ok(expression == NULL, "expression is not NULL\n"); - ok(function == NULL, "function is not NULL\n"); - ok(file == NULL, "file is not NULL\n"); - ok(line == 0, "line = %u\n", line); - ok(res == NULL, "res = %p\n", res); -} - static void test_swab( void ) { char original[] = "BADCFEHGJILKNMPORQTSVUXWZY@#"; char expected1[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ@#"; @@ -968,23 +956,6 @@ static void test__strtoi64(void) return; } - if(p_invalid_parameter) { - errno = 0xdeadbeef; - res = p_strtoi64(NULL, NULL, 10); - ok(res == 0, "res != 0\n"); - res = p_strtoi64(no1, NULL, 1); - ok(res == 0, "res != 0\n"); - res = p_strtoi64(no1, NULL, 37); - ok(res == 0, "res != 0\n"); - ures = p_strtoui64(NULL, NULL, 10); - ok(ures == 0, "res = %d\n", (int)ures); - ures = p_strtoui64(no1, NULL, 1); - ok(ures == 0, "res = %d\n", (int)ures); - ures = p_strtoui64(no1, NULL, 37); - ok(ures == 0, "res = %d\n", (int)ures); - ok(errno == 0xdeadbeef, "errno = %x\n", errno); - } - errno = 0xdeadbeef; res = p_strtoi64(no1, NULL, 10); ok(res == 31923, "res != 31923\n"); @@ -1123,9 +1094,6 @@ START_TEST(string) SET(pmemcmp,"memcmp"); SET(p_mbctype,"_mbctype"); SET(p__mb_cur_max,"__mb_cur_max"); - p_invalid_parameter = (void *)GetProcAddress( hMsvcrt,"_invalid_parameter"); - if(p_invalid_parameter) - *p_invalid_parameter = test_invalid_parameter_handler; pstrcpy_s = (void *)GetProcAddress( hMsvcrt,"strcpy_s" ); pstrcat_s = (void *)GetProcAddress( hMsvcrt,"strcat_s" ); p_mbsnbcpy_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcpy_s" );

1 0

Henri Verbeet : wined3d: Verify each state table entry has either a handler or a representative.
by Alexandre Julliard April 1, 2010

April 1, 2010

Module: wine Branch: master Commit: f4330add3928e06131ddc5ede6148ca4c268e9ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4330add3928e06131ddc5ede… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 1 11:34:47 2010 +0200 wined3d: Verify each state table entry has either a handler or a representative. --- dlls/wined3d/state.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 607ceab..4465b9d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5662,11 +5662,24 @@ static void validate_state_table(struct StateEntry *state_table) for (i = 0; i < STATE_HIGHEST + 1; ++i) { DWORD rep = state_table[i].representative; - if (rep && !state_table[rep].representative) + if (rep) { - ERR("State %s (%#x) has invalid representative %s (%#x).\n", - debug_d3dstate(i), i, debug_d3dstate(rep), rep); - state_table[i].representative = 0; + if (!state_table[rep].representative) + { + ERR("State %s (%#x) has invalid representative %s (%#x).\n", + debug_d3dstate(i), i, debug_d3dstate(rep), rep); + state_table[i].representative = 0; + } + + if (rep != i) + { + if (state_table[i].apply) + ERR("State %s (%#x) has both a handler and representative.\n", debug_d3dstate(i), i); + } + else if (!state_table[i].apply) + { + ERR("Self representing state %s (%#x) has no handler.\n", debug_d3dstate(i), i); + } } } }

1 0

Henri Verbeet : wined3d: Don't call directly into the state table.
by Alexandre Julliard April 1, 2010

April 1, 2010

Module: wine Branch: master Commit: 03c472bff09e702689c1d97a32bb832013dee8de URL: http://source.winehq.org/git/wine.git/?a=commit;h=03c472bff09e702689c1d97a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 1 11:34:44 2010 +0200 wined3d: Don't call directly into the state table. --- dlls/wined3d/arb_program_shader.c | 19 +++++++------------ dlls/wined3d/ati_fragment_shader.c | 5 ++--- dlls/wined3d/state.c | 21 ++++++--------------- dlls/wined3d/wined3d_private.h | 8 ++++++++ 4 files changed, 23 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8e613c9..3c67877 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5377,9 +5377,8 @@ static void set_bumpmat_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, s /* The pixel shader has to know the bump env matrix. Do a constants update if it isn't scheduled * anyway */ - if(!isStateDirty(context, STATE_PIXELSHADERCONSTANT)) { - device->StateTable[STATE_PIXELSHADERCONSTANT].apply(STATE_PIXELSHADERCONSTANT, stateblock, context); - } + if (!isStateDirty(context, STATE_PIXELSHADERCONSTANT)) + stateblock_apply_state(STATE_PIXELSHADERCONSTANT, stateblock, context); } if(device->shader_backend == &arb_program_shader_backend) { @@ -5414,9 +5413,8 @@ static void tex_bumpenvlum_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock /* The pixel shader has to know the luminance offset. Do a constants update if it * isn't scheduled anyway */ - if(!isStateDirty(context, STATE_PIXELSHADERCONSTANT)) { - device->StateTable[STATE_PIXELSHADERCONSTANT].apply(STATE_PIXELSHADERCONSTANT, stateblock, context); - } + if (!isStateDirty(context, STATE_PIXELSHADERCONSTANT)) + stateblock_apply_state(STATE_PIXELSHADERCONSTANT, stateblock, context); } if(device->shader_backend == &arb_program_shader_backend) { @@ -6007,13 +6005,10 @@ static void fragment_prog_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, if(!isStateDirty(context, device->StateTable[STATE_VSHADER].representative)) { device->shader_backend->shader_select(context, use_pshader, use_vshader); - if (!isStateDirty(context, STATE_VERTEXSHADERCONSTANT) && (use_vshader || use_pshader)) { - device->StateTable[STATE_VERTEXSHADERCONSTANT].apply(STATE_VERTEXSHADERCONSTANT, stateblock, context); - } - } - if(use_pshader) { - device->StateTable[STATE_PIXELSHADERCONSTANT].apply(STATE_PIXELSHADERCONSTANT, stateblock, context); + if (!isStateDirty(context, STATE_VERTEXSHADERCONSTANT) && (use_vshader || use_pshader)) + stateblock_apply_state(STATE_VERTEXSHADERCONSTANT, stateblock, context); } + if (use_pshader) stateblock_apply_state(STATE_PIXELSHADERCONSTANT, stateblock, context); } /* We can't link the fog states to the fragment state directly since the vertex pipeline links them diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 0f911e9..c81dffc 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -907,9 +907,8 @@ static void atifs_apply_pixelshader(DWORD state, IWineD3DStateBlockImpl *statebl if(!isStateDirty(context, device->StateTable[STATE_VSHADER].representative)) { device->shader_backend->shader_select(context, FALSE, use_vshader); - if (!isStateDirty(context, STATE_VERTEXSHADERCONSTANT) && use_vshader) { - device->StateTable[STATE_VERTEXSHADERCONSTANT].apply(STATE_VERTEXSHADERCONSTANT, stateblock, context); - } + if (!isStateDirty(context, STATE_VERTEXSHADERCONSTANT) && use_vshader) + stateblock_apply_state(STATE_VERTEXSHADERCONSTANT, stateblock, context); } } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f7e6f13..04de86f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -450,10 +450,7 @@ static void state_blend(DWORD state, IWineD3DStateBlockImpl *stateblock, struct /* colorkey fixup for stage 0 alphaop depends on WINED3DRS_ALPHABLENDENABLE state, so it may need updating */ if (stateblock->renderState[WINED3DRS_COLORKEYENABLE]) - { - const struct StateEntry *StateTable = stateblock->device->StateTable; - StateTable[STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAOP)].apply(STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAOP), stateblock, context); - } + stateblock_apply_state(STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAOP), stateblock, context); } static void state_blendfactor_w(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) @@ -506,10 +503,7 @@ static void state_alpha(DWORD state, IWineD3DStateBlockImpl *stateblock, struct } if (enable_ckey || context->last_was_ckey) - { - const struct StateEntry *StateTable = stateblock->device->StateTable; - StateTable[STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAOP)].apply(STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAOP), stateblock, context); - } + stateblock_apply_state(STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAOP), stateblock, context); context->last_was_ckey = enable_ckey; if (stateblock->renderState[WINED3DRS_ALPHATESTENABLE] || @@ -3633,10 +3627,8 @@ void apply_pixelshader(DWORD state, IWineD3DStateBlockImpl *stateblock, struct w * while it was enabled, so re-apply them. */ for (i = 0; i < context->gl_info->limits.texture_stages; ++i) { - if(!isStateDirty(context, STATE_TEXTURESTAGE(i, WINED3DTSS_COLOROP))) { - device->StateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_COLOROP)].apply - (STATE_TEXTURESTAGE(i, WINED3DTSS_COLOROP), stateblock, context); - } + if (!isStateDirty(context, STATE_TEXTURESTAGE(i, WINED3DTSS_COLOROP))) + stateblock_apply_state(STATE_TEXTURESTAGE(i, WINED3DTSS_COLOROP), stateblock, context); } context->last_was_pshader = FALSE; } @@ -4648,9 +4640,8 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, s context->last_was_vshader = useVertexShaderFunction; - if(updateFog) { - device->StateTable[STATE_RENDER(WINED3DRS_FOGVERTEXMODE)].apply(STATE_RENDER(WINED3DRS_FOGVERTEXMODE), stateblock, context); - } + if (updateFog) stateblock_apply_state(STATE_RENDER(WINED3DRS_FOGVERTEXMODE), stateblock, context); + if(!useVertexShaderFunction) { int i; for(i = 0; i < MAX_TEXTURES; i++) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a812114..097232e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2432,6 +2432,14 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl *device, WINED3DSTATEBLOCKTYPE type) DECLSPEC_HIDDEN; void stateblock_init_contained_states(IWineD3DStateBlockImpl *object) DECLSPEC_HIDDEN; +static inline void stateblock_apply_state(DWORD state, IWineD3DStateBlockImpl *stateblock, + struct wined3d_context *context) +{ + const struct StateEntry *statetable = stateblock->device->StateTable; + DWORD rep = statetable[state].representative; + statetable[rep].apply(rep, stateblock, context); +} + /* Direct3D terminology with little modifications. We do not have an issued state * because only the driver knows about it, but we have a created state because d3d * allows GetData on a created issue, but opengl doesn't

1 0

Jörg Höhle : winmm: Improve MCI's Sysinfo command .
by Alexandre Julliard April 1, 2010

April 1, 2010

Module: wine Branch: master Commit: f70b2f54935d6aff2b5464131e3f4a004f42aa18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f70b2f54935d6aff2b5464131… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Nov 17 22:07:55 2009 +0100 winmm: Improve MCI's Sysinfo command. --- dlls/winmm/mci.c | 55 +++++++++++++++++++++++++++++++++++++++-------- dlls/winmm/tests/mci.c | 6 ++-- 2 files changed, 48 insertions(+), 13 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 54e9e19..4fbb9a0 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1733,10 +1733,16 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm TRACE("(%08x, %08X, %p[num=%d, wDevTyp=%u])\n", uDevID, dwFlags, lpParms, lpParms->dwNumber, lpParms->wDeviceType); + if ((WORD)MCI_ALL_DEVICE_ID == LOWORD(uDevID)) + uDevID = MCI_ALL_DEVICE_ID; /* Be compatible with Win9x */ - switch (dwFlags & ~MCI_SYSINFO_OPEN) { + switch (dwFlags & ~(MCI_SYSINFO_OPEN|MCI_NOTIFY|MCI_WAIT)) { case MCI_SYSINFO_QUANTITY: - if (lpParms->wDeviceType < MCI_DEVTYPE_FIRST || lpParms->wDeviceType > MCI_DEVTYPE_LAST) { + if (lpParms->dwRetSize < sizeof(DWORD)) + return MCIERR_PARAM_OVERFLOW; + /* Win9x returns 0 for 0 < uDevID < (UINT16)MCI_ALL_DEVICE_ID */ + if (uDevID == MCI_ALL_DEVICE_ID) { + /* wDeviceType == MCI_ALL_DEVICE_ID is not recognized. */ if (dwFlags & MCI_SYSINFO_OPEN) { TRACE("MCI_SYSINFO_QUANTITY: # of open MCI drivers\n"); EnterCriticalSection(&WINMM_cs); @@ -1756,14 +1762,14 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm } } else { if (dwFlags & MCI_SYSINFO_OPEN) { - TRACE("MCI_SYSINFO_QUANTITY: # of open MCI drivers of type %u\n", lpParms->wDeviceType); + TRACE("MCI_SYSINFO_QUANTITY: # of open MCI drivers of type %d\n", lpParms->wDeviceType); EnterCriticalSection(&WINMM_cs); for (wmd = MciDrivers; wmd; wmd = wmd->lpNext) { if (wmd->wType == lpParms->wDeviceType) cnt++; } LeaveCriticalSection(&WINMM_cs); } else { - TRACE("MCI_SYSINFO_QUANTITY: # of installed MCI drivers of type %u\n", lpParms->wDeviceType); + TRACE("MCI_SYSINFO_QUANTITY: # of installed MCI drivers of type %d\n", lpParms->wDeviceType); FIXME("Don't know how to get # of MCI devices of a given type\n"); cnt = 1; } @@ -1771,6 +1777,7 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm *(DWORD*)lpParms->lpstrReturn = cnt; TRACE("(%d) => '%d'\n", lpParms->dwNumber, *(DWORD*)lpParms->lpstrReturn); ret = MCI_INTEGER_RETURNED; + /* return ret; Only Win9x sends a notification in this case. */ break; case MCI_SYSINFO_INSTALLNAME: TRACE("MCI_SYSINFO_INSTALLNAME\n"); @@ -1784,12 +1791,27 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm TRACE("(%d) => %s\n", lpParms->dwNumber, debugstr_w(lpParms->lpstrReturn)); break; case MCI_SYSINFO_NAME: - TRACE("MCI_SYSINFO_NAME\n"); + s = NULL; if (dwFlags & MCI_SYSINFO_OPEN) { - FIXME("Don't handle MCI_SYSINFO_NAME|MCI_SYSINFO_OPEN (yet)\n"); - ret = MCIERR_UNRECOGNIZED_COMMAND; - } else { - s = NULL; + /* Win9x returns 0 for 0 < uDevID < (UINT16)MCI_ALL_DEVICE_ID */ + TRACE("MCI_SYSINFO_NAME: nth alias of type %d\n", + uDevID == MCI_ALL_DEVICE_ID ? MCI_ALL_DEVICE_ID : lpParms->wDeviceType); + EnterCriticalSection(&WINMM_cs); + for (wmd = MciDrivers; wmd; wmd = wmd->lpNext) { + /* wDeviceType == MCI_ALL_DEVICE_ID is not recognized. */ + if (uDevID == MCI_ALL_DEVICE_ID || + lpParms->wDeviceType == wmd->wType) { + cnt++; + if (cnt == lpParms->dwNumber) { + s = wmd->lpstrAlias; + break; + } + } + } + LeaveCriticalSection(&WINMM_cs); + ret = s ? MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize / sizeof(WCHAR), s) : MCIERR_OUTOFRANGE; + } else if (MCI_ALL_DEVICE_ID == uDevID) { + TRACE("MCI_SYSINFO_NAME: device #%d\n", lpParms->dwNumber); if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, wszHklmMci, 0, KEY_QUERY_VALUE, &hKey ) == ERROR_SUCCESS) { if (RegQueryInfoKeyW( hKey, 0, 0, 0, &cnt, @@ -1814,13 +1836,26 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm } } ret = s ? MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize / sizeof(WCHAR), s) : MCIERR_OUTOFRANGE; + } else { + FIXME("MCI_SYSINFO_NAME: nth device of type %d\n", lpParms->wDeviceType); + /* Cheating: what is asked for is the nth device from the registry. */ + if (1 != lpParms->dwNumber || /* Handle only one of each kind. */ + lpParms->wDeviceType < MCI_DEVTYPE_FIRST || lpParms->wDeviceType > MCI_DEVTYPE_LAST) + ret = MCIERR_OUTOFRANGE; + else { + LoadStringW(hWinMM32Instance, LOWORD(lpParms->wDeviceType), + lpParms->lpstrReturn, lpParms->dwRetSize / sizeof(WCHAR)); + ret = 0; + } } TRACE("(%d) => %s\n", lpParms->dwNumber, debugstr_w(lpParms->lpstrReturn)); break; default: TRACE("Unsupported flag value=%08x\n", dwFlags); - ret = MCIERR_UNRECOGNIZED_COMMAND; + ret = MCIERR_UNRECOGNIZED_KEYWORD; } + if ((dwFlags & MCI_NOTIFY) && HRESULT_CODE(ret)==0) + mciDriverNotify((HWND)lpParms->dwCallback, uDevID, MCI_NOTIFY_SUCCESSFUL); return ret; } diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 6bdfefe..a289fd6 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -230,7 +230,7 @@ static void test_openCloseWAVE(HWND hwnd) memset(buf, 0, sizeof(buf)); err = mciSendString(command_sysinfo, buf, sizeof(buf), NULL); ok(!err,"mci %s returned %s\n", command_sysinfo, dbg_mcierr(err)); - todo_wine ok(buf[0] == '0' && buf[1] == 0, "mci %s, expected output buffer '0', got: '%s'\n", command_sysinfo, buf); + ok(buf[0] == '0' && buf[1] == 0, "mci %s, expected output buffer '0', got: '%s'\n", command_sysinfo, buf); err = mciSendString("open new type waveaudio", buf, sizeof(buf), NULL); ok(err==MCIERR_NEW_REQUIRES_ALIAS,"mci open new without alias returned %s\n", dbg_mcierr(err)); @@ -724,7 +724,7 @@ static void test_AutoOpenWAVE(HWND hwnd) err = mciSendString("sysinfo waveaudio quantity open", buf, sizeof(buf), NULL); ok(!err,"mci sysinfo waveaudio quantity open returned %s\n", dbg_mcierr(err)); - if(!err) todo_wine ok(!strcmp(buf,"0"), "sysinfo quantity open expected 0, got: %s, some more tests will fail.\n", buf); + if(!err) ok(!strcmp(buf,"0"), "sysinfo quantity open expected 0, got: %s, some more tests will fail.\n", buf); /* Who knows why some machines pass all tests but return MCIERR_HARDWARE here? */ err = mciSendString("sound NoSuchSoundDefined wait", NULL, 0, NULL); @@ -736,7 +736,7 @@ static void test_AutoOpenWAVE(HWND hwnd) buf[0]=0; err = mciSendString("sysinfo waveaudio name 1 open", buf, sizeof(buf), NULL); - todo_wine ok(err==MCIERR_OUTOFRANGE,"sysinfo waveaudio name 1 returned %s\n", dbg_mcierr(err)); + ok(err==MCIERR_OUTOFRANGE,"sysinfo waveaudio name 1 returned %s\n", dbg_mcierr(err)); if(!err) trace("sysinfo dangling open alias: %s\n", buf); err = mciSendString("play no-such-file-exists.wav notify", buf, sizeof(buf), NULL);

1 0

Mikhail Maroukhine : imm32: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard April 1, 2010

April 1, 2010

Module: wine Branch: master Commit: 42e897f22894a2f8527ffe89641f816f603f91ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e897f22894a2f8527ffe896… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sat Mar 27 02:53:36 2010 +0600 imm32: Fix compiler warnings with flag -Wcast-qual. --- dlls/imm32/imm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 6f97448..2898e5e 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1843,10 +1843,10 @@ HKL WINAPI ImmInstallIMEW( if (rc == ERROR_SUCCESS) { - rc = RegSetValueExW(hkey, szImeFileW, 0, REG_SZ, (LPBYTE)lpszIMEFileName, + rc = RegSetValueExW(hkey, szImeFileW, 0, REG_SZ, (const BYTE*)lpszIMEFileName, (lstrlenW(lpszIMEFileName) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) - rc = RegSetValueExW(hkey, szLayoutTextW, 0, REG_SZ, (LPBYTE)lpszLayoutText, + rc = RegSetValueExW(hkey, szLayoutTextW, 0, REG_SZ, (const BYTE*)lpszLayoutText, (lstrlenW(lpszLayoutText) + 1) * sizeof(WCHAR)); RegCloseKey(hkey); return hkl;

1 0

Mikhail Maroukhine : rpcrt4: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard April 1, 2010

April 1, 2010

Module: wine Branch: master Commit: 9b933a35944522dd871d1f8530d2c6818e0aa221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b933a35944522dd871d1f853… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sat Mar 27 02:53:36 2010 +0600 rpcrt4: Fix compiler warnings with flag -Wcast-qual. --- dlls/rpcrt4/ndr_marshall.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 9946bd1..f36069c 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2395,7 +2395,7 @@ unsigned char * WINAPI NdrNonConformantStringMarshall(PMIDL_STUB_MESSAGE pStubM TRACE("(pStubMsg == ^%p, pMemory == ^%p, pFormat == ^%p)\n", pStubMsg, pMemory, pFormat); - maxsize = *(USHORT *)&pFormat[2]; + maxsize = *(const USHORT *)&pFormat[2]; if (*pFormat == RPC_FC_CSTRING) { @@ -2445,7 +2445,7 @@ unsigned char * WINAPI NdrNonConformantStringUnmarshall(PMIDL_STUB_MESSAGE pStu TRACE("(pStubMsg == ^%p, *pMemory == ^%p, pFormat == ^%p, fMustAlloc == %u)\n", pStubMsg, *ppMemory, pFormat, fMustAlloc); - maxsize = *(USHORT *)&pFormat[2]; + maxsize = *(const USHORT *)&pFormat[2]; ReadVariance(pStubMsg, NULL, maxsize); if (pStubMsg->Offset) @@ -2495,7 +2495,7 @@ void WINAPI NdrNonConformantStringBufferSize(PMIDL_STUB_MESSAGE pStubMsg, TRACE("(pStubMsg == ^%p, pMemory == ^%p, pFormat == ^%p)\n", pStubMsg, pMemory, pFormat); - maxsize = *(USHORT *)&pFormat[2]; + maxsize = *(const USHORT *)&pFormat[2]; SizeVariance(pStubMsg); @@ -2538,7 +2538,7 @@ ULONG WINAPI NdrNonConformantStringMemorySize(PMIDL_STUB_MESSAGE pStubMsg, TRACE("(pStubMsg == ^%p, pFormat == ^%p)\n", pStubMsg, pFormat); - maxsize = *(USHORT *)&pFormat[2]; + maxsize = *(const USHORT *)&pFormat[2]; ReadVariance(pStubMsg, NULL, maxsize); @@ -6268,7 +6268,7 @@ static unsigned char *WINAPI NdrRangeMarshall( unsigned char *pMemory, PFORMAT_STRING pFormat) { - NDR_RANGE *pRange = (NDR_RANGE *)pFormat; + const NDR_RANGE *pRange = (const NDR_RANGE *)pFormat; unsigned char base_type; TRACE("pStubMsg %p, pMemory %p, type 0x%02x\n", pStubMsg, pMemory, *pFormat); @@ -6294,7 +6294,7 @@ unsigned char *WINAPI NdrRangeUnmarshall( PFORMAT_STRING pFormat, unsigned char fMustAlloc) { - NDR_RANGE *pRange = (NDR_RANGE *)pFormat; + const NDR_RANGE *pRange = (const NDR_RANGE *)pFormat; unsigned char base_type; TRACE("pStubMsg: %p, ppMemory: %p, type: 0x%02x, fMustAlloc: %s\n", pStubMsg, ppMemory, *pFormat, fMustAlloc ? "true" : "false"); @@ -6391,7 +6391,7 @@ static void WINAPI NdrRangeBufferSize( unsigned char *pMemory, PFORMAT_STRING pFormat) { - NDR_RANGE *pRange = (NDR_RANGE *)pFormat; + const NDR_RANGE *pRange = (const NDR_RANGE *)pFormat; unsigned char base_type; TRACE("pStubMsg %p, pMemory %p, type 0x%02x\n", pStubMsg, pMemory, *pFormat); @@ -6413,7 +6413,7 @@ static ULONG WINAPI NdrRangeMemorySize( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { - NDR_RANGE *pRange = (NDR_RANGE *)pFormat; + const NDR_RANGE *pRange = (const NDR_RANGE *)pFormat; unsigned char base_type; if (pRange->type != RPC_FC_RANGE)

1 0

Jörg Höhle : winmm: Improve MCI' s Sysinfo string command.
by Alexandre Julliard April 1, 2010

April 1, 2010

Module: wine Branch: master Commit: 4ed308f452b537bdcbb96f165fd34b6e4994883d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ed308f452b537bdcbb96f165… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Nov 18 00:58:17 2009 +0100 winmm: Improve MCI's Sysinfo string command. --- dlls/winmm/mci.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 4fbb9a0..cde8c88 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1233,6 +1233,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, static const WCHAR wszNew[] = {'n','e','w',0}; static const WCHAR wszSAliasS[] = {' ','a','l','i','a','s',' ',0}; static const WCHAR wszTypeS[] = {'t','y','p','e',' ',0}; + static const WCHAR wszSysinfo[] = {'s','y','s','i','n','f','o',0}; TRACE("(%s, %p, %d, %p)\n", debugstr_w(lpstrCommand), lpstrRet, uRetLen, hwndCallback); @@ -1326,6 +1327,20 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, MCI_UnLoadMciDriver(wmd); goto errCleanUp; } + } else if (!strcmpW(verb, wszSysinfo)) { + /* System commands are not subject to auto-open. */ + /* It's too early to handle Sysinfo here because the + * requirements on dev depend on the flags: + * alias with INSTALLNAME, name like "waveaudio" + * with QUANTITY and NAME. */ + data[4] = MCI_ALL_DEVICE_ID; + if (MCI_ALL_DEVICE_ID != uDevID) { + /* FIXME: Map device name like waveaudio to MCI_DEVTYPE_xyz */ + uDevID = mciGetDeviceIDW(dev); + wmd = MCI_GetDriver(uDevID); + if (wmd) + data[4] = wmd->wType; + } } else if ((MCI_ALL_DEVICE_ID != uDevID) && !(wmd = MCI_GetDriver(mciGetDeviceIDW(dev)))) { /* auto open */ static const WCHAR wszOpenWait[] = {'o','p','e','n',' ','%','s',' ','w','a','i','t',0};

1 0