November 2013 - Wine-Commits

Henri Verbeet : d3d9/tests: Get rid of some unused test data in pretransformed_varying_test().
by Alexandre Julliard Nov. 1, 2013

Nov. 1, 2013

Module: wine Branch: master Commit: 88971aa17d22ab7aac8df01a3b9c58a17206e0df URL: http://source.winehq.org/git/wine.git/?a=commit;h=88971aa17d22ab7aac8df01a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 1 09:41:00 2013 +0100 d3d9/tests: Get rid of some unused test data in pretransformed_varying_test(). --- dlls/d3d9/tests/visual.c | 73 +++++++++++++++++++++------------------------ 1 files changed, 34 insertions(+), 39 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 44755ec..f134067 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6295,15 +6295,6 @@ static void nested_loop_test(IDirect3DDevice9 *device) IDirect3DVertexShader9_Release(vshader); } -struct varying_test_struct -{ - const DWORD *shader_code; - IDirect3DPixelShader9 *shader; - DWORD color, color_rhw; - const char *name; - BOOL todo, todo_rhw; -}; - struct hugeVertex { float pos_x, pos_y, pos_z, rhw; @@ -6396,18 +6387,25 @@ static void pretransformed_varying_test(IDirect3DDevice9 *device) }; /* sample: fails */ - struct varying_test_struct tests[] = { - {blendweight_code, NULL, 0x00000000, 0x00191919, "blendweight" , FALSE, TRUE }, - {blendindices_code, NULL, 0x00000000, 0x00333333, "blendindices" , FALSE, TRUE }, - {normal_code, NULL, 0x00000000, 0x004c4c4c, "normal" , FALSE, TRUE }, - /* Why does dx not forward the texcoord? */ - {texcoord0_code, NULL, 0x00000000, 0x00808c8c, "texcoord0" , FALSE, FALSE }, - {tangent_code, NULL, 0x00000000, 0x00999999, "tangent" , FALSE, TRUE }, - {binormal_code, NULL, 0x00000000, 0x00b2b2b2, "binormal" , FALSE, TRUE }, - {color_code, NULL, 0x00e6e6e6, 0x00e6e6e6, "color" , FALSE, FALSE }, - {fog_code, NULL, 0x00000000, 0x00666666, "fog" , FALSE, TRUE }, - {depth_code, NULL, 0x00000000, 0x00cccccc, "depth" , FALSE, TRUE }, - {specular_code, NULL, 0x004488ff, 0x004488ff, "specular" , FALSE, FALSE } + static const struct + { + const char *name; + const DWORD *shader_code; + DWORD color; + BOOL todo; + } + tests[] = + { + {"blendweight", blendweight_code, 0x00191919, TRUE }, + {"blendindices", blendindices_code, 0x00333333, TRUE }, + {"normal", normal_code, 0x004c4c4c, TRUE }, + {"texcoord0", texcoord0_code, 0x00808c8c, FALSE}, + {"tangent", tangent_code, 0x00999999, TRUE }, + {"binormal", binormal_code, 0x00b2b2b2, TRUE }, + {"color", color_code, 0x00e6e6e6, FALSE}, + {"fog", fog_code, 0x00666666, TRUE }, + {"depth", depth_code, 0x00cccccc, TRUE }, + {"specular", specular_code, 0x004488ff, FALSE}, }; /* Declare a monster vertex type :-) */ static const D3DVERTEXELEMENT9 decl_elements[] = { @@ -6495,21 +6493,19 @@ static void pretransformed_varying_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetVertexDeclaration(device, decl); ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration returned %08x\n", hr); - for(i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) - { - hr = IDirect3DDevice9_CreatePixelShader(device, tests[i].shader_code, &tests[i].shader); - ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader failed for shader %s, hr = %08x\n", - tests[i].name, hr); - } - hr = IDirect3DDevice9_SetVertexDeclaration(device, decl); ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration returned %08x\n", hr); - for(i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) { + IDirect3DPixelShader9 *shader; + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); - hr = IDirect3DDevice9_SetPixelShader(device, tests[i].shader); + hr = IDirect3DDevice9_CreatePixelShader(device, tests[i].shader_code, &shader); + ok(SUCCEEDED(hr), "Failed to create pixel shader for test %s, hr %#x.\n", tests[i].name, hr); + + hr = IDirect3DDevice9_SetPixelShader(device, shader); ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader returned %08x\n", hr); hr = IDirect3DDevice9_BeginScene(device); @@ -6525,24 +6521,23 @@ static void pretransformed_varying_test(IDirect3DDevice9 *device) /* This isn't a weekend's job to fix, ignore the problem for now. * Needs a replacement pipeline. */ color = getPixelColor(device, 360, 240); - if (tests[i].todo_rhw) - todo_wine ok(color_match(color, tests[i].color_rhw, 1) + if (tests[i].todo) + todo_wine ok(color_match(color, tests[i].color, 1) || broken(color_match(color, 0x00000000, 1) && tests[i].shader_code == blendindices_code), "Test %s returned color 0x%08x, expected 0x%08x (todo).\n", - tests[i].name, color, tests[i].color_rhw); + tests[i].name, color, tests[i].color); else - ok(color_match(color, tests[i].color_rhw, 1), + ok(color_match(color, tests[i].color, 1), "Test %s returned color 0x%08x, expected 0x%08x.\n", - tests[i].name, color, tests[i].color_rhw); + tests[i].name, color, tests[i].color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); - } - for(i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) - { - IDirect3DPixelShader9_Release(tests[i].shader); + hr = IDirect3DDevice9_SetPixelShader(device, NULL); + ok(SUCCEEDED(hr), "Failed to set pixel shader for test %s, hr %#x.\n", tests[i].name, hr); + IDirect3DPixelShader9_Release(shader); } IDirect3DVertexDeclaration9_Release(decl);

