wine-devel February 2013

wine-devel@winehq.org

62 participants
126 discussions

Re: ole32/tests: Add test for IDispatch interface in IOleObject_QueryInterface.
by Marvin 09 Feb '13

09 Feb '13

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=24324 Your paranoid android. === WNT4WSSP6 (32 bit defaulthandler) === defaulthandler.c:115: Test failed: got 80004002 === W2KPROSP4 (32 bit defaulthandler) === defaulthandler.c:115: Test failed: got 80004002 === WXPPROSP3 (32 bit defaulthandler) === defaulthandler.c:115: Test failed: got 80004002 === W2K3R2SESP2 (32 bit defaulthandler) === defaulthandler.c:115: Test failed: got 80004002 === WVISTAADM (32 bit defaulthandler) === defaulthandler.c:115: Test failed: got 80004002 === W2K8SE (32 bit defaulthandler) === defaulthandler.c:115: Test failed: got 80004002 === W7PRO (32 bit defaulthandler) === defaulthandler.c:115: Test failed: got 80004002 === W7PROX64 (32 bit defaulthandler) === defaulthandler.c:115: Test failed: got 80004002 === TEST64_W7SP1 (32 bit defaulthandler) === defaulthandler.c:115: Test failed: got 80004002 === W7PROX64 (64 bit defaulthandler) === defaulthandler.c:115: Test failed: got 80004002 === TEST64_W7SP1 (64 bit defaulthandler) === defaulthandler.c:115: Test failed: got 80004002

1 0

Re: [PATCH 1/2] shell32: Add a basic implementation for SHGetStockIconInfo
by Dmitry Timoshkov 08 Feb '13

08 Feb '13

Detlef Riekenberg <wine.dev(a)web.de> wrote: > +/**************************************************************************** > + * helper for SHGetStockIconInfo > + */ > +typedef struct stockiconentry_t { > + SHSTOCKICONID id; > + DWORD iconid; > +} stockiconentry; Why bother with a typedef? > +static stockiconentry stockicontable[] = { > + {SIID_DOCNOASSOC, IDI_SHELL_DOCUMENT}, > + {SIID_DOCASSOC, IDI_SHELL_DOCUMENT}, > + {SIID_FOLDER, IDI_SHELL_FOLDER}, > + {SIID_DRIVERNET, IDI_SHELL_NETDRIVE}, > + {SIID_DRIVERCD, IDI_SHELL_CDROM}, > + {SIID_DRIVERRAM, IDI_SHELL_RAMDISK}, > + {SIID_DESKTOPPC, IDI_SHELL_MY_COMPUTER}, > + {SIID_PRINTER, IDI_SHELL_PRINTER}, > + {SIID_SETTINGS, IDI_SHELL_CONTROL_PANEL}, > + {SIID_RECYCLERFULL, IDI_SHELL_FULL_RECYCLE_BIN}, > + {SIID_DELETE, IDI_SHELL_CONFIRM_DELETE}, > +}; Please don't forget to add 'const'. > +static int cmp_stockiconentry(const void *entry1, const void *entry2) > +{ > + stockiconentry *p1 = (stockiconentry *) entry1; > + stockiconentry *p2 = (stockiconentry *) entry2; > + > + return p1->id - p2->id; > +} Don't cast away 'const'. > +HRESULT WINAPI SHGetStockIconInfo(SHSTOCKICONID id, UINT flags, SHSTOCKICONINFO *sii) > +{ > + stockiconentry *entry; > + > + TRACE("(%d, 0x%x, %p)\n", id, flags, sii); > + if ((id < 0) | (id >= (SIID_MAX_ICONS - 1)) || !sii || (sii->cbSize != sizeof(SHSTOCKICONINFO))) > + return E_INVALIDARG; > + > + /* find the requested icon */ > + entry = bsearch(&id, stockicontable, sizeof(stockicontable)/sizeof(stockicontable[0]), > + sizeof(stockiconentry), cmp_stockiconentry); > + > + if (!entry) { > + FIXME("using fallback for id %d\n", id); > + entry = stockicontable; > + } > + > + if (flags) > + FIXME("flags 0x%x not implemented\n", flags); > + > + sii->hIcon = NULL; > + sii->iSysImageIndex = -1; > + sii->iIcon = - entry->iconid; > + > + GetModuleFileNameW(shell32_hInstance, sii->szPath, MAX_PATH); > + > + return S_OK; > +} GetModuleFileNameW can fail, so filling 'sii' may be a bit premature. -- Dmitry.

