May 2010 - Wine-commits - list.winehq.org

Piotr Caban : msvcrt: Fixed wcstombs(_s_l) implementation.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 335c9772ece4964c061526d8178348c6d1f61ac3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=335c9772ece4964c061526d81… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 6 14:27:57 2010 +0200 msvcrt: Fixed wcstombs(_s_l) implementation. --- dlls/msvcrt/msvcrt.spec | 4 +- dlls/msvcrt/wcs.c | 109 +++++++++++++++++++++++++++------------------- 2 files changed, 66 insertions(+), 47 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 8655f6f..c7d6654 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1040,7 +1040,7 @@ @ cdecl _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l # stub _wcstol_l -# stub _wcstombs_l +@ cdecl _wcstombs_l(ptr ptr long ptr) MSVCRT__wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) MSVCRT__wcstombs_s_l @ cdecl _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 @ cdecl _wcstoui64_l(wstr ptr long ptr) MSVCRT__wcstoui64_l @@ -1417,7 +1417,7 @@ @ cdecl wcstok(wstr wstr) MSVCRT_wcstok # stub wcstok_s @ cdecl wcstol(wstr ptr long) ntdll.wcstol -@ cdecl wcstombs(ptr ptr long) ntdll.wcstombs +@ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) ntdll.wcstoul @ stub wcsxfrm #(ptr wstr long) MSVCRT_wcsxfrm diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 5334115..96a25e5 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -227,76 +227,95 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, } /********************************************************************* - * _wcstombs_s_l (MSVCRT.@) + * _wcstombs_l (MSVCRT.@) */ -int CDECL MSVCRT__wcstombs_s_l(MSVCRT_size_t *ret, char *mbstr, - MSVCRT_size_t size, const MSVCRT_wchar_t *wcstr, +MSVCRT_size_t CDECL MSVCRT__wcstombs_l(char *mbstr, const MSVCRT_wchar_t *wcstr, MSVCRT_size_t count, MSVCRT__locale_t locale) { - char default_char = '\0', *p; - int hlp, len; - - if(!size) - return 0; - - if(!mbstr || !wcstr) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); - if(mbstr) - *mbstr = '\0'; - *MSVCRT__errno() = MSVCRT_EINVAL; - return MSVCRT_EINVAL; - } + char default_char = '\0'; + MSVCRT_size_t tmp; + BOOL used_default; if(!locale) locale = get_locale(); - if(size<=count) - len = size; - else if(count==_TRUNCATE) - len = size-1; - else - len = count; + /* FIXME: Use wcslen here */ + tmp = strlenW(wcstr); + if(tmp>count && mbstr) + tmp = count; - p = mbstr; - *ret = 0; - while(1) { - if(!len) - break; + tmp = WideCharToMultiByte(locale->locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS, + wcstr, tmp, mbstr, count, &default_char, &used_default); - if(*wcstr == '\0') { - *p = '\0'; - break; - } + if(used_default) + return -1; - hlp = WideCharToMultiByte(locale->locinfo->lc_codepage, - WC_NO_BEST_FIT_CHARS, wcstr, 1, p, len, &default_char, NULL); - if(!hlp || *p=='\0') - break; + if(tmp<count && mbstr) + mbstr[tmp] = '\0'; - p += hlp; - len -= hlp; + return tmp; +} - wcstr++; - *ret += 1; +/********************************************************************* + * wcstombs (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT_wcstombs(char *mbstr, const MSVCRT_wchar_t *wcstr, + MSVCRT_size_t count) +{ + return MSVCRT__wcstombs_l(mbstr, wcstr, count, NULL); +} + +/********************************************************************* + * _wcstombs_s_l (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT__wcstombs_s_l(MSVCRT_size_t *ret, char *mbstr, + MSVCRT_size_t size, const MSVCRT_wchar_t *wcstr, + MSVCRT_size_t count, MSVCRT__locale_t locale) +{ + MSVCRT_size_t conv; + + if(!mbstr && !size) { + conv = MSVCRT__wcstombs_l(NULL, wcstr, 0, locale); + if(ret) + *ret = conv; + return 0; + } + + if(!wcstr || !mbstr) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if(mbstr && size) + mbstr[0] = '\0'; + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; } - if(!len && size<=count) { + if(count==_TRUNCATE || size<count) + conv = size; + else + conv = count; + + conv = MSVCRT__wcstombs_l(mbstr, wcstr, conv, locale); + if(conv<size) + mbstr[conv++] = '\0'; + else if(conv==size && (count==_TRUNCATE || mbstr[conv-1]=='\0')) + mbstr[conv-1] = '\0'; + else { MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); - *mbstr = '\0'; + if(size) + mbstr[0] = '\0'; *MSVCRT__errno() = MSVCRT_ERANGE; return MSVCRT_ERANGE; } - if(*wcstr == '\0') - *ret += 1; - *p = '\0'; + if(ret) + *ret = conv; return 0; } /********************************************************************* * wcstombs_s (MSVCRT.@) */ -int CDECL MSVCRT_wcstombs_s(MSVCRT_size_t *ret, char *mbstr, +MSVCRT_size_t CDECL MSVCRT_wcstombs_s(MSVCRT_size_t *ret, char *mbstr, MSVCRT_size_t size, const MSVCRT_wchar_t *wcstr, MSVCRT_size_t count) { return MSVCRT__wcstombs_s_l(ret, mbstr, size, wcstr, count, NULL);

