July 2013 - Wine-Commits - list.winehq.org

André Hentschel : gdi32: Remove superfluous cast.
by Alexandre Julliard July 1, 2013

July 1, 2013

Module: wine Branch: master Commit: 20bf02910b5d6e9b9789097821da36cad89e8442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20bf02910b5d6e9b978909782… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 30 15:35:21 2013 +0200 gdi32: Remove superfluous cast. --- dlls/gdi32/dibdrv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/opengl.c b/dlls/gdi32/dibdrv/opengl.c index 67cab00..add0b01 100644 --- a/dlls/gdi32/dibdrv/opengl.c +++ b/dlls/gdi32/dibdrv/opengl.c @@ -121,7 +121,7 @@ static BOOL init_opengl(void) goto failed; } } -#define LOAD_FUNCPTR(f) do if (!(p##f = (void *)wine_dlsym( osmesa_handle, #f, buffer, sizeof(buffer) ))) \ +#define LOAD_FUNCPTR(f) do if (!(p##f = wine_dlsym( osmesa_handle, #f, buffer, sizeof(buffer) ))) \ { \ ERR( "%s not found in %s (%s), disabling.\n", #f, SONAME_LIBOSMESA, buffer ); \ goto failed; \

1 0

Frédéric Delanoy : server: Clarify wineserver manpage -d option.
by Alexandre Julliard July 1, 2013

July 1, 2013

Module: wine Branch: master Commit: ea8c843d576ddcca3364e66b35be48702be48657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea8c843d576ddcca3364e66b3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jun 29 14:15:24 2013 +0200 server: Clarify wineserver manpage -d option. --- server/wineserver.man.in | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/server/wineserver.man.in b/server/wineserver.man.in index c0b696e..27756f4 100644 --- a/server/wineserver.man.in +++ b/server/wineserver.man.in @@ -1,4 +1,3 @@ -.\" -*- nroff -*- .TH WINESERVER 1 "October 2005" "@PACKAGE_STRING@" "Windows on Unix" .SH NAME wineserver \- the Wine server @@ -23,8 +22,8 @@ Set the debug level to extra verbose debugging. If .I n is not specified, the default is 1. The debug output will be sent to -stderr. \fBwine\fR(1) will automatically set the debug level when -starting \fBwineserver\fR if the +server option is set in the +stderr. \fBwine\fR(1) will automatically enable normal level debugging +when starting \fBwineserver\fR if the +server option is set in the WINEDEBUG variable. .TP .BR \-f ", " --foreground @@ -88,7 +87,7 @@ Directory containing user specific data managed by .BR wine . .TP .BI /tmp/.wine- uid -The directory containing the server Unix socket and the lock +Directory containing the server Unix socket and the lock file. These files are created in a subdirectory generated from the WINEPREFIX directory device and inode numbers. .SH AUTHORS @@ -98,16 +97,16 @@ is Alexandre Julliard. Many other people have contributed new features and bug fixes. Please check the file Changelog in the Wine distribution for the complete details. .SH BUGS -If you find a bug, please submit a bug report at +If you find a bug, please submit a bug report on the .UR http://bugs.winehq.org -.BR http://bugs.winehq.org . -.UE +.B Wine bug tracker +.UE . .SH AVAILABILITY .B wineserver is part of the Wine distribution, which is available through WineHQ, -the Wine development headquarters, at +the .UR http://www.winehq.org/ -.BR http://www.winehq.org/ . -.UE +.B Wine development headquarters +.UE . .SH "SEE ALSO" .BR wine (1).

1 0

Alexandre Julliard : ntdll: Leave NtQueryDirectoryFile early when a non-wildcard mask is used in the getdirentries case .
by Alexandre Julliard July 1, 2013

July 1, 2013