1 0

Henri Verbeet : d3d9/tests: Fix the expected value for the "blendindices" test in pretransformed_varying_test().
by Alexandre Julliard Nov. 1, 2013

Nov. 1, 2013

Module: wine Branch: master Commit: 532f17bce0b8c47c07316e2d5d1557208ebd0d8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=532f17bce0b8c47c07316e2d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 1 09:40:59 2013 +0100 d3d9/tests: Fix the expected value for the "blendindices" test in pretransformed_varying_test(). 0x00333333 makes much more sense than 0x00000000, and is what most of my hardware returns. Apparently at least some GF7 cards (still) return 0x00000000, so also accept that as broken(). --- dlls/d3d9/tests/visual.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 246dd07..44755ec 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6398,7 +6398,7 @@ static void pretransformed_varying_test(IDirect3DDevice9 *device) struct varying_test_struct tests[] = { {blendweight_code, NULL, 0x00000000, 0x00191919, "blendweight" , FALSE, TRUE }, - {blendindices_code, NULL, 0x00000000, 0x00000000, "blendindices" , FALSE, FALSE }, + {blendindices_code, NULL, 0x00000000, 0x00333333, "blendindices" , FALSE, TRUE }, {normal_code, NULL, 0x00000000, 0x004c4c4c, "normal" , FALSE, TRUE }, /* Why does dx not forward the texcoord? */ {texcoord0_code, NULL, 0x00000000, 0x00808c8c, "texcoord0" , FALSE, FALSE }, @@ -6526,7 +6526,9 @@ static void pretransformed_varying_test(IDirect3DDevice9 *device) * Needs a replacement pipeline. */ color = getPixelColor(device, 360, 240); if (tests[i].todo_rhw) - todo_wine ok(color_match(color, tests[i].color_rhw, 1), + todo_wine ok(color_match(color, tests[i].color_rhw, 1) + || broken(color_match(color, 0x00000000, 1) + && tests[i].shader_code == blendindices_code), "Test %s returned color 0x%08x, expected 0x%08x (todo).\n", tests[i].name, color, tests[i].color_rhw); else

1 0

Frédéric Delanoy : ntdll: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 1, 2013

Nov. 1, 2013

Module: wine Branch: master Commit: 7e63200672869e55d57eecbabd693fafd438851a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e63200672869e55d57eecbab… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 1 00:21:24 2013 +0100 ntdll: Use BOOL type where appropriate. --- dlls/ntdll/file.c | 18 +++++++++--------- dlls/ntdll/rtlstr.c | 8 ++++---- dlls/ntdll/signal_i386.c | 4 ++-- dlls/ntdll/string.c | 4 ++-- dlls/ntdll/wcstring.c | 8 ++++---- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index bd9516d..1de2c61 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -115,7 +115,7 @@ static NTSTATUS FILE_CreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATT ULONG options, PVOID ea_buffer, ULONG ea_length ) { ANSI_STRING unix_name; - int created = FALSE; + BOOL created = FALSE; TRACE("handle=%p access=%08x name=%s objattr=%08x root=%p sec=%p io=%p alloc_size=%p " "attr=%08x sharing=%08x disp=%d options=%08x ea=%p.0x%08x\n", @@ -586,14 +586,14 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, PIO_STATUS_BLOCK io_status, void* buffer, ULONG length, PLARGE_INTEGER offset, PULONG key) { - int result, unix_handle, needs_close, timeout_init_done = 0; + int result, unix_handle, needs_close; unsigned int options; struct io_timeouts timeouts; NTSTATUS status; ULONG total = 0; enum server_fd_type type; ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user; - BOOL send_completion = FALSE, async_read; + BOOL send_completion = FALSE, async_read, timeout_init_done = FALSE; TRACE("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p),partial stub!\n", hFile,hEvent,apc,apc_user,io_status,buffer,length,offset,key); @@ -733,7 +733,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, if (!timeout_init_done) { - timeout_init_done = 1; + timeout_init_done = TRUE; if ((status = get_io_timeouts( hFile, type, length, TRUE, &timeouts ))) goto err; if (hEvent) NtResetEvent( hEvent, NULL ); @@ -965,14 +965,14 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, const void* buffer, ULONG length, PLARGE_INTEGER offset, PULONG key) { - int result, unix_handle, needs_close, timeout_init_done = 0; + int result, unix_handle, needs_close; unsigned int options; struct io_timeouts timeouts; NTSTATUS status; ULONG total = 0; enum server_fd_type type; ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user; - BOOL send_completion = FALSE, async_write, append_write = FALSE; + BOOL send_completion = FALSE, async_write, append_write = FALSE, timeout_init_done = FALSE; LARGE_INTEGER offset_eof; TRACE("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p)!\n", @@ -1133,7 +1133,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, if (!timeout_init_done) { - timeout_init_done = 1; + timeout_init_done = TRUE; if ((status = get_io_timeouts( hFile, type, length, FALSE, &timeouts ))) goto err; if (hEvent) NtResetEvent( hEvent, NULL ); @@ -2498,13 +2498,13 @@ static inline void get_device_info_fstatfs( FILE_FS_DEVICE_INFORMATION *info, co } #endif -static inline int is_device_placeholder( int fd ) +static inline BOOL is_device_placeholder( int fd ) { static const char wine_placeholder[] = "Wine device placeholder"; char buffer[sizeof(wine_placeholder)-1]; if (pread( fd, buffer, sizeof(wine_placeholder) - 1, 0 ) != sizeof(wine_placeholder) - 1) - return 0; + return FALSE; return !memcmp( buffer, wine_placeholder, sizeof(wine_placeholder) - 1 ); } diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index b092772..01b4446 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -1723,7 +1723,7 @@ NTSTATUS WINAPI RtlCharToInteger( CHAR chCurrent; int digit; ULONG RunningTotal = 0; - char bMinus = 0; + BOOL bMinus = FALSE; while (*str != '\0' && *str <= ' ') { str++; @@ -1732,7 +1732,7 @@ NTSTATUS WINAPI RtlCharToInteger( if (*str == '+') { str++; } else if (*str == '-') { - bMinus = 1; + bMinus = TRUE; str++; } /* if */ @@ -1877,7 +1877,7 @@ NTSTATUS WINAPI RtlUnicodeStringToInteger( WCHAR wchCurrent; int digit; ULONG RunningTotal = 0; - char bMinus = 0; + BOOL bMinus = FALSE; while (CharsRemaining >= 1 && *lpwstr <= ' ') { lpwstr++; @@ -1889,7 +1889,7 @@ NTSTATUS WINAPI RtlUnicodeStringToInteger( lpwstr++; CharsRemaining--; } else if (*lpwstr == '-') { - bMinus = 1; + bMinus = TRUE; lpwstr++; CharsRemaining--; } /* if */ diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index b29405b..fe6d517 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -448,7 +448,7 @@ static size_t signal_stack_size; static wine_signal_handler handlers[256]; -static int fpux_support; /* whether the CPU support extended fpu context */ +static BOOL fpux_support; /* whether the CPU supports extended fpu context */ extern void DECLSPEC_NORETURN __wine_restore_regs( const CONTEXT *context ); @@ -1126,7 +1126,7 @@ static inline void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext, { context->ContextFlags |= CONTEXT_FLOATING_POINT | CONTEXT_EXTENDED_REGISTERS; memcpy( context->ExtendedRegisters, fpux, sizeof(*fpux) ); - fpux_support = 1; + fpux_support = TRUE; if (!fpu) fpux_to_fpu( &context->FloatSave, fpux ); } if (!fpu && !fpux) save_fpu( context ); diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index e7a1a61..2a006f1 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -734,7 +734,7 @@ char * __cdecl _i64toa( LONGLONG __cdecl _atoi64( const char *str ) { ULONGLONG RunningTotal = 0; - char bMinus = 0; + BOOL bMinus = FALSE; while (*str == ' ' || (*str >= '\011' && *str <= '\015')) { str++; @@ -743,7 +743,7 @@ LONGLONG __cdecl _atoi64( const char *str ) if (*str == '+') { str++; } else if (*str == '-') { - bMinus = 1; + bMinus = TRUE; str++; } /* if */ diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index 7f0035d..acdb33a 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -640,7 +640,7 @@ LPWSTR __cdecl _i64tow( LONG __cdecl _wtol( LPCWSTR str ) { ULONG RunningTotal = 0; - char bMinus = 0; + BOOL bMinus = FALSE; while (isspaceW(*str)) { str++; @@ -649,7 +649,7 @@ LONG __cdecl _wtol( LPCWSTR str ) if (*str == '+') { str++; } else if (*str == '-') { - bMinus = 1; + bMinus = TRUE; str++; } /* if */ @@ -703,7 +703,7 @@ int __cdecl _wtoi( LPCWSTR str ) LONGLONG __cdecl _wtoi64( LPCWSTR str ) { ULONGLONG RunningTotal = 0; - char bMinus = 0; + BOOL bMinus = FALSE; while (isspaceW(*str)) { str++; @@ -712,7 +712,7 @@ LONGLONG __cdecl _wtoi64( LPCWSTR str ) if (*str == '+') { str++; } else if (*str == '-') { - bMinus = 1; + bMinus = TRUE; str++; } /* if */

1 0

Frédéric Delanoy : imm32/tests: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 1, 2013

Nov. 1, 2013

Module: wine Branch: master Commit: 45eff32ad0bf121771b9b4b57446244e3fb82d93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45eff32ad0bf121771b9b4b57… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 1 00:21:23 2013 +0100 imm32/tests: Use BOOL type where appropriate. --- dlls/imm32/tests/imm32.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index a37190c..7275fe3 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -797,7 +797,8 @@ static void test_ImmGetIMCLockCount(void) static void test_ImmGetIMCCLockCount(void) { HIMCC imcc; - DWORD count, g_count, ret, i; + DWORD count, g_count, i; + BOOL ret; VOID *p; imcc = ImmCreateIMCC(sizeof(CANDIDATEINFO));

1 0

Frédéric Delanoy : eject: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 1, 2013

Nov. 1, 2013

Module: wine Branch: master Commit: 423d66195b29be310332154caf8d1e9523624e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=423d66195b29be310332154ca… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 1 00:21:22 2013 +0100 eject: Use BOOL type where appropriate. --- programs/eject/eject.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/eject/eject.c b/programs/eject/eject.c index 02ff4ba..483ac21 100644 --- a/programs/eject/eject.c +++ b/programs/eject/eject.c @@ -33,8 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(eject); /* options */ -static int unmount_only; -static int eject_all; +static BOOL unmount_only; +static BOOL eject_all; /* wrapper for GetDriveTypeW */ static DWORD get_drive_type( WCHAR drive ) @@ -134,8 +134,8 @@ static void parse_options( int *argc, char *argv[] ) } for (opt = argv[i] + 1; *opt; opt++) switch(*opt) { - case 'a': eject_all = 1; break; - case 'u': unmount_only = 1; break; + case 'a': eject_all = TRUE; break; + case 'u': unmount_only = TRUE; break; case 'h': usage(); break; default: WINE_MESSAGE( "Unknown option -%c\n", *opt );

1 0

Jeremy Newman : remove google checkout donation option
by Jeremy Newman Nov. 1, 2013

Nov. 1, 2013

Module: website Branch: master Commit: 3c59cf9a8ce6a2ad03da39b15dcad2c551597aa2 URL: http://source.winehq.org/git/website.git/?a=commit;h=3c59cf9a8ce6a2ad03da39… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 1 09:46:45 2013 -0500 remove google checkout donation option --- templates/de/donate.template | 34 ---------------------------------- templates/en/donate.template | 34 ---------------------------------- templates/fr/donate.template | 35 ----------------------------------- templates/pl/donate.template | 35 ----------------------------------- templates/pt/donate.template | 34 ---------------------------------- templates/tr/donate.template | 34 ---------------------------------- templates/zh-cn/donate.template | 34 ---------------------------------- 7 files changed, 0 insertions(+), 240 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=3c59cf9a8ce6a2ad03…

1 0