January 2009 - Wine-Commits

Vincent Pelletier : wined3d: Make WARN about oversized texture output surface and texture sizes.
by Alexandre Julliard Jan. 3, 2009

Jan. 3, 2009

Module: wine Branch: master Commit: 23dcf61e611bf6372d2ed7ff8aa8c8fbdd410e18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23dcf61e611bf6372d2ed7ff8… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Fri Jan 2 21:42:32 2009 +0100 wined3d: Make WARN about oversized texture output surface and texture sizes. --- dlls/wined3d/surface.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 67097ac..3aca76c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3865,7 +3865,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { 3: WARN and return WINED3DERR_NOTAVAILABLE; 4: Create the surface, but allow it to be used only for DirectDraw Blts. Some apps(e.g. Swat 3) create textures with a Height of 16 and a Width > 3000 and blt 16x16 letter areas from them to the render target. */ - WARN("(%p) Creating an oversized surface\n", This); + WARN("(%p) Creating an oversized surface: %ux%u (texture is %ux%u)\n", + This, This->pow2Width, This->pow2Height, This->currentDesc.Width, This->currentDesc.Height); This->Flags |= SFLAG_OVERSIZE; /* This will be initialized on the first blt */

1 0

Henri Verbeet : wined3d: Convert textures to a bitmap in struct SAVEDSTATES .
by Alexandre Julliard Jan. 3, 2009

Jan. 3, 2009

Module: wine Branch: master Commit: 9a889f6b0b1393609eba09383ef7d88afa83afbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a889f6b0b1393609eba09383… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 2 16:19:12 2009 +0100 wined3d: Convert textures to a bitmap in struct SAVEDSTATES. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/stateblock.c | 35 +++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a0b6d1f..1ce2287 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4541,7 +4541,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTexture(IWineD3DDevice *iface, DWORD TRACE("GL_LIMITS %d\n",GL_LIMITS(sampler_stages)); TRACE("(%p) : oldtexture(%p)\n", This,oldTexture); - This->updateStateBlock->changed.textures[Stage] = TRUE; + This->updateStateBlock->changed.textures |= 1 << Stage; TRACE("(%p) : setting new texture to %p\n", This, pTexture); This->updateStateBlock->textures[Stage] = pTexture; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 2923d50..1ffdabe 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -88,7 +88,7 @@ static void stateblock_savedstates_copy(IWineD3DStateBlock* iface, SAVEDSTATES * /* Fixed size arrays */ dest->streamSource = source->streamSource; dest->streamFreq = source->streamFreq; - memcpy(dest->textures, source->textures, bsize * MAX_COMBINED_SAMPLERS); + dest->textures = source->textures; memcpy(dest->transform, source->transform, bsize * (HIGHEST_TRANSFORMSTATE + 1)); memcpy(dest->renderState, source->renderState, bsize * (WINEHIGHEST_RENDER_STATE + 1)); memcpy(dest->textureState, source->textureState, bsize * MAX_TEXTURES * (WINED3D_HIGHEST_TEXTURE_STATE + 1)); @@ -125,7 +125,7 @@ void stateblock_savedstates_set( /* Fixed size arrays */ states->streamSource = value ? 0xffff : 0; states->streamFreq = value ? 0xffff : 0; - memset(states->textures, value, bsize * MAX_COMBINED_SAMPLERS); + states->textures = value ? 0xfffff : 0; memset(states->transform, value, bsize * (HIGHEST_TRANSFORMSTATE + 1)); memset(states->renderState, value, bsize * (WINEHIGHEST_RENDER_STATE + 1)); memset(states->textureState, value, bsize * MAX_TEXTURES * (WINED3D_HIGHEST_TEXTURE_STATE + 1)); @@ -574,11 +574,13 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) /* Samplers */ /* TODO: move over to using memcpy */ - for (j = 0; j < MAX_COMBINED_SAMPLERS; j++) { - if (This->changed.textures[j]) { - TRACE("Updating texture %u to %p (was %p)\n", j, targetStateBlock->textures[j], This->textures[j]); - This->textures[j] = targetStateBlock->textures[j]; - } + map = This->changed.textures; + for (i = 0; map; map >>= 1, ++i) + { + if (!(map & 1)) continue; + + TRACE("Updating texture %u to %p (was %p)\n", i, targetStateBlock->textures[i], This->textures[i]); + This->textures[i] = targetStateBlock->textures[i]; } for (j = 0; j < This->num_contained_sampler_states; j++) { @@ -832,14 +834,15 @@ should really perform a delta so that only the changes get updated*/ { if (map & 1) IWineD3DDevice_SetStreamSourceFreq(pDevice, i, This->streamFreq[i] | This->streamFlags[i]); } - for (j = 0 ; j < MAX_COMBINED_SAMPLERS; j++){ - if (This->changed.textures[j]) { - if (j < MAX_FRAGMENT_SAMPLERS) { - IWineD3DDevice_SetTexture(pDevice, j, This->textures[j]); - } else { - IWineD3DDevice_SetTexture(pDevice, WINED3DVERTEXTEXTURESAMPLER0 + j - MAX_FRAGMENT_SAMPLERS, This->textures[j]); - } - } + + map = This->changed.textures; + for (i = 0; map; map >>= 1, ++i) + { + if (!(map & 1)) continue; + + if (i < MAX_FRAGMENT_SAMPLERS) IWineD3DDevice_SetTexture(pDevice, i, This->textures[i]); + else IWineD3DDevice_SetTexture(pDevice, WINED3DVERTEXTEXTURESAMPLER0 + i - MAX_FRAGMENT_SAMPLERS, + This->textures[i]); } map = This->changed.clipplane; @@ -1239,7 +1242,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat for(i = 0; i < GL_LIMITS(textures); i++) { /* Note: This avoids calling SetTexture, so pretend it has been called */ - This->changed.textures[i] = TRUE; + This->changed.textures |= 1 << i; This->textures[i] = NULL; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 010f097..90f8ee1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1760,7 +1760,7 @@ extern const IWineD3DVertexDeclarationVtbl IWineD3DVertexDeclaration_Vtbl; typedef struct SAVEDSTATES { WORD streamSource; /* MAX_STREAMS, 16 */ WORD streamFreq; /* MAX_STREAMS, 16 */ - BOOL textures[MAX_COMBINED_SAMPLERS]; + DWORD textures; /* MAX_COMBINED_SAMPLERS, 20 */ BOOL transform[HIGHEST_TRANSFORMSTATE + 1]; BOOL renderState[WINEHIGHEST_RENDER_STATE + 1]; BOOL textureState[MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1];

1 0

Henri Verbeet : wined3d: Handle WINED3DFVF_XYZW in get_flexible_vertex_size ().
by Alexandre Julliard Jan. 3, 2009

Jan. 3, 2009

Module: wine Branch: master Commit: 39909f2a062adb8f5e1a6b38a7e00d0ba53d2452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39909f2a062adb8f5e1a6b38a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 2 16:19:12 2009 +0100 wined3d: Handle WINED3DFVF_XYZW in get_flexible_vertex_size(). Spotted by Chris Robinson. --- dlls/wined3d/utils.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d62ef07..8cf8ee0 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1512,6 +1512,7 @@ DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) { case WINED3DFVF_XYZB3: size += 6 * sizeof(float); break; case WINED3DFVF_XYZB4: size += 7 * sizeof(float); break; case WINED3DFVF_XYZB5: size += 8 * sizeof(float); break; + case WINED3DFVF_XYZW: size += 4 * sizeof(float); break; default: ERR("Unexpected position mask\n"); } for (i = 0; i < numTextures; i++) {

1 0

Henri Verbeet : wined3d: Fix the line number for some fglrx spam.
by Alexandre Julliard Jan. 3, 2009

Jan. 3, 2009

Module: wine Branch: master Commit: 2e0212e9989629ea4d39898ad931d1964a26cbe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e0212e9989629ea4d39898ad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 2 16:19:12 2009 +0100 wined3d: Fix the line number for some fglrx spam. We added a #version line a while ago, so the line number for the warning changed. --- dlls/wined3d/glsl_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ff14fa3..f3933ff 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -130,7 +130,8 @@ static void print_glsl_info_log(const WineD3D_GL_Info *gl_info, GLhandleARB obj) "Fragment shader(s) linked, vertex shader(s) linked.", /* fglrx, no \n */ "Vertex shader(s) linked, no fragment shader(s) defined. \n ", /* fglrx, with \n */ "Vertex shader(s) linked, no fragment shader(s) defined.", /* fglrx, no \n */ - "Fragment shader was successfully compiled to run on hardware.\nWARNING: 0:1: extension 'GL_ARB_draw_buffers' is not supported", + "Fragment shader was successfully compiled to run on hardware.\n" + "WARNING: 0:2: extension 'GL_ARB_draw_buffers' is not supported", "Fragment shader(s) linked, no vertex shader(s) defined.", /* fglrx, no \n */ "Fragment shader(s) linked, no vertex shader(s) defined. \n ", /* fglrx, with \n */ "WARNING: 0:2: extension 'GL_ARB_draw_buffers' is not supported\n" /* MacOS ati */

1 0

Henri Verbeet : wined3d: Don't bother with the GLSL info log if nobody' s looking.
by Alexandre Julliard Jan. 3, 2009

Jan. 3, 2009

Module: wine Branch: master Commit: 3c14b3936f03f737ad9c0bd10caf5ed86abb6408 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c14b3936f03f737ad9c0bd10… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 2 16:19:12 2009 +0100 wined3d: Don't bother with the GLSL info log if nobody's looking. --- dlls/wined3d/glsl_shader.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f3933ff..eb169e0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -137,6 +137,8 @@ static void print_glsl_info_log(const WineD3D_GL_Info *gl_info, GLhandleARB obj) "WARNING: 0:2: extension 'GL_ARB_draw_buffers' is not supported\n" /* MacOS ati */ }; + if (!TRACE_ON(d3d_shader) && !FIXME_ON(d3d_shader)) return; + GL_EXTCALL(glGetObjectParameterivARB(obj, GL_OBJECT_INFO_LOG_LENGTH_ARB, &infologLength));

1 0

Henri Verbeet : d3d: Fix the value of D3DFVF_POSITION_MASK.
by Alexandre Julliard Jan. 3, 2009

Jan. 3, 2009

Module: wine Branch: master Commit: d359a7813fe3d7acd8d3791fe63a4e44bb22ebb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d359a7813fe3d7acd8d3791fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 2 16:19:12 2009 +0100 d3d: Fix the value of D3DFVF_POSITION_MASK. --- include/d3d9types.h | 2 +- include/wine/wined3d.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d9types.h b/include/d3d9types.h index 61e321c..d0ac9b4 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -128,7 +128,7 @@ #define MAX_DEVICE_IDENTIFIER_STRING 512 #define D3DFVF_RESERVED0 0x0001 -#define D3DFVF_POSITION_MASK 0x000E +#define D3DFVF_POSITION_MASK 0x400E #define D3DFVF_XYZ 0x0002 #define D3DFVF_XYZRHW 0x0004 #define D3DFVF_XYZB1 0x0006 diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index ae64888..422673e 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -889,7 +889,7 @@ const UINT WINED3DCLIPPLANE5 = (1 << 5); /* FVF (Flexible Vertex Format) codes */ const UINT WINED3DFVF_RESERVED0 = 0x0001; -const UINT WINED3DFVF_POSITION_MASK = 0x000e; +const UINT WINED3DFVF_POSITION_MASK = 0x400e; const UINT WINED3DFVF_XYZ = 0x0002; const UINT WINED3DFVF_XYZRHW = 0x0004; const UINT WINED3DFVF_XYZB1 = 0x0006;

1 0

Alexandre Julliard : cmd.exe: Don't use wvsprintf on sysv-style varargs, use a libwine function instead.
by Alexandre Julliard Jan. 3, 2009

Jan. 3, 2009

Module: wine Branch: master Commit: 854c9b208977d8f0469ef8d531aee1d1ca2819e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=854c9b208977d8f0469ef8d53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 2 22:01:06 2009 +0100 cmd.exe: Don't use wvsprintf on sysv-style varargs, use a libwine function instead. --- programs/cmd/wcmdmain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index b135a16..e4f29a1 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -158,7 +158,7 @@ void WCMD_output (const WCHAR *format, ...) { int ret; va_start(ap,format); - ret = wvsprintf (string, format, ap); + ret = vsnprintfW(string, sizeof(string)/sizeof(WCHAR), format, ap); if( ret >= (sizeof(string)/sizeof(WCHAR))) { WINE_ERR("Output truncated in WCMD_output\n" ); ret = (sizeof(string)/sizeof(WCHAR)) - 1;

1 0

Alexandre Julliard : xcopy.exe: Don't use wvsprintf on sysv-style varargs, use a libwine function instead.
by Alexandre Julliard Jan. 3, 2009

Jan. 3, 2009

Module: wine Branch: master Commit: 91421f0f0225f6e11e34b76e527419d9cd5098db URL: http://source.winehq.org/git/wine.git/?a=commit;h=91421f0f0225f6e11e34b76e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 2 22:01:16 2009 +0100 xcopy.exe: Don't use wvsprintf on sysv-style varargs, use a libwine function instead. --- programs/xcopy/xcopy.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 273047c..e89c404 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -43,6 +43,7 @@ #include <stdio.h> #include <windows.h> #include <wine/debug.h> +#include <wine/unicode.h> #include "xcopy.h" WINE_DEFAULT_DEBUG_CHANNEL(xcopy); @@ -999,9 +1000,8 @@ int XCOPY_wprintf(const WCHAR *format, ...) { return 0; } - /* Use wvsprintf to store output into unicode buffer */ va_start(parms, format); - len = vswprintf(output_bufW, format, parms); + len = vsnprintfW(output_bufW, MAX_WRITECONSOLE_SIZE/sizeof(WCHAR), format, parms); va_end(parms); /* Try to write as unicode all the time we think its a console */

1 0

Dylan Smith : richedit: Fix unicode truncation on EM_GETLINE message.
by Alexandre Julliard Jan. 3, 2009

Jan. 3, 2009

Module: wine Branch: master Commit: 7a5430600879281b43a59b36bf5dd9ad8bc440f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a5430600879281b43a59b36b… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Jan 2 13:56:49 2009 -0500 richedit: Fix unicode truncation on EM_GETLINE message. --- dlls/riched20/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b5a69f7..1f7c7db 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3558,7 +3558,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, nCopy = min(nCharsLeft, strText->nLen); if (unicode) - lstrcpynW((LPWSTR) dest, strText->szData, nCopy); + memcpy(dest, strText->szData, nCopy * sizeof(WCHAR)); else nCopy = WideCharToMultiByte(CP_ACP, 0, strText->szData, nCopy, dest, nCharsLeft, NULL, NULL);

1 0

Alexandre Julliard : msvcrt: Convert the open functions to use MS ABI varargs.
by Alexandre Julliard Jan. 3, 2009

Jan. 3, 2009

Module: wine Branch: master Commit: dd34f924bec261e85642db966b0c6f50b13fcc22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd34f924bec261e85642db966… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 2 21:46:24 2009 +0100 msvcrt: Convert the open functions to use MS ABI varargs. --- dlls/msvcrt/file.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 60fdfa1..8945044 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1418,7 +1418,7 @@ int CDECL MSVCRT__pipe(int *pfds, unsigned int psize, int textmode) */ int CDECL MSVCRT__sopen( const char *path, int oflags, int shflags, ... ) { - va_list ap; + __ms_va_list ap; int pmode; DWORD access = 0, creation = 0, attrib; DWORD sharing; @@ -1440,9 +1440,9 @@ int CDECL MSVCRT__sopen( const char *path, int oflags, int shflags, ... ) if (oflags & MSVCRT__O_CREAT) { - va_start(ap, shflags); - pmode = va_arg(ap, int); - va_end(ap); + __ms_va_start(ap, shflags); + pmode = va_arg(ap, int); + __ms_va_end(ap); if(pmode & ~(MSVCRT__S_IREAD | MSVCRT__S_IWRITE)) FIXME(": pmode 0x%04x ignored\n", pmode); @@ -1516,12 +1516,12 @@ int CDECL MSVCRT__wsopen( const MSVCRT_wchar_t* path, int oflags, int shflags, . { const unsigned int len = strlenW(path); char *patha = MSVCRT_calloc(len + 1,1); - va_list ap; + __ms_va_list ap; int pmode; - va_start(ap, shflags); + __ms_va_start(ap, shflags); pmode = va_arg(ap, int); - va_end(ap); + __ms_va_end(ap); if (patha && WideCharToMultiByte(CP_ACP,0,path,len,patha,len,NULL,NULL)) { @@ -1539,14 +1539,14 @@ int CDECL MSVCRT__wsopen( const MSVCRT_wchar_t* path, int oflags, int shflags, . */ int CDECL MSVCRT__open( const char *path, int flags, ... ) { - va_list ap; + __ms_va_list ap; if (flags & MSVCRT__O_CREAT) { int pmode; - va_start(ap, flags); + __ms_va_start(ap, flags); pmode = va_arg(ap, int); - va_end(ap); + __ms_va_end(ap); return MSVCRT__sopen( path, flags, MSVCRT__SH_DENYNO, pmode ); } else @@ -1560,12 +1560,12 @@ int CDECL _wopen(const MSVCRT_wchar_t *path,int flags,...) { const unsigned int len = strlenW(path); char *patha = MSVCRT_calloc(len + 1,1); - va_list ap; + __ms_va_list ap; int pmode; - va_start(ap, flags); + __ms_va_start(ap, flags); pmode = va_arg(ap, int); - va_end(ap); + __ms_va_end(ap); if (patha && WideCharToMultiByte(CP_ACP,0,path,len,patha,len,NULL,NULL)) {

1 0