Module: wine Branch: master Commit: 96b7c71cfe5acb9b319697dcff93b2e814c8b00f URL: http://source.winehq.org/git/wine.git/?a=commit;h=96b7c71cfe5acb9b319697dcf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 1 19:49:46 2013 +0200 ntdll: Leave NtQueryDirectoryFile early when a non-wildcard mask is used in the getdirentries case. This avoids having to retry the getdirentries call which may fail if the buffer size is too small. --- dlls/ntdll/directory.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index c552a8b..1a84537 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -247,6 +247,13 @@ static inline unsigned int max_dir_info_size( FILE_INFORMATION_CLASS class ) return dir_info_size( class, MAX_DIR_ENTRY_LEN ); } +static inline BOOL has_wildcard( const UNICODE_STRING *mask ) +{ + return (!mask || + memchrW( mask->Buffer, '*', mask->Length / sizeof(WCHAR) ) || + memchrW( mask->Buffer, '?', mask->Length / sizeof(WCHAR) )); +} + /* support for a directory queue for filesystem searches */ @@ -1823,6 +1830,7 @@ static int read_directory_getdirentries( int fd, IO_STATUS_BLOCK *io, void *buff last_info = NULL; goto restart; } + if (!has_wildcard( mask )) break; /* if we have to return but the buffer contains more data, restart with a smaller size */ if (res > 0 && (single_entry || io->Information + max_dir_info_size(class) > length)) { @@ -2000,13 +2008,6 @@ done: } -static inline WCHAR *mempbrkW( const WCHAR *ptr, const WCHAR *accept, size_t n ) -{ - const WCHAR *end; - for (end = ptr + n; ptr < end; ptr++) if (strchrW( accept, *ptr )) return (WCHAR *)ptr; - return NULL; -} - /****************************************************************************** * NtQueryDirectoryFile [NTDLL.@] * ZwQueryDirectoryFile [NTDLL.@] @@ -2021,7 +2022,6 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HANDLE handle, HANDLE event, BOOLEAN restart_scan ) { int cwd, fd, needs_close; - static const WCHAR wszWildcards[] = { '*','?',0 }; TRACE("(%p %p %p %p %p %p 0x%08x 0x%08x 0x%08x %s 0x%08x\n", handle, event, apc_routine, apc_context, io, buffer, @@ -2068,7 +2068,7 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HANDLE handle, HANDLE event, if ((read_directory_vfat( fd, io, buffer, length, single_entry, mask, restart_scan, info_class )) != -1) goto done; #endif - if (mask && !mempbrkW( mask->Buffer, wszWildcards, mask->Length / sizeof(WCHAR) ) && + if (!has_wildcard( mask ) && read_directory_stat( fd, io, buffer, length, single_entry, mask, restart_scan, info_class ) != -1) goto done; #ifdef USE_GETDENTS

1 0

Alexandre Julliard : gdi32: Don' t load linked fonts only to look up control characters.
by Alexandre Julliard July 1, 2013

July 1, 2013

Module: wine Branch: master Commit: 60d29d1d0d478f94e4375f8fac4fca1d30e843fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=60d29d1d0d478f94e4375f8fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 1 14:13:07 2013 +0200 gdi32: Don't load linked fonts only to look up control characters. --- dlls/gdi32/freetype.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index bdd6df7..72d8377 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7605,6 +7605,8 @@ static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, return TRUE; } + if (c < 32) goto done; /* don't check linked fonts for control characters */ + LIST_FOR_EACH_ENTRY(child_font, &font->child_fonts, CHILD_FONT, entry) { if(!child_font->font) @@ -7624,6 +7626,8 @@ static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, return TRUE; } } + +done: *glyph = get_default_char_index(font); *vert = FALSE; return FALSE;

1 0

Jacek Caban : mshtml/tests: Fixed script tests on IE10.
by Alexandre Julliard July 1, 2013

July 1, 2013