1 0

Piotr Caban : msvcrt: Added mbstowcs and wcstombs tests.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 2eb4b694a7256c4a5c418363501ef1b8122b84a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eb4b694a7256c4a5c4183635… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 6 14:28:08 2010 +0200 msvcrt: Added mbstowcs and wcstombs tests. --- dlls/msvcrt/tests/string.c | 78 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 5d61687..f6c0e2c 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -56,6 +56,8 @@ 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 int (__cdecl *pwcstombs_s)(size_t*,char*,size_t,const wchar_t*,size_t); +static int (__cdecl *pmbstowcs_s)(size_t*,wchar_t*,size_t,const char*,size_t); static int *p__mb_cur_max; static unsigned char *p_mbctype; @@ -1161,6 +1163,79 @@ static void test__strtod(void) ok(errno == ERANGE, "errno = %x\n", errno); } +static void test_mbstowcs(void) +{ + static const wchar_t wSimple[] = { 't','e','x','t',0 }; + static const wchar_t wHiragana[] = { 0x3042,0x3043,0 }; + static const char mSimple[] = "text"; + static const char mHiragana[] = { 0x82,0xa0,0x82,0xa1,0 }; + + wchar_t wOut[6]; + char mOut[6]; + size_t ret; + int err; + + wOut[4] = '!'; wOut[5] = '\0'; + mOut[4] = '!'; mOut[5] = '\0'; + + ret = mbstowcs(NULL, mSimple, 0); + ok(ret == 4, "ret = %d\n", ret); + + ret = mbstowcs(wOut, mSimple, 4); + ok(ret == 4, "ret = %d\n", ret); + ok(!memcmp(wOut, wSimple, 4*sizeof(wchar_t)), "wOut = %s\n", wine_dbgstr_w(wOut)); + ok(wOut[4] == '!', "wOut[4] != \'!\'\n"); + + ret = wcstombs(NULL, wSimple, 0); + ok(ret == 4, "ret = %d\n", ret); + + ret = wcstombs(mOut, wSimple, 6); + ok(ret == 4, "ret = %d\n", ret); + ok(!memcmp(mOut, mSimple, 5*sizeof(char)), "mOut = %s\n", mOut); + + ret = wcstombs(mOut, wSimple, 2); + ok(ret == 2, "ret = %d\n", ret); + ok(!memcmp(mOut, mSimple, 5*sizeof(char)), "mOut = %s\n", mOut); + + if(!setlocale(LC_ALL, "Japanese_Japan.932")) { + win_skip("Japanese_Japan.932 locale not available\n"); + return; + } + + ret = mbstowcs(wOut, mHiragana, 6); + ok(ret == 2, "ret = %d\n", ret); + ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut)); + + ret = wcstombs(mOut, wHiragana, 6); + ok(ret == 4, "ret = %d\n", ret); + ok(!memcmp(mOut, mHiragana, sizeof(mHiragana)), "mOut = %s\n", mOut); + + if(!pmbstowcs_s || !pwcstombs_s) { + win_skip("mbstowcs_s or wcstombs_s not available\n"); + return; + } + + err = pmbstowcs_s(&ret, wOut, 6, mSimple, -1/*_TRUNCATE*/); + ok(err == 0, "err = %d\n", err); + ok(ret == 5, "ret = %d\n", (int)ret); + ok(!memcmp(wOut, wSimple, sizeof(wSimple)), "wOut = %s\n", wine_dbgstr_w(wOut)); + + err = pmbstowcs_s(&ret, wOut, 6, mHiragana, -1/*_TRUNCATE*/); + ok(err == 0, "err = %d\n", err); + ok(ret == 3, "ret = %d\n", (int)ret); + ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut)); + + err = pwcstombs_s(&ret, mOut, 6, wSimple, -1/*_TRUNCATE*/); + ok(err == 0, "err = %d\n", err); + ok(ret == 5, "ret = %d\n", (int)ret); + ok(!memcmp(mOut, mSimple, sizeof(mSimple)), "mOut = %s\n", mOut); + + err = pwcstombs_s(&ret, mOut, 6, wHiragana, -1/*_TRUNCATE*/); + ok(err == 0, "err = %d\n", err); + ok(ret == 5, "ret = %d\n", (int)ret); + ok(!memcmp(mOut, mHiragana, sizeof(mHiragana)), "mOut = %s\n", mOut); +} + START_TEST(string) { char mem[100]; @@ -1183,6 +1258,8 @@ START_TEST(string) p_strnlen = (void *)GetProcAddress( hMsvcrt,"strnlen" ); p_strtoi64 = (void *) GetProcAddress(hMsvcrt, "_strtoi64"); p_strtoui64 = (void *) GetProcAddress(hMsvcrt, "_strtoui64"); + pmbstowcs_s = (void *) GetProcAddress(hMsvcrt, "mbstowcs_s"); + pwcstombs_s = (void *) GetProcAddress(hMsvcrt, "wcstombs_s"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -1215,4 +1292,5 @@ START_TEST(string) test_strnlen(); test__strtoi64(); test__strtod(); + test_mbstowcs(); }

1 0

Rico Schüller : d3d10: Implement ID3D10Effect:: GetVariableBySemantic().
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 337c5d2730a02ee94fb97aa0df011f791d6b3f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=337c5d2730a02ee94fb97aa0d… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed May 5 19:01:54 2010 +0200 d3d10: Implement ID3D10Effect::GetVariableBySemantic(). --- dlls/d3d10/effect.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index c43f88a..016e842 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2220,9 +2220,48 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableBySemantic(ID3D10Effect *iface, LPCSTR semantic) { - FIXME("iface %p, semantic %s stub!\n", iface, debugstr_a(semantic)); + struct d3d10_effect *This = (struct d3d10_effect *)iface; + unsigned int i; + + TRACE("iface %p, semantic %s\n", iface, debugstr_a(semantic)); + + if (!semantic) + { + WARN("Invalid semantic specified\n"); + return (ID3D10EffectVariable *)&null_variable; + } - return NULL; + for (i = 0; i < This->local_buffer_count; ++i) + { + struct d3d10_effect_variable *l = &This->local_buffers[i]; + unsigned int j; + + for (j = 0; j < l->type->member_count; ++j) + { + struct d3d10_effect_variable *v = &l->members[j]; + + if (!strcmp(v->semantic, semantic)) + { + TRACE("Returning variable %p.\n", v); + return (ID3D10EffectVariable *)v; + } + } + } + + for (i = 0; i < This->local_variable_count; ++i) + { + struct d3d10_effect_variable *v = &This->local_variables[i]; + + if (!strcmp(v->semantic, semantic)) + { + TRACE("Returning variable %p.\n", v); + return (ID3D10EffectVariable *)v; + } + } + + WARN("Invalid semantic specified\n"); + + return (ID3D10EffectVariable *)&null_variable; } static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqueByIndex(ID3D10Effect *iface,

1 0

Rico Schüller : d3d10: Add argument check in ID3D10Effect::GetVariableByName().
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: b0b9897f9fcca9c276bf3ffa520b608c5e34dbac URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0b9897f9fcca9c276bf3ffa5… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed May 5 19:01:59 2010 +0200 d3d10: Add argument check in ID3D10Effect::GetVariableByName(). --- dlls/d3d10/effect.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 016e842..9a6c843 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2184,6 +2184,12 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); + if (!name) + { + WARN("Invalid name specified\n"); + return (ID3D10EffectVariable *)&null_variable; + } + for (i = 0; i < This->local_buffer_count; ++i) { struct d3d10_effect_variable *l = &This->local_buffers[i];

1 0

Rico Schüller : d3d10/tests: Add ID3D10Effect:: GetVariableBy*() test.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 89b0c8437516786e8713cfe0fb6786f65f6a1425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89b0c8437516786e8713cfe0f… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed May 5 19:02:02 2010 +0200 d3d10/tests: Add ID3D10Effect::GetVariableBy*() test. --- dlls/d3d10/tests/effect.c | 126 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 126 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index ee96fb9..f37f945 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3441,6 +3441,131 @@ static void test_effect_local_shader(ID3D10Device *device) effect->lpVtbl->Release(effect); } +/* + * test_effect_get_variable_by + */ +#if 0 +cbuffer cb +{ + float f1 : SV_POSITION; + float f2 : COLOR0; +}; +cbuffer cb2 +{ + float f3 : SV_POSITION; + float f4 : COLOR1; +}; +Texture1D tex1 : COLOR2; +Texture1D tex2 : COLOR1; +#endif +static DWORD fx_test_egvb[] = { +0x43425844, 0x63d60ede, 0xf75a09d1, 0x47da5604, 0x7ef6e331, 0x00000001, 0x000001ca, 0x00000001, +0x00000024, 0x30315846, 0x0000019e, 0xfeff1001, 0x00000002, 0x00000004, 0x00000002, 0x00000000, +0x00000000, 0x00000000, 0x00000000, 0x0000008a, 0x00000000, 0x00000002, 0x00000000, 0x00000000, +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x66006263, +0x74616f6c, 0x00000700, 0x00000100, 0x00000000, 0x00000400, 0x00001000, 0x00000400, 0x00090900, +0x00316600, 0x505f5653, 0x5449534f, 0x004e4f49, 0x43003266, 0x524f4c4f, 0x62630030, 0x33660032, +0x00346600, 0x4f4c4f43, 0x54003152, 0x75747865, 0x44316572, 0x00005300, 0x00000200, 0x00000000, +0x00000000, 0x00000000, 0x00000000, 0x00000a00, 0x78657400, 0x4f430031, 0x32524f4c, 0x78657400, +0x00040032, 0x00100000, 0x00000000, 0x00020000, 0xffff0000, 0x0000ffff, 0x00290000, 0x000d0000, +0x002c0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00380000, 0x000d0000, 0x003b0000, +0x00040000, 0x00000000, 0x00000000, 0x00000000, 0x00420000, 0x00100000, 0x00000000, 0x00020000, +0xffff0000, 0x0000ffff, 0x00460000, 0x000d0000, 0x002c0000, 0x00000000, 0x00000000, 0x00000000, +0x00000000, 0x00490000, 0x000d0000, 0x004c0000, 0x00040000, 0x00000000, 0x00000000, 0x00000000, +0x00790000, 0x005d0000, 0x007e0000, 0xffff0000, 0x0000ffff, 0x00850000, 0x005d0000, 0x004c0000, +0xffff0000, 0x0000ffff, 0x00000000, +}; + +static void test_effect_get_variable_by(ID3D10Device *device) +{ + ID3D10Effect *effect; + ID3D10EffectVariable *variable_by_index, *variable, *null_variable; + HRESULT hr; + + hr = create_effect(fx_test_egvb, 0, device, NULL, &effect); + ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + + /* get the null variable */ + null_variable = effect->lpVtbl->GetVariableByIndex(effect, 0xffffffff); + + /* check for invalid arguments */ + variable = effect->lpVtbl->GetVariableByName(effect, NULL); + ok(null_variable == variable, "GetVariableByName got %p, expected %p\n", variable, null_variable); + + variable = effect->lpVtbl->GetVariableBySemantic(effect, NULL); + ok(null_variable == variable, "GetVariableBySemantic got %p, expected %p\n", variable, null_variable); + + variable = effect->lpVtbl->GetVariableByName(effect, "invalid"); + ok(null_variable == variable, "GetVariableByName got %p, expected %p\n", variable, null_variable); + + variable = effect->lpVtbl->GetVariableBySemantic(effect, "invalid"); + ok(null_variable == variable, "GetVariableBySemantic got %p, expected %p\n", variable, null_variable); + + /* variable f1 */ + variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 0); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + + variable = effect->lpVtbl->GetVariableByName(effect, "f1"); + ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); + + variable = effect->lpVtbl->GetVariableBySemantic(effect, "SV_POSITION"); + ok(variable_by_index == variable, "GetVariableBySemantic got %p, expected %p\n", variable, variable_by_index); + + /* variable f2 */ + variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 1); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + + variable = effect->lpVtbl->GetVariableByName(effect, "f2"); + ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); + + variable = effect->lpVtbl->GetVariableBySemantic(effect, "COLOR0"); + ok(variable_by_index == variable, "GetVariableBySemantic got %p, expected %p\n", variable, variable_by_index); + + /* variable f3 */ + variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 2); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + + variable = effect->lpVtbl->GetVariableByName(effect, "f3"); + ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); + + variable = effect->lpVtbl->GetVariableBySemantic(effect, "SV_POSITION"); + ok(variable != null_variable, "GetVariableBySemantic failed %p", variable); + ok(variable != variable_by_index, "GetVariableBySemantic failed %p", variable); + + /* variable f4 */ + variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 3); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + + variable = effect->lpVtbl->GetVariableByName(effect, "f4"); + ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); + + variable = effect->lpVtbl->GetVariableBySemantic(effect, "COLOR1"); + ok(variable_by_index == variable, "GetVariableBySemantic got %p, expected %p\n", variable, variable_by_index); + + /* variable tex1 */ + variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 4); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + + variable = effect->lpVtbl->GetVariableByName(effect, "tex1"); + ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); + + variable = effect->lpVtbl->GetVariableBySemantic(effect, "COLOR2"); + ok(variable_by_index == variable, "GetVariableBySemantic got %p, expected %p\n", variable, variable_by_index); + + /* variable tex2 */ + variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 5); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + + variable = effect->lpVtbl->GetVariableByName(effect, "tex2"); + ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); + + variable = effect->lpVtbl->GetVariableBySemantic(effect, "COLOR1"); + ok(variable != null_variable, "GetVariableBySemantic failed %p", variable); + ok(variable != variable_by_index, "GetVariableBySemantic failed %p", variable); + + effect->lpVtbl->Release(effect); +} + START_TEST(effect) { ID3D10Device *device; @@ -3460,6 +3585,7 @@ START_TEST(effect) test_effect_variable_type_class(device); test_effect_constant_buffer_stride(device); test_effect_local_shader(device); + test_effect_get_variable_by(device); refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left\n", refcount);

1 0

Damjan Jovanovic : winex11.drv: Use unicode filenames for WM_DROPFILES.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 538b39c4cf4b20f636b0424536da6354c8991cab URL: http://source.winehq.org/git/wine.git/?a=commit;h=538b39c4cf4b20f636b042453… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed May 5 20:50:04 2010 +0200 winex11.drv: Use unicode filenames for WM_DROPFILES. --- dlls/winex11.drv/xdnd.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index fe36e0c..9d209fc 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -367,7 +367,7 @@ static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len) char *uri; WCHAR *path; - char *out = NULL; + WCHAR *out = NULL; int size = 0; int capacity = 4096; @@ -375,7 +375,7 @@ static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len) int start = 0; int end = 0; - out = HeapAlloc(GetProcessHeap(), 0, capacity); + out = HeapAlloc(GetProcessHeap(), 0, capacity * sizeof(WCHAR)); if (out == NULL) return 0; @@ -403,11 +403,11 @@ static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len) if (pathSize > capacity-size) { capacity = 2*capacity + pathSize; - out = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, out, capacity + 1); + out = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, out, (capacity + 1)*sizeof(WCHAR)); if (out == NULL) goto done; } - WideCharToMultiByte(CP_ACP, 0, path, -1, &out[size], pathSize, 0, 0); + memcpy(&out[size], path, pathSize * sizeof(WCHAR)); size += pathSize; done: HeapFree(GetProcessHeap(), 0, path); @@ -421,17 +421,17 @@ static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len) if (out && end >= len) { DROPFILES *dropFiles; - dropFiles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DROPFILES) + size + 1); + dropFiles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DROPFILES) + (size + 1)*sizeof(WCHAR)); if (dropFiles) { dropFiles->pFiles = sizeof(DROPFILES); dropFiles->pt.x = XDNDxy.x; dropFiles->pt.y = XDNDxy.y; dropFiles->fNC = 0; - dropFiles->fWide = FALSE; + dropFiles->fWide = TRUE; out[size] = '\0'; - memcpy(((char*)dropFiles) + dropFiles->pFiles, out, size + 1); - X11DRV_XDND_InsertXDNDData(property, CF_HDROP, dropFiles, sizeof(DROPFILES) + size + 1); + memcpy(((char*)dropFiles) + dropFiles->pFiles, out, (size + 1)*sizeof(WCHAR)); + X11DRV_XDND_InsertXDNDData(property, CF_HDROP, dropFiles, sizeof(DROPFILES) + (size + 1)*sizeof(WCHAR)); count = 1; } } @@ -508,9 +508,9 @@ static void X11DRV_XDND_SendDropFiles(HWND hwnd) lpDrop->pt.y = XDNDxy.y; TRACE("Sending WM_DROPFILES: hWnd(0x%p) %p(%s)\n", hwnd, - ((char*)lpDrop) + lpDrop->pFiles, ((char*)lpDrop) + lpDrop->pFiles); + ((char*)lpDrop) + lpDrop->pFiles, debugstr_w((WCHAR*)(((char*)lpDrop) + lpDrop->pFiles))); - PostMessageA(hwnd, WM_DROPFILES, (WPARAM)lpDrop, 0L); + PostMessageW(hwnd, WM_DROPFILES, (WPARAM)lpDrop, 0L); } }

1 0

Damjan Jovanovic : winemenubuilder: Make desktop files executable.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: ac7a24ba3530264ceae03033e5ac96387fb73e8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac7a24ba3530264ceae03033e… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed May 5 22:53:57 2010 +0200 winemenubuilder: Make desktop files executable. --- programs/winemenubuilder/winemenubuilder.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 201f9ac..4884d7e 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2334,6 +2334,8 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) if (location) { r = !write_desktop_entry(NULL, location, lastEntry, escaped_path, escaped_args, escaped_description, work_dir, icon_name); + if (r == 0) + chmod(location, 0755); HeapFree(GetProcessHeap(), 0, location); } } @@ -2425,6 +2427,8 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link if (location) { r = !write_desktop_entry(NULL, location, lastEntry, "winebrowser", escaped_urlPath, NULL, NULL, NULL); + if (r == 0) + chmod(location, 0755); HeapFree(GetProcessHeap(), 0, location); } }

