December 2013 - Wine-commits

Dmitry Timoshkov : include: Add more Task Scheduler interface definitions.
by Alexandre Julliard 13 Dec '13

13 Dec '13

Module: wine Branch: master Commit: 870f289680e1d03dc050849514896f5880aa24d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=870f289680e1d03dc05084951… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 13 18:55:18 2013 +0900 include: Add more Task Scheduler interface definitions. --- include/taskschd.idl | 286 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 285 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=870f289680e1d03dc0508…

1 0

Dmitry Timoshkov : secur32/tests: Use LoadLibrary instead of GetModuleHandle to load advapi32.dll APIs.
by Alexandre Julliard 13 Dec '13

13 Dec '13

Module: wine Branch: master Commit: 79511d98b740c662f46ab33df2e79e401acbd942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79511d98b740c662f46ab33df… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 12 14:11:30 2013 +0900 secur32/tests: Use LoadLibrary instead of GetModuleHandle to load advapi32.dll APIs. --- dlls/secur32/tests/schannel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 81539c7..a00c276 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -123,7 +123,7 @@ static void InitFunctionPtrs(void) secdll = LoadLibraryA("secur32.dll"); if(!secdll) secdll = LoadLibraryA("security.dll"); - advapi32dll = GetModuleHandleA("advapi32.dll"); + advapi32dll = LoadLibraryA("advapi32.dll"); #define GET_PROC(h, func) p ## func = (void*)GetProcAddress(h, #func)

1 0

Dmitry Timoshkov : secur32/tests: Make sure that QueryContextAttributes( SECPKG_ATTR_STREAM_SIZES) succeeds.
by Alexandre Julliard 13 Dec '13

13 Dec '13

Module: wine Branch: master Commit: 476f57fd632110d53c501c15375120fdaf627733 URL: http://source.winehq.org/git/wine.git/?a=commit;h=476f57fd632110d53c501c153… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 12 14:12:13 2013 +0900 secur32/tests: Make sure that QueryContextAttributes(SECPKG_ATTR_STREAM_SIZES) succeeds. --- dlls/secur32/tests/schannel.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index a00c276..daac39f 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -804,7 +804,8 @@ todo_wine ok(conn_info.dwHashStrength >= 128, "conn_info.dwHashStrength = %d\n", conn_info.dwHashStrength); } - pQueryContextAttributesA(&context, SECPKG_ATTR_STREAM_SIZES, &sizes); + status = pQueryContextAttributesA(&context, SECPKG_ATTR_STREAM_SIZES, &sizes); + ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_STREAM_SIZES) failed: %08x\n", status); reset_buffers(&buffers[0]);

1 0

Dmitry Timoshkov : secur32/tests: Add a test for QueryCredentialsAttributes (SECPKG_CRED_ATTR_NAMES).
by Alexandre Julliard 13 Dec '13

13 Dec '13

Module: wine Branch: master Commit: 25a037543293a933d3517d4844d6d9e7cef86bf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25a037543293a933d3517d484… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 12 14:13:01 2013 +0900 secur32/tests: Add a test for QueryCredentialsAttributes(SECPKG_CRED_ATTR_NAMES). --- dlls/secur32/tests/schannel.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index daac39f..8cfa4f8 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -198,6 +198,7 @@ static void testAcquireSecurityContext(void) ULONG i; SECURITY_STATUS st; CredHandle cred; + SecPkgCredentials_NamesA names; TimeStamp exp; SCHANNEL_CRED schanCred; PCCERT_CONTEXT certs[2]; @@ -299,6 +300,10 @@ static void testAcquireSecurityContext(void) ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st); /* expriy is indeterminate in win2k3 */ trace("expiry: %08x%08x\n", exp.HighPart, exp.LowPart); + + st = pQueryCredentialsAttributesA(&cred, SECPKG_CRED_ATTR_NAMES, &names); + ok(st == SEC_E_NO_CREDENTIALS || st == SEC_E_UNSUPPORTED_FUNCTION /* before Vista */, "expected SEC_E_NO_CREDENTIALS, got %08x\n", st); + pFreeCredentialsHandle(&cred); /* Bad version in SCHANNEL_CRED */ @@ -621,6 +626,7 @@ static void test_communication(void) SCHANNEL_CRED cred; CredHandle cred_handle; CtxtHandle context; + SecPkgCredentials_NamesA names; SecPkgContext_StreamSizes sizes; SecPkgContext_ConnectionInfo conn_info; CERT_CONTEXT *cert; @@ -790,6 +796,9 @@ todo_wine return; } + status = pQueryCredentialsAttributesA(&cred_handle, SECPKG_CRED_ATTR_NAMES, &names); + ok(status == SEC_E_NO_CREDENTIALS || status == SEC_E_UNSUPPORTED_FUNCTION /* before Vista */, "expected SEC_E_NO_CREDENTIALS, got %08x\n", status); + status = pQueryContextAttributesA(&context, SECPKG_ATTR_REMOTE_CERT_CONTEXT, (void*)&cert); ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_REMOTE_CERT_CONTEXT) failed: %08x\n", status); if(status == SEC_E_OK) {

