February 2011 - Wine-Commits

Austin English : comctl32/tests: Make sure to use a return value (LLVM/ Clang).
by Alexandre Julliard Feb. 18, 2011

Feb. 18, 2011

Module: wine Branch: master Commit: 809bb35bf0ada7ba3369909f3beac34bf6e381a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=809bb35bf0ada7ba3369909f3… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 16 18:21:29 2011 -0800 comctl32/tests: Make sure to use a return value (LLVM/Clang). --- dlls/comctl32/tests/updown.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 859b3a0..f10e469 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -406,6 +406,7 @@ static void test_updown_pos32(void) low = high = -1; r = SendMessage(updown, UDM_GETRANGE32, (WPARAM) &low , (LPARAM) &high ); + expect(0,r); if (low == -1) { win_skip("UDM_SETRANGE32/UDM_GETRANGE32 not available\n");

1 0

Austin English : comctl32/tests: Make sure to use a return value (LLVM/ Clang).
by Alexandre Julliard Feb. 18, 2011

Feb. 18, 2011

Module: wine Branch: master Commit: 4803f921e699e9392e8db71509890de5c4466b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4803f921e699e9392e8db7150… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 16 18:20:25 2011 -0800 comctl32/tests: Make sure to use a return value (LLVM/Clang). --- dlls/comctl32/tests/monthcal.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 52e16c3..ae6c7b5 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1143,6 +1143,7 @@ static void test_todaylink(void) hwnd = create_monthcal_control(0); res = SendMessage(hwnd, MCM_GETMINREQRECT, 0, (LPARAM)&r); + expect(1, res); MoveWindow(hwnd, 0, 0, r.right, r.bottom, FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES);

1 0

André Hentschel : wineusr: Fix more typos.
by Alexandre Julliard Feb. 18, 2011

Feb. 18, 2011

Module: docs Branch: master Commit: 0b01467a56abee4062ff996a0e3cd67b173d9fff URL: http://source.winehq.org/git/docs.git/?a=commit;h=0b01467a56abee4062ff996a0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 16 19:08:56 2011 +0100 wineusr: Fix more typos. As spotted by Andrew Singleton. --- en/wineusr-configuring.sgml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/en/wineusr-configuring.sgml b/en/wineusr-configuring.sgml index 6bfc27e..56f7923 100644 --- a/en/wineusr-configuring.sgml +++ b/en/wineusr-configuring.sgml @@ -294,7 +294,7 @@ see buttons to add and remove available drives. When you choose to add a drive, a new entry will be made and a default drive mapping will appear. You can change where - this drives points to by changing what's in the + this drive points to by changing what's in the <emphasis>Path:</emphasis> box. If you're unsure of the exact path you can choose "Browse" to search for it. Removing a drive is as easy as selecting the drive and @@ -390,13 +390,13 @@ of applications and the operating system. Likewise, Wine implements a registry and some settings not found in Winecfg can be changed within it. (There's actually more of a chance - you'll need to dip into the registry to change an applications' + you'll need to dip into the registry to change an application's settings than Wine itself.) </para> <para> Now, the fact that Wine itself uses the registry to store settings has been controversial. Some people argue that it's too much like - Windows. To counter this, there's several things to consider. + Windows. To counter this there are several things to consider. First, it's impossible to avoid implementing a registry simply because applications expect to be able to store their settings there. In order for Wine to store and access settings in a separate

1 0

André Hentschel : wineusr: Teach how to run Wine before how to configure it.
by Alexandre Julliard Feb. 18, 2011

Feb. 18, 2011

Module: docs Branch: master Commit: e99a076b45c1b0ccacf28038de2d1b3bd49272cd URL: http://source.winehq.org/git/docs.git/?a=commit;h=e99a076b45c1b0ccacf28038d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 16 19:34:39 2011 +0100 wineusr: Teach how to run Wine before how to configure it. --- en/wineusr-guide.sgml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/en/wineusr-guide.sgml b/en/wineusr-guide.sgml index 7a6bc75..13698b4 100644 --- a/en/wineusr-guide.sgml +++ b/en/wineusr-guide.sgml @@ -83,8 +83,8 @@ &introduction; &getting; - &configuring; &running; + &configuring; &bugs; &glossary;

1 0

Jörg Höhle : msvcrt/tests: sizeof(long double) is 12 with MS.
by Alexandre Julliard Feb. 17, 2011

Feb. 17, 2011

Module: wine Branch: master Commit: d9d43231371171ba128d391cfb37cc167e7651cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d43231371171ba128d391cf… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Dec 28 23:02:12 2010 +0100 msvcrt/tests: sizeof(long double) is 12 with MS. --- dlls/msvcrt/tests/misc.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index a4a1bd3..d93dccf 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -170,17 +170,28 @@ static const I10_OUTPUT_test I10_OUTPUT_tests[] = { static void test_I10_OUTPUT(void) { I10_OUTPUT_data out; - int i, j, ret; + int i, j = sizeof(long double), ret; if(!pI10_OUTPUT) { win_skip("I10_OUTPUT not available\n"); return; } + if (j != 12) + trace("sizeof(long double) = %d on this machine\n", j); for(i=0; i<sizeof(I10_OUTPUT_tests)/sizeof(I10_OUTPUT_test); i++) { memset(out.str, '#', sizeof(out.str)); - ret = pI10_OUTPUT(I10_OUTPUT_tests[i].d, I10_OUTPUT_tests[i].size, I10_OUTPUT_tests[i].flags, &out); + if (sizeof(long double) == 12) + ret = pI10_OUTPUT(I10_OUTPUT_tests[i].d, I10_OUTPUT_tests[i].size, I10_OUTPUT_tests[i].flags, &out); + else { + /* MS' "long double" is an 80 bit FP that takes 12 bytes*/ + typedef struct { ULONG x80[3]; } uld; /* same calling convention */ + union { long double ld; uld ld12; } fp80; + int (__cdecl *pI10_OUTPUT12)(uld, int, int, void*) = (void*)pI10_OUTPUT; + fp80.ld = I10_OUTPUT_tests[i].d; + ret = pI10_OUTPUT12(fp80.ld12, I10_OUTPUT_tests[i].size, I10_OUTPUT_tests[i].flags, &out); + } ok(ret == I10_OUTPUT_tests[i].ret, "%d: ret = %d\n", i, ret); ok(out.pos == I10_OUTPUT_tests[i].out.pos, "%d: out.pos = %hd\n", i, out.pos); ok(out.sign == I10_OUTPUT_tests[i].out.sign, "%d: out.size = %c\n", i, out.sign);

1 0

Jörg Höhle : msvcrt: sizeof(long double) is 12 with MS, but not necessarily so on UNIX.
by Alexandre Julliard Feb. 17, 2011

Feb. 17, 2011

Module: wine Branch: master Commit: c6d67fad8f6d0ac199d0945314564e39aa64644f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6d67fad8f6d0ac199d094531… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Dec 1 22:26:26 2010 +0100 msvcrt: sizeof(long double) is 12 with MS, but not necessarily so on UNIX. --- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/string.c | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index c878c08..1c7120f 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -86,7 +86,7 @@ typedef int (*__cdecl MSVCRT__onexit_t)(void); typedef void (__cdecl *MSVCRT_invalid_parameter_handler)(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, unsigned, MSVCRT_uintptr_t); typedef void (__cdecl *MSVCRT_purecall_handler)(void); -typedef struct {long double x;} MSVCRT__LDOUBLE; +typedef struct {ULONG x80[3];} MSVCRT__LDOUBLE; /* Intel 80 bit FP format has sizeof() 12 */ struct MSVCRT_tm { int tm_sec; diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 031c3d0..2b9d41e 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -561,8 +561,10 @@ int CDECL MSVCRT__atoldbl(MSVCRT__LDOUBLE *value, const char *str) { /* FIXME needs error checking for huge/small values */ #ifdef HAVE_STRTOLD + long double ld; TRACE("str %s value %p\n",str,value); - value->x = strtold(str,0); + ld = strtold(str,0); + memcpy(value, &ld, 10); #else FIXME("stub, str %s value %p\n",str,value); #endif @@ -575,8 +577,10 @@ int CDECL MSVCRT__atoldbl(MSVCRT__LDOUBLE *value, const char *str) int CDECL __STRINGTOLD( MSVCRT__LDOUBLE *value, char **endptr, const char *str, int flags ) { #ifdef HAVE_STRTOLD + long double ld; FIXME("%p %p %s %x partial stub\n", value, endptr, str, flags ); - value->x = strtold(str,endptr); + ld = strtold(str,0); + memcpy(value, &ld, 10); #else FIXME("%p %p %s %x stub\n", value, endptr, str, flags ); #endif @@ -1281,7 +1285,7 @@ struct _I10_OUTPUT_DATA { /********************************************************************* * $I10_OUTPUT (MSVCRT.@) - * ld - long double to be printed to data + * ld80 - long double (Intel 80 bit FP in 12 bytes) to be printed to data * prec - precision of part, we're interested in * flag - 0 for first prec digits, 1 for fractional part * data - data to be populated @@ -1294,16 +1298,22 @@ struct _I10_OUTPUT_DATA { * Native sets last byte of data->str to '0' or '9', I don't know what * it means. Current implementation sets it always to '0'. */ -int CDECL MSVCRT_I10_OUTPUT(MSVCRT__LDOUBLE ld, int prec, int flag, struct _I10_OUTPUT_DATA *data) +int CDECL MSVCRT_I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I10_OUTPUT_DATA *data) { static const char inf_str[] = "1#INF"; static const char nan_str[] = "1#QNAN"; - double d = ld.x; + /* MS' long double type wants 12 bytes for Intel's 80 bit FP format. + * Some UNIX have sizeof(long double) == 16, yet only 80 bit are used. + * Assume long double uses 80 bit FP, never seen 128 bit FP. */ + long double ld = 0; + double d; char format[8]; char buf[I10_OUTPUT_MAX_PREC+9]; /* 9 = strlen("0.e+0000") + '\0' */ char *p; + memcpy(&ld, &ld80, 10); + d = ld; TRACE("(%lf %d %x %p)\n", d, prec, flag, data); if(d<0) {

1 0

Austin English : crypt32/tests: Make sure to use a return value (LLVM/Clang ).
by Alexandre Julliard Feb. 17, 2011

Feb. 17, 2011

Module: wine Branch: master Commit: 498d8738e392493d2953dfc0e1a677d21b31f3e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=498d8738e392493d2953dfc0e… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 16 18:34:28 2011 -0800 crypt32/tests: Make sure to use a return value (LLVM/Clang). --- dlls/crypt32/tests/cert.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index b1a993d..e338740 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1834,6 +1834,7 @@ static void testCertSigs(void) CryptReleaseContext(csp, 0); ret = pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_DELETEKEYSET); + ok(ret, "CryptAcquireContext failed: %08x\n", GetLastError()); } static const BYTE md5SignedEmptyCert[] = {

1 0

Austin English : winmm/tests: Remove dead assignment (LLVM/Clang).
by Alexandre Julliard Feb. 17, 2011

Feb. 17, 2011

Module: wine Branch: master Commit: d583f12d8e33bd28f6d936e9d2902e2d8d918e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d583f12d8e33bd28f6d936e9d… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 16 18:26:25 2011 -0800 winmm/tests: Remove dead assignment (LLVM/Clang). --- dlls/winmm/tests/wave.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 77a4cc1..c85f13c 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -319,7 +319,6 @@ const char * wave_open_flags(DWORD flags) if ((flags & WAVE_MAPPED) == WAVE_MAPPED) { if (!first) strcat(msg, "|"); strcat(msg, "WAVE_MAPPED"); - first = FALSE; } return msg; }

1 0

Austin English : jscript/tests: Remove a dead assignment (LLVM/Clang).
by Alexandre Julliard Feb. 17, 2011

Feb. 17, 2011

Module: wine Branch: master Commit: 4dc81b65180504f124b6634005be841a1f5d791f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc81b65180504f124b663400… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 16 18:43:24 2011 -0800 jscript/tests: Remove a dead assignment (LLVM/Clang). --- dlls/jscript/tests/run.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 326b327..18252be 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1276,7 +1276,7 @@ static void run_from_res(const char *name) len = MultiByteToWideChar(CP_ACP, 0, data, size, NULL, 0); str = SysAllocStringLen(NULL, len); - len = MultiByteToWideChar(CP_ACP, 0, data, size, str, len); + MultiByteToWideChar(CP_ACP, 0, data, size, str, len); SET_EXPECT(global_success_d); SET_EXPECT(global_success_i);

1 0

Austin English : d3d9/tests: Make sure to use return values (LLVM/Clang).
by Alexandre Julliard Feb. 17, 2011

Feb. 17, 2011

Module: wine Branch: master Commit: 66f5234f3e4d2e5cc2ddaa3b8938c92996db277d URL: http://source.winehq.org/git/wine.git/?a=commit;h=66f5234f3e4d2e5cc2ddaa3b8… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 16 18:37:45 2011 -0800 d3d9/tests: Make sure to use return values (LLVM/Clang). --- dlls/d3d9/tests/visual.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0800892..9a40891 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11290,7 +11290,9 @@ static void clip_planes_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader failed, hr=%08x\n", hr); hr = IDirect3DDevice9_SetPixelShader(device, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed, hr=%08x\n", hr); IDirect3DDevice9_SetClipPlane(device, 0, plane0); @@ -11328,6 +11330,7 @@ static void clip_planes_test(IDirect3DDevice9 *device) IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPLANEENABLE, 0); hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader failed, hr=%08x\n", hr); IDirect3DVertexShader9_Release(shader); hr = IDirect3DDevice9_SetRenderTarget(device, 0, original_rt); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget failed, hr=%08x\n", hr);

1 0