wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Henri Verbeet : wined3d: Recognise the SM4 "primID" register type.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 59bdd6ae9715d143b84e669c59be7e5841bd36ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=59bdd6ae9715d143b84e669c5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 15 22:26:19 2012 +0200 wined3d: Recognise the SM4 "primID" register type. --- dlls/wined3d/shader.c | 4 ++++ dlls/wined3d/shader_sm4.c | 3 ++- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 9c70f08..b735b77 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -992,6 +992,10 @@ static void shader_dump_register(const struct wined3d_shader_register *reg, TRACE("cb"); break; + case WINED3DSPR_PRIMID: + TRACE("primID"); + break; + case WINED3DSPR_NULL: TRACE("null"); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b69ba82..1159d6e 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -131,6 +131,7 @@ enum wined3d_sm4_register_type WINED3D_SM4_RT_IMMCONST = 0x4, WINED3D_SM4_RT_SAMPLER = 0x6, WINED3D_SM4_RT_CONSTBUFFER = 0x8, + WINED3D_SM4_RT_PRIMID = 0xb, WINED3D_SM4_RT_NULL = 0xd, }; @@ -269,7 +270,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM4_RT_CONSTBUFFER */ WINED3DSPR_CONSTBUFFER, /* UNKNOWN */ 0, /* UNKNOWN */ 0, - /* UNKNOWN */ 0, + /* WINED3D_SM4_RT_PRIMID */ WINED3DSPR_PRIMID, /* UNKNOWN */ 0, /* WINED3D_SM4_RT_NULL */ WINED3DSPR_NULL, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 56bdbad..06f75de 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -320,6 +320,7 @@ enum wined3d_shader_register_type WINED3DSPR_PREDICATE = 19, WINED3DSPR_IMMCONST, WINED3DSPR_CONSTBUFFER, + WINED3DSPR_PRIMID, WINED3DSPR_NULL, WINED3DSPR_RESOURCE, }; @@ -2678,6 +2679,7 @@ static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg) case WINED3DSPR_CONSTBOOL: /* b# */ case WINED3DSPR_LOOP: /* aL */ case WINED3DSPR_PREDICATE: /* p0 */ + case WINED3DSPR_PRIMID: /* primID */ return TRUE; case WINED3DSPR_MISCTYPE:

1 0

Henri Verbeet : wined3d: Explicitly check the shader type in shader_glsl_mov().
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 347dda068f9a4fdb12607f6d337d0dffa5c6b01b URL: http://source.winehq.org/git/wine.git/?a=commit;h=347dda068f9a4fdb12607f6d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 15 22:26:18 2012 +0200 wined3d: Explicitly check the shader type in shader_glsl_mov(). --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ff3c7e4..388f438 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2314,7 +2314,7 @@ static void shader_glsl_mov(const struct wined3d_shader_instruction *ins) /* In vs_1_1 WINED3DSIO_MOV can write to the address register. In later * shader versions WINED3DSIO_MOVA is used for this. */ if (ins->ctx->reg_maps->shader_version.major == 1 - && !shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type) + && ins->ctx->reg_maps->shader_version.type == WINED3D_SHADER_TYPE_VERTEX && ins->dst[0].reg.type == WINED3DSPR_ADDR) { /* This is a simple floor() */

1 0

