December 2007 - Wine-commits

Rob Shearman : oleaut32: Don' t call SafeArrayAllocData in LPSAFEARRAY_UserUnmarshal if we called SafeArrayCreateEx instead of SafeArrayAllocDescriptor .
by Alexandre Julliard 07 Dec '07

07 Dec '07

Module: wine Branch: master Commit: baccba317e4472ae2cbfa2075b15ce9a3af3a5e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baccba317e4472ae2cbfa2075… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Dec 7 14:13:57 2007 +0000 oleaut32: Don't call SafeArrayAllocData in LPSAFEARRAY_UserUnmarshal if we called SafeArrayCreateEx instead of SafeArrayAllocDescriptor. Otherwise, we'll leak memory. --- dlls/oleaut32/usrmarshal.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 3f84fab..49570f4 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1048,9 +1048,14 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B (*ppsa)->cbElements = wiresa->cbElements; (*ppsa)->cLocks = LOWORD(wiresa->cLocks); - hr = SafeArrayAllocData(*ppsa); - if (FAILED(hr)) - RpcRaiseException(hr); + /* SafeArrayCreateEx allocates the data for us, but + * SafeArrayAllocDescriptor doesn't */ + if(!vt) + { + hr = SafeArrayAllocData(*ppsa); + if (FAILED(hr)) + RpcRaiseException(hr); + } if ((*(ULONG *)Buffer != cell_count) || (SAFEARRAY_GetCellCount(*ppsa) != cell_count)) RpcRaiseException(RPC_S_INVALID_BOUND);

1 0

Aric Stewart : fonts: Add 18 pixel strike with japanese fonts to system.sdf .
by Alexandre Julliard 07 Dec '07

07 Dec '07

Module: wine Branch: master Commit: 9de1b6a84b176549d1f19fd99e95936c5d3210da URL: http://source.winehq.org/git/wine.git/?a=commit;h=9de1b6a84b176549d1f19fd99… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 6 10:52:29 2007 +0900 fonts: Add 18 pixel strike with japanese fonts to system.sdf. --- fonts/system.sfd | 416 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 416 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9de1b6a84b176549d1f19…

1 0

Stefan Dösinger : ddraw: Set X8R8G8B8 for 32 bpp.
by Alexandre Julliard 07 Dec '07

07 Dec '07

