March 2008 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Use GL_EXT_gpu_program_parameters if available.
by Alexandre Julliard 04 Mar '08

04 Mar '08

Module: wine Branch: master Commit: 8b28ca720edd1b177bb04022e8767d67e0ae7c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b28ca720edd1b177bb04022e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 14 15:30:29 2008 +0100 wined3d: Use GL_EXT_gpu_program_parameters if available. --- dlls/wined3d/arb_program_shader.c | 25 +++++++++++++++++++++---- dlls/wined3d/directx.c | 1 + include/wine/wined3d_gl.h | 13 ++++++++++++- 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index fbcc7aa..75899e7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -90,10 +90,27 @@ static unsigned int shader_arb_load_constantsF(IWineD3DBaseShaderImpl* This, Win GL_EXTCALL(glProgramEnvParameter4fvARB(target_type, i, lcl_const)); } } else { - for(i = 0; i < max_constants; i++) { - if(dirty_consts[i]) { - dirty_consts[i] = 0; - GL_EXTCALL(glProgramEnvParameter4fvARB(target_type, i, constants + (i * 4))); + if(GL_SUPPORT(EXT_GPU_PROGRAM_PARAMETERS)) { + /* TODO: Benchmark if we're better of with finding the dirty constants ourselves, + * or just reloading *all* constants at once + * + GL_EXTCALL(glProgramEnvParameters4fvEXT(target_type, 0, max_constants, constants)); + */ + for(i = 0; i < max_constants; i++) { + if(!dirty_consts[i]) continue; + + /* Find the next block of dirty constants */ + j = i; + for(i++; (i < max_constants) && dirty_consts[i]; i++); + + GL_EXTCALL(glProgramEnvParameters4fvEXT(target_type, j, i - j, constants + (j * 4))); + } + } else { + for(i = 0; i < max_constants; i++) { + if(dirty_consts[i]) { + dirty_consts[i] = 0; + GL_EXTCALL(glProgramEnvParameter4fvARB(target_type, i, constants + (i * 4))); + } } } } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f4557ba..3d819f1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -107,6 +107,7 @@ static const struct { {"GL_EXT_texture_lod_bias", EXT_TEXTURE_LOD_BIAS, 0 }, {"GL_EXT_vertex_shader", EXT_VERTEX_SHADER, 0 }, {"GL_EXT_vertex_weighting", EXT_VERTEX_WEIGHTING, 0 }, + {"GL_EXT_gpu_program_parameters", EXT_GPU_PROGRAM_PARAMETERS, 0 }, /* NV */ {"GL_NV_half_float", NV_HALF_FLOAT, 0 }, diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 66bfad8..ac1457f 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -2906,6 +2906,13 @@ typedef void (WINE_GLAPI * PGLFNFINISHRENDERAPPLEPROC) (void); #define GL_LUMINANCE_ALPHA_FLOAT16_APPLE 0x881F #endif +/* GL_EXT_gpu_program_parameters */ +#ifndef GL_EXT_gpu_program_parameters +#define GL_EXT_gpu_program_parameters +typedef void (WINE_GLAPI * PGLFNPROGRAMENVPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const float *params); +typedef void (WINE_GLAPI * PGLFNPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const float *params); +#endif + /* GL_VERSION_2_0 */ #ifndef GL_VERSION_2_0 #define GL_VERSION_2_0 1 @@ -3240,6 +3247,7 @@ typedef enum _GL_SupportedExt { EXT_TEXTURE_ENV_DOT3, EXT_TEXTURE_SRGB, EXT_VERTEX_WEIGHTING, + EXT_GPU_PROGRAM_PARAMETERS, /* NVIDIA */ NV_HALF_FLOAT, NV_FOG_DISTANCE, @@ -3559,7 +3567,10 @@ typedef enum _GL_SupportedExt { USE_GL_FUNC(PGLXFNWAITVIDEOSYNCSGIPROC, glXWaitVideoSyncSGI, SGI_VIDEO_SYNC, NULL );\ /* GL_APPLE_flush_render */ \ USE_GL_FUNC(PGLFNFLUSHRENDERAPPLEPROC, glFlushRenderApple, APPLE_FLUSH_RENDER, NULL );\ - USE_GL_FUNC(PGLFNFINISHRENDERAPPLEPROC, glFinishRenderApple, APPLE_FLUSH_RENDER, NULL ); + USE_GL_FUNC(PGLFNFINISHRENDERAPPLEPROC, glFinishRenderApple, APPLE_FLUSH_RENDER, NULL );\ + /* GL_EXT_gpu_program_parameters */ \ + USE_GL_FUNC(PGLFNPROGRAMENVPARAMETERS4FVEXTPROC, glProgramEnvParameters4fvEXT, EXT_GPU_PROGRAM_PARAMETERS,NULL );\ + USE_GL_FUNC(PGLFNPROGRAMLOCALPARAMETERS4FVEXTPROC, glProgramLocalParameters4fvEXT, EXT_GPU_PROGRAM_PARAMETERS,NULL ); /**************************************************** * OpenGL WGL defines and functions pointer

1 0

Karsten Elfenbein : winealsa: Use "default" as the default card name instead of "default:0".
by Alexandre Julliard 04 Mar '08

04 Mar '08

Module: wine Branch: master Commit: 0fe3a59b46a44b6d2d54a1afe1c4198c53d6c68c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fe3a59b46a44b6d2d54a1afe… Author: Karsten Elfenbein <kelfe(a)gmx.de> Date: Tue Mar 4 01:28:58 2008 -0800 winealsa: Use "default" as the default card name instead of "default:0". --- dlls/winealsa.drv/waveinit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/waveinit.c b/dlls/winealsa.drv/waveinit.c index 918ddc7..f29b8dc 100644 --- a/dlls/winealsa.drv/waveinit.c +++ b/dlls/winealsa.drv/waveinit.c @@ -741,7 +741,7 @@ static int ALSA_ScanDevices(int directhw, char *pcmname = NULL; snd_pcm_t *pcm; - sprintf(defaultpcmname, "default:%d", card); + sprintf(defaultpcmname, "default"); sprintf(plugpcmname, "plughw:%d,%d", card, device); sprintf(hwpcmname, "hw:%d,%d", card, device);

1 0

Rob Shearman : libwpp: Include wine/port.h in ppl.l as strcasecmp is used, which isn't available on all platforms.
by Alexandre Julliard 04 Mar '08

04 Mar '08

Module: wine Branch: master Commit: dfcd07eba0e0524b0ede06dc39a07a14d68dfa9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfcd07eba0e0524b0ede06dc3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 3 21:47:14 2008 +0000 libwpp: Include wine/port.h in ppl.l as strcasecmp is used, which isn't available on all platforms. --- libs/wpp/ppl.l | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 5c39dbb..4bb928c 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -156,7 +156,8 @@ cident [a-zA-Z_][0-9a-zA-Z_]* ul [uUlL]|[uUlL][lL]|[lL][uU]|[lL][lL][uU]|[uU][lL][lL]|[lL][uU][lL] %{ -#include <config.h> +#include "config.h" +#include "wine/port.h" #include <stdio.h> #include <stdlib.h> #include <string.h>

1 0

Rob Shearman : Add configure check for strtoll and strtoull.
by Alexandre Julliard 04 Mar '08

04 Mar '08

Module: wine Branch: master Commit: e9f5bce333bc7744859aad5c48d3b9d4f5e76658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9f5bce333bc7744859aad5c4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 3 21:48:18 2008 +0000 Add configure check for strtoll and strtoull. Define these to _strtoi64 and _strtoui64 if these are available instead. --- configure | 8 ++++++++ configure.ac | 4 ++++ include/config.h.in | 12 ++++++++++++ include/wine/port.h | 8 ++++++++ 4 files changed, 32 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 831ac1a..1389645 100755 --- a/configure +++ b/configure @@ -16595,6 +16595,10 @@ esac + + + + for ac_func in \ _pclose \ _popen \ @@ -16603,6 +16607,8 @@ for ac_func in \ _strdup \ _stricmp \ _strnicmp \ + _strtoi64 \ + _strtoui64 \ _vsnprintf \ asctime_r \ chsize \ @@ -16654,6 +16660,8 @@ for ac_func in \ strerror \ strncasecmp \ strtold \ + strtoll \ + strtoull \ tcgetattr \ thr_kill2 \ timegm \ diff --git a/configure.ac b/configure.ac index 4ccc1db..5d06e6f 100644 --- a/configure.ac +++ b/configure.ac @@ -1328,6 +1328,8 @@ AC_CHECK_FUNCS(\ _strdup \ _stricmp \ _strnicmp \ + _strtoi64 \ + _strtoui64 \ _vsnprintf \ asctime_r \ chsize \ @@ -1379,6 +1381,8 @@ AC_CHECK_FUNCS(\ strerror \ strncasecmp \ strtold \ + strtoll \ + strtoull \ tcgetattr \ thr_kill2 \ timegm \ diff --git a/include/config.h.in b/include/config.h.in index 1b2c828..ac464db 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -666,6 +666,12 @@ /* Define to 1 if you have the `strtold' function. */ #undef HAVE_STRTOLD +/* Define to 1 if you have the `strtoll' function. */ +#undef HAVE_STRTOLL + +/* Define to 1 if you have the `strtoull' function. */ +#undef HAVE_STRTOULL + /* Define to 1 if `direction' is member of `struct ff_effect'. */ #undef HAVE_STRUCT_FF_EFFECT_DIRECTION @@ -972,6 +978,12 @@ /* Define to 1 if you have the `_strnicmp' function. */ #undef HAVE__STRNICMP +/* Define to 1 if you have the `_strtoi64' function. */ +#undef HAVE__STRTOI64 + +/* Define to 1 if you have the `_strtoui64' function. */ +#undef HAVE__STRTOUI64 + /* Define to 1 if you have the `_vsnprintf' function. */ #undef HAVE__VSNPRINTF diff --git a/include/wine/port.h b/include/wine/port.h index 4b94a5e..6727891 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -138,6 +138,14 @@ struct statvfs #define vsnprintf _vsnprintf #endif +#if !defined(HAVE_STRTOLL) && defined(HAVE__STRTOI64) +#define strtoll _strtoi64 +#endif + +#if !defined(HAVE_STRTOULL) && defined(HAVE__STRTOUI64) +#define strtoull _strtoui64 +#endif + #ifndef S_ISLNK # define S_ISLNK(mod) (0) #endif

1 0

Rob Shearman : include: Remove superfluous semi-colon from d3d9.h.
by Alexandre Julliard 04 Mar '08

04 Mar '08

Module: wine Branch: master Commit: ce8d915c034329aae84d749965399642171641ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce8d915c034329aae84d74996… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 3 21:48:25 2008 +0000 include: Remove superfluous semi-colon from d3d9.h. --- include/d3d9.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3d9.h b/include/d3d9.h index dfe400e..11f1cd3 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -259,7 +259,7 @@ DECLARE_INTERFACE_(IDirect3D9Ex,IDirect3D9) STDMETHOD_(UINT, GetAdapterModeCountEx)(THIS_ UINT Adapter, CONST D3DDISPLAYMODEFILTER *pFilter) PURE; STDMETHOD(EnumAdapterModesEx)(THIS_ UINT Adapter, CONST D3DDISPLAYMODEFILTER *pFilter, UINT Mode, D3DDISPLAYMODEEX* pMode) PURE; STDMETHOD(GetAdapterDisplayModeEx)(THIS_ UINT Adapter, D3DDISPLAYMODEEX *pMode, D3DDISPLAYROTATION *pRotation); - STDMETHOD(CreateDeviceEx)(THIS_ UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS* pPresentationParameters, D3DDISPLAYMODEEX* pFullscreenDisplayMode, struct IDirect3DDevice9Ex **ppReturnedDeviceInterface); PURE; + STDMETHOD(CreateDeviceEx)(THIS_ UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS* pPresentationParameters, D3DDISPLAYMODEEX* pFullscreenDisplayMode, struct IDirect3DDevice9Ex **ppReturnedDeviceInterface) PURE; STDMETHOD(GetAdapterLUID)(THIS_ UINT Adatper, LUID *pLUID) PURE; }; #undef INTERFACE

1 0

Rob Shearman : libport: Undefine strcasecmp and strncasecmp in case they are defined to stricmp and strnicmp respectively .
by Alexandre Julliard 04 Mar '08

04 Mar '08

Module: wine Branch: master Commit: 7cb2ced97d5738ffaba296b68abbca50245bdb49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cb2ced97d5738ffaba296b68… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 3 21:52:27 2008 +0000 libport: Undefine strcasecmp and strncasecmp in case they are defined to stricmp and strnicmp respectively. --- libs/port/strcasecmp.c | 1 + libs/port/strncasecmp.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libs/port/strcasecmp.c b/libs/port/strcasecmp.c index b641cbc..ceab948 100644 --- a/libs/port/strcasecmp.c +++ b/libs/port/strcasecmp.c @@ -24,6 +24,7 @@ #include <ctype.h> #ifndef HAVE_STRCASECMP +#undef strcasecmp int strcasecmp( const char *str1, const char *str2 ) { const unsigned char *ustr1 = (const unsigned char *)str1; diff --git a/libs/port/strncasecmp.c b/libs/port/strncasecmp.c index 315c8af..e74ebb0 100644 --- a/libs/port/strncasecmp.c +++ b/libs/port/strncasecmp.c @@ -24,6 +24,7 @@ #include <ctype.h> #ifndef HAVE_STRNCASECMP +#undef strncasecmp int strncasecmp( const char *str1, const char *str2, size_t n ) { const unsigned char *ustr1 = (const unsigned char *)str1;

1 0

Alexandre Julliard : widl: Avoid getopt constants that may not be defined.
by Alexandre Julliard 04 Mar '08

04 Mar '08

Module: wine Branch: master Commit: 1dca65607b47f050652dd4a47131dd6bb62c3e15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dca65607b47f050652dd4a47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 4 12:14:46 2008 +0100 widl: Avoid getopt constants that may not be defined. --- tools/widl/widl.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 07f024c..bb3f651 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -147,13 +147,13 @@ enum { static const char short_options[] = "cC:d:D:EhH:I:NpP:sS:tT:uU:VW"; static const struct option long_options[] = { - { "dlldata", required_argument, 0, DLLDATA_OPTION }, - { "dlldata-only", no_argument, 0, DLLDATA_ONLY_OPTION }, - { "local-stubs", required_argument, 0, LOCAL_STUBS_OPTION }, - { "oldnames", no_argument, 0, OLDNAMES_OPTION }, - { "prefix-all", required_argument, 0, PREFIX_ALL_OPTION }, - { "prefix-client", required_argument, 0, PREFIX_CLIENT_OPTION }, - { "prefix-server", required_argument, 0, PREFIX_SERVER_OPTION }, + { "dlldata", 1, 0, DLLDATA_OPTION }, + { "dlldata-only", 0, 0, DLLDATA_ONLY_OPTION }, + { "local-stubs", 1, 0, LOCAL_STUBS_OPTION }, + { "oldnames", 0, 0, OLDNAMES_OPTION }, + { "prefix-all", 1, 0, PREFIX_ALL_OPTION }, + { "prefix-client", 1, 0, PREFIX_CLIENT_OPTION }, + { "prefix-server", 1, 0, PREFIX_SERVER_OPTION }, { 0, 0, 0, 0 } };

1 0

Stefan Dösinger : wined3d: Implement a different constant dirtification algorithm.
by Alexandre Julliard 04 Mar '08

04 Mar '08

Module: wine Branch: master Commit: 107e80a79cc4a112a471683a0ff1b670e0264755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=107e80a79cc4a112a471683a0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 4 02:30:23 2008 +0100 wined3d: Implement a different constant dirtification algorithm. Add a new property of the shader backend which indicates whether the shader backend is able to dirtify single constants rather than dirtifying vshader and pshader constants as a whole. Depending on this a different Set*ConstantF implementation is used which marks constants dirty. The ARB shader backend uses this and marks constants clean after uploading. --- dlls/wined3d/arb_program_shader.c | 107 ++++++++++--------- dlls/wined3d/baseshader.c | 4 +- dlls/wined3d/context.c | 21 ++++ dlls/wined3d/device.c | 217 +++++++++++++++++++++++++++++++++++++ dlls/wined3d/directx.c | 8 ++ dlls/wined3d/glsl_shader.c | 8 ++- dlls/wined3d/wined3d_private.h | 6 +- 7 files changed, 318 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=107e80a79cc4a112a4716…

1 0

Stefan Dösinger : wined3d: Hardcode local constants in ARB shaders if possible.
by Alexandre Julliard 04 Mar '08

04 Mar '08

Module: wine Branch: master Commit: aeb0e43e3eb476789411d236c39192193295c20d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeb0e43e3eb476789411d236c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 14 14:15:49 2008 +0100 wined3d: Hardcode local constants in ARB shaders if possible. --- dlls/wined3d/arb_program_shader.c | 164 +++++++++++++++++++++++-------------- dlls/wined3d/glsl_shader.c | 13 +--- dlls/wined3d/wined3d_private.h | 11 +++ 3 files changed, 113 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aeb0e43e3eb476789411d…

1 0

Jason Edmeades : cmd.exe: Support cd .. when saving current directory.
by Alexandre Julliard 04 Mar '08

04 Mar '08

Module: wine Branch: master Commit: 4492334762a71d037edfab61cb40ad337723d974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4492334762a71d037edfab61c… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Mon Mar 3 23:14:30 2008 +0000 cmd.exe: Support cd .. when saving current directory. --- programs/cmd/builtins.c | 3 +++ programs/cmd/wcmdmain.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 8592090..17b385d 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1865,6 +1865,9 @@ void WCMD_setshow_default (WCHAR *command) { return; } else { + /* Save away the actual new directory, to store as current location */ + GetCurrentDirectoryW (sizeof(string)/sizeof(WCHAR), string); + /* Restore old directory if drive letter would change, and CD x:\directory /D (or pushd c:\directory) not supplied */ if ((strstrW(quals, parmD) == NULL) && diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 2261a28..4c482ee 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -419,6 +419,7 @@ int wmain (int argc, WCHAR *argvW[]) static const WCHAR fmt[] = {'=','%','c',':','\0'}; wsprintf(envvar, fmt, string[0]); SetEnvironmentVariable(envvar, string); + WINE_TRACE("Set %s to %s\n", wine_dbgstr_w(envvar), wine_dbgstr_w(string)); } if (opt_k) { @@ -643,7 +644,9 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects, if (GetEnvironmentVariable(envvar, dir, MAX_PATH) == 0) { static const WCHAR fmt[] = {'%','s','\\','\0'}; wsprintf(cmd, fmt, cmd); + WINE_TRACE("No special directory settings, using dir of %s\n", wine_dbgstr_w(cmd)); } + WINE_TRACE("Got directory %s as %s\n", wine_dbgstr_w(envvar), wine_dbgstr_w(cmd)); status = SetCurrentDirectory (cmd); if (!status) WCMD_print_error (); HeapFree( GetProcessHeap(), 0, cmd );

1 0