Henri Verbeet : wined3d: Explicitly check the shader type in shader_glsl_texldl().
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 82a44af25998ef83b3883c1dc5484780043f16b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82a44af25998ef83b3883c1dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 15 22:26:17 2012 +0200 wined3d: Explicitly check the shader type in shader_glsl_texldl(). --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f6e3d8d..ff3c7e4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3491,7 +3491,7 @@ static void shader_glsl_texldl(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &lod_param); if (!gl_info->supported[ARB_SHADER_TEXTURE_LOD] && !gl_info->supported[EXT_GPU_SHADER4] - && shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) + && ins->ctx->reg_maps->shader_version.type == WINED3D_SHADER_TYPE_PIXEL) { /* Plain GLSL only supports Lod sampling functions in vertex shaders. * However, the NVIDIA drivers allow them in fragment shaders as well,

1 0

Vincent Povirk : winemono: Added 0.0.8 release.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: tools Branch: master Commit: f621b5397a922c2cdd03b363d98b90277e419871 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f621b5397a922c2cdd03b363… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Oct 8 10:26:17 2012 -0500 winemono: Added 0.0.8 release. --- winemono.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/winemono.php b/winemono.php index 86cd977..0e03a70 100644 --- a/winemono.php +++ b/winemono.php @@ -4,7 +4,7 @@ */ // Default version if none given -$sVersion = '0.0.4'; +$sVersion = '0.0.8'; // Suffix appended to base name of file $sFileSuffix = ''; @@ -27,7 +27,8 @@ $sFileName = sprintf('%s/%s/wine-mono-%s.%s', $sFolder, $sVersion, $sFileSuffix, // Size array $aFileSizes = array( - '0.0.4'=>44408320 + '0.0.4'=>44408320, + '0.0.8'=>46967296 ); // Exact size of the file:

1 0

Francois Gouget : testbot/TestLauncher: Tweak the ReportError() implementation.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: tools Branch: master Commit: cc474d01ad968763ba2a1821d77b8b23e7896186 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cc474d01ad968763ba2a1821… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 15 15:38:14 2012 +0200 testbot/TestLauncher: Tweak the ReportError() implementation. In particular make sure it behaves as if it was a single instruction, e.g. if used without a block after an 'if'. Also make sure gcc will know to check the format string. --- testbot/src/TestLauncher/TestLauncher.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 855b773..a790470 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -26,17 +26,28 @@ #define strncpy_s(dest, size, src, max) strncpy((dest), (src), (max)) #define strcat_s(dest, size, src) strcat((dest), (src)) #endif - #define countof(Array) (sizeof(Array) / sizeof(Array[0])) -#define ReportError LocationFile = __FILE__; LocationLine = __LINE__; OutputError -static const char *LocationFile; -static unsigned LocationLine; static unsigned Failures = 0; static unsigned Skips = 0; static char TestName[_MAX_PATH]; -static void OutputError(const char *Format, ...) + +#define ReportError (_SetErrorLocation(__FILE__, __LINE__), 0) ? (void)0 : _ReportError + +static const char *LocationFile; +static unsigned LocationLine; +static void _SetErrorLocation(const char* file, int line) +{ + LocationFile = file; + LocationLine = line; +} + +#ifdef __GNUC__ +static void _ReportError(const char *Format, ...) __attribute__((format (printf,1,2) )); +#endif + +static void _ReportError(const char *Format, ...) { va_list ArgList;

1 0

Francois Gouget : testbot/VMs: Make the WaitForToolsInGuest() timeout configurable.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: tools Branch: master Commit: ad55676a9ad5e62856444bd236adfb644adec1fd URL: http://source.winehq.org/git/tools.git/?a=commit;h=ad55676a9ad5e62856444bd2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 15 15:35:19 2012 +0200 testbot/VMs: Make the WaitForToolsInGuest() timeout configurable. --- testbot/lib/WineTestBot/Config.pm | 14 ++++++++------ testbot/lib/WineTestBot/VMs.pm | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index f547a64..353b429 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -27,9 +27,9 @@ WineTestBot::Config - Site-independent configuration settings use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $VixHostType $VixHostUsername $VixHostPassword $VixGuestUsername $VixGuestPassword $DbDataSource $DbUsername - $DbPassword $MaxRevertingVMs $MaxRunningVMs $MaxExtraPoweredOnVms $SleepAfterRevert - $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc - $SuiteTimeout $SingleTimeout + $DbPassword $MaxRevertingVMs $MaxRunningVMs $MaxExtraPoweredOnVms + $SleepAfterRevert $WaitForToolsInVM $AdminEMail $RobotEMail + $WinePatchToOverride $WinePatchCc $SuiteTimeout $SingleTimeout $BuildTimeout $ReconfigTimeout $OverheadTimeout $TagPrefix $ProjectName $PatchesMailingList $PatchResultsEMail $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter @@ -40,9 +40,10 @@ require Exporter; @ISA = qw(Exporter); @EXPORT = qw($UseSSL $LogDir $DataDir $BinDir $VixHostType $VixHostUsername $VixHostPassword $VixGuestUsername - $VixGuestPassword $MaxRevertingVMs $MaxRunningVMs $MaxExtraPoweredOnVms - $SleepAfterRevert $AdminEMail $RobotEMail $WinePatchToOverride - $WinePatchCc $SuiteTimeout + $VixGuestPassword $MaxRevertingVMs $MaxRunningVMs + $MaxExtraPoweredOnVms $SleepAfterRevert $WaitForToolsInVM + $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc + $SuiteTimeout $SingleTimeout $BuildTimeout $ReconfigTimeout $OverheadTimeout $TagPrefix $ProjectName $PatchesMailingList $PatchResultsEMail $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter @@ -58,6 +59,7 @@ $MaxRevertingVMs = 1; $MaxRunningVMs = 2; $MaxExtraPoweredOnVms = 2; $SleepAfterRevert = 30; +$WaitForToolsInVM = 60; $SuiteTimeout = 30 * 60; $SingleTimeout = 2 * 60; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index ef03889..98f99f7 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -351,7 +351,7 @@ sub WaitForToolsInGuest return $ErrMessage; } - my $Err = VMWaitForToolsInGuest($VMHandle, 60); + my $Err = VMWaitForToolsInGuest($VMHandle, WaitForToolsInVM); return $self->CheckError($Err); }

1 0

Francois Gouget : testbot/Engine: Fix support for interfacing directly with the wine-patches mailing list.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: tools Branch: master Commit: 9be205456b60a7b9353909cb5ca06e695ccd3dff URL: http://source.winehq.org/git/tools.git/?a=commit;h=9be205456b60a7b9353909cb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 15 15:35:04 2012 +0200 testbot/Engine: Fix support for interfacing directly with the wine-patches mailing list. --- testbot/bin/Engine.pl | 29 +++++++++++++------------ testbot/bin/WinePatchesWebGet.pl | 34 +++++++++++++++--------------- testbot/bin/WineSendLog.pl | 6 ++-- testbot/ddl/update12.sql | 8 +++++++ testbot/ddl/winetestbot.sql | 6 +++- testbot/doc/winetestbot-schema.dia | 30 ++++++++++++++++++++++---- testbot/lib/WineTestBot/Engine/Notify.pm | 4 +- testbot/lib/WineTestBot/Patches.pm | 7 +++-- 8 files changed, 78 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=9be205456b60a7b93539…

1 0

Francois Gouget : testbot/src: Compile GenFixEnv and TestLauncher with -Wall.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: tools Branch: master Commit: 6ce3e1672df2b06d5b11cb87c9c0bc77eff82c94 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6ce3e1672df2b06d5b11cb87… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 15 15:33:12 2012 +0200 testbot/src: Compile GenFixEnv and TestLauncher with -Wall. --- testbot/src/GenFixEnv/Makefile | 2 +- testbot/src/TestLauncher/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/src/GenFixEnv/Makefile b/testbot/src/GenFixEnv/Makefile index 30c34b9..a485094 100644 --- a/testbot/src/GenFixEnv/Makefile +++ b/testbot/src/GenFixEnv/Makefile @@ -6,5 +6,5 @@ CROSSSTRIP32 = i686-w64-mingw32-strip all: $(bindir)/GenFixEnv.exe $(bindir)/GenFixEnv.exe: GenFixEnv.c - $(CROSSCC32) -o $@ $< + $(CROSSCC32) -Wall -o $@ $< $(CROSSSTRIP32) $@ diff --git a/testbot/src/TestLauncher/Makefile b/testbot/src/TestLauncher/Makefile index 2b1dfaa..2bce2a1 100644 --- a/testbot/src/TestLauncher/Makefile +++ b/testbot/src/TestLauncher/Makefile @@ -8,9 +8,9 @@ CROSSSTRIP64 = x86_64-w64-mingw32-strip all: $(bindir)/TestLauncher32.exe $(bindir)/TestLauncher64.exe $(bindir)/TestLauncher32.exe: TestLauncher.c - $(CROSSCC32) -o $@ $< + $(CROSSCC32) -Wall -o $@ $< $(CROSSSTRIP32) $@ $(bindir)/TestLauncher64.exe: TestLauncher.c - $(CROSSCC64) -o $@ $< + $(CROSSCC64) -Wall -o $@ $< $(CROSSSTRIP64) $@

1 0

Francois Gouget : testbot/GenFixEnv: Remove an unused variable.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: tools Branch: master Commit: 864aafdbbfa894cd6a17e6f1450518df5a1676b6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=864aafdbbfa894cd6a17e6f1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 15 15:32:52 2012 +0200 testbot/GenFixEnv: Remove an unused variable. --- testbot/src/GenFixEnv/GenFixEnv.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/testbot/src/GenFixEnv/GenFixEnv.c b/testbot/src/GenFixEnv/GenFixEnv.c index f2d4c0f..8272eb6 100644 --- a/testbot/src/GenFixEnv/GenFixEnv.c +++ b/testbot/src/GenFixEnv/GenFixEnv.c @@ -83,7 +83,6 @@ static void GenerateUserProfile(FILE *BatchFile) BOOL (WINAPI *pGetUserProfileDirectoryA)(HANDLE,LPSTR,LPDWORD); HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); HMODULE huserenv = LoadLibraryA("userenv.dll"); - BOOL NoErr; HANDLE Token; char Data[1024]; DWORD DataSize;

1 0

Francois Gouget : testbot/lib: If we cannot open the log file, then log to stderr.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: tools Branch: master Commit: be1fa7e49ec5c2a8c8599752a0b216062fdbf79e URL: http://source.winehq.org/git/tools.git/?a=commit;h=be1fa7e49ec5c2a8c8599752… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 15 15:32:39 2012 +0200 testbot/lib: If we cannot open the log file, then log to stderr. --- testbot/lib/WineTestBot/Log.pm | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index 6883968..7de6dcb 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -38,20 +38,18 @@ sub LogMsg(@) if (!defined $logfile) { my $oldumask = umask(002); - if (open($logfile, ">>", "$LogDir/log")) - { - # Flush after each print - my $tmp=select($logfile); - $| = 1; - select($tmp); - } - else + if (!open($logfile, ">>", "$LogDir/log")) { require File::Basename; print STDERR File::Basename::basename($0), ":warning: could not open '$LogDir/log' for writing: $!\n"; - $logfile = undef; + open($logfile, ">>&=", 2); } umask($oldumask); + + # Flush after each print + my $tmp=select($logfile); + $| = 1; + select($tmp); } print $logfile scalar localtime, " ", @_ if ($logfile); }

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2012