3 2

Re: [PATCH] winebuild: Use $CCAS to assemble if found
by Charles Davis 08 Feb '13

08 Feb '13

Hi, On Feb 3, 2013, at 7:33 PM, Alexandre Rostovtsev wrote: > Commit c14bdaf1 made winebuild use Clang to assemble if found. > > However, just because a user has some version of Clang installed, it > does not mean that she wants to use Clang to assemble Wine. For example, > a user who has both Clang and GAS installed may want to use GAS to avoid > textrels (see https://bugs.gentoo.org/show_bug.cgi?id=455308). Long term, that should really get fixed in LLVM/Clang. I'll file a PR (if one wasn't already). > > This patch allows the user to override which assembler gets used by > exporting CCAS at Wine configure time; the name CCAS was chosen for > compatibility with automake's standard AM_PROG_AS macro. I wrote the patch that prompted this one. And I'll freely admit, this is why I wanted to limit that patch to Mac OS--to minimize fallout on other platforms (like, obviously, Gentoo :). > --- > configure | 106 ++++++++++++++++++++++++++++++++++++++++++++ > configure.ac | 4 ++ > tools/winebuild/Makefile.in | 5 ++- > tools/winebuild/utils.c | 12 +++++ > 4 files changed, 126 insertions(+), 1 deletion(-) > > diff --git a/configure b/configure > index e3253ee..d0b7777 100755 > --- a/configure > +++ b/configure > @@ -732,6 +732,8 @@ FLEX > TOOLSDIR > WOW64_DISABLE > TARGETFLAGS > +ac_ct_CCAS > +CCAS > CPPBIN > ac_ct_CXX > CXXFLAGS > @@ -861,6 +863,7 @@ CPPFLAGS > CXX > CXXFLAGS > CCC > +CCAS > CPP > XMKMF' > > @@ -1549,6 +1552,7 @@ Some influential environment variables: > you have headers in a nonstandard directory <include dir> > CXX C++ compiler command > CXXFLAGS C++ compiler flags > + CCAS Assembler command > CPP C preprocessor > XMKMF Path to xmkmf, Makefile generator for X Window System > > @@ -4075,6 +4079,108 @@ cat >>confdefs.h <<_ACEOF > _ACEOF > > > + > +if test -n "$ac_tool_prefix"; then > + for ac_prog in clang gas as > + do > + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. > +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 > +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 > +$as_echo_n "checking for $ac_word... " >&6; } > +if ${ac_cv_prog_CCAS+:} false; then : > + $as_echo_n "(cached) " >&6 > +else > + if test -n "$CCAS"; then > + ac_cv_prog_CCAS="$CCAS" # Let the user override the test. > +else > +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR > +for as_dir in $PATH > +do > + IFS=$as_save_IFS > + test -z "$as_dir" && as_dir=. > + for ac_exec_ext in '' $ac_executable_extensions; do > + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > + ac_cv_prog_CCAS="$ac_tool_prefix$ac_prog" > + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > + break 2 > + fi > +done > + done > +IFS=$as_save_IFS > + > +fi > +fi > +CCAS=$ac_cv_prog_CCAS > +if test -n "$CCAS"; then > + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CCAS" >&5 > +$as_echo "$CCAS" >&6; } > +else > + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 > +$as_echo "no" >&6; } > +fi > + > + > + test -n "$CCAS" && break > + done > +fi > +if test -z "$CCAS"; then > + ac_ct_CCAS=$CCAS > + for ac_prog in clang gas as > +do > + # Extract the first word of "$ac_prog", so it can be a program name with args. > +set dummy $ac_prog; ac_word=$2 > +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 > +$as_echo_n "checking for $ac_word... " >&6; } > +if ${ac_cv_prog_ac_ct_CCAS+:} false; then : > + $as_echo_n "(cached) " >&6 > +else > + if test -n "$ac_ct_CCAS"; then > + ac_cv_prog_ac_ct_CCAS="$ac_ct_CCAS" # Let the user override the test. > +else > +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR > +for as_dir in $PATH > +do > + IFS=$as_save_IFS > + test -z "$as_dir" && as_dir=. > + for ac_exec_ext in '' $ac_executable_extensions; do > + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > + ac_cv_prog_ac_ct_CCAS="$ac_prog" > + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > + break 2 > + fi > +done > + done > +IFS=$as_save_IFS > + > +fi > +fi > +ac_ct_CCAS=$ac_cv_prog_ac_ct_CCAS > +if test -n "$ac_ct_CCAS"; then > + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CCAS" >&5 > +$as_echo "$ac_ct_CCAS" >&6; } > +else > + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 > +$as_echo "no" >&6; } > +fi > + > + > + test -n "$ac_ct_CCAS" && break > +done > + > + if test "x$ac_ct_CCAS" = x; then > + CCAS=""$CC"" > + else > + case $cross_compiling:$ac_tool_warned in > +yes:) > +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 > +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} > +ac_tool_warned=yes ;; > +esac > + CCAS=$ac_ct_CCAS > + fi > +fi > + > + > case $host in > *-darwin*) > if test "x$enable_win64" = "xyes" > diff --git a/configure.ac b/configure.ac > index c93cd08..760f325 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -126,6 +126,10 @@ dnl We can't use AC_PROG_CPP for winegcc, it uses by default $(CC) -E > AC_CHECK_TOOL(CPPBIN,cpp,cpp) > AC_DEFINE_UNQUOTED(EXEEXT,["$ac_exeext"],[Define to the file extension for executables.]) > > +dnl Analogous to AM_PROG_AS > +AC_ARG_VAR([CCAS],[Assembler command]) > +AC_CHECK_TOOLS(CCAS,[clang gas as],["$CC"]) If the user doesn't set CCAS--which she doesn't the majority of the time--configure will pick up the first of {clang, gas, as} in the PATH. Are you sure that's what you want? One of the earlier versions of the "Use Clang to assemble" patch attempted to detect Clang in the PATH, and use it if it was there. I was told that winebuild should detect the binary to use at runtime instead. Perhaps we should just not define CCAS if the user didn't specify it. Then below, you can wrap the block you added in an #ifdef. AJ may have more to say about this. > + > case $host in > *-darwin*) > if test "x$enable_win64" = "xyes" > diff --git a/tools/winebuild/Makefile.in b/tools/winebuild/Makefile.in > index 2017129..3fe47a3 100644 > --- a/tools/winebuild/Makefile.in > +++ b/tools/winebuild/Makefile.in > @@ -1,4 +1,7 @@ > -DEFS = -D__WINESRC__ $(EXTRADEFS) > +DEFS = \ > + -DCCAS="\"@CCAS@\"" \ > + -D__WINESRC__ \ > + $(EXTRADEFS) > > PROGRAMS = winebuild$(EXEEXT) > MANPAGE = winebuild.man > diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c > index 262ff3a..1c5f918 100644 > --- a/tools/winebuild/utils.c > +++ b/tools/winebuild/utils.c > @@ -352,6 +352,18 @@ struct strarray *get_as_command(void) > static int as_is_clang = 0; > struct strarray *args = strarray_init(); > > + if (!as_command && strlen( CCAS )) > + { > + struct stat st; > + > + if (!stat( CCAS, &st )) > + as_command = CCAS; > + else > + as_command = find_tool( CCAS, NULL ); > + > + if (as_command && strstr( as_command, "clang" )) as_is_clang = 1; You may recall that one of the earlier versions (later than the one that detected Clang in configure) used strstr(3) to detect Clang; I was then told not to use it. I suspect this is because some systems' strstr(3) exhibits quadratic-time behavior. I don't know if you can avoid that in this case, though. Maybe you can just grab the basename and strip off the CTARGET prefix; then you should just be able to do a strcmp(3). Or am I missing something? More generally, calling the variable "CCAS" implies that any old C compiler driver that knows how to assemble can be specified. If the user specifies a compiler that isn't Clang--GCC, for example--she'll get the wrong behavior. In particular, the 'as_is_clang' variable is used below to pass the right switches and options to Clang. Presumably we'd want to do that for the GCC case, too. > + } > + > if (!as_command) > { > as_command = find_tool( "clang", NULL ); > -- > 1.8.1.2 > > > I'm sorry for any inconvenience I might have caused, and I hope we can get this fixed soon. Chip

3 3

[PATCH v2 1/8] locks: make flock_lock_file take is_conflict callback parm
by Pavel Shilovsky 07 Feb '13

07 Feb '13

This parm demetermines how to check if locks have conflicts. This let us use flock_lock_file funtions further to add O_DENY* flags support through flocks. Signed-off-by: Pavel Shilovsky <piastry(a)etersoft.ru> --- fs/locks.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/fs/locks.c b/fs/locks.c index a94e331..9edfec4 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -697,14 +697,20 @@ static int posix_locks_deadlock(struct file_lock *caller_fl, return 0; } -/* Try to create a FLOCK lock on filp. We always insert new FLOCK locks +/* + * Try to create a FLOCK lock on filp. We always insert new FLOCK locks * after any leases, but before any posix locks. * * Note that if called with an FL_EXISTS argument, the caller may determine * whether or not a lock was successfully freed by testing the return * value for -ENOENT. + * + * Take @is_conflict callback that determines how to check if locks have + * conflicts or not. */ -static int flock_lock_file(struct file *filp, struct file_lock *request) +static int +flock_lock_file(struct file *filp, struct file_lock *request, + int (*is_conflict)(struct file_lock *, struct file_lock *)) { struct file_lock *new_fl = NULL; struct file_lock **before; @@ -760,7 +766,7 @@ find_conflict: break; if (IS_LEASE(fl)) continue; - if (!flock_locks_conflict(request, fl)) + if (!is_conflict(request, fl)) continue; error = -EAGAIN; if (!(request->fl_flags & FL_SLEEP)) @@ -1589,7 +1595,7 @@ int flock_lock_file_wait(struct file *filp, struct file_lock *fl) int error; might_sleep(); for (;;) { - error = flock_lock_file(filp, fl); + error = flock_lock_file(filp, fl, flock_locks_conflict); if (error != FILE_LOCK_DEFERRED) break; error = wait_event_interruptible(fl->fl_wait, !fl->fl_next); -- 1.8.1.1

2 20

Re: [PATCH] gdi32/tests: Skip justification tests where Times New Roman is not installed.
by Alexandre Julliard 07 Feb '13

07 Feb '13

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > --- > dlls/gdi32/tests/font.c | 6 ++++++ > 1 file changed, 6 insertions(+) There's no reason to require Times New Roman in that test, it could fall back to some other font. -- Alexandre Julliard julliard(a)winehq.org

1 0

[PATCH v2 0/8] Add O_DENY* support for VFS and CIFS/NFS
by Pavel Shilovsky 07 Feb '13

07 Feb '13

This patchset adds support of O_DENY* flags for Linux fs layer. These flags can be used by any application that needs share reservations to organize a file access. VFS already has some sort of this capability - now it's done through flock/LOCK_MAND mechanis, but that approach is non-atomic. This patchset build new capabilities on top of the existing one but doesn't bring any changes into the flock call semantic. These flags can be used by NFS (built-in-kernel) and CIFS (Samba) servers and Wine applications through VFS (for local filesystems) or CIFS/NFS modules. This will help when e.g. Samba and NFS server share the same directory for Windows and Linux users or Wine applications use Samba/NFS share to access the same data from different clients. According to the previous discussions the most problematic question is how to prevent situations like DoS attacks where e.g /lib/liba.so file can be open with DENYREAD, or smth like this. That's why one extra flag O_DENYMAND is added. It indicates to underlying layer that an application want to use O_DENY* flags semantic. It allows us not affect native Linux applications (that don't use O_DENYMAND flag) - so, these flags (and the semantic of open syscall that they bring) are used only for those applications that really want it proccessed that way. So, we have four new flags: O_DENYREAD - to prevent other opens with read access, O_DENYWRITE - to prevent other opens with write access, O_DENYDELETE - to prevent delete operations (this flag is not implemented in VFS and NFS part and only suitable for CIFS module), O_DENYMAND - to switch on/off three flags above. The #1 patch bring infrastructure to let us add this capability easier. #2 patch adds flags to fcntl while #3 patch implement VFS part. Patches #4, #5, #6 are related to CIFS-specific changes. #7 and #8 describe NFS and NFSD parts. Also, I created the preliminary patch for Samba that replaces the existing use of flock/LOCK_MAND mechanism with O_DENY* flags: http://git.etersoft.ru/people/piastry/packages/?p=samba.git;a=commitdiff;h=… Pavel Shilovsky (8): locks: make flock_lock_file take is_conflict callback parm fcntl: Introduce new O_DENY* open flags vfs: Add O_DENYREAD/WRITE flags support for open syscall CIFS: Add O_DENY* open flags support CIFS: Use NT_CREATE_ANDX command for forcemand mounts CIFS: Translate SHARING_VIOLATION to -ETXTBSY error code for SMB2 NFSv4: Add O_DENY* open flags support NFSD: Pass share reservations flags to VFS fs/cifs/cifsacl.c | 10 ++-- fs/cifs/cifsglob.h | 12 +++- fs/cifs/cifsproto.h | 9 +-- fs/cifs/cifssmb.c | 47 ++++++++------- fs/cifs/dir.c | 14 +++-- fs/cifs/file.c | 18 ++++-- fs/cifs/inode.c | 11 ++-- fs/cifs/link.c | 10 ++-- fs/cifs/readdir.c | 2 +- fs/cifs/smb1ops.c | 15 ++--- fs/cifs/smb2file.c | 10 ++-- fs/cifs/smb2inode.c | 4 +- fs/cifs/smb2maperror.c | 2 +- fs/cifs/smb2ops.c | 10 ++-- fs/cifs/smb2pdu.c | 6 +- fs/cifs/smb2proto.h | 14 +++-- fs/fcntl.c | 5 +- fs/locks.c | 121 ++++++++++++++++++++++++++++++++++++--- fs/namei.c | 10 +++- fs/nfs/nfs4xdr.c | 24 ++++++-- fs/nfsd/nfs4state.c | 46 ++++++++++++++- include/linux/fs.h | 6 ++ include/uapi/asm-generic/fcntl.h | 14 +++++ 23 files changed, 324 insertions(+), 96 deletions(-) -- 1.8.1.1

3 6

Re: iphlpapi: Let C look like C.
by Austin English 07 Feb '13

07 Feb '13

On Feb 6, 2013 11:13 PM, "Michael Stefaniuc" <mstefani(a)redhat.de> wrote: > > --- > dlls/iphlpapi/ipstats.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c > index f8191ba..966d24e 100644 > --- a/dlls/iphlpapi/ipstats.c > +++ b/dlls/iphlpapi/ipstats.c > @@ -693,7 +693,7 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) > } > > ret = GetIcmpStatistics(&ipv4stats); > - if SUCCEEDED(ret) > + if (SUCCEEDED(ret)) > { > stats->icmpInStats.dwMsgs = ipv4stats.stats.icmpInStats.dwMsgs; > stats->icmpInStats.dwErrors = ipv4stats.stats.icmpInStats.dwErrors; > -- > 1.7.6.5 Minor nitpick, "Make C look like C" would be a more proper title, imho.

3 3

Re: comctl32/tests: drop broken test
by Marvin 06 Feb '13

06 Feb '13

1 0

Re: [1/4] windowscodecs: Implement IWICColorContext::InitializeFromFilename.
by Ludger Sprenker 06 Feb '13

06 Feb '13

On Wed, 06 Feb 2013 13:51:32 +0100, Hans Leidekker wrote: > + handle = CreateFileW(filename, GENERIC_READ, 0, NULL, > OPEN_EXISTING, 0, NULL); > + if (handle == INVALID_HANDLE_VALUE) return > HRESULT_FROM_WIN32(GetLastError()); Hello Hans, I think, you are hiding a fixme for the default color profiles shipped with windows. (like "c:\windows\system32\spool\drivers\color\sRGB Color Space Profile.icm") I don't know the correct way to support these files. Maybe wine could search in "/usr/share/color/icc" for compatible profiles on runtime or take these files from other open source projects and include them in the wine installation. Regards, Ludger

2 1

Re: [4/4] windowscodecs: Implement IWICComponentFactory::CreateDecoderFromFileHandle.
by Vincent Povirk 06 Feb '13

06 Feb '13

> + hr = map_file(file, &map, &mem, &size); > + if (FAILED(hr)) return hr; > + ... > + > + hr = IWICStreamImpl_InitializeFromMemory(stream, mem, size.u.LowPart); > + if (FAILED(hr)) goto error; This makes me sad. Is this really simpler than implementing Write and Seek for a file handle?

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel February 2013