April 2009 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Store the write mask in struct wined3d_shader_dst_param.
by Alexandre Julliard April 7, 2009

April 7, 2009

Module: wine Branch: master Commit: 6f66c1ddbd1d53589b0bf587bc23d57838652b25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f66c1ddbd1d53589b0bf587b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 7 11:09:11 2009 +0200 wined3d: Store the write mask in struct wined3d_shader_dst_param. --- dlls/wined3d/arb_program_shader.c | 8 ++++---- dlls/wined3d/baseshader.c | 1 + dlls/wined3d/glsl_shader.c | 12 +++++++----- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 794f1e3..42af755 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -688,7 +688,7 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD if (shader_is_pshader_version(ins->reg_maps->shader_version)) { IWineD3DPixelShaderImpl *ps = (IWineD3DPixelShaderImpl *)ins->shader; - gen_color_correction(buffer, dst_str, ins->dst[0].token & WINED3DSP_WRITEMASK_ALL, + gen_color_correction(buffer, dst_str, ins->dst[0].write_mask, "one", "coefmul.x", ps->cur_args->color_fixup[sampler_idx]); } } @@ -1584,10 +1584,10 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) break; } + tmp_dst = ins->dst[0]; for (i = 0; i < nComponents; i++) { - tmp_dst.register_idx = ins->dst[0].register_idx; - tmp_dst.modifiers = ins->dst[0].modifiers; - tmp_dst.token = ((ins->dst[0].token) & ~WINED3DSP_WRITEMASK_ALL) | (WINED3DSP_WRITEMASK_0 << i); + tmp_dst.write_mask = WINED3DSP_WRITEMASK_0 << i; + tmp_dst.token = (tmp_dst.token & ~WINED3DSP_WRITEMASK_ALL) | tmp_dst.write_mask; tmp_ins.src[1] = ins->src[1]+i; shader_hw_map2gl(&tmp_ins); } diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index ed6c069..db3ab1e 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -851,6 +851,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, dst_param.addr_token = 0; pToken += shader_get_param(pToken, shader_version, &dst_param.token, &dst_param.addr_token); dst_param.register_idx = dst_param.token & WINED3DSP_REGNUM_MASK; + dst_param.write_mask = dst_param.token & WINED3DSP_WRITEMASK_ALL; dst_param.modifiers = dst_param.token & WINED3DSP_DSTMOD_MASK; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e18224d..7c0ea51 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1446,7 +1446,7 @@ static void shader_glsl_color_correction(const struct wined3d_shader_instruction if (fixup.y_sign_fixup || fixup.y_source != CHANNEL_SOURCE_Y) mask |= WINED3DSP_WRITEMASK_1; if (fixup.z_sign_fixup || fixup.z_source != CHANNEL_SOURCE_Z) mask |= WINED3DSP_WRITEMASK_2; if (fixup.w_sign_fixup || fixup.w_source != CHANNEL_SOURCE_W) mask |= WINED3DSP_WRITEMASK_3; - mask &= ins->dst[0].token; + mask &= ins->dst[0].write_mask; if (!mask) return; /* Nothing to do */ @@ -1509,7 +1509,7 @@ static void PRINTF_ATTR(6, 7) shader_glsl_gen_sample_code(const struct wined3d_s BOOL rect_fixup = FALSE; va_list args; - shader_glsl_get_swizzle(swizzle, FALSE, ins->dst[0].token, dst_swizzle); + shader_glsl_get_swizzle(swizzle, FALSE, ins->dst[0].write_mask, dst_swizzle); if (shader_is_pshader_version(ins->reg_maps->shader_version)) { @@ -1947,6 +1947,7 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) temp_destination = TRUE; } else { struct wined3d_shader_dst_param dst = ins->dst[0]; + dst.write_mask &= write_mask; dst.token &= ~WINED3DSP_WRITEMASK_ALL | write_mask; write_mask = shader_glsl_append_dst_ext(ins->buffer, ins, &dst); if (!write_mask) continue; @@ -2010,6 +2011,7 @@ static void shader_glsl_cnd(const struct wined3d_shader_instruction *ins) } } dst = ins->dst[0]; + dst.write_mask &= write_mask; dst.token &= ~WINED3DSP_WRITEMASK_ALL | write_mask; write_mask = shader_glsl_append_dst_ext(ins->buffer, ins, &dst); if (!write_mask) continue; @@ -2087,11 +2089,11 @@ static void shader_glsl_mnxn(const struct wined3d_shader_instruction *ins) break; } + tmp_dst = ins->dst[0]; for (i = 0; i < nComponents; ++i) { - tmp_dst.register_idx = ins->dst[0].register_idx; - tmp_dst.modifiers = ins->dst[0].modifiers; - tmp_dst.token = ((ins->dst[0].token) & ~WINED3DSP_WRITEMASK_ALL) | (WINED3DSP_WRITEMASK_0 << i); + tmp_dst.write_mask = WINED3DSP_WRITEMASK_0 << i; + tmp_dst.token = (tmp_dst.token & ~WINED3DSP_WRITEMASK_ALL) | tmp_dst.write_mask; tmp_ins.src[1] = ins->src[1] + i; shader_glsl_dot(&tmp_ins); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ff03d3d..ccc681f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -453,6 +453,7 @@ typedef struct SHADER_OPCODE struct wined3d_shader_dst_param { UINT register_idx; + DWORD write_mask; DWORD modifiers; DWORD token; DWORD addr_token;

1 0

Jacek Caban : urlmon: Added DeCompMimeFilter stub implementation.
by Alexandre Julliard April 7, 2009

April 7, 2009

Module: wine Branch: master Commit: 11a6f3539f6b3cf4ab61fbc1a64f7ea0a024a974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11a6f3539f6b3cf4ab61fbc1a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 7 00:14:26 2009 +0200 urlmon: Added DeCompMimeFilter stub implementation. --- dlls/urlmon/Makefile.in | 1 + dlls/urlmon/mimefilter.c | 192 +++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon_main.c | 5 +- dlls/urlmon/urlmon_main.h | 1 + 4 files changed, 198 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in index 825eab2..bd6a256 100644 --- a/dlls/urlmon/Makefile.in +++ b/dlls/urlmon/Makefile.in @@ -17,6 +17,7 @@ C_SRCS = \ gopher.c \ http.c \ internet.c \ + mimefilter.c \ mk.c \ protocol.c \ regsvr.c \ diff --git a/dlls/urlmon/mimefilter.c b/dlls/urlmon/mimefilter.c new file mode 100644 index 0000000..9964612 --- /dev/null +++ b/dlls/urlmon/mimefilter.c @@ -0,0 +1,192 @@ +/* + * Copyright 2009 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "urlmon_main.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(urlmon); + +typedef struct { + const IInternetProtocolVtbl *lpIInternetProtocolVtbl; + + LONG ref; +} MimeFilter; + +#define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpIInternetProtocolVtbl) + +#define PROTOCOL_THIS(iface) DEFINE_THIS(MimeFilter, IInternetProtocol, iface) + +static HRESULT WINAPI MimeFilterProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + + *ppv = NULL; + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = PROTOCOL(This); + }else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) { + TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv); + *ppv = PROTOCOL(This); + }else if(IsEqualGUID(&IID_IInternetProtocol, riid)) { + TRACE("(%p)->(IID_IInternetProtocol %p)\n", This, ppv); + *ppv = PROTOCOL(This); + } + + if(*ppv) { + IInternetProtocol_AddRef(iface); + return S_OK; + } + + WARN("not supported interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI MimeFilterProtocol_AddRef(IInternetProtocol *iface) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + LONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) ref=%d\n", This, ref); + return ref; +} + +static ULONG WINAPI MimeFilterProtocol_Release(IInternetProtocol *iface) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + heap_free(This); + + URLMON_UnlockModule(); + } + + return ref; +} + +static HRESULT WINAPI MimeFilterProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, + IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo, + DWORD grfPI, HANDLE_PTR dwReserved) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, + pOIBindInfo, grfPI, dwReserved); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterProtocol_Continue(IInternetProtocol *iface, PROTOCOLDATA *pProtocolData) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%p)\n", This, pProtocolData); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterProtocol_Abort(IInternetProtocol *iface, HRESULT hrReason, + DWORD dwOptions) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%08x)\n", This, dwOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterProtocol_Suspend(IInternetProtocol *iface) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterProtocol_Resume(IInternetProtocol *iface) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterProtocol_Read(IInternetProtocol *iface, void *pv, + ULONG cb, ULONG *pcbRead) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER dlibMove, + DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterProtocol_LockRequest(IInternetProtocol *iface, DWORD dwOptions) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%08x)\n", This, dwOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterProtocol_UnlockRequest(IInternetProtocol *iface) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +#undef PROTOCOL_THIS + +static const IInternetProtocolVtbl MimeFilterProtocolVtbl = { + MimeFilterProtocol_QueryInterface, + MimeFilterProtocol_AddRef, + MimeFilterProtocol_Release, + MimeFilterProtocol_Start, + MimeFilterProtocol_Continue, + MimeFilterProtocol_Abort, + MimeFilterProtocol_Terminate, + MimeFilterProtocol_Suspend, + MimeFilterProtocol_Resume, + MimeFilterProtocol_Read, + MimeFilterProtocol_Seek, + MimeFilterProtocol_LockRequest, + MimeFilterProtocol_UnlockRequest +}; + +HRESULT MimeFilter_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) +{ + MimeFilter *ret; + + TRACE("(%p %p)\n", pUnkOuter, ppobj); + + URLMON_LockModule(); + + ret = heap_alloc_zero(sizeof(MimeFilter)); + + ret->lpIInternetProtocolVtbl = &MimeFilterProtocolVtbl; + ret->ref = 1; + + *ppobj = PROTOCOL(ret); + return S_OK; +} diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index ad1b07b..8561937 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -187,6 +187,8 @@ static const ClassFactory ZoneManagerCF = { &ClassFactoryVtbl, ZoneMgrImpl_Construct}; static const ClassFactory StdURLMonikerCF = { &ClassFactoryVtbl, StdURLMoniker_Construct}; +static const ClassFactory MimeFilterCF = + { &ClassFactoryVtbl, MimeFilter_Construct}; struct object_creation_info { @@ -212,7 +214,8 @@ static const struct object_creation_info object_creation[] = { &CLSID_MkProtocol, CLASSFACTORY(&MkProtocolCF), wszMk }, { &CLSID_InternetSecurityManager, CLASSFACTORY(&SecurityManagerCF), NULL }, { &CLSID_InternetZoneManager, CLASSFACTORY(&ZoneManagerCF), NULL }, - { &CLSID_StdURLMoniker, CLASSFACTORY(&StdURLMonikerCF), NULL } + { &CLSID_StdURLMoniker, CLASSFACTORY(&StdURLMonikerCF), NULL }, + { &CLSID_DeCompMimeFilter, CLASSFACTORY(&MimeFilterCF), NULL } }; static void init_session(BOOL init) diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 0d9a966..1ee2eec 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -45,6 +45,7 @@ extern HRESULT HttpSProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); extern HRESULT FtpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); extern HRESULT GopherProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); extern HRESULT MkProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); +extern HRESULT MimeFilter_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); /********************************************************************** * Dll lifetime tracking declaration for urlmon.dll

1 0

Alexandre Julliard : msvcrt: Fix scanf to correctly parse pointers on 64-bit.
by Alexandre Julliard April 7, 2009

April 7, 2009

Module: wine Branch: master Commit: 3a195139c24647633f2c9213cd893465392b7b94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a195139c24647633f2c9213c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 20:58:10 2009 +0200 msvcrt: Fix scanf to correctly parse pointers on 64-bit. --- dlls/msvcrt/scanf.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 6ea9ab1..3eb705b 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -151,6 +151,8 @@ _FUNCTION_ { switch(*format) { case 'p': case 'P': /* pointer. */ + if (sizeof(void *) == sizeof(LONGLONG)) I64_prefix = 1; + /* fall through */ case 'x': case 'X': /* hexadecimal integer. */ base = 16; @@ -224,7 +226,7 @@ _FUNCTION_ { if (!suppress) { #define _SET_NUMBER_(type) *va_arg(ap, type*) = negative ? -cur : cur if (I64_prefix) _SET_NUMBER_(LONGLONG); - else if (l_prefix) _SET_NUMBER_(long int); + else if (l_prefix) _SET_NUMBER_(LONG); else if (h_prefix) _SET_NUMBER_(short int); else _SET_NUMBER_(int); }

1 0

Alexandre Julliard : kernel32/tests: Use the appropriate processor architecture in generated manifests.
by Alexandre Julliard April 7, 2009

April 7, 2009

Module: wine Branch: master Commit: 4b9bba163e1fad1aa36b3aaf12738e9b183947c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9bba163e1fad1aa36b3aaf1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 20:57:47 2009 +0200 kernel32/tests: Use the appropriate processor architecture in generated manifests. --- dlls/kernel32/tests/actctx.c | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 5573c6a..d8f48de 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -43,6 +43,14 @@ static const char* strw(LPCWSTR x) return buffer; } +#ifdef __i386__ +#define ARCH "x86" +#elif defined __x86_64__ +#define ARCH "amd64" +#else +#define ARCH "none" +#endif + static const char manifest1[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" "<assemblyIdentity version=\"1.0.0.0\" name=\"Wine.Test\" type=\"win32\"></assemblyIdentity>" @@ -54,7 +62,7 @@ static const char manifest2[] = "</assemblyIdentity>" "<dependency>" "<dependentAssembly>" -"<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.3\" processorArchitecture=\"x86\">" +"<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.3\" processorArchitecture=\"" ARCH "\">" "</assemblyIdentity>" "</dependentAssembly>" "</dependency>" @@ -76,7 +84,7 @@ static const char manifest4[] = "<dependency>" "<dependentAssembly>" "<assemblyIdentity type=\"win32\" name=\"Microsoft.Windows.Common-Controls\" " - "version=\"6.0.1.0\" processorArchitecture=\"x86\" publicKeyToken=\"6595b64144ccf1df\">" + "version=\"6.0.1.0\" processorArchitecture=\"" ARCH "\" publicKeyToken=\"6595b64144ccf1df\">" "</assemblyIdentity>" "</dependentAssembly>" "</dependency>" @@ -84,19 +92,19 @@ static const char manifest4[] = static const char testdep_manifest1[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" -"<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.3\" processorArchitecture=\"x86\"/>" +"<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.3\" processorArchitecture=\"" ARCH "\"/>" "</assembly>"; static const char testdep_manifest2[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" -"<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.3\" processorArchitecture=\"x86\" />" +"<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.3\" processorArchitecture=\"" ARCH "\" />" "<file name=\"testlib.dll\"></file>" "<file name=\"testlib2.dll\" hash=\"63c978c2b53d6cf72b42fb7308f9af12ab19ec53\" hashalg=\"SHA1\" />" "</assembly>"; static const char testdep_manifest3[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\"> " -"<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.3\" processorArchitecture=\"x86\"/>" +"<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.3\" processorArchitecture=\"" ARCH "\"/>" "<file name=\"testlib.dll\"/>" "<file name=\"testlib2.dll\" hash=\"63c978c2b53d6cf72b42fb7308f9af12ab19ec53\" hashalg=\"SHA1\">" "<windowClass>wndClass</windowClass>" @@ -138,7 +146,7 @@ static const char wrong_manifest6[] = static const char wrong_manifest7[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" -"<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.3\" processorArchitecture=\"x86\" />" +"<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.3\" processorArchitecture=\"" ARCH "\" />" "<file name=\"testlib.dll\" hash=\"63c978c2b53d6cf72b42fb7308f9af12ab19ec5\" hashalg=\"SHA1\" />" "</assembly>"; @@ -150,7 +158,7 @@ static const char wrong_manifest8[] = static const char wrong_depmanifest1[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" -"<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.4\" processorArchitecture=\"x86\" />" +"<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.4\" processorArchitecture=\"" ARCH "\" />" "</assembly>"; static const WCHAR testlib_dll[] = @@ -386,21 +394,21 @@ static const info_in_assembly manifest4_info = { static const info_in_assembly depmanifest1_info = { 0x10, depmanifest_path, - "testdep,processorArchitecture=\"x86\"," + "testdep,processorArchitecture=\"" ARCH "\"," "type=\"win32\",version=\"6.5.4.3\"", TRUE }; static const info_in_assembly depmanifest2_info = { 0x10, depmanifest_path, - "testdep,processorArchitecture=\"x86\"," + "testdep,processorArchitecture=\"" ARCH "\"," "type=\"win32\",version=\"6.5.4.3\"", TRUE }; static const info_in_assembly depmanifest3_info = { 0x10, depmanifest_path, - "testdep,processorArchitecture=\"x86\",type=\"win32\",version=\"6.5.4.3\"", + "testdep,processorArchitecture=\"" ARCH "\",type=\"win32\",version=\"6.5.4.3\"", TRUE };

1 0

Aric Stewart : gdi32/tests: Demonstrate issues in wine with SaveDC and RestoreDC in metafiles and enhmetafiles .
by Alexandre Julliard April 6, 2009

April 6, 2009

Module: wine Branch: master Commit: cac6b96de47d6f8587dbc68266218890c24cf617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac6b96de47d6f8587dbc6826… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 3 13:35:38 2009 -0500 gdi32/tests: Demonstrate issues in wine with SaveDC and RestoreDC in metafiles and enhmetafiles. --- dlls/gdi32/tests/metafile.c | 191 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 191 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cac6b96de47d6f8587dbc…

1 0

Michael Stefaniuc : winhlp32: Remove superfluous casts.
by Alexandre Julliard April 6, 2009

April 6, 2009

Module: wine Branch: master Commit: cd4a7c31465427c1d6cd213337aa37041427c82d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd4a7c31465427c1d6cd21333… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 6 11:51:26 2009 +0200 winhlp32: Remove superfluous casts. --- programs/winhlp32/winhelp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index bac416e..ddd58ad 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -353,7 +353,7 @@ static LRESULT WINHELP_HandleCommand(HWND hSrcWnd, LPARAM lParam) return 0; } - wh = (WINHELP*)cds->lpData; + wh = cds->lpData; if (wh) { @@ -1154,7 +1154,7 @@ static LRESULT CALLBACK WINHELP_ShadowWndProc(HWND hWnd, UINT msg, WPARAM wParam */ static void cb_KWBTree(void *p, void **next, void *cookie) { - HWND hListWnd = (HWND)cookie; + HWND hListWnd = cookie; int count; WINE_TRACE("Adding '%s' to search list\n", (char *)p);

1 0

Alexandre Julliard : shlwapi/tests: Don' t test uninitialized parts of the variant.
by Alexandre Julliard April 6, 2009

April 6, 2009

Module: wine Branch: master Commit: f702885e63ed01222128eadf04e7c44b64a851aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f702885e63ed01222128eadf0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 13:52:01 2009 +0200 shlwapi/tests: Don't test uninitialized parts of the variant. --- dlls/shlwapi/tests/ordinal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 3e37121..3a50219 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -482,7 +482,7 @@ static void test_SHPackDispParams(void) ok(params.rgdispidNamedArgs == NULL, "params.rgdispidNamedArgs = %p\n", params.rgdispidNamedArgs); ok(params.rgvarg == vars, "params.rgvarg = %p\n", params.rgvarg); ok(V_VT(vars) == VT_I4, "V_VT(var) = %d\n", V_VT(vars)); - ok(V_DISPATCH(vars) == (void*)0xdeadbeef, "failed\n"); + ok(V_I4(vars) == 0xdeadbeef, "failed %x\n", V_I4(vars)); memset(&params, 0xc0, sizeof(params)); hres = pSHPackDispParams(&params, NULL, 0, 0);

1 0

Stefano Guidoni : winemp3: Rounding block count up in mpeg3_streamsize.
by Alexandre Julliard April 6, 2009

April 6, 2009

Module: wine Branch: master Commit: 697a64595a493d35e0862dee094d8b2f5228c07d URL: http://source.winehq.org/git/wine.git/?a=commit;h=697a64595a493d35e0862dee0… Author: Stefano Guidoni <s.guidoni(a)tin.it> Date: Sun Apr 5 23:17:27 2009 +0100 winemp3: Rounding block count up in mpeg3_streamsize. --- dlls/winemp3.acm/mpegl3.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 3ebd94c..f30bfef 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -490,8 +490,7 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEGLAYER3) { - nblocks = (adsi->pwfxDst->nAvgBytesPerSec * 8 * 144 / adsi->pwfxDst->nSamplesPerSec); - nblocks = (adss->cbDstLength - 3002 - nblocks) / nblocks; + nblocks = (adss->cbDstLength - 3000) / (DWORD)(adsi->pwfxDst->nAvgBytesPerSec * 1152 / adsi->pwfxDst->nSamplesPerSec + 0.5); if (nblocks == 0) return ACMERR_NOTPOSSIBLE; adss->cbSrcLength = nblocks * 1152 * adsi->pwfxSrc->nBlockAlign; @@ -502,7 +501,7 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad nblocks = adss->cbDstLength / (adsi->pwfxDst->nBlockAlign * 1152); if (nblocks == 0) return ACMERR_NOTPOSSIBLE; - adss->cbSrcLength = nblocks * (DWORD)(adsi->pwfxSrc->nAvgBytesPerSec * 8 * 144 / adsi->pwfxSrc->nSamplesPerSec); + adss->cbSrcLength = nblocks * (DWORD)(adsi->pwfxSrc->nAvgBytesPerSec * 1152 / adsi->pwfxSrc->nSamplesPerSec); } else { @@ -517,15 +516,20 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad nblocks = adss->cbSrcLength / (adsi->pwfxSrc->nBlockAlign * 1152); if (nblocks == 0) return ACMERR_NOTPOSSIBLE; - adss->cbDstLength = nblocks * (DWORD)(adsi->pwfxDst->nAvgBytesPerSec * 8 * 144 / adsi->pwfxDst->nSamplesPerSec); + if (adss->cbSrcLength % (DWORD)(adsi->pwfxSrc->nBlockAlign * 1152)) + /* Round block count up. */ + nblocks++; + adss->cbDstLength = 3000 + nblocks * (DWORD)(adsi->pwfxDst->nAvgBytesPerSec * 1152 / adsi->pwfxDst->nSamplesPerSec + 0.5); } else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { - nblocks = (adsi->pwfxSrc->nAvgBytesPerSec * 8 * 144 / adsi->pwfxSrc->nSamplesPerSec); - nblocks = (adss->cbSrcLength - 3002 - nblocks) / nblocks; + nblocks = adss->cbSrcLength / (DWORD)(adsi->pwfxSrc->nAvgBytesPerSec * 1152 / adsi->pwfxSrc->nSamplesPerSec); if (nblocks == 0) return ACMERR_NOTPOSSIBLE; + if (adss->cbSrcLength % (DWORD)(adsi->pwfxSrc->nAvgBytesPerSec * 1152 / adsi->pwfxSrc->nSamplesPerSec)) + /* Round block count up. */ + nblocks++; adss->cbDstLength = nblocks * 1152 * adsi->pwfxDst->nBlockAlign; } else

1 0

Paul Vriens : urlmon/tests: Fix a test by using a better default registry key.
by Alexandre Julliard April 6, 2009

April 6, 2009

Module: wine Branch: master Commit: 7c8d07bc1052d64a80b6e8b756d099bf71bc8b87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c8d07bc1052d64a80b6e8b75… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Apr 6 11:13:06 2009 +0200 urlmon/tests: Fix a test by using a better default registry key. --- dlls/urlmon/tests/misc.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 7702e1e..64ed937 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -851,7 +851,10 @@ static void test_url_action(IInternetSecurityManager *secmgr, IInternetZoneManag HKEY hkey; HRESULT hres; - res = RegOpenKeyA(HKEY_LOCAL_MACHINE, + /* FIXME: HKEY_CURRENT_USER is most of the time the default but this can be changed on a system. + * The test should be changed to cope with that, if need be. + */ + res = RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\\Zones\\3", &hkey); if(res != ERROR_SUCCESS) { ok(0, "Could not open zone key\n");

1 0

Marcus Meissner : oleaut32: IPropertyBag_Read_Proxy return on unknown type (Coverity 892).
by Alexandre Julliard April 6, 2009

April 6, 2009

Module: wine Branch: master Commit: a9c0c247edf0ace58bbdd9b21737f3c6380ad405 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c0c247edf0ace58bbdd9b21… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Apr 4 18:15:16 2009 +0200 oleaut32: IPropertyBag_Read_Proxy return on unknown type (Coverity 892). --- dlls/oleaut32/usrmarshal.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index a119c28..14c655c 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -2041,7 +2041,8 @@ HRESULT CALLBACK IPropertyBag_Read_Proxy( FIXME("Safearray support not yet implemented.\n"); return E_NOTIMPL; default: - break; + FIXME("Unknown V_VT %d - support not yet implemented.\n", V_VT(pVar)); + return E_NOTIMPL; } return IPropertyBag_RemoteRead_Proxy(This, pszPropName, pVar, pErrorLog,

1 0