Module: wine Branch: master Commit: f29d947f6aebaf5e74df06488eb3a02fbee9d2bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f29d947f6aebaf5e74df06488… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 6 22:13:25 2007 +0100 ddraw: Set X8R8G8B8 for 32 bpp. --- dlls/ddraw/ddraw.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 37a49fe..15e8edc 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -599,7 +599,7 @@ IDirectDrawImpl_SetDisplayMode(IDirectDraw7 *iface, case 15: Mode.Format = WINED3DFMT_X1R5G5B5; break; case 16: Mode.Format = WINED3DFMT_R5G6B5; break; case 24: Mode.Format = WINED3DFMT_R8G8B8; break; - case 32: Mode.Format = WINED3DFMT_A8R8G8B8; break; + case 32: Mode.Format = WINED3DFMT_X8R8G8B8; break; } /* TODO: The possible return values from msdn suggest that

1 0

Stefan Dösinger : wined3d: Add an alpha blending test.
by Alexandre Julliard 07 Dec '07

07 Dec '07

Module: wine Branch: master Commit: f700cbe74b465c1dc704a1e2673fc558f0a1391b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f700cbe74b465c1dc704a1e26… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 6 22:33:26 2007 +0100 wined3d: Add an alpha blending test. --- dlls/d3d8/tests/visual.c | 182 +++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/visual.c | 177 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/visual.c | 168 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/context.c | 14 ++++ dlls/wined3d/state.c | 29 ++++++- dlls/wined3d/utils.c | 13 +++- 6 files changed, 576 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f700cbe74b465c1dc704a…

1 0

Stefan Dösinger : wined3d: A more detailed occlusion query test and fixes.
by Alexandre Julliard 07 Dec '07

07 Dec '07

Module: wine Branch: master Commit: 0e8c13e63003eab37313f15834bb1b1057197173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e8c13e63003eab37313f1583… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 4 01:43:24 2007 +0100 wined3d: A more detailed occlusion query test and fixes. --- dlls/d3d9/tests/query.c | 112 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 1 + dlls/wined3d/query.c | 67 ++++++++++++++++++----- dlls/wined3d/wined3d_private.h | 10 ++++ 4 files changed, 175 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e8c13e63003eab37313f…

1 0

Francois Gouget : wininet/tests: Remove trailing spaces in ok() calls.
by Alexandre Julliard 07 Dec '07

07 Dec '07

Module: wine Branch: master Commit: 6cdbb96b270126212fd8e5d0e56cd88724e07d90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cdbb96b270126212fd8e5d0e… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 7 00:58:19 2007 +0100 wininet/tests: Remove trailing spaces in ok() calls. --- dlls/wininet/tests/ftp.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 1f63752..06bcc0b 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -747,7 +747,7 @@ static void test_get_current_dir(HINTERNET hFtp, HINTERNET hConnect) bRet = FtpGetCurrentDirectoryA( hFtp, lpszCurrentDirectory, &dwCurrentDirectoryLen ); ok ( bRet == TRUE, "Expected FtpGetCurrentDirectoryA to pass\n" ); todo_wine - ok ( lstrcmp(lpszCurrentDirectory, "/pub") == 0, "Expected returned value \"%s\" to match \"%s\" \n", (char*)lpszCurrentDirectory, "/pub"); + ok ( lstrcmp(lpszCurrentDirectory, "/pub") == 0, "Expected returned value \"%s\" to match \"%s\"\n", (char*)lpszCurrentDirectory, "/pub"); ok ( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got: %d\n", GetLastError()); @@ -759,7 +759,7 @@ todo_wine bRet = FtpGetCurrentDirectoryA( hFtp, lpszCurrentDirectory, &dwCurrentDirectoryLen ); todo_wine ok ( bRet == FALSE, "Expected FtpGetCurrentDirectoryA to fail\n"); - ok ( lstrcmp(lpszCurrentDirectory, "/pub") != 0, "Expected returned value \"%s\" to not match \"%s\" \n", (char*)lpszCurrentDirectory, "/pub"); + ok ( lstrcmp(lpszCurrentDirectory, "/pub") != 0, "Expected returned value \"%s\" to not match \"%s\"\n", (char*)lpszCurrentDirectory, "/pub"); todo_wine ok ( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got: %d\n", GetLastError()); @@ -770,7 +770,7 @@ todo_wine bRet = FtpGetCurrentDirectoryA( hFtp, lpszCurrentDirectory, &dwCurrentDirectoryLen ); ok ( bRet == TRUE, "Expected FtpGetCurrentDirectoryA to pass\n"); todo_wine - ok ( lstrcmp(lpszCurrentDirectory, "/pub") == 0, "Expected returned value \"%s\" to match \"%s\" \n", (char*)lpszCurrentDirectory, "/pub"); + ok ( lstrcmp(lpszCurrentDirectory, "/pub") == 0, "Expected returned value \"%s\" to match \"%s\"\n", (char*)lpszCurrentDirectory, "/pub"); ok ( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got: %d\n", GetLastError()); }

1 0

Stefan Dösinger : wined3d: Initialize output texcoord .w to 1.0 if needed.
by Alexandre Julliard 07 Dec '07

07 Dec '07

Module: wine Branch: master Commit: 54fa7129816a4d20bbd3d0649be539707e68311a URL: http://source.winehq.org/git/wine.git/?a=commit;h=54fa7129816a4d20bbd3d0649… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 6 22:10:11 2007 +0100 wined3d: Initialize output texcoord .w to 1.0 if needed. The GL_ARB_vertex_program extension does not define a standard value for output texture coordinates. This makes problems when using vertex shaders with fixed function fragment processing because fffp divides the texture coords by its .w component. This means that gl shaders have to write to the .w component of texture coords. Direct3D shaders however do not. --- dlls/wined3d/baseshader.c | 9 +++++++++ dlls/wined3d/directx.c | 14 ++++++++++++++ dlls/wined3d/glsl_shader.c | 28 +++++++++++++++++++++++----- dlls/wined3d/vertexshader.c | 10 ++++++++++ dlls/wined3d/wined3d_private.h | 5 +++++ include/wine/wined3d_gl.h | 1 + 6 files changed, 62 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 5f94a29..0a0c10e 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -463,6 +463,15 @@ HRESULT shader_get_registers_used( reg_maps->usesrelconstF = TRUE; } } + + /* WINED3DSPR_TEXCRDOUT is the same as WINED3DSPR_OUTPUT. _OUTPUT can be > MAX_REG_TEXCRD and is used + * in >= 3.0 shaders. Filter 3.0 shaders to prevent overflows, and also filter pixel shaders because TECRDOUT + * isn't used in them, but future register types might cause issues + */ + else if(WINED3DSPR_TEXCRDOUT == regtype && i == 0 /* Only look at writes */ && + !pshader && WINED3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) < 3) { + reg_maps->texcoord_mask[reg] |= shader_get_writemask(param); + } } } } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c712bb4..a269988 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2860,6 +2860,20 @@ static void fixup_extensions(WineD3D_GL_Info *gl_info) { gl_info->supported[ARB_TEXTURE_RECTANGLE] = TRUE; } } + + /* The Intel GPUs on MacOS set the .w register of texcoords to 0.0 by default, which causes problems + * with fixed function fragment processing. Ideally this flag should be detected with a test shader + * and opengl feedback mode, but some GL implementations(MacOS ATI at least, propably all macos ones) + * do not like vertex shaders in feedback mode and return an error, even though it should be valid + * according to the spec. + * + * We don't want to enable this on all cards, as it adds an extra instruction per texcoord used. This + * makes the shader slower and eats instruction slots which should be available to the d3d app. + */ + if(gl_info->gl_vendor == VENDOR_INTEL) { + TRACE("Enabling vertex texture coord fixes in vertex shaders\n"); + gl_info->set_texcoord_w = TRUE; + } } } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0b68c78..80b8ea9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2870,7 +2870,7 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs SHADER_BUFFER buffer; DWORD usage_token; DWORD register_token; - DWORD usage, usage_idx; + DWORD usage, usage_idx, writemask; char reg_mask[6]; semantic *semantics_out, *semantics_in; @@ -2880,8 +2880,21 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs buffer.newline = TRUE; if(vs_major < 3 && ps_major < 3) { - /* That one is easy: The vertex shader writes to the builtin varyings, the pixel shader reads from them */ - shader_addline(&buffer, "void order_ps_input() { /* do nothing */ }\n"); + /* That one is easy: The vertex shader writes to the builtin varyings, the pixel shader reads from them. + * Take care about the texcoord .w fixup though if we're using the fixed function fragment pipeline + */ + if((GLINFO_LOCATION).set_texcoord_w && ps_major == 0 && vs_major > 0) { + shader_addline(&buffer, "void order_ps_input() {\n"); + for(i = 0; i < min(8, MAX_REG_TEXCRD); i++) { + if(vs->baseShader.reg_maps.texcoord_mask[i] != 0 && + vs->baseShader.reg_maps.texcoord_mask[i] != WINED3DSP_WRITEMASK_ALL) { + shader_addline(&buffer, "gl_TexCoord[%u].w = 1.0;\n", i); + } + } + shader_addline(&buffer, "}\n"); + } else { + shader_addline(&buffer, "void order_ps_input() { /* do nothing */ }\n"); + } } else if(ps_major < 3 && vs_major >= 3) { /* The vertex shader writes to its own varyings, the pixel shader needs them in the builtin ones */ semantics_out = vs->semantics_out; @@ -2894,7 +2907,7 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; - shader_glsl_get_write_mask(register_token, reg_mask); + writemask = shader_glsl_get_write_mask(register_token, reg_mask); switch(usage) { case WINED3DDECLUSAGE_COLOR: @@ -2910,8 +2923,13 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs case WINED3DDECLUSAGE_TEXCOORD: if (usage_idx < 8) { + if(!(GLINFO_LOCATION).set_texcoord_w || ps_major > 0) writemask |= WINED3DSP_WRITEMASK_3; + shader_addline(&buffer, "gl_TexCoord[%u]%s = OUT[%u]%s;\n", - usage_idx, reg_mask, i, reg_mask); + usage_idx, reg_mask, i, reg_mask); + if(!(writemask & WINED3DSP_WRITEMASK_3)) { + shader_addline(&buffer, "gl_TexCoord[%u].w = 1.0;\n", usage_idx); + } } break; diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index f67cbae..13349de 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -455,6 +455,16 @@ static VOID IWineD3DVertexShaderImpl_GenerateShader( /* We need a constant to fixup the final position */ shader_addline(&buffer, "PARAM posFixup = program.env[%d];\n", ARB_SHADER_PRIVCONST_POS); + if((GLINFO_LOCATION).set_texcoord_w) { + int i; + for(i = 0; i < min(8, MAX_REG_TEXCRD); i++) { + if(This->baseShader.reg_maps.texcoord_mask[i] != 0 && + This->baseShader.reg_maps.texcoord_mask[i] != WINED3DSP_WRITEMASK_ALL) { + shader_addline(&buffer, "MOV result.texcoord[%u].w, -helper_const.y;\n", i); + } + } + } + /* Base Shader Body */ shader_generate_main( (IWineD3DBaseShader*) This, &buffer, reg_maps, pFunction); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c0e1265..86a6bb8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1672,6 +1672,7 @@ typedef struct shader_reg_maps { char packed_output[MAX_REG_OUTPUT]; /* vertex >= 3.0 */ char attributes[MAX_ATTRIBS]; /* vertex */ char labels[MAX_LABELS]; /* pixel, vertex */ + DWORD texcoord_mask[MAX_REG_TEXCRD]; /* vertex < 3.0 */ /* Sampler usage tokens * Use 0 as default (bit 31 is always 1 on a valid token) */ @@ -2012,6 +2013,10 @@ static inline int shader_get_regtype(const DWORD param) { ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2)); } +static inline int shader_get_writemask(const DWORD param) { + return param & WINED3DSP_WRITEMASK_ALL; +} + extern unsigned int shader_get_float_offset(const DWORD reg); static inline BOOL shader_is_pshader_version(DWORD token) { diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 86ad677..c364f09 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -3685,6 +3685,7 @@ typedef struct _WineD3D_GL_Info { GL_VSVersion vs_ati_version; BOOL arb_vs_offset_limit; + BOOL set_texcoord_w; BOOL supported[OPENGL_SUPPORTED_EXT_END + 1];

1 0

Francois Gouget : ddraw: Rename DDRAW_dump_flags_() to DDRAW_dump_flags_nolf() to clarify its difference from DDRAW_dump_flags ().
by Alexandre Julliard 07 Dec '07

07 Dec '07

Module: wine Branch: master Commit: 6a8f961e08839f41f8905724c4e8356fd3302126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a8f961e08839f41f8905724c… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 7 01:03:03 2007 +0100 ddraw: Rename DDRAW_dump_flags_() to DDRAW_dump_flags_nolf() to clarify its difference from DDRAW_dump_flags(). --- dlls/ddraw/utils.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index b857d96..80397ec 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -629,12 +629,8 @@ DDRAW_dump_DDCOLORKEY(const DDCOLORKEY *ddck) TRACE(" Low : %d - High : %d", ddck->dwColorSpaceLowValue, ddck->dwColorSpaceHighValue); } -#define DDRAW_dump_flags(flags,names,num_names) DDRAW_dump_flags_(flags, names, num_names, 1) -static void -DDRAW_dump_flags_(DWORD flags, - const flag_info* names, - size_t num_names, - int newline) +static void DDRAW_dump_flags_nolf(DWORD flags, const flag_info* names, + size_t num_names) { unsigned int i; @@ -642,9 +638,13 @@ DDRAW_dump_flags_(DWORD flags, if ((flags & names[i].val) || /* standard flag value */ ((!flags) && (!names[i].val))) /* zero value only */ TRACE("%s ", names[i].name); +} - if (newline) - TRACE("\n"); +static void DDRAW_dump_flags(DWORD flags, const flag_info* names, + size_t num_names) +{ + DDRAW_dump_flags_nolf(flags, names, num_names); + TRACE("\n"); } void DDRAW_dump_DDSCAPS2(const DDSCAPS2 *in) @@ -703,8 +703,8 @@ void DDRAW_dump_DDSCAPS2(const DDSCAPS2 *in) FE(DDSCAPS2_STEREOSURFACELEFT) }; - DDRAW_dump_flags_(in->dwCaps, flags, sizeof(flags)/sizeof(flags[0]), 0); - DDRAW_dump_flags_(in->dwCaps2, flags2, sizeof(flags2)/sizeof(flags2[0]), 0); + DDRAW_dump_flags_nolf(in->dwCaps, flags, sizeof(flags)/sizeof(flags[0])); + DDRAW_dump_flags_nolf(in->dwCaps2, flags2, sizeof(flags2)/sizeof(flags2[0])); } void @@ -741,7 +741,7 @@ DDRAW_dump_pixelformat_flag(DWORD flagmask) FE(DDPF_ZPIXELS) }; - DDRAW_dump_flags_(flagmask, flags, sizeof(flags)/sizeof(flags[0]), 0); + DDRAW_dump_flags_nolf(flagmask, flags, sizeof(flags)/sizeof(flags[0])); } static void

1 0

Francois Gouget : ddraw: Modify DDRAW_dump_( DWORD|PTR|DDCOLORKEY|DDSCAPS2|pixelformat)() to print a trailing '\n'.
by Alexandre Julliard 07 Dec '07

07 Dec '07

Module: wine Branch: master Commit: 90834020da269f1a961ec252e8cc7e0e8d931fc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90834020da269f1a961ec252e… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 7 01:03:29 2007 +0100 ddraw: Modify DDRAW_dump_(DWORD|PTR|DDCOLORKEY|DDSCAPS2|pixelformat)() to print a trailing '\n'. --- dlls/ddraw/ddraw.c | 1 - dlls/ddraw/utils.c | 20 ++++++++------------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 5e2d564..37a49fe 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -910,7 +910,6 @@ IDirectDrawImpl_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *Caps, DWORD *t { TRACE("(%p) Asked for memory with description: ", This); DDRAW_dump_DDSCAPS2(Caps); - TRACE("\n"); } EnterCriticalSection(&ddraw_cs); diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 80397ec..86222af 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -321,7 +321,6 @@ PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, if(TRACE_ON(ddraw)) { TRACE("Returning: "); DDRAW_dump_pixelformat(DDPixelFormat); - TRACE("\n"); } } /***************************************************************************** @@ -343,7 +342,6 @@ PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat) if(TRACE_ON(ddraw)) { DDRAW_dump_pixelformat(DDPixelFormat); - TRACE("\n"); } if(DDPixelFormat->dwFlags & DDPF_PALETTEINDEXED8) @@ -616,17 +614,17 @@ PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat) static void DDRAW_dump_DWORD(const void *in) { - TRACE("%d", *((const DWORD *) in)); + TRACE("%d\n", *((const DWORD *) in)); } static void DDRAW_dump_PTR(const void *in) { - TRACE("%p", *((const void * const*) in)); + TRACE("%p\n", *((const void * const*) in)); } static void DDRAW_dump_DDCOLORKEY(const DDCOLORKEY *ddck) { - TRACE(" Low : %d - High : %d", ddck->dwColorSpaceLowValue, ddck->dwColorSpaceHighValue); + TRACE("Low : %d - High : %d\n", ddck->dwColorSpaceLowValue, ddck->dwColorSpaceHighValue); } static void DDRAW_dump_flags_nolf(DWORD flags, const flag_info* names, @@ -637,11 +635,10 @@ static void DDRAW_dump_flags_nolf(DWORD flags, const flag_info* names, for (i=0; i < num_names; i++) if ((flags & names[i].val) || /* standard flag value */ ((!flags) && (!names[i].val))) /* zero value only */ - TRACE("%s ", names[i].name); + TRACE("%s\n", names[i].name); } -static void DDRAW_dump_flags(DWORD flags, const flag_info* names, - size_t num_names) +static void DDRAW_dump_flags(DWORD flags, const flag_info* names, size_t num_names) { DDRAW_dump_flags_nolf(flags, names, num_names); TRACE("\n"); @@ -704,7 +701,7 @@ void DDRAW_dump_DDSCAPS2(const DDSCAPS2 *in) }; DDRAW_dump_flags_nolf(in->dwCaps, flags, sizeof(flags)/sizeof(flags[0])); - DDRAW_dump_flags_nolf(in->dwCaps2, flags2, sizeof(flags2)/sizeof(flags2[0])); + DDRAW_dump_flags(in->dwCaps2, flags2, sizeof(flags2)/sizeof(flags2[0])); } void @@ -758,7 +755,6 @@ DDRAW_dump_members(DWORD flags, { TRACE(" - %s : ", mems[i].name); mems[i].func((const char *)data + mems[i].offset); - TRACE("\n"); } } } @@ -820,7 +816,7 @@ DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf) TRACE(" V "); TRACE(cmd, pf->u3.dwBumpDvBitMask); TRACE(" L "); TRACE(cmd, pf->u4.dwBumpLuminanceBitMask); } - TRACE(")"); + TRACE(")\n"); } void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd) @@ -1118,7 +1114,7 @@ void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps) TRACE(" - dwMinOverlayStretch : %d\n", lpcaps->dwMinOverlayStretch); TRACE(" - dwMaxOverlayStretch : %d\n", lpcaps->dwMaxOverlayStretch); TRACE("...\n"); - TRACE(" - ddsCaps : "); DDRAW_dump_DDSCAPS2(&lpcaps->ddsCaps); TRACE("\n"); + TRACE(" - ddsCaps : "); DDRAW_dump_DDSCAPS2(&lpcaps->ddsCaps); } /*****************************************************************************

1 0

Francois Gouget : inetcomm: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 07 Dec '07

07 Dec '07

Module: wine Branch: master Commit: 842450e96b146294801d358ba278cef3daaef052 URL: http://source.winehq.org/git/wine.git/?a=commit;h=842450e96b146294801d358ba… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 7 01:02:08 2007 +0100 inetcomm: Fix compilation on systems that don't support nameless unions. --- dlls/inetcomm/mimeole.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 16fe3f4..59619df 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -20,6 +20,7 @@ */ #define COBJMACROS +#define NONAMELESSUNION #include <stdarg.h> #include <stdio.h> @@ -343,7 +344,7 @@ static void read_value(header_t *header, char **cur) } header->value.vt = VT_LPSTR; - header->value.pszVal = value; + header->value.u.pszVal = value; *cur = end; } @@ -359,15 +360,15 @@ static void init_content_type(MimeBody *body, header_t *header) return; } - slash = strchr(header->value.pszVal, '/'); + slash = strchr(header->value.u.pszVal, '/'); if(!slash) { WARN("malformed context type value\n"); return; } - len = slash - header->value.pszVal; + len = slash - header->value.u.pszVal; body->content_pri_type = HeapAlloc(GetProcessHeap(), 0, len + 1); - memcpy(body->content_pri_type, header->value.pszVal, len); + memcpy(body->content_pri_type, header->value.u.pszVal, len); body->content_pri_type[len] = '\0'; body->content_sub_type = strdupA(slash + 1); }

1 0