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

lostwages/ include/winehq.conf news/2007041301.xml
by Alexandre Julliard April 13, 2007

April 13, 2007

ChangeSet ID: 31041 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2007/04/13 11:08:08 Modified files: include : winehq.conf Added files: news : 2007041301.xml Log message: Release 0.9.35 Patch: http://cvs.winehq.org/patch.py?id=31041 Old revision New revision Changes Path 1.57 1.58 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2007041301.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.57 lostwages/include/winehq.conf:1.58 --- lostwages/include/winehq.conf:1.57 13 Apr 2007 16: 8: 8 -0000 +++ lostwages/include/winehq.conf 13 Apr 2007 16: 8: 8 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.34 +snapshot_date: 0.9.35 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2007041301.xml diff -u -p /dev/null lostwages/news/2007041301.xml:1.1 --- /dev/null 13 Apr 2007 16: 8: 8 -0000 +++ lostwages/news/2007041301.xml 13 Apr 2007 16: 8: 8 -0000 @@ -0,0 +1,25 @@ +<news> +<date>April 13, 2007</date> +<title>Wine 0.9.35 Released</title> +<body> +<p>Wine 0.9.35 was released today, with the following main changes:</p> + +<ul> +<li>Broken aRts sound driver now removed for good.</li> +<li>Many fixes to the Quartz DLL sound support.</li> +<li>File I/O performance improvements.</li> +<li>The usual assortment of Direct3D fixes.</li> +<li>Lots of bug fixes.</li> +</ul> + +<p> +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.35.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.35">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. +</p> +</body> +</news>

1 0

Tag wine-0.9.35 : Alexandre Julliard : Release 0.9.35
by Alexandre Julliard April 13, 2007

April 13, 2007

Module: wine Branch: refs/tags/wine-0.9.35 Tag: dea484602fbef4750e59ae3c3273d491a3721c1a URL: http://source.winehq.org/git/wine.git/?a=tag;h=dea484602fbef4750e59ae3c3273… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 17:47:53 2007 +0200 Release 0.9.35

1 0

Alexandre Julliard : Release 0.9.35.
by Alexandre Julliard April 13, 2007

April 13, 2007

Module: wine Branch: master Commit: 29e8ac74fec5928162f97ff5a0fe7ab89f9c4257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29e8ac74fec5928162f97ff5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 17:47:52 2007 +0200 Release 0.9.35. --- ANNOUNCE | 744 ++++++++++++++++------------------ ChangeLog | 1350 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 1717 insertions(+), 397 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=29e8ac74fec5928162f97…

1 0

Huw Davies : imagehlp: Add support for the indices array passed to ImageEnumerateCertificates.
by Alexandre Julliard April 13, 2007

April 13, 2007