1 0

Jactry Zeng : Add wine-zh mailing list to forums page in Simplified Chinese .
by Jeremy Newman 13 Dec '13

13 Dec '13

Module: website Branch: master Commit: 074d1b83263cbed3c7c71966da0e0609a9668408 URL: http://source.winehq.org/git/website.git/?a=commit;h=074d1b83263cbed3c7c719… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sat Dec 14 01:05:36 2013 +0800 Add wine-zh mailing list to forums page in Simplified Chinese. --- templates/zh-cn/forums.template | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/templates/zh-cn/forums.template b/templates/zh-cn/forums.template index ea15c02..6da126d 100644 --- a/templates/zh-cn/forums.template +++ b/templates/zh-cn/forums.template @@ -50,6 +50,13 @@ WWW</a>，或者发送一封标题为“subscribe”的邮件到 <i>指定列表 </li> <li> + [<a href="http://www.freelists.org/list/wine-zh">（取消）订阅</a>] + [<a href="http://www.freelists.org/archive/wine-zh/">存档</a>] + <a href="mailto:wine-zh(a)freelists.org">wine-zh(a)freelists.org</a><br> + 一个低流量（10封/天）的开放性列表，用于中文终端用户讨论。 + </li> + + <li> [<a href="//www.winehq.org/mailman/listinfo/wine-devel">（取消）订阅</a>] [<a href="//www.winehq.org/pipermail/wine-devel/">存档 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.devel">存档 2</a>]

1 0

Dan Kegel : Add wine-zh mailing list to forums page
by Jeremy Newman 13 Dec '13

13 Dec '13

Module: website Branch: master Commit: 9a27a39d94a4b08b6ad4c505db9c9f2e2f379c1a URL: http://source.winehq.org/git/website.git/?a=commit;h=9a27a39d94a4b08b6ad4c5… Author: Dan Kegel <dank(a)kegel.com> Date: Fri Dec 13 07:49:08 2013 -0800 Add wine-zh mailing list to forums page Zhenbo Li suggested this change. The wine-zh mailing list's been going for a year now, let's add it to the list. --- templates/en/forums.template | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/templates/en/forums.template b/templates/en/forums.template index 60090d3..c2106e4 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -60,6 +60,13 @@ mailing list software.</p> </li> <li> + [<a href="http://www.freelists.org/list/wine-zh">(Un-)Subscribe</a>] + [<a href="http://www.freelists.org/archive/wine-zh/">Archive</a>] + <a href="mailto:wine-zh(a)freelists.org">wine-zh(a)freelists.org</a><br> + A low traffic (10/day) open list for end-user discussions in Chinese. + </li> + + <li> [<a href="//www.winehq.org/mailman/listinfo/wine-devel">(Un-)Subscribe</a>] [<a href="//www.winehq.org/pipermail/wine-devel/">Archive 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.devel">Archive 2</a>]

1 0

Alexandre Julliard : format_comment.txt.tmpl: Don' t point to the edit page for attachments.
by Alexandre Julliard 13 Dec '13

13 Dec '13

Module: bugzilla Branch: master Commit: e1dfeca781942ca9b6c1952d9eb03b354767152d URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=e1dfeca781942ca9b6c19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 20:32:35 2013 +0100 format_comment.txt.tmpl: Don't point to the edit page for attachments. This reverts the fix for https://bugzilla.mozilla.org/show_bug.cgi?id=658547. Viewing the attachment directly is more useful. --- template/en/default/bug/format_comment.txt.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/template/en/default/bug/format_comment.txt.tmpl b/template/en/default/bug/format_comment.txt.tmpl index 1567980..ed89188 100644 --- a/template/en/default/bug/format_comment.txt.tmpl +++ b/template/en/default/bug/format_comment.txt.tmpl @@ -42,7 +42,7 @@ X[% comment_body %] [% ELSIF comment.type == constants.CMT_ATTACHMENT_CREATED %] Created attachment [% comment.extra_data %] [% IF is_bugmail %] - --> [% urlbase _ "attachment.cgi?id=" _ comment.extra_data _ "&action=edit" %] + --> [% urlbase _ "attachment.cgi?id=" _ comment.extra_data %] [% END %] [%+ comment.attachment.description %]