Module: wine Branch: master Commit: b09b9d3cb9091dd38c536943c8a295c08771fe9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b09b9d3cb9091dd38c536943c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 29 15:00:23 2013 +0200 mshtml/tests: Fixed script tests on IE10. --- dlls/mshtml/tests/script.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index af1103d..0c3c542 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -1768,6 +1768,8 @@ static HRESULT WINAPI ActiveScriptProperty_SetProperty(IActiveScriptProperty *if ok(V_VT(pvarValue) == VT_BOOL, "V_VT(pvarValue)=%d\n", V_VT(pvarValue)); ok(V_BOOL(pvarValue) == VARIANT_TRUE, "V_BOOL(pvarValue)=%x\n", V_BOOL(pvarValue)); break; + case 0x70000003: /* Undocumented property set by IE10 */ + return E_NOTIMPL; default: ok(0, "unexpected property %x\n", dwProperty); return E_NOTIMPL;

1 0

Henri Verbeet : d3d8/tests: Make shader bytecode static const.
by Alexandre Julliard July 1, 2013

July 1, 2013

Module: wine Branch: master Commit: 00f41ac4e0f8fe1b375056c604055c5ffe2eb2af URL: http://source.winehq.org/git/wine.git/?a=commit;h=00f41ac4e0f8fe1b375056c60… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 1 14:17:58 2013 +0200 d3d8/tests: Make shader bytecode static const. --- dlls/d3d8/tests/visual.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index cd830b6..f2c9b67 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -1006,7 +1006,8 @@ static void test_rcp_rsq(IDirect3DDevice8 *device) { 1.0f, 1.0f, 0.0f}, }; - const DWORD rcp_test[] = { + static const DWORD rcp_test[] = + { 0xfffe0101, /* vs.1.1 */ 0x0009fffe, 0x30303030, 0x30303030, /* Shaders have to have a minimal size. */ @@ -1019,7 +1020,8 @@ static void test_rcp_rsq(IDirect3DDevice8 *device) 0x0000ffff /* END */ }; - const DWORD rsq_test[] = { + static const DWORD rsq_test[] = + { 0xfffe0101, /* vs.1.1 */ 0x0009fffe, 0x30303030, 0x30303030, /* Shaders have to have a minimal size. */

1 0

André Hentschel : netstat: Remove superfluous casts.
by Alexandre Julliard July 1, 2013

July 1, 2013

Module: wine Branch: master Commit: 49f550e8ed0b4aeffef9d8e8cb9fc2126873ef7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f550e8ed0b4aeffef9d8e8c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 30 15:35:09 2013 +0200 netstat: Remove superfluous casts. --- programs/netstat/netstat.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index 23f2b40..fab39e3 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -189,7 +189,7 @@ static void NETSTAT_eth_stats(void) size = sizeof(MIB_IFTABLE); do { - table = (PMIB_IFTABLE)HeapAlloc(GetProcessHeap(), 0, size); + table = HeapAlloc(GetProcessHeap(), 0, size); err = GetIfTable(table, &size, FALSE); if (err != NO_ERROR) HeapFree(GetProcessHeap(), 0, table); } while (err == ERROR_INSUFFICIENT_BUFFER); @@ -246,7 +246,7 @@ static void NETSTAT_tcp_table(void) size = sizeof(MIB_TCPTABLE); do { - table = (PMIB_TCPTABLE)HeapAlloc(GetProcessHeap(), 0, size); + table = HeapAlloc(GetProcessHeap(), 0, size); err = GetTcpTable(table, &size, TRUE); if (err != NO_ERROR) HeapFree(GetProcessHeap(), 0, table); } while (err == ERROR_INSUFFICIENT_BUFFER); @@ -301,7 +301,7 @@ static void NETSTAT_udp_table(void) size = sizeof(MIB_UDPTABLE); do { - table = (PMIB_UDPTABLE)HeapAlloc(GetProcessHeap(), 0, size); + table = HeapAlloc(GetProcessHeap(), 0, size); err = GetUdpTable(table, &size, TRUE); if (err != NO_ERROR) HeapFree(GetProcessHeap(), 0, table); } while (err == ERROR_INSUFFICIENT_BUFFER);

1 0

Pavel Borecki : po: Update Czech translation.
by Alexandre Julliard July 1, 2013

July 1, 2013

Module: wine Branch: master Commit: 2b4e893d64fbfcd73c8e62f50e8e446edd3c5bf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b4e893d64fbfcd73c8e62f50… Author: Pavel Borecki <pavel.borecki(a)gmail.com> Date: Sun Jun 30 09:54:16 2013 +0200 po: Update Czech translation. --- po/cs.po | 2676 +++++++++++++++++++++++++++++--------------------------------- 1 files changed, 1257 insertions(+), 1419 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b4e893d64fbfcd73c8e6…

1 0

Frédéric Delanoy : wineusr: Assorted spelling fixes.
by Alexandre Julliard July 1, 2013

July 1, 2013

Module: docs Branch: master Commit: aca51a985079970d6a5eb921895da98ae43790c4 URL: http://source.winehq.org/git/docs.git/?a=commit;h=aca51a985079970d6a5eb9218… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 1 16:24:40 2013 +0200 wineusr: Assorted spelling fixes. --- en/wineusr-bugs.sgml | 34 +++++++++++++++++----------------- en/wineusr-configuring.sgml | 16 ++++++++-------- en/wineusr-running.sgml | 6 +++--- 3 files changed, 28 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=aca51a985079970d6a5eb…

1 0

Frédéric Delanoy : wineusr: 'uninstaller' should be used with wine on the command line.
by Alexandre Julliard July 1, 2013

July 1, 2013

Module: docs Branch: master Commit: 6d04b336fbe6a9510953c2fd572c03e9df547d96 URL: http://source.winehq.org/git/docs.git/?a=commit;h=6d04b336fbe6a9510953c2fd5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 1 16:24:39 2013 +0200 wineusr: 'uninstaller' should be used with wine on the command line. --- en/wineusr-running.sgml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/en/wineusr-running.sgml b/en/wineusr-running.sgml index 042c2ba..a1d7022 100644 --- a/en/wineusr-running.sgml +++ b/en/wineusr-running.sgml @@ -30,7 +30,7 @@ </para> <screen> - <prompt>$</prompt> <userinput>uninstaller</userinput> + <prompt>$</prompt> <userinput>wine uninstaller</userinput> </screen> <para>

1 0