January 2009 - Wine-commits

Vincent Pelletier : wined3d: Make WARN about oversized texture output surface and texture sizes.
by Alexandre Julliard 03 Jan '09

03 Jan '09

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

Rob Shearman : widl: Add aliased types to the typelib for statements in the library block if the typedef itself doesn 't need to be added.
by Alexandre Julliard 03 Jan '09

03 Jan '09

Module: wine Branch: master Commit: d2c4ff23057c38547434d893272afd3e4e8a2b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2c4ff23057c38547434d8932… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Jan 2 23:47:45 2009 +0000 widl: Add aliased types to the typelib for statements in the library block if the typedef itself doesn't need to be added. Otherwise, the order of types in the typelib will be wrong or types will be missing. --- tools/widl/write_msft.c | 50 +++++++++++++++++++++++++++++----------------- 1 files changed, 31 insertions(+), 19 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 01e98a6..fd237dc 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2191,6 +2191,30 @@ static void add_module_typeinfo(msft_typelib_t *typelib, type_t *module) msft_typeinfo->typeinfo->size = idx; } +static void add_type_typeinfo(msft_typelib_t *typelib, type_t *type) +{ + switch (type->kind) { + case TKIND_INTERFACE: + case TKIND_DISPATCH: + add_interface_typeinfo(typelib, type); + break; + case TKIND_RECORD: + add_structure_typeinfo(typelib, type); + break; + case TKIND_ENUM: + add_enum_typeinfo(typelib, type); + break; + case TKIND_COCLASS: + add_coclass_typeinfo(typelib, type); + break; + case TKIND_PRIMITIVE: + break; + default: + error("add_entry: unhandled type %d for %s\n", type->kind, type->name); + break; + } +} + static void add_entry(msft_typelib_t *typelib, const statement_t *stmt) { switch(stmt->type) { @@ -2206,9 +2230,14 @@ static void add_entry(msft_typelib_t *typelib, const statement_t *stmt) case STMT_TYPEDEF: { const type_list_t *type_entry = stmt->u.type_list; - for (; type_entry; type_entry = type_entry->next) + for (; type_entry; type_entry = type_entry->next) { + /* if the type is public then add the typedef, otherwise attempt + * to add the aliased type */ if (is_attr(type_entry->type->attrs, ATTR_PUBLIC)) add_typedef_typeinfo(typelib, type_entry->type); + else + add_type_typeinfo(typelib, type_entry->type->orig); + } break; } case STMT_MODULE: @@ -2218,24 +2247,7 @@ static void add_entry(msft_typelib_t *typelib, const statement_t *stmt) case STMT_TYPEREF: { type_t *type = stmt->u.type; - switch (type->kind) { - case TKIND_INTERFACE: - case TKIND_DISPATCH: - add_interface_typeinfo(typelib, type); - break; - case TKIND_RECORD: - add_structure_typeinfo(typelib, type); - break; - case TKIND_ENUM: - add_enum_typeinfo(typelib, type); - break; - case TKIND_COCLASS: - add_coclass_typeinfo(typelib, type); - break; - default: - error("add_entry: unhandled type %d\n", type->kind); - break; - } + add_type_typeinfo(typelib, type); break; } }

1 0

Henri Verbeet : wined3d: Fix the line number for some fglrx spam.
by Alexandre Julliard 03 Jan '09

03 Jan '09

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 03 Jan '09

03 Jan '09

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 03 Jan '09

03 Jan '09

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

Henri Verbeet : wined3d: Handle WINED3DFVF_XYZW in get_flexible_vertex_size ().
by Alexandre Julliard 03 Jan '09

03 Jan '09

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

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

03 Jan '09

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 03 Jan '09

03 Jan '09

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 03 Jan '09

03 Jan '09

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 03 Jan '09

03 Jan '09

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