1 0

Frédéric Delanoy : krnl386.exe16: Use BOOL type where appropriate.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: 8a10493e6bd91df632ec145dcc797b7661ad60c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a10493e6bd91df632ec145dc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 11 20:57:15 2013 +0100 krnl386.exe16: Use BOOL type where appropriate. --- dlls/krnl386.exe16/dosexe.h | 2 +- dlls/krnl386.exe16/int16.c | 6 ++-- dlls/krnl386.exe16/int21.c | 51 ++++++++++++++++++++++--------------------- 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/dlls/krnl386.exe16/dosexe.h b/dlls/krnl386.exe16/dosexe.h index 0b813e1..f9df172 100644 --- a/dlls/krnl386.exe16/dosexe.h +++ b/dlls/krnl386.exe16/dosexe.h @@ -404,7 +404,7 @@ extern void WINAPI DOSVM_Int15Handler(CONTEXT*); /* int16.c */ extern void WINAPI DOSVM_Int16Handler(CONTEXT*); extern BOOL DOSVM_Int16ReadChar( BYTE *, BYTE *, CONTEXT * ); -extern int DOSVM_Int16AddChar(BYTE ascii,BYTE scan); +extern BOOL DOSVM_Int16AddChar(BYTE ascii, BYTE scan); /* int21.c */ extern void WINAPI DOSVM_Int21Handler(CONTEXT*); diff --git a/dlls/krnl386.exe16/int16.c b/dlls/krnl386.exe16/int16.c index 5d84a0b..c731472 100644 --- a/dlls/krnl386.exe16/int16.c +++ b/dlls/krnl386.exe16/int16.c @@ -195,7 +195,7 @@ BOOL DOSVM_Int16ReadChar(BYTE *ascii, BYTE *scan, CONTEXT *waitctx) return TRUE; } -int DOSVM_Int16AddChar(BYTE ascii,BYTE scan) +BOOL DOSVM_Int16AddChar(BYTE ascii,BYTE scan) { BIOSDATA *data = DOSVM_BiosData(); WORD CurOfs = data->FirstKbdCharPtr; @@ -204,12 +204,12 @@ int DOSVM_Int16AddChar(BYTE ascii,BYTE scan) TRACE("(%02x,%02x)\n",ascii,scan); if (NextOfs >= data->KbdBufferEnd) NextOfs = data->KbdBufferStart; /* check if buffer is full */ - if (NextOfs == data->NextKbdCharPtr) return 0; + if (NextOfs == data->NextKbdCharPtr) return FALSE; /* okay, insert character in ring buffer */ ((BYTE*)data)[CurOfs] = ascii; ((BYTE*)data)[CurOfs+1] = scan; data->FirstKbdCharPtr = NextOfs; - return 1; + return TRUE; } diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index 3652054..53b6537 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -3437,7 +3437,7 @@ static int INT21_GetDiskSerialNumber( CONTEXT *context ) * INT21_SetDiskSerialNumber * */ -static int INT21_SetDiskSerialNumber( CONTEXT *context ) +static BOOL INT21_SetDiskSerialNumber( CONTEXT *context ) { #if 0 BYTE *dataptr = CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx); @@ -3446,15 +3446,15 @@ static int INT21_SetDiskSerialNumber( CONTEXT *context ) if (!is_valid_drive(drive)) { SetLastError( ERROR_INVALID_DRIVE ); - return 0; + return FALSE; } DRIVE_SetSerialNumber( drive, *(DWORD *)(dataptr + 2) ); - return 1; + return TRUE; #else FIXME("Setting drive serial number is no longer supported\n"); SetLastError( ERROR_NOT_SUPPORTED ); - return 0; + return FALSE; #endif } @@ -3463,7 +3463,7 @@ static int INT21_SetDiskSerialNumber( CONTEXT *context ) * INT21_GetFreeDiskSpace * */ -static int INT21_GetFreeDiskSpace( CONTEXT *context ) +static BOOL INT21_GetFreeDiskSpace( CONTEXT *context ) { DWORD cluster_sectors, sector_bytes, free_clusters, total_clusters; WCHAR root[] = {'A',':','\\',0}; @@ -3473,7 +3473,8 @@ static int INT21_GetFreeDiskSpace( CONTEXT *context ) root[0] += INT21_MapDrive(DL_reg(context)); if (!GetDiskFreeSpaceW( root, &cluster_sectors, &sector_bytes, - &free_clusters, &total_clusters )) return 0; + &free_clusters, &total_clusters )) + return FALSE; /* Some old win31 apps (Lotus SmartSuite 5.1) crap out if there's too * much disk space, so Windows XP seems to apply the following limits: @@ -3530,19 +3531,19 @@ static int INT21_GetFreeDiskSpace( CONTEXT *context ) SET_BX( context, free_clusters ); SET_CX( context, sector_bytes ); SET_DX( context, total_clusters ); - return 1; + return TRUE; } /****************************************************************** * INT21_GetDriveAllocInfo * */ -static int INT21_GetDriveAllocInfo( CONTEXT *context, BYTE drive ) +static BOOL INT21_GetDriveAllocInfo( CONTEXT *context, BYTE drive ) { INT21_DPB *dpb; drive = INT21_MapDrive( drive ); - if (!INT21_FillDrivePB( drive )) return 0; + if (!INT21_FillDrivePB( drive )) return FALSE; dpb = &(INT21_GetHeapPointer()->misc_dpb_list[drive]); SET_AL( context, dpb->cluster_sectors + 1 ); SET_CX( context, dpb->sector_bytes ); @@ -3550,7 +3551,7 @@ static int INT21_GetDriveAllocInfo( CONTEXT *context, BYTE drive ) context->SegDs = INT21_GetHeapSelector( context ); SET_BX( context, offsetof( INT21_HEAP, misc_dpb_list[drive].media_ID ) ); - return 1; + return TRUE; } /*********************************************************************** @@ -3800,7 +3801,7 @@ static const WCHAR *INT21_FindPath; /* will point to current dta->fullPath searc /****************************************************************** * INT21_FindFirst */ -static int INT21_FindFirst( CONTEXT *context ) +static BOOL INT21_FindFirst( CONTEXT *context ) { WCHAR *p, *q; const char *path; @@ -3829,7 +3830,7 @@ static int INT21_FindFirst( CONTEXT *context ) SetLastError( ERROR_FILE_NOT_FOUND ); SET_AX( context, ERROR_FILE_NOT_FOUND ); SET_CFLAG(context); - return 0; + return FALSE; } WideCharToMultiByte(CP_OEMCP, 0, maskW, 12, dta->mask, sizeof(dta->mask), NULL, NULL); @@ -3842,7 +3843,7 @@ static int INT21_FindFirst( CONTEXT *context ) dta->drive = toupperW(dta->fullPath[0]) - 'A'; dta->count = 0; dta->search_attr = CL_reg(context); - return 1; + return TRUE; } /****************************************************************** @@ -3930,14 +3931,14 @@ static unsigned INT21_FindHelper(LPCWSTR fullPath, unsigned drive, unsigned coun /****************************************************************** * INT21_FindNext */ -static int INT21_FindNext( CONTEXT *context ) +static BOOL INT21_FindNext( CONTEXT *context ) { FINDFILE_DTA *dta = (FINDFILE_DTA *)INT21_GetCurrentDTA(context); DWORD attr = dta->search_attr | FA_UNUSED | FA_ARCHIVE | FA_RDONLY; WIN32_FIND_DATAW entry; int n; - if (!dta->fullPath) return 0; + if (!dta->fullPath) return FALSE; n = INT21_FindHelper(dta->fullPath, dta->drive, dta->count, dta->mask, attr, &entry); @@ -3962,11 +3963,11 @@ static int INT21_FindNext( CONTEXT *context ) INT21_FindPath = dta->fullPath = NULL; } dta->count = n; - return 1; + return TRUE; } HeapFree( GetProcessHeap(), 0, dta->fullPath ); INT21_FindPath = dta->fullPath = NULL; - return 0; + return FALSE; } /* microsoft's programmers should be shot for using CP/M style int21 @@ -3976,7 +3977,7 @@ static int INT21_FindNext( CONTEXT *context ) * INT21_FindFirstFCB * */ -static int INT21_FindFirstFCB( CONTEXT *context ) +static BOOL INT21_FindFirstFCB( CONTEXT *context ) { BYTE *fcb = CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx); FINDFILE_FCB *pFCB; @@ -3986,21 +3987,21 @@ static int INT21_FindFirstFCB( CONTEXT *context ) if (*fcb == 0xff) pFCB = (FINDFILE_FCB *)(fcb + 7); else pFCB = (FINDFILE_FCB *)fcb; drive = INT21_MapDrive( pFCB->drive ); - if (drive == MAX_DOS_DRIVES) return 0; + if (drive == MAX_DOS_DRIVES) return FALSE; p[0] = 'A' + drive; pFCB->fullPath = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); - if (!pFCB->fullPath) return 0; + if (!pFCB->fullPath) return FALSE; GetLongPathNameW(p, pFCB->fullPath, MAX_PATH); pFCB->count = 0; - return 1; + return TRUE; } /****************************************************************** * INT21_FindNextFCB * */ -static int INT21_FindNextFCB( CONTEXT *context ) +static BOOL INT21_FindNextFCB( CONTEXT *context ) { BYTE *fcb = CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx); FINDFILE_FCB *pFCB; @@ -4022,14 +4023,14 @@ static int INT21_FindNextFCB( CONTEXT *context ) pFCB = (FINDFILE_FCB *)fcb; } - if (!pFCB->fullPath) return 0; + if (!pFCB->fullPath) return FALSE; n = INT21_FindHelper(pFCB->fullPath, INT21_MapDrive( pFCB->drive ), pFCB->count, pFCB->filename, attr, &entry); if (!n) { HeapFree( GetProcessHeap(), 0, pFCB->fullPath ); INT21_FindPath = pFCB->fullPath = NULL; - return 0; + return FALSE; } pFCB->count += n; @@ -4055,7 +4056,7 @@ static int INT21_FindNextFCB( CONTEXT *context ) else INT21_ToDosFCBFormat( entry.cFileName, nameW ); WideCharToMultiByte(CP_OEMCP, 0, nameW, 11, ddl->filename, 11, NULL, NULL); - return 1; + return TRUE; }

1 0

Alexandre Bique : cmd: Update the string of the ver command.
by Alexandre Julliard 12 Dec '13

12 Dec '13

1 0

Frédéric Delanoy : wined3d: Use BOOL type where appropriate.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: cc6f9c36cd58cf28b56db7726052ebd382027f9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc6f9c36cd58cf28b56db7726… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 11 20:05:34 2013 +0100 wined3d: Use BOOL type where appropriate. --- dlls/wined3d/arb_program_shader.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0821fc2..23ca809 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1506,17 +1506,16 @@ static void shader_arb_get_src_param(const struct wined3d_shader_instruction *in const struct wined3d_shader_src_param *src, unsigned int tmpreg, char *outregstr) { /* Generate a line that does the input modifier computation and return the input register to use */ - BOOL is_color = FALSE; + BOOL is_color = FALSE, insert_line; char regstr[256]; char swzstr[20]; - int insert_line; struct wined3d_shader_buffer *buffer = ins->ctx->buffer; struct shader_arb_ctx_priv *ctx = ins->ctx->backend_data; const char *one = arb_get_helper_value(ins->ctx->reg_maps->shader_version.type, ARB_ONE); const char *two = arb_get_helper_value(ins->ctx->reg_maps->shader_version.type, ARB_TWO); /* Assume a new line will be added */ - insert_line = 1; + insert_line = TRUE; /* Get register name */ shader_arb_get_register_name(ins, &src->reg, regstr, &is_color); @@ -1526,11 +1525,11 @@ static void shader_arb_get_src_param(const struct wined3d_shader_instruction *in { case WINED3DSPSM_NONE: sprintf(outregstr, "%s%s", regstr, swzstr); - insert_line = 0; + insert_line = FALSE; break; case WINED3DSPSM_NEG: sprintf(outregstr, "-%s%s", regstr, swzstr); - insert_line = 0; + insert_line = FALSE; break; case WINED3DSPSM_BIAS: shader_addline(buffer, "ADD T%c, %s, -coefdiv.x;\n", 'A' + tmpreg, regstr); @@ -1564,7 +1563,7 @@ static void shader_arb_get_src_param(const struct wined3d_shader_instruction *in case WINED3DSPSM_ABS: if(ctx->target_version >= NV2) { sprintf(outregstr, "|%s%s|", regstr, swzstr); - insert_line = 0; + insert_line = FALSE; } else { shader_addline(buffer, "ABS T%c, %s;\n", 'A' + tmpreg, regstr); } @@ -1576,11 +1575,11 @@ static void shader_arb_get_src_param(const struct wined3d_shader_instruction *in shader_addline(buffer, "ABS T%c, %s;\n", 'A' + tmpreg, regstr); sprintf(outregstr, "-T%c%s", 'A' + tmpreg, swzstr); } - insert_line = 0; + insert_line = FALSE; break; default: sprintf(outregstr, "%s%s", regstr, swzstr); - insert_line = 0; + insert_line = FALSE; } /* Return modified or original register, with swizzle */

1 0