Module: wine Branch: master Commit: ddb564bfe243b32a534595a2e38364012fc7b967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddb564bfe243b32a534595a2e… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 13 12:02:47 2007 +0100 imagehlp: Add support for the indices array passed to ImageEnumerateCertificates. --- dlls/imagehlp/integrity.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/imagehlp/integrity.c b/dlls/imagehlp/integrity.c index b3b8e66..99608b7 100644 --- a/dlls/imagehlp/integrity.c +++ b/dlls/imagehlp/integrity.c @@ -161,7 +161,7 @@ BOOL WINAPI ImageEnumerateCertificates( HANDLE handle, WORD TypeFilter, PDWORD CertificateCount, PDWORD Indices, DWORD IndexCount) { - DWORD size, count, offset, sd_VirtualAddr; + DWORD size, count, offset, sd_VirtualAddr, index; WIN_CERTIFICATE hdr; const size_t cert_hdr_size = sizeof hdr - sizeof hdr.bCertificate; BOOL r; @@ -169,17 +169,12 @@ BOOL WINAPI ImageEnumerateCertificates( TRACE("%p %hd %p %p %d\n", handle, TypeFilter, CertificateCount, Indices, IndexCount); - if( Indices ) - { - FIXME("Indices not handled!\n"); - return FALSE; - } - r = IMAGEHLP_GetSecurityDirOffset( handle, &sd_VirtualAddr, &size ); if( !r ) return FALSE; offset = 0; + index = 0; *CertificateCount = 0; while( offset < size ) { @@ -207,10 +202,13 @@ BOOL WINAPI ImageEnumerateCertificates( (TypeFilter == hdr.wCertificateType) ) { (*CertificateCount)++; + if(Indices && *CertificateCount <= IndexCount) + *Indices++ = index; } /* next certificate */ offset += hdr.dwLength; + index++; } return TRUE;

1 0

András Kovács : ntdll: Add Vista version option.
by Alexandre Julliard April 13, 2007

April 13, 2007

Module: wine Branch: master Commit: 9f9b55d2fcfe62551957a1ea694c0afb3d02195d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f9b55d2fcfe62551957a1ea6… Author: András Kovács <andras(a)debian.sth.sze.hu> Date: Thu Apr 12 16:10:50 2007 +0200 ntdll: Add Vista version option. --- dlls/ntdll/version.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 5879ff2..f29b495 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -50,6 +50,7 @@ typedef enum NT2K, /* Windows 2000 */ WINXP, /* Windows XP */ WIN2K3, /* Windows 2003 */ + WINVISTA,/* Windows Vista */ NB_WINDOWS_VERSIONS } WINDOWS_VERSION; @@ -135,6 +136,12 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = sizeof(RTL_OSVERSIONINFOEXW), 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','1',0}, 1, 0, VER_SUITE_SINGLEUSERTS, VER_NT_SERVER, 0 + }, + /* WINVISTA */ + { + sizeof(RTL_OSVERSIONINFOEXW), 6, 0, 0x1770, VER_PLATFORM_WIN32_NT, + {' ',0}, + 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 } }; @@ -150,7 +157,8 @@ static const char * const WinVersionNames[NB_WINDOWS_VERSIONS] = "nt40", /* NT40 */ "win2000,win2k,nt2k,nt2000", /* NT2K */ "winxp", /* WINXP */ - "win2003,win2k3" /* WIN2K3 */ + "win2003,win2k3", /* WIN2K3 */ + "vista,winvista" /* WINVISTA*/ };

1 0

András Kovács : winecfg: Add Windows Vista version option.
by Alexandre Julliard April 13, 2007

April 13, 2007

Module: wine Branch: master Commit: fffe9ba4e4a17785c50d022eaca803276424cbd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fffe9ba4e4a17785c50d022ea… Author: András Kovács <andras(a)debian.sth.sze.hu> Date: Thu Apr 12 15:15:20 2007 +0200 winecfg: Add Windows Vista version option. --- programs/winecfg/appdefaults.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 2330aee..ed61f9d 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -48,6 +48,7 @@ static const struct const char *szProductType; } win_versions[] = { + { "vista", "Windows Vista", 6, 0, 0x1770,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, { "win2003", "Windows 2003", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"}, { "winxp", "Windows XP", 5, 1, 0xA28, VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "WinNT"}, { "win2k", "Windows 2000", 5, 0, 0x893, VER_PLATFORM_WIN32_NT, "Service Pack 4", 4, 0, "WinNT"},

1 0

Andrew Talbot : oleaut32: Remove superfluous semicolons.
by Alexandre Julliard April 13, 2007

April 13, 2007

Module: wine Branch: master Commit: 321c21c5c841b97d8a9400c9cd5c0e1bd5921cab URL: http://source.winehq.org/git/wine.git/?a=commit;h=321c21c5c841b97d8a9400c9c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Apr 12 21:30:40 2007 +0100 oleaut32: Remove superfluous semicolons. --- dlls/oleaut32/vartype.c | 156 +++++++++++++++++++++++----------------------- 1 files changed, 78 insertions(+), 78 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 54b389a..fd4e56e 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -164,103 +164,103 @@ static HRESULT VARIANT_FromDisp(IDispatch* pdispIn, LCID lcid, void* pOut, if (in < (dest)lo || in > hi) return DISP_E_OVERFLOW; *out = in; return S_OK; } /* I1 */ -POSTST(signed char, BYTE, VarI1FromUI1, I1_MAX); -BOTHTST(signed char, SHORT, VarI1FromI2, I1_MIN, I1_MAX); -BOTHTST(signed char, LONG, VarI1FromI4, I1_MIN, I1_MAX); -SIMPLE(signed char, VARIANT_BOOL, VarI1FromBool); -POSTST(signed char, USHORT, VarI1FromUI2, I1_MAX); -POSTST(signed char, ULONG, VarI1FromUI4, I1_MAX); -BOTHTST(signed char, LONG64, VarI1FromI8, I1_MIN, I1_MAX); -POSTST(signed char, ULONG64, VarI1FromUI8, I1_MAX); +POSTST(signed char, BYTE, VarI1FromUI1, I1_MAX) +BOTHTST(signed char, SHORT, VarI1FromI2, I1_MIN, I1_MAX) +BOTHTST(signed char, LONG, VarI1FromI4, I1_MIN, I1_MAX) +SIMPLE(signed char, VARIANT_BOOL, VarI1FromBool) +POSTST(signed char, USHORT, VarI1FromUI2, I1_MAX) +POSTST(signed char, ULONG, VarI1FromUI4, I1_MAX) +BOTHTST(signed char, LONG64, VarI1FromI8, I1_MIN, I1_MAX) +POSTST(signed char, ULONG64, VarI1FromUI8, I1_MAX) /* UI1 */ -BOTHTST(BYTE, SHORT, VarUI1FromI2, UI1_MIN, UI1_MAX); -SIMPLE(BYTE, VARIANT_BOOL, VarUI1FromBool); -NEGTST(BYTE, signed char, VarUI1FromI1); -POSTST(BYTE, USHORT, VarUI1FromUI2, UI1_MAX); -BOTHTST(BYTE, LONG, VarUI1FromI4, UI1_MIN, UI1_MAX); -POSTST(BYTE, ULONG, VarUI1FromUI4, UI1_MAX); -BOTHTST(BYTE, LONG64, VarUI1FromI8, UI1_MIN, UI1_MAX); -POSTST(BYTE, ULONG64, VarUI1FromUI8, UI1_MAX); +BOTHTST(BYTE, SHORT, VarUI1FromI2, UI1_MIN, UI1_MAX) +SIMPLE(BYTE, VARIANT_BOOL, VarUI1FromBool) +NEGTST(BYTE, signed char, VarUI1FromI1) +POSTST(BYTE, USHORT, VarUI1FromUI2, UI1_MAX) +BOTHTST(BYTE, LONG, VarUI1FromI4, UI1_MIN, UI1_MAX) +POSTST(BYTE, ULONG, VarUI1FromUI4, UI1_MAX) +BOTHTST(BYTE, LONG64, VarUI1FromI8, UI1_MIN, UI1_MAX) +POSTST(BYTE, ULONG64, VarUI1FromUI8, UI1_MAX) /* I2 */ -SIMPLE(SHORT, BYTE, VarI2FromUI1); -BOTHTST(SHORT, LONG, VarI2FromI4, I2_MIN, I2_MAX); -SIMPLE(SHORT, VARIANT_BOOL, VarI2FromBool); -SIMPLE(SHORT, signed char, VarI2FromI1); -POSTST(SHORT, USHORT, VarI2FromUI2, I2_MAX); -POSTST(SHORT, ULONG, VarI2FromUI4, I2_MAX); -BOTHTST(SHORT, LONG64, VarI2FromI8, I2_MIN, I2_MAX); -POSTST(SHORT, ULONG64, VarI2FromUI8, I2_MAX); +SIMPLE(SHORT, BYTE, VarI2FromUI1) +BOTHTST(SHORT, LONG, VarI2FromI4, I2_MIN, I2_MAX) +SIMPLE(SHORT, VARIANT_BOOL, VarI2FromBool) +SIMPLE(SHORT, signed char, VarI2FromI1) +POSTST(SHORT, USHORT, VarI2FromUI2, I2_MAX) +POSTST(SHORT, ULONG, VarI2FromUI4, I2_MAX) +BOTHTST(SHORT, LONG64, VarI2FromI8, I2_MIN, I2_MAX) +POSTST(SHORT, ULONG64, VarI2FromUI8, I2_MAX) /* UI2 */ -SIMPLE(USHORT, BYTE, VarUI2FromUI1); -NEGTST(USHORT, SHORT, VarUI2FromI2); -BOTHTST(USHORT, LONG, VarUI2FromI4, UI2_MIN, UI2_MAX); -SIMPLE(USHORT, VARIANT_BOOL, VarUI2FromBool); -NEGTST(USHORT, signed char, VarUI2FromI1); -POSTST(USHORT, ULONG, VarUI2FromUI4, UI2_MAX); -BOTHTST(USHORT, LONG64, VarUI2FromI8, UI2_MIN, UI2_MAX); -POSTST(USHORT, ULONG64, VarUI2FromUI8, UI2_MAX); +SIMPLE(USHORT, BYTE, VarUI2FromUI1) +NEGTST(USHORT, SHORT, VarUI2FromI2) +BOTHTST(USHORT, LONG, VarUI2FromI4, UI2_MIN, UI2_MAX) +SIMPLE(USHORT, VARIANT_BOOL, VarUI2FromBool) +NEGTST(USHORT, signed char, VarUI2FromI1) +POSTST(USHORT, ULONG, VarUI2FromUI4, UI2_MAX) +BOTHTST(USHORT, LONG64, VarUI2FromI8, UI2_MIN, UI2_MAX) +POSTST(USHORT, ULONG64, VarUI2FromUI8, UI2_MAX) /* I4 */ -SIMPLE(LONG, BYTE, VarI4FromUI1); -SIMPLE(LONG, SHORT, VarI4FromI2); -SIMPLE(LONG, VARIANT_BOOL, VarI4FromBool); -SIMPLE(LONG, signed char, VarI4FromI1); -SIMPLE(LONG, USHORT, VarI4FromUI2); -POSTST(LONG, ULONG, VarI4FromUI4, I4_MAX); -BOTHTST(LONG, LONG64, VarI4FromI8, I4_MIN, I4_MAX); -POSTST(LONG, ULONG64, VarI4FromUI8, I4_MAX); +SIMPLE(LONG, BYTE, VarI4FromUI1) +SIMPLE(LONG, SHORT, VarI4FromI2) +SIMPLE(LONG, VARIANT_BOOL, VarI4FromBool) +SIMPLE(LONG, signed char, VarI4FromI1) +SIMPLE(LONG, USHORT, VarI4FromUI2) +POSTST(LONG, ULONG, VarI4FromUI4, I4_MAX) +BOTHTST(LONG, LONG64, VarI4FromI8, I4_MIN, I4_MAX) +POSTST(LONG, ULONG64, VarI4FromUI8, I4_MAX) /* UI4 */ -SIMPLE(ULONG, BYTE, VarUI4FromUI1); -NEGTST(ULONG, SHORT, VarUI4FromI2); -NEGTST(ULONG, LONG, VarUI4FromI4); -SIMPLE(ULONG, VARIANT_BOOL, VarUI4FromBool); -NEGTST(ULONG, signed char, VarUI4FromI1); -SIMPLE(ULONG, USHORT, VarUI4FromUI2); -BOTHTST(ULONG, LONG64, VarUI4FromI8, UI4_MIN, UI4_MAX); -POSTST(ULONG, ULONG64, VarUI4FromUI8, UI4_MAX); +SIMPLE(ULONG, BYTE, VarUI4FromUI1) +NEGTST(ULONG, SHORT, VarUI4FromI2) +NEGTST(ULONG, LONG, VarUI4FromI4) +SIMPLE(ULONG, VARIANT_BOOL, VarUI4FromBool) +NEGTST(ULONG, signed char, VarUI4FromI1) +SIMPLE(ULONG, USHORT, VarUI4FromUI2) +BOTHTST(ULONG, LONG64, VarUI4FromI8, UI4_MIN, UI4_MAX) +POSTST(ULONG, ULONG64, VarUI4FromUI8, UI4_MAX) /* I8 */ -SIMPLE(LONG64, BYTE, VarI8FromUI1); -SIMPLE(LONG64, SHORT, VarI8FromI2); -SIMPLE(LONG64, signed char, VarI8FromI1); -SIMPLE(LONG64, USHORT, VarI8FromUI2); -SIMPLE(LONG64, ULONG, VarI8FromUI4); -POSTST(LONG64, ULONG64, VarI8FromUI8, I8_MAX); +SIMPLE(LONG64, BYTE, VarI8FromUI1) +SIMPLE(LONG64, SHORT, VarI8FromI2) +SIMPLE(LONG64, signed char, VarI8FromI1) +SIMPLE(LONG64, USHORT, VarI8FromUI2) +SIMPLE(LONG64, ULONG, VarI8FromUI4) +POSTST(LONG64, ULONG64, VarI8FromUI8, I8_MAX) /* UI8 */ -SIMPLE(ULONG64, BYTE, VarUI8FromUI1); -NEGTST(ULONG64, SHORT, VarUI8FromI2); -NEGTST(ULONG64, signed char, VarUI8FromI1); -SIMPLE(ULONG64, USHORT, VarUI8FromUI2); -SIMPLE(ULONG64, ULONG, VarUI8FromUI4); -NEGTST(ULONG64, LONG64, VarUI8FromI8); +SIMPLE(ULONG64, BYTE, VarUI8FromUI1) +NEGTST(ULONG64, SHORT, VarUI8FromI2) +NEGTST(ULONG64, signed char, VarUI8FromI1) +SIMPLE(ULONG64, USHORT, VarUI8FromUI2) +SIMPLE(ULONG64, ULONG, VarUI8FromUI4) +NEGTST(ULONG64, LONG64, VarUI8FromI8) /* R4 (float) */ -SIMPLE(float, BYTE, VarR4FromUI1); -SIMPLE(float, SHORT, VarR4FromI2); -SIMPLE(float, signed char, VarR4FromI1); -SIMPLE(float, USHORT, VarR4FromUI2); -SIMPLE(float, LONG, VarR4FromI4); -SIMPLE(float, ULONG, VarR4FromUI4); -SIMPLE(float, LONG64, VarR4FromI8); -SIMPLE(float, ULONG64, VarR4FromUI8); +SIMPLE(float, BYTE, VarR4FromUI1) +SIMPLE(float, SHORT, VarR4FromI2) +SIMPLE(float, signed char, VarR4FromI1) +SIMPLE(float, USHORT, VarR4FromUI2) +SIMPLE(float, LONG, VarR4FromI4) +SIMPLE(float, ULONG, VarR4FromUI4) +SIMPLE(float, LONG64, VarR4FromI8) +SIMPLE(float, ULONG64, VarR4FromUI8) /* R8 (double) */ -SIMPLE(double, BYTE, VarR8FromUI1); -SIMPLE(double, SHORT, VarR8FromI2); -SIMPLE(double, float, VarR8FromR4); +SIMPLE(double, BYTE, VarR8FromUI1) +SIMPLE(double, SHORT, VarR8FromI2) +SIMPLE(double, float, VarR8FromR4) RETTYP _VarR8FromCy(CY i, double* o) { *o = (double)i.int64 / CY_MULTIPLIER_F; return S_OK; } -SIMPLE(double, DATE, VarR8FromDate); -SIMPLE(double, signed char, VarR8FromI1); -SIMPLE(double, USHORT, VarR8FromUI2); -SIMPLE(double, LONG, VarR8FromI4); -SIMPLE(double, ULONG, VarR8FromUI4); -SIMPLE(double, LONG64, VarR8FromI8); -SIMPLE(double, ULONG64, VarR8FromUI8); +SIMPLE(double, DATE, VarR8FromDate) +SIMPLE(double, signed char, VarR8FromI1) +SIMPLE(double, USHORT, VarR8FromUI2) +SIMPLE(double, LONG, VarR8FromI4) +SIMPLE(double, ULONG, VarR8FromUI4) +SIMPLE(double, LONG64, VarR8FromI8) +SIMPLE(double, ULONG64, VarR8FromUI8) /* I1

1 0

Andrew Talbot : ole32: Void functions should not return a value.
by Alexandre Julliard April 13, 2007

April 13, 2007

Module: wine Branch: master Commit: 65bf44868c6d12e243a578e61c828d696ea9b28e URL: http://source.winehq.org/git/wine.git/?a=commit;h=65bf44868c6d12e243a578e61… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Apr 12 21:30:19 2007 +0100 ole32: Void functions should not return a value. --- dlls/ole32/rpc.c | 9 +++++++-- dlls/ole32/usrmarshal.c | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index c7604b7..9c3ab83 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1352,7 +1352,11 @@ static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg) TRACE("ipid = %s, iMethod = %d\n", debugstr_guid(&ipid), msg->ProcNum); params = HeapAlloc(GetProcessHeap(), 0, sizeof(*params)); - if (!params) return RpcRaiseException(E_OUTOFMEMORY); + if (!params) + { + RpcRaiseException(E_OUTOFMEMORY); + return; + } hr = ipid_get_dispatch_params(&ipid, &apt, &params->stub, &params->chan, &params->iid, &params->iface); @@ -1360,7 +1364,8 @@ static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg) { ERR("no apartment found for ipid %s\n", debugstr_guid(&ipid)); HeapFree(GetProcessHeap(), 0, params); - return RpcRaiseException(hr); + RpcRaiseException(hr); + return; } params->msg = (RPCOLEMESSAGE *)msg; diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 1651cd7..c1b5542 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -321,7 +321,7 @@ static void __RPC_USER handle_UserFree(ULONG *pFlags, HANDLE *phMenu) void __RPC_USER type##_UserFree(ULONG *pFlags, type *handle) \ { \ TRACE("(%s, &%p\n", debugstr_user_flags(pFlags), *handle); \ - return handle_UserFree(pFlags, (HANDLE *)handle); \ + handle_UserFree(pFlags, (HANDLE *)handle); \ } IMPL_WIREM_HANDLE(HACCEL)

1 0

Fabian Bieler : wined3d: Mark vertex shader 3. 0 as foggy shaders if they write out the fog coord.
by Alexandre Julliard April 13, 2007

April 13, 2007

Module: wine Branch: master Commit: c4bbed4854d8bb5fbf23e283562118c5bc5bdf86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4bbed4854d8bb5fbf23e2835… Author: Fabian Bieler <der.fabe(a)gmx.net> Date: Thu Apr 12 19:08:51 2007 +0200 wined3d: Mark vertex shader 3.0 as foggy shaders if they write out the fog coord. --- dlls/wined3d/baseshader.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 9e937ad..2944663 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -253,6 +253,8 @@ HRESULT shader_get_registers_used( reg_maps->packed_output[regnum] = 1; semantics_out[regnum].usage = usage; semantics_out[regnum].reg = param; + if (usage & (WINED3DDECLUSAGE_FOG << WINED3DSP_DCL_USAGE_SHIFT)) + reg_maps->fog = 1; /* Save sampler usage token */ } else if (WINED3DSPR_SAMPLER == regtype)

1 0

H. Verbeet : wined3d: Fix some swizzles on scalars.
by Alexandre Julliard April 13, 2007

April 13, 2007

Module: wine Branch: master Commit: a79654d339fa2482ccdc121dfb5960e8e600a128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a79654d339fa2482ccdc121df… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Apr 12 23:55:31 2007 +0200 wined3d: Fix some swizzles on scalars. --- dlls/wined3d/glsl_shader.c | 19 +++++++++---------- dlls/wined3d/wined3d_private.h | 24 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5700902..f6d55d1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -703,11 +703,8 @@ static void shader_glsl_get_register_name( static DWORD shader_glsl_get_write_mask(const DWORD param, char *write_mask) { char *ptr = write_mask; DWORD mask = param & WINED3DSP_WRITEMASK_ALL; - DWORD reg_type = shader_get_regtype(param); - /* gl_FogFragCoord, gl_PointSize and gl_FragDepth are floats, fixup the write mask. */ - if (((reg_type == WINED3DSPR_RASTOUT) && ((param & WINED3DSP_REGNUM_MASK) != 0)) - || reg_type == WINED3DSPR_DEPTHOUT) { + if (shader_is_scalar(param)) { mask = WINED3DSP_WRITEMASK_0; } else { *ptr++ = '.'; @@ -741,12 +738,14 @@ static void shader_glsl_get_swizzle(const DWORD param, BOOL fixup, DWORD mask, c const char *swizzle_chars = fixup ? "zyxw" : "xyzw"; char *ptr = swizzle_str; - *ptr++ = '.'; - /* swizzle bits fields: wwzzyyxx */ - if (mask & WINED3DSP_WRITEMASK_0) *ptr++ = swizzle_chars[swizzle & 0x03]; - if (mask & WINED3DSP_WRITEMASK_1) *ptr++ = swizzle_chars[(swizzle >> 2) & 0x03]; - if (mask & WINED3DSP_WRITEMASK_2) *ptr++ = swizzle_chars[(swizzle >> 4) & 0x03]; - if (mask & WINED3DSP_WRITEMASK_3) *ptr++ = swizzle_chars[(swizzle >> 6) & 0x03]; + if (!shader_is_scalar(param)) { + *ptr++ = '.'; + /* swizzle bits fields: wwzzyyxx */ + if (mask & WINED3DSP_WRITEMASK_0) *ptr++ = swizzle_chars[swizzle & 0x03]; + if (mask & WINED3DSP_WRITEMASK_1) *ptr++ = swizzle_chars[(swizzle >> 2) & 0x03]; + if (mask & WINED3DSP_WRITEMASK_2) *ptr++ = swizzle_chars[(swizzle >> 4) & 0x03]; + if (mask & WINED3DSP_WRITEMASK_3) *ptr++ = swizzle_chars[(swizzle >> 6) & 0x03]; + } *ptr = '\0'; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d0da532..0d3ef84 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1847,6 +1847,30 @@ static inline BOOL shader_is_comment(DWORD token) { return WINED3DSIO_COMMENT == (token & WINED3DSI_OPCODE_MASK); } +/* TODO: vFace (ps_3_0) */ +static inline BOOL shader_is_scalar(DWORD param) { + DWORD reg_type = shader_get_regtype(param); + + switch (reg_type) { + case WINED3DSPR_RASTOUT: + if ((param & WINED3DSP_REGNUM_MASK) != 0) { + /* oFog & oPts */ + return TRUE; + } + /* oPos */ + return FALSE; + + case WINED3DSPR_DEPTHOUT: /* oDepth */ + case WINED3DSPR_CONSTBOOL: /* b# */ + case WINED3DSPR_LOOP: /* aL */ + case WINED3DSPR_PREDICATE: /* p0 */ + return TRUE; + + default: + return FALSE; + } +} + /* Internally used shader constants. Applications can use constants 0 to GL_LIMITS(vshader_constantsF) - 1, * so upload them above that */

1 0