March 2009 - Wine-commits - list.winehq.org

Michael Stefaniuc : cryptui: Remove superfluous pointer casts.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: 8cb973261fefdef97822bdd4a36f6a95419ef575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cb973261fefdef97822bdd4a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 4 10:41:21 2009 +0100 cryptui: Remove superfluous pointer casts. --- dlls/cryptui/main.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index af86408..ddbea8e 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -3236,8 +3236,7 @@ static WCHAR *get_cert_property_as_string(PCCERT_CONTEXT cert, DWORD prop) name = HeapAlloc(GetProcessHeap(), 0, cb); if (name) { - if (!CertGetCertificateContextProperty(cert, prop, (LPBYTE)name, - &cb)) + if (!CertGetCertificateContextProperty(cert, prop, name, &cb)) { HeapFree(GetProcessHeap(), 0, name); name = NULL; @@ -4460,7 +4459,7 @@ static BOOL is_ca_cert(PCCERT_CONTEXT cert, BOOL defaultIfNotSpecified) if (CryptDecodeObjectEx(X509_ASN_ENCODING, szOID_BASIC_CONSTRAINTS, ext->Value.pbData, ext->Value.cbData, CRYPT_DECODE_ALLOC_FLAG, - NULL, (LPBYTE)&info, &size)) + NULL, &info, &size)) { if (info->SubjectType.cbData == 1) isCA = info->SubjectType.pbData[0] & CERT_CA_SUBJECT_FLAG;

1 0

Michael Stefaniuc : mlang: Remove superfluous pointer casts.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: 7d35ba645e5eee906744170fa8fee3e98f2cb7b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d35ba645e5eee906744170fa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 4 10:41:15 2009 +0100 mlang: Remove superfluous pointer casts. The casts are already part of the CONTAINING_RECORD macro. --- dlls/mlang/mlang.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 6f79f0b..4fc8e1b 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1495,7 +1495,7 @@ typedef struct tagEnumCodePage_impl static inline EnumCodePage_impl *impl_from_IEnumCodePage( IEnumCodePage *iface ) { - return (EnumCodePage_impl *)CONTAINING_RECORD( iface, EnumCodePage_impl, vtbl_IEnumCodePage ); + return CONTAINING_RECORD( iface, EnumCodePage_impl, vtbl_IEnumCodePage ); } static HRESULT WINAPI fnIEnumCodePage_QueryInterface( @@ -1688,7 +1688,7 @@ typedef struct tagEnumScript_impl static inline EnumScript_impl *impl_from_IEnumScript( IEnumScript *iface ) { - return (EnumScript_impl *)CONTAINING_RECORD( iface, EnumScript_impl, vtbl_IEnumScript ); + return CONTAINING_RECORD( iface, EnumScript_impl, vtbl_IEnumScript ); } static HRESULT WINAPI fnIEnumScript_QueryInterface( @@ -1850,7 +1850,7 @@ static HRESULT EnumScript_create( MLang_impl* mlang, DWORD dwFlags, static inline MLang_impl *impl_from_IMLangFontLink( IMLangFontLink *iface ) { - return (MLang_impl *)CONTAINING_RECORD( iface, MLang_impl, vtbl_IMLangFontLink ); + return CONTAINING_RECORD( iface, MLang_impl, vtbl_IMLangFontLink ); } static HRESULT WINAPI fnIMLangFontLink_QueryInterface( @@ -2088,7 +2088,7 @@ static const IMLangFontLinkVtbl IMLangFontLink_vtbl = static inline MLang_impl *impl_from_IMultiLanguage( IMultiLanguage *iface ) { - return (MLang_impl *)CONTAINING_RECORD( iface, MLang_impl, vtbl_IMultiLanguage ); + return CONTAINING_RECORD( iface, MLang_impl, vtbl_IMultiLanguage ); } static HRESULT WINAPI fnIMultiLanguage_QueryInterface( @@ -2281,7 +2281,7 @@ typedef struct tagEnumRfc1766_impl static inline EnumRfc1766_impl *impl_from_IEnumRfc1766( IEnumRfc1766 *iface ) { - return (EnumRfc1766_impl *)CONTAINING_RECORD( iface, EnumRfc1766_impl, vtbl_IEnumRfc1766 ); + return CONTAINING_RECORD( iface, EnumRfc1766_impl, vtbl_IEnumRfc1766 ); } static HRESULT WINAPI fnIEnumRfc1766_QueryInterface( @@ -2551,7 +2551,7 @@ static const IMultiLanguageVtbl IMultiLanguage_vtbl = static inline MLang_impl *impl_from_IMultiLanguage3( IMultiLanguage3 *iface ) { - return (MLang_impl *)CONTAINING_RECORD( iface, MLang_impl, vtbl_IMultiLanguage3 ); + return CONTAINING_RECORD( iface, MLang_impl, vtbl_IMultiLanguage3 ); } static HRESULT WINAPI fnIMultiLanguage2_QueryInterface( @@ -3171,7 +3171,7 @@ static const IMultiLanguage3Vtbl IMultiLanguage3_vtbl = static inline MLang_impl *impl_from_IMLangFontLink2( IMLangFontLink2 *iface ) { - return (MLang_impl *)CONTAINING_RECORD( iface, MLang_impl, vtbl_IMLangFontLink2 ); + return CONTAINING_RECORD( iface, MLang_impl, vtbl_IMLangFontLink2 ); } static HRESULT WINAPI fnIMLangFontLink2_QueryInterface( @@ -3325,7 +3325,7 @@ static const IMLangFontLink2Vtbl IMLangFontLink2_vtbl = static inline MLang_impl *impl_from_IMLangLineBreakConsole( IMLangLineBreakConsole *iface ) { - return (MLang_impl *)CONTAINING_RECORD( iface, MLang_impl, vtbl_IMLangLineBreakConsole ); + return CONTAINING_RECORD( iface, MLang_impl, vtbl_IMLangLineBreakConsole ); } static HRESULT WINAPI fnIMLangLineBreakConsole_QueryInterface(

1 0

Alexandre Julliard : iphlpapi: Move the ip/icmp/tcp/ udp statistics functions to ipstats.c.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: b35e43d9a0e23e56cfe859217728b0bb702b83b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b35e43d9a0e23e56cfe859217… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 3 19:46:03 2009 +0100 iphlpapi: Move the ip/icmp/tcp/udp statistics functions to ipstats.c. --- dlls/iphlpapi/iphlpapi_main.c | 92 ----------------------------------------- dlls/iphlpapi/ipstats.c | 60 +++++++++++++++++++++++++-- dlls/iphlpapi/ipstats.h | 20 --------- 3 files changed, 56 insertions(+), 116 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 3481f86..547b666 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -733,29 +733,6 @@ DWORD WINAPI GetFriendlyIfIndex(DWORD IfIndex) /****************************************************************** - * GetIcmpStatistics (IPHLPAPI.@) - * - * Get the ICMP statistics for the local computer. - * - * PARAMS - * pStats [Out] buffer for ICMP statistics - * - * RETURNS - * Success: NO_ERROR - * Failure: error code from winerror.h - */ -DWORD WINAPI GetIcmpStatistics(PMIB_ICMP pStats) -{ - DWORD ret; - - TRACE("pStats %p\n", pStats); - ret = getICMPStats(pStats); - TRACE("returning %d\n", ret); - return ret; -} - - -/****************************************************************** * GetIfEntry (IPHLPAPI.@) * * Get information about an interface. @@ -1110,29 +1087,6 @@ DWORD WINAPI GetIpNetTable(PMIB_IPNETTABLE pIpNetTable, PULONG pdwSize, BOOL bOr /****************************************************************** - * GetIpStatistics (IPHLPAPI.@) - * - * Get the IP statistics for the local computer. - * - * PARAMS - * pStats [Out] buffer for IP statistics - * - * RETURNS - * Success: NO_ERROR - * Failure: error code from winerror.h - */ -DWORD WINAPI GetIpStatistics(PMIB_IPSTATS pStats) -{ - DWORD ret; - - TRACE("pStats %p\n", pStats); - ret = getIPStats(pStats); - TRACE("returning %d\n", ret); - return ret; -} - - -/****************************************************************** * GetNetworkParams (IPHLPAPI.@) * * Get the network parameters for the local computer. @@ -1303,29 +1257,6 @@ BOOL WINAPI GetRTTAndHopCount(IPAddr DestIpAddress, PULONG HopCount, ULONG MaxHo /****************************************************************** - * GetTcpStatistics (IPHLPAPI.@) - * - * Get the TCP statistics for the local computer. - * - * PARAMS - * pStats [Out] buffer for TCP statistics - * - * RETURNS - * Success: NO_ERROR - * Failure: error code from winerror.h - */ -DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS pStats) -{ - DWORD ret; - - TRACE("pStats %p\n", pStats); - ret = getTCPStats(pStats); - TRACE("returning %d\n", ret); - return ret; -} - - -/****************************************************************** * GetTcpTable (IPHLPAPI.@) * * Get the table of active TCP connections. @@ -1375,29 +1306,6 @@ DWORD WINAPI GetTcpTable(PMIB_TCPTABLE pTcpTable, PDWORD pdwSize, BOOL bOrder) /****************************************************************** - * GetUdpStatistics (IPHLPAPI.@) - * - * Get the UDP statistics for the local computer. - * - * PARAMS - * pStats [Out] buffer for UDP statistics - * - * RETURNS - * Success: NO_ERROR - * Failure: error code from winerror.h - */ -DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS pStats) -{ - DWORD ret; - - TRACE("pStats %p\n", pStats); - ret = getUDPStats(pStats); - TRACE("returning %d\n", ret); - return ret; -} - - -/****************************************************************** * GetUdpTable (IPHLPAPI.@) * * Get a table of active UDP connections. diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index f630906..c50d611 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -284,7 +284,20 @@ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) #endif } -DWORD getICMPStats(MIB_ICMP *stats) + +/****************************************************************** + * GetIcmpStatistics (IPHLPAPI.@) + * + * Get the ICMP statistics for the local computer. + * + * PARAMS + * stats [Out] buffer for ICMP statistics + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + */ +DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) { #if defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) int mib[] = {CTL_NET, PF_INET, IPPROTO_ICMP, ICMPCTL_STATS}; @@ -481,7 +494,20 @@ DWORD getICMPStats(MIB_ICMP *stats) #endif } -DWORD getIPStats(PMIB_IPSTATS stats) + +/****************************************************************** + * GetIpStatistics (IPHLPAPI.@) + * + * Get the IP statistics for the local computer. + * + * PARAMS + * stats [Out] buffer for IP statistics + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + */ +DWORD WINAPI GetIpStatistics(PMIB_IPSTATS stats) { #if defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) int mib[] = {CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS}; @@ -655,7 +681,20 @@ DWORD getIPStats(PMIB_IPSTATS stats) #endif } -DWORD getTCPStats(MIB_TCPSTATS *stats) + +/****************************************************************** + * GetTcpStatistics (IPHLPAPI.@) + * + * Get the TCP statistics for the local computer. + * + * PARAMS + * stats [Out] buffer for TCP statistics + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + */ +DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS stats) { #if defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) #ifndef TCPTV_MIN /* got removed in Mac OS X for some reason */ @@ -797,7 +836,20 @@ DWORD getTCPStats(MIB_TCPSTATS *stats) #endif } -DWORD getUDPStats(MIB_UDPSTATS *stats) + +/****************************************************************** + * GetUdpStatistics (IPHLPAPI.@) + * + * Get the UDP statistics for the local computer. + * + * PARAMS + * stats [Out] buffer for UDP statistics + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + */ +DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS stats) { #if defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) int mib[] = {CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS}; diff --git a/dlls/iphlpapi/ipstats.h b/dlls/iphlpapi/ipstats.h index aad931c..d7aeb65 100644 --- a/dlls/iphlpapi/ipstats.h +++ b/dlls/iphlpapi/ipstats.h @@ -32,26 +32,6 @@ */ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry); -/* Gets ICMP statistics into stats. Returns ERROR_INVALID_PARAMETER if stats is - * NULL, NO_ERROR otherwise. - */ -DWORD getICMPStats(MIB_ICMP *stats); - -/* Gets IP statistics into stats. Returns ERROR_INVALID_PARAMETER if stats is - * NULL, NO_ERROR otherwise. - */ -DWORD getIPStats(PMIB_IPSTATS stats); - -/* Gets TCP statistics into stats. Returns ERROR_INVALID_PARAMETER if stats is - * NULL, NO_ERROR otherwise. - */ -DWORD getTCPStats(MIB_TCPSTATS *stats); - -/* Gets UDP statistics into stats. Returns ERROR_INVALID_PARAMETER if stats is - * NULL, NO_ERROR otherwise. - */ -DWORD getUDPStats(MIB_UDPSTATS *stats); - DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, BOOL bOrder, HANDLE heap, DWORD flags); DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable, BOOL bOrder, HANDLE heap, DWORD flags); DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BOOL bOrder, HANDLE heap, DWORD flags);

1 0

Christian Costa : wine.inf: Use 32-bit version of MCI DirectShow driver.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: 0faa6ab7dae559491d8ce88479166c89294c5f0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0faa6ab7dae559491d8ce8847… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Mar 3 20:54:36 2009 +0100 wine.inf: Use 32-bit version of MCI DirectShow driver. --- tools/wine.inf.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 3f3afae..d77b8c8 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2323,8 +2323,8 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16422,Internet Explorer,iexplore.exe [SystemIni] -system.ini, mci,,"MPEGVideo=mciqtz.drv" -system.ini, mci,,"MPEGVideo2=mciqtz.drv" +system.ini, mci,,"MPEGVideo=mciqtz32.dll" +system.ini, mci,,"MPEGVideo2=mciqtz32.dll" system.ini, mci,,"avivideo=mciavi32.dll" system.ini, mci,,"cdaudio=mcicda.dll" system.ini, mci,,"sequencer=mciseq.dll"

1 0

Paul Vriens : shlwapi/tests: Fix some typos.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: a86566cb919a4e436894678fa643ab1af78a0cb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a86566cb919a4e436894678fa… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Mar 3 21:42:32 2009 +0100 shlwapi/tests: Fix some typos. --- dlls/shlwapi/tests/path.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 89a61c3..52eee2d 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -393,10 +393,10 @@ static void test_PathCombineW(void) wszString2[0] = 'a'; wszString = pPathCombineW(wszString2, NULL, NULL); ok (wszString == NULL || - broken(wszString[0] = 'a'), /* Win95 and some W2K */ + broken(wszString[0] == 'a'), /* Win95 and some W2K */ "Expected a NULL return\n"); ok (wszString2[0] == 0 || - broken(wszString2[0] = 'a'), /* Win95 and some W2K */ + broken(wszString2[0] == 'a'), /* Win95 and some W2K */ "Destination string not empty\n"); HeapFree(GetProcessHeap(), 0, wszString2); @@ -411,7 +411,7 @@ static void test_PathCombineW(void) wszString = pPathCombineW(wbuf, wstr1, wstr2); ok(wszString == NULL, "Expected a NULL return\n"); ok(wbuf[0] == 0 || - broken(wbuf[0] = 0xbfbf), /* Win95 and some W2K */ + broken(wbuf[0] == 0xbfbf), /* Win95 and some W2K */ "Buffer contains data\n"); /* PathCombineW can be used in place */

1 0

Alexandre Julliard : configure: Enable automatic dependencies for FreeBSD make.
by Alexandre Julliard 03 Mar '09

03 Mar '09

Module: wine Branch: master Commit: 566cb8c7a32f6128ae7d05f7fab30db08ba64ea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=566cb8c7a32f6128ae7d05f7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 3 16:34:52 2009 +0100 configure: Enable automatic dependencies for FreeBSD make. --- Makefile.in | 1 + configure | 1 + configure.ac | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 1dd8ef1..5d9039a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -150,6 +150,7 @@ Makefile $(ALL_MAKERULES) $(ALL_MAKEFILES): config.status @./config.status $@ .INIT: Makefile .BEGIN: Makefile +.MAKEFILEDEPS: $(RECURSE_TARGETS) $(MAKEDEP): $(ALL_MAKEFILES) diff --git a/configure b/configure index 99616f3..dd91eb8 100755 --- a/configure +++ b/configure @@ -24220,6 +24220,7 @@ DEPENDENCIES="### Dependencies: .INIT: Makefile .BEGIN: Makefile +.MAKEFILEDEPS: Makefile: dummy -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) diff --git a/configure.ac b/configure.ac index 792571b..0f7927e 100644 --- a/configure.ac +++ b/configure.ac @@ -1830,6 +1830,7 @@ AC_SUBST(DEPENDENCIES,["### Dependencies: .INIT: Makefile .BEGIN: Makefile +.MAKEFILEDEPS: Makefile: dummy -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS)

1 0

Alexandre Julliard : configure: 16-bit object files should depend on IDL headers too.
by Alexandre Julliard 03 Mar '09

03 Mar '09

Module: wine Branch: master Commit: 5e43687fede71e80e8d8789ba3e6c3d1aaa79e46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e43687fede71e80e8d8789ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 3 15:41:06 2009 +0100 configure: 16-bit object files should depend on IDL headers too. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 33a4bc1..99616f3 100755 --- a/configure +++ b/configure @@ -24223,7 +24223,7 @@ DEPENDENCIES="### Dependencies: Makefile: dummy -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) -\$(OBJS): \$(IDL_GEN_HEADERS) +\$(OBJS) \$(C_SRCS16:.c=.o): \$(IDL_GEN_HEADERS) \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS) \$(RC_SRCS:.rc=.res): \$(IDL_TLB_SRCS:.idl=.tlb) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c) diff --git a/configure.ac b/configure.ac index 4d5a235..792571b 100644 --- a/configure.ac +++ b/configure.ac @@ -1833,7 +1833,7 @@ AC_SUBST(DEPENDENCIES,["### Dependencies: Makefile: dummy -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) -\$(OBJS): \$(IDL_GEN_HEADERS) +\$(OBJS) \$(C_SRCS16:.c=.o): \$(IDL_GEN_HEADERS) \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS) \$(RC_SRCS:.rc=.res): \$(IDL_TLB_SRCS:.idl=.tlb) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c)

1 0

Alexandre Julliard : makefiles: Add a dummy dependency on empty targets to work around a FreeBSD make bug.
by Alexandre Julliard 03 Mar '09

03 Mar '09

Module: wine Branch: master Commit: 0f677a5beb34e7dece216ccc0d18cec2728f400e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f677a5beb34e7dece216ccc0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 3 16:23:16 2009 +0100 makefiles: Add a dummy dependency on empty targets to work around a FreeBSD make bug. --- Make.rules.in | 14 +++++++------- dlls/Makedll.rules.in | 6 +++--- programs/Makeprog.rules.in | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 3645603..5dc8884 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -271,10 +271,10 @@ $(SUBDIRS:%=%/__install-dev__): dummy $(SUBDIRS:%=%/__uninstall__): dummy @cd `dirname $@` && $(MAKE) uninstall -install:: $(INSTALLSUBDIRS:%=%/__install__) -install-lib:: $(INSTALLSUBDIRS:%=%/__install-lib__) -install-dev:: $(INSTALLSUBDIRS:%=%/__install-dev__) -uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__) +install:: $(INSTALLSUBDIRS:%=%/__install__) dummy +install-lib:: $(INSTALLSUBDIRS:%=%/__install-lib__) dummy +install-dev:: $(INSTALLSUBDIRS:%=%/__install-dev__) dummy +uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__) dummy $(INSTALLDIRS): $(MKINSTALLDIRS) $@ @@ -294,11 +294,11 @@ $(TESTSUBDIRS:%=%/__crosstest__): dummy $(TESTSUBDIRS:%=%/__testclean__): dummy @cd `dirname $@` && $(MAKE) testclean -check test:: $(TESTSUBDIRS:%=%/__test__) +check test:: $(TESTSUBDIRS:%=%/__test__) dummy -crosstest:: $(TESTSUBDIRS:%=%/__crosstest__) +crosstest:: $(TESTSUBDIRS:%=%/__crosstest__) dummy -testclean:: $(TESTSUBDIRS:%=%/__testclean__) +testclean:: $(TESTSUBDIRS:%=%/__testclean__) dummy .PHONY: check test testclean crosstest $(TESTSUBDIRS:%=%/__test__) $(TESTSUBDIRS:%=%/__crosstest__) $(TESTSUBDIRS:%=%/__testclean__) diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index ca9e972..76747b6 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -62,9 +62,9 @@ $(SUBDIRS): implib # Rules for testing -check test:: $(SUBDIRS:%=%/__test__) +check test:: $(SUBDIRS:%=%/__test__) dummy -crosstest:: $(SUBDIRS:%=%/__crosstest__) +crosstest:: $(SUBDIRS:%=%/__crosstest__) dummy # Rules for auto documentation @@ -97,7 +97,7 @@ $(IMPLIB_SRCS:%=_install_static_implib_/%): install_static_implib_$(IMPLIBEXT) install install-lib:: $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir) dummy $(INSTALL_PROGRAM) $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT) -install install-dev:: $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%) +install install-dev:: $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%) dummy uninstall:: -cd $(DESTDIR)$(dlldir) && $(RM) $(MODULE)$(DLLEXT) $(IMPORTLIBFILE) $(STATICIMPLIB) diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index 1f9fe78..add239f 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -31,7 +31,7 @@ $(MODULE): $(OBJS) $(RCOBJS) Makefile.in # Rules for testing -check test:: $(SUBDIRS:%=%/__test__) +check test:: $(SUBDIRS:%=%/__test__) dummy $(TESTRESULTS): $(MODULE)$(DLLEXT)

1 0

Diaa Sami : cmd: Fixed a number of buffer overflows.
by Alexandre Julliard 03 Mar '09

03 Mar '09

Module: wine Branch: master Commit: 8ea1a12ed6b14497423c4114a6fc95bbcc31a322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ea1a12ed6b14497423c4114a… Author: Diaa Sami <diaasami(a)gmail.com> Date: Mon Mar 2 20:45:50 2009 +0200 cmd: Fixed a number of buffer overflows. --- programs/cmd/Cs.rc | 1 + programs/cmd/Da.rc | 1 + programs/cmd/De.rc | 1 + programs/cmd/En.rc | 1 + programs/cmd/Es.rc | 1 + programs/cmd/Fr.rc | 1 + programs/cmd/Ja.rc | 1 + programs/cmd/Ko.rc | 1 + programs/cmd/Nl.rc | 1 + programs/cmd/No.rc | 1 + programs/cmd/Pl.rc | 1 + programs/cmd/Pt.rc | 1 + programs/cmd/Ru.rc | 1 + programs/cmd/Si.rc | 1 + programs/cmd/Tr.rc | 1 + programs/cmd/wcmd.h | 1 + programs/cmd/wcmdmain.c | 22 ++++++++++++---------- 17 files changed, 28 insertions(+), 10 deletions(-) diff --git a/programs/cmd/Cs.rc b/programs/cmd/Cs.rc index 4f6a385..15ece45 100644 --- a/programs/cmd/Cs.rc +++ b/programs/cmd/Cs.rc @@ -276,4 +276,5 @@ Zadejte HELP <p WCMD_CONSTITLE,"Wine Command Prompt" WCMD_VERSION,"CMD Version %s\n\n" WCMD_MOREPROMPT, "More? " + WCMD_LINETOOLONG, "The input line is too long.\n" } diff --git a/programs/cmd/Da.rc b/programs/cmd/Da.rc index a18c5e3..9870f71 100644 --- a/programs/cmd/Da.rc +++ b/programs/cmd/Da.rc @@ -254,4 +254,5 @@ Skriv WCMD_CONSTITLE,"Wine Command Prompt" WCMD_VERSION,"CMD Version %s\n\n" WCMD_MOREPROMPT, "Mere? " + WCMD_LINETOOLONG, "The input line is too long.\n" } diff --git a/programs/cmd/De.rc b/programs/cmd/De.rc index 933acc4..ab41d33 100644 --- a/programs/cmd/De.rc +++ b/programs/cmd/De.rc @@ -292,4 +292,5 @@ obigen Befehle erhalten.\n" WCMD_CONSTITLE,"Wine Befehlsprozessor" WCMD_VERSION,"CMD Version %s\n\n" WCMD_MOREPROMPT, "Mehr? " + WCMD_LINETOOLONG, "The input line is too long.\n" } diff --git a/programs/cmd/En.rc b/programs/cmd/En.rc index aa2147d..941d58f 100644 --- a/programs/cmd/En.rc +++ b/programs/cmd/En.rc @@ -272,4 +272,5 @@ Enter HELP <command> for further information on any of the above commands\n" WCMD_CONSTITLE,"Wine Command Prompt" WCMD_VERSION,"CMD Version %s\n\n" WCMD_MOREPROMPT, "More? " + WCMD_LINETOOLONG, "The input line is too long.\n" } diff --git a/programs/cmd/Es.rc b/programs/cmd/Es.rc index c807483..f27906a 100644 --- a/programs/cmd/Es.rc +++ b/programs/cmd/Es.rc @@ -289,4 +289,5 @@ Introduzca HELP <comando> para m WCMD_CONSTITLE,"Wine Command Prompt" WCMD_VERSION,"CMD Version %s\n\n" WCMD_MOREPROMPT, "More? " + WCMD_LINETOOLONG, "The input line is too long.\n" } diff --git a/programs/cmd/Fr.rc b/programs/cmd/Fr.rc index 4be49bc..7551c76 100644 --- a/programs/cmd/Fr.rc +++ b/programs/cmd/Fr.rc @@ -270,4 +270,5 @@ Entrez HELP <commande> pour plus d'informations sur les commandes ci-dessus\n" WCMD_CONSTITLE,"Invite de commande Wine" WCMD_VERSION,"CMD version %s\n\n" WCMD_MOREPROMPT, "Plus�? " + WCMD_LINETOOLONG, "The input line is too long.\n" } diff --git a/programs/cmd/Ja.rc b/programs/cmd/Ja.rc index aa7ef9e..20273ec 100644 --- a/programs/cmd/Ja.rc +++ b/programs/cmd/Ja.rc @@ -277,6 +277,7 @@ EXIT\t\tCMDを終了\n\n\ WCMD_CONSTITLE,"Wine Command Prompt" WCMD_VERSION,"CMD Version %s\n\n" WCMD_MOREPROMPT, "More? " + WCMD_LINETOOLONG, "The input line is too long.\n" } #pragma code_page(default) diff --git a/programs/cmd/Ko.rc b/programs/cmd/Ko.rc index c4a2961..ea29a0a 100644 --- a/programs/cmd/Ko.rc +++ b/programs/cmd/Ko.rc @@ -264,4 +264,5 @@ HELP < WCMD_CONSTITLE,"Wine �� Է´��" WCMD_VERSION,"CMD �� %s\n\n" WCMD_MOREPROMPT, " ��? " + WCMD_LINETOOLONG, "The input line is too long.\n" } diff --git a/programs/cmd/Nl.rc b/programs/cmd/Nl.rc index b1b7e57..6863b00 100644 --- a/programs/cmd/Nl.rc +++ b/programs/cmd/Nl.rc @@ -272,4 +272,5 @@ type HELP <opdracht> voor meer informatie over bovengenoemde opdrachten\n" WCMD_CONSTITLE,"Wine Command Prompt" WCMD_VERSION,"CMD Versie %s\n\n" WCMD_MOREPROMPT, "Meer? " + WCMD_LINETOOLONG, "The input line is too long.\n" } diff --git a/programs/cmd/No.rc b/programs/cmd/No.rc index 394d28e..71a694b 100644 --- a/programs/cmd/No.rc +++ b/programs/cmd/No.rc @@ -270,4 +270,5 @@ Skriv WCMD_CONSTITLE,"Wine Command Prompt" WCMD_VERSION,"CMD Version %s\n\n" WCMD_MOREPROMPT, "More? " + WCMD_LINETOOLONG, "The input line is too long.\n" } diff --git a/programs/cmd/Pl.rc b/programs/cmd/Pl.rc index 70ac982..7951843 100644 --- a/programs/cmd/Pl.rc +++ b/programs/cmd/Pl.rc @@ -267,4 +267,5 @@ Wpisz HELP <komenda> dla dok WCMD_CONSTITLE,"Wine Command Prompt" WCMD_VERSION,"CMD Version %s\n\n" WCMD_MOREPROMPT, "More? " + WCMD_LINETOOLONG, "The input line is too long.\n" } diff --git a/programs/cmd/Pt.rc b/programs/cmd/Pt.rc index dd8069f..65e0a6b 100644 --- a/programs/cmd/Pt.rc +++ b/programs/cmd/Pt.rc @@ -499,4 +499,5 @@ Digite HELP <comando> para mais informa WCMD_CONSTITLE,"Wine Command Prompt" WCMD_VERSION,"CMD Version %s\n\n" WCMD_MOREPROMPT, "More? " + WCMD_LINETOOLONG, "The input line is too long.\n" } diff --git a/programs/cmd/Ru.rc b/programs/cmd/Ru.rc index a97c190..5bd2a05 100644 --- a/programs/cmd/Ru.rc +++ b/programs/cmd/Ru.rc @@ -278,4 +278,5 @@ EXIT\t\t WCMD_CONSTITLE,"�� Wine" WCMD_VERSION,"�� CMD %s\n\n" WCMD_MOREPROMPT, "��? " + WCMD_LINETOOLONG, "The input line is too long.\n" } diff --git a/programs/cmd/Si.rc b/programs/cmd/Si.rc index 4bbfdce..9a18741 100644 --- a/programs/cmd/Si.rc +++ b/programs/cmd/Si.rc @@ -270,6 +270,7 @@ Uporabite HELP <ukaz> za več informacijo o kateremkoli od zgoraj navedenih ukaz WCMD_CONSTITLE,"Wine ukazni poziv" WCMD_VERSION,"CMD različica %s\n\n" WCMD_MOREPROMPT, "Več? " + WCMD_LINETOOLONG, "The input line is too long.\n" } #pragma code_page(default) diff --git a/programs/cmd/Tr.rc b/programs/cmd/Tr.rc index 204fc17..656a583 100644 --- a/programs/cmd/Tr.rc +++ b/programs/cmd/Tr.rc @@ -274,4 +274,5 @@ Yukar WCMD_CONSTITLE,"Wine Command Prompt" WCMD_VERSION,"CMD Version %s\n\n" WCMD_MOREPROMPT, "More? " + WCMD_LINETOOLONG, "The input line is too long.\n" } diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index a31b011..67aab42 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -243,6 +243,7 @@ extern WCHAR version_string[]; #define WCMD_CONSTITLE 1032 #define WCMD_VERSION 1033 #define WCMD_MOREPROMPT 1034 +#define WCMD_LINETOOLONG 1035 /* msdn specified max for Win XP */ #define MAXSTRING 8192 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 4bbd72e..f90ca8c 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -88,7 +88,7 @@ static const WCHAR equalsW[] = {'=','\0'}; static const WCHAR closeBW[] = {')','\0'}; WCHAR anykey[100]; WCHAR version_string[100]; -WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; +WCHAR quals[MAX_PATH], param1[MAXSTRING], param2[MAXSTRING]; BATCH_CONTEXT *context = NULL; extern struct env_stack *pushd_directories; static const WCHAR *pagedMessage = NULL; @@ -972,7 +972,8 @@ void WCMD_run_program (WCHAR *command, int called) { WCHAR temp[MAX_PATH]; WCHAR pathtosearch[MAXSTRING]; WCHAR *pathposn; - WCHAR stemofsearch[MAX_PATH]; + WCHAR stemofsearch[MAX_PATH]; /* maximum allowed executable name is + MAX_PATH, including null character */ WCHAR *lastSlash; WCHAR pathext[MAXSTRING]; BOOL extensionsupplied = FALSE; @@ -998,6 +999,12 @@ void WCMD_run_program (WCHAR *command, int called) { strcpyW (pathtosearch, curDir); } if (strchrW(param1, '.') != NULL) extensionsupplied = TRUE; + if (strlenW(param1) >= MAX_PATH) + { + WCMD_output_asis(WCMD_LoadMessage(WCMD_LINETOOLONG)); + return; + } + strcpyW(stemofsearch, param1); } else { @@ -1584,22 +1591,17 @@ WCHAR *WCMD_LoadMessage(UINT id) { * Dumps out the parsed command line to ensure syntax is correct */ static void WCMD_DumpCommands(CMD_LIST *commands) { - WCHAR buffer[MAXSTRING]; CMD_LIST *thisCmd = commands; - const WCHAR fmt[] = {'%','p',' ','%','d',' ','%','2','.','2','d',' ', - '%','p',' ','%','s',' ','R','e','d','i','r',':', - '%','s','\0'}; WINE_TRACE("Parsed line:\n"); while (thisCmd != NULL) { - sprintfW(buffer, fmt, + WINE_TRACE("%p %d %2.2d %p %s Redir:%s\n", thisCmd, thisCmd->prevDelim, thisCmd->bracketDepth, thisCmd->nextcommand, - thisCmd->command, - thisCmd->redirects); - WINE_TRACE("%s\n", wine_dbgstr_w(buffer)); + wine_dbgstr_w(thisCmd->command), + wine_dbgstr_w(thisCmd->redirects)); thisCmd = thisCmd->nextcommand; } }

1 0

Huw Davies : gdi32/tests: Improve some test failure messages.
by Alexandre Julliard 03 Mar '09

03 Mar '09

Module: wine Branch: master Commit: 1ad19cc9ceb259be26c9329b851a8739a521fb34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ad19cc9ceb259be26c9329b8… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 3 10:24:08 2009 +0000 gdi32/tests: Improve some test failure messages. --- dlls/gdi32/tests/bitmap.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index b1ba7a0..c46c745 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -101,7 +101,17 @@ static void test_bitmap_info(HBITMAP hbm, INT expected_depth, const BITMAPINFOHE memset(buf, 0xAA, sizeof(buf)); ret = GetBitmapBits(hbm, sizeof(buf), buf); ok(ret == bm.bmWidthBytes * bm.bmHeight, "%d != %d\n", ret, bm.bmWidthBytes * bm.bmHeight); - ok(!memcmp(buf, buf_cmp, sizeof(buf)), "buffers do not match\n"); + ok(!memcmp(buf, buf_cmp, sizeof(buf)), "buffers do not match, depth %d\n", bmih->biBitCount); + if(memcmp(buf, buf_cmp, sizeof(buf))) + { + int i; + for(i = 0; i < sizeof(buf); i++) + if(buf[i] != buf_cmp[i]) + { + trace("first mismatched byte %d: got %02x expected %02x\n", i, buf[i], buf_cmp[i]); + break; + } + } /* test various buffer sizes for GetObject */ ret = GetObject(hbm, sizeof(*bma) * 2, bma); @@ -427,7 +437,7 @@ static void test_dib_bits_access( HBITMAP hdib, void *bits ) pbmi->bmiHeader.biCompression = BI_RGB; ret = SetDIBits( hdc, hdib, 0, 16, data, pbmi, DIB_RGB_COLORS ); - ok( ret == 16, "SetDIBits failed\n" ); + ok(ret == 16, "SetDIBits failed: expected 16 got %d\n", ret); ok(VirtualQuery(bits, &info, sizeof(info)) == sizeof(info), "VirtualQuery failed\n"); @@ -2185,7 +2195,7 @@ static void test_get16dibits(void) info->bmiHeader.biCompression = BI_RGB; ret = GetDIBits(screen_dc, hbmp, 0, 0, NULL, info, 0); - ok(ret != 0, "GetDIBits failed\n"); + ok(ret != 0, "GetDIBits failed got %d\n", ret); for (p = ((BYTE *) info) + sizeof(info->bmiHeader); (p - ((BYTE *) info)) < info_len; p++) if (*p != '!')

1 0