1 0

Nikolay Sivov : comctl32/rebar: Try to center child rectangle only if cyChild height is not zero.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 5eedf51df69219ab44e2878ddacf6e002cdb08dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eedf51df69219ab44e2878dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 6 00:15:05 2010 +0400 comctl32/rebar: Try to center child rectangle only if cyChild height is not zero. --- dlls/comctl32/rebar.c | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index cc06425..cd3abad 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -707,7 +707,7 @@ REBAR_CalcHorzBand (const REBAR_INFO *infoPtr, UINT rstart, UINT rend) /* *** Supports only Horizontal bars. *** */ { REBAR_BAND *lpBand; - UINT i, xoff, yoff; + UINT i, xoff; RECT work; for(i=rstart; i<rend; i++){ @@ -770,12 +770,24 @@ REBAR_CalcHorzBand (const REBAR_INFO *infoPtr, UINT rstart, UINT rend) } /* set initial child window rectangle if there is a child */ - if (lpBand->hwndChild != NULL) { - int cyBand = lpBand->rcBand.bottom - lpBand->rcBand.top; - yoff = (cyBand - lpBand->cyChild) / 2; - SetRect (&lpBand->rcChild, - lpBand->rcBand.left + lpBand->cxHeader, lpBand->rcBand.top + yoff, - lpBand->rcBand.right - REBAR_POST_CHILD, lpBand->rcBand.top + yoff + lpBand->cyChild); + if (lpBand->hwndChild) { + + lpBand->rcChild.left = lpBand->rcBand.left + lpBand->cxHeader; + lpBand->rcChild.right = lpBand->rcBand.right - REBAR_POST_CHILD; + + if (lpBand->cyChild > 0) { + + UINT yoff = (lpBand->rcBand.bottom - lpBand->rcBand.top - lpBand->cyChild) / 2; + + /* center child if height is known */ + lpBand->rcChild.top = lpBand->rcBand.top + yoff; + lpBand->rcChild.bottom = lpBand->rcBand.top + yoff + lpBand->cyChild; + } + else { + lpBand->rcChild.top = lpBand->rcBand.top; + lpBand->rcChild.bottom = lpBand->rcBand.bottom; + } + if ((lpBand->fStyle & RBBS_USECHEVRON) && (lpBand->rcChild.right - lpBand->rcChild.left < lpBand->cxIdeal)) { lpBand->rcChild.right -= CHEVRON_WIDTH;

1 0

Nikolay Sivov : ole32/ole2: Use W calls for registry access.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 56fdbc226e1f1cfc5ddce26d2c625d86e427e350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56fdbc226e1f1cfc5ddce26d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 6 01:20:30 2010 +0400 ole32/ole2: Use W calls for registry access. --- dlls/ole32/ole2.c | 93 ++++++++++++++++++++++++----------------------------- 1 files changed, 42 insertions(+), 51 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 2e4da53..73a2d2d 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -119,6 +119,13 @@ static const WCHAR OLEDD_DRAGTRACKERCLASS[] = static const WCHAR prop_olemenuW[] = {'P','R','O','P','_','O','L','E','M','e','n','u','D','e','s','c','r','i','p','t','o','r',0}; +static const WCHAR clsidfmtW[] = + {'C','L','S','I','D','\\','{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-', + '%','0','2','x','%','0','2','x','-','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x', + '%','0','2','x','%','0','2','x','}','\\',0}; + +static const WCHAR emptyW[] = { 0 }; + /* * This is the head of the Drop target container. */ @@ -378,13 +385,12 @@ HRESULT WINAPI OleRegGetUserType( DWORD dwFormOfType, LPOLESTR* pszUserType) { - char keyName[60]; + WCHAR keyName[60]; DWORD dwKeyType; DWORD cbData; HKEY clsidKey; LONG hres; - LPSTR buffer; - HRESULT retVal; + /* * Initialize the out parameter. */ @@ -393,17 +399,17 @@ HRESULT WINAPI OleRegGetUserType( /* * Build the key name we're looking for */ - sprintf( keyName, "CLSID\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\", - clsid->Data1, clsid->Data2, clsid->Data3, - clsid->Data4[0], clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], - clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], clsid->Data4[7] ); + sprintfW( keyName, clsidfmtW, + clsid->Data1, clsid->Data2, clsid->Data3, + clsid->Data4[0], clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], + clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], clsid->Data4[7] ); - TRACE("(%s, %d, %p)\n", keyName, dwFormOfType, pszUserType); + TRACE("(%s, %d, %p)\n", debugstr_w(keyName), dwFormOfType, pszUserType); /* * Open the class id Key */ - hres = RegOpenKeyA(HKEY_CLASSES_ROOT, + hres = RegOpenKeyW(HKEY_CLASSES_ROOT, keyName, &clsidKey); @@ -415,8 +421,8 @@ HRESULT WINAPI OleRegGetUserType( */ cbData = 0; - hres = RegQueryValueExA(clsidKey, - "", + hres = RegQueryValueExW(clsidKey, + emptyW, NULL, &dwKeyType, NULL, @@ -431,7 +437,7 @@ HRESULT WINAPI OleRegGetUserType( /* * Allocate a buffer for the registry value. */ - *pszUserType = CoTaskMemAlloc(cbData*2); + *pszUserType = CoTaskMemAlloc(cbData); if (*pszUserType==NULL) { @@ -439,41 +445,24 @@ HRESULT WINAPI OleRegGetUserType( return E_OUTOFMEMORY; } - buffer = HeapAlloc(GetProcessHeap(), 0, cbData); - - if (buffer == NULL) - { - RegCloseKey(clsidKey); - CoTaskMemFree(*pszUserType); - *pszUserType=NULL; - return E_OUTOFMEMORY; - } - - hres = RegQueryValueExA(clsidKey, - "", + hres = RegQueryValueExW(clsidKey, + emptyW, NULL, &dwKeyType, - (LPBYTE) buffer, + (LPBYTE) *pszUserType, &cbData); RegCloseKey(clsidKey); - - if (hres!=ERROR_SUCCESS) + if (hres != ERROR_SUCCESS) { CoTaskMemFree(*pszUserType); - *pszUserType=NULL; + *pszUserType = NULL; - retVal = REGDB_E_READREGDB; - } - else - { - MultiByteToWideChar( CP_ACP, 0, buffer, -1, *pszUserType, cbData /*FIXME*/ ); - retVal = S_OK; + return REGDB_E_READREGDB; } - HeapFree(GetProcessHeap(), 0, buffer); - return retVal; + return S_OK; } /*********************************************************************** @@ -593,7 +582,9 @@ HRESULT WINAPI OleRegGetMiscStatus( DWORD dwAspect, DWORD* pdwStatus) { - char keyName[60]; + static const WCHAR miscstatusW[] = {'M','i','s','c','S','t','a','t','u','s',0}; + static const WCHAR dfmtW[] = {'%','d',0}; + WCHAR keyName[60]; HKEY clsidKey; HKEY miscStatusKey; HKEY aspectKey; @@ -607,17 +598,17 @@ HRESULT WINAPI OleRegGetMiscStatus( /* * Build the key name we're looking for */ - sprintf( keyName, "CLSID\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\", - clsid->Data1, clsid->Data2, clsid->Data3, - clsid->Data4[0], clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], - clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], clsid->Data4[7] ); + sprintfW( keyName, clsidfmtW, + clsid->Data1, clsid->Data2, clsid->Data3, + clsid->Data4[0], clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], + clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], clsid->Data4[7] ); - TRACE("(%s, %d, %p)\n", keyName, dwAspect, pdwStatus); + TRACE("(%s, %d, %p)\n", debugstr_w(keyName), dwAspect, pdwStatus); /* * Open the class id Key */ - result = RegOpenKeyA(HKEY_CLASSES_ROOT, + result = RegOpenKeyW(HKEY_CLASSES_ROOT, keyName, &clsidKey); @@ -627,8 +618,8 @@ HRESULT WINAPI OleRegGetMiscStatus( /* * Get the MiscStatus */ - result = RegOpenKeyA(clsidKey, - "MiscStatus", + result = RegOpenKeyW(clsidKey, + miscstatusW, &miscStatusKey); @@ -646,9 +637,9 @@ HRESULT WINAPI OleRegGetMiscStatus( /* * Open the key specific to the requested aspect. */ - sprintf(keyName, "%d", dwAspect); + sprintfW(keyName, dfmtW, dwAspect); - result = RegOpenKeyA(miscStatusKey, + result = RegOpenKeyW(miscStatusKey, keyName, &aspectKey); @@ -2280,13 +2271,13 @@ static void OLEUTL_ReadRegistryDWORDValue( HKEY regKey, DWORD* pdwValue) { - char buffer[20]; + WCHAR buffer[20]; DWORD cbData = sizeof(buffer); DWORD dwKeyType; LONG lres; - lres = RegQueryValueExA(regKey, - "", + lres = RegQueryValueExW(regKey, + emptyW, NULL, &dwKeyType, (LPBYTE)buffer, @@ -2302,7 +2293,7 @@ static void OLEUTL_ReadRegistryDWORDValue( case REG_EXPAND_SZ: case REG_MULTI_SZ: case REG_SZ: - *pdwValue = (DWORD)strtoul(buffer, NULL, 10); + *pdwValue = (DWORD)strtoulW(buffer, NULL, 10); break; } }

1 0

Gerald Pfeifer : wined3d: Fix the handling of the blue channel inIWineGDISurfaceImpl_SaveSnapshot. ( take 2).
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: da628001fef259c4533fe940e8da43f7d4177208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da628001fef259c4533fe940e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu May 6 00:10:18 2010 +0200 wined3d: Fix the handling of the blue channel inIWineGDISurfaceImpl_SaveSnapshot. (take 2). --- dlls/wined3d/surface_gdi.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index eec9b84..580c88a 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -341,14 +341,13 @@ const char* filename) fwrite(output, 3 * This->pow2Width, 1, f); } } else { - int red_shift, green_shift, blue_shift, pix_width, alpha_shift; + int red_shift, green_shift, blue_shift, pix_width; pix_width = format_desc->byte_count; red_shift = get_shift(format_desc->red_mask); green_shift = get_shift(format_desc->green_mask); blue_shift = get_shift(format_desc->blue_mask); - alpha_shift = get_shift(format_desc->alpha_mask); for (y = 0; y < This->pow2Height; y++) { const unsigned char *src = This->resource.allocatedMemory + (y * 1 * IWineD3DSurface_GetPitch(iface)); @@ -367,8 +366,8 @@ const char* filename) output[3 * x + 0] = red_shift > 0 ? comp >> red_shift : comp << -red_shift; comp = color & format_desc->green_mask; output[3 * x + 1] = green_shift > 0 ? comp >> green_shift : comp << -green_shift; - comp = color & format_desc->alpha_mask; - output[3 * x + 2] = alpha_shift > 0 ? comp >> alpha_shift : comp << -alpha_shift; + comp = color & format_desc->blue_mask; + output[3 * x + 2] = blue_shift > 0 ? comp >> blue_shift : comp << -blue_shift; } fwrite(output, 3 * This->pow2Width, 1, f); }

1 0