April 2013 - Wine-devel - list.winehq.org

[PATCH v6 0/7] Add O_DENY* support for VFS and CIFS/NFS
by Pavel Shilovsky 11 Jun '13

11 Jun '13

Main changes from v5: 1) O_DENYDELETE is now supported by VFS. 2) ESHAREDENIED erro code is introduced to be returned on sharelock conflicts. 3) forcemand dependancy is removed. CIFS module detects if it should use NTCreateAndX command according to existence of O_DENY flags. 4) Term 'deny lock' is replaced by 'sharelock' (function names, code comments, patch descriptions). Main changes from v4: 1) deny_lock_file uses FS_DOES_SHARELOCK flag from fs_flags to determine whether to use VFS locks or not. 2) Make nfs code return -EBUSY for share conflicts (was -EACCESS). Main changes from v3 1) O_DENYMAND is removed, sharelock mount option is introduced. 2) Patch fcntl.h and VFS patches are united into one. 3) flock/LOCK_MAND is disabled for sharelock mounts. 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 extra mount option 'sharelock' is added for switching on/off O_DENY* flags processing. It allows us to avoid use of these flags on critical places (like /, /lib) and turn them on if we really want it proccessed that way. So, we have 3 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), The patchset avoid data races problem on newely created files: open with O_CREAT can return the -ETXTBSY error for a successfully created file if this files was locked with a sharelock by another task. Also, it turns flock/LOCK_MAND capability off for mounts with 'sharelock' option. This lets us not mix one share reservation approach with another. The #1 patch adds flags to fcntl and implements VFS part. The patches #3, #4, #5 are related to CIFS-specific changes, #6 and #7 describe NFS and NFSD parts. 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=… The future part of open man page patch: ----- O_DENYREAD, O_DENYWRIYE, O_DENYDELETE - used to inforce a mandatory share reservation scheme of the file access. If these flag is passed, the open fails with -ESHAREDENIED in following cases: 1) if O_DENYREAD flag is specified and there is another open with READ access to the file; 2) if O_DENYWRITE flag is specified and there is another open with WRITE access to the file; 3) if READ access is requested and there is another open with O_DENYREAD flags; 4) if WRITE access is requested and there is another open with O_DENYWRITE flags. If O_DENYDELETE flag is specified and the open succeded, any further unlink operation will fail with -ESHAREDENIED untill this open is closed. Now this flag is processed by VFS and CIFS filesystem. This mechanism is done through flocks. If O_DENY* flags are specified, flock syscall is processed after the open. The share modes are translated into flock according the following rules: 1) !O_DENYREAD -> LOCK_READ | LOCK_MAND 2) !O_DENYWRITE -> LOCK_WRITE | LOCK_MAND 3) !O_DENYDELETE -> LOCK_DELETE | LOCK_MAND ----- Pavel Shilovsky (7): VFS: Introduce new O_DENY* open flags VFS: Add O_DENYDELETE support for VFS CIFS: Add share_access parm to open request CIFS: Add O_DENY* open flags support NFSv4: Add O_DENY* open flags support NFSD: Pass share reservations flags to VFS locks: Disable LOCK_MAND support for MS_SHARELOCK mounts fs/cifs/cifsacl.c | 8 +- fs/cifs/cifsfs.c | 2 +- fs/cifs/cifsglob.h | 18 ++++- fs/cifs/cifsproto.h | 8 +- fs/cifs/cifssmb.c | 50 +++++++------ fs/cifs/dir.c | 16 ++-- fs/cifs/file.c | 25 +++++-- fs/cifs/inode.c | 21 +++--- fs/cifs/link.c | 25 ++----- fs/cifs/netmisc.c | 2 +- fs/cifs/readdir.c | 5 +- fs/cifs/smb1ops.c | 16 ++-- 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 | 158 ++++++++++++++++++++++++++++++++++++--- fs/namei.c | 48 +++++++++++- fs/nfs/dir.c | 4 + fs/nfs/internal.h | 3 +- fs/nfs/nfs4file.c | 4 + fs/nfs/nfs4proc.c | 4 +- fs/nfs/nfs4super.c | 9 ++- fs/nfs/nfs4xdr.c | 21 +++++- fs/nfs/super.c | 7 +- fs/nfsd/nfs4state.c | 46 +++++++++++- fs/nfsd/nfsproc.c | 1 + fs/proc_namespace.c | 1 + include/linux/fs.h | 14 ++++ include/uapi/asm-generic/errno.h | 2 + include/uapi/asm-generic/fcntl.h | 12 +++ include/uapi/linux/fs.h | 1 + 35 files changed, 443 insertions(+), 139 deletions(-) -- 1.8.1.5

4 13

Re: [AppDB] version: Only display comments section in case version has maintainers
by Christopher Cope 02 May '13

02 May '13

I understand the premise, but I disagree. A lot of apps that I use don't have maintainers. However, the comments are typically helpful. I believe this should be approached differently. "André Hentschel" <nerv(a)dawncrow.de> wrote: >Am 28.04.2013 18:57, schrieb Rosanne DiMesio: >> Forced moderation of comments could work for apps with maintainers >who are doing their job, but most of the spam I recently deleted was in >unmaintained apps. My suggestion would be to block comments altogether >on unmaintained apps, not just because of spam, but because of other >inappropriate things that are not being monitored, such as posting >links to illegal downloads. As for the maintainers who clearly aren't >doing their jobs (about 20-25% of the spam I found was in entries with >maintainers), admins already have the capability of removing them. > > >--- > include/version.php | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > >diff --git a/include/version.php b/include/version.php >index 8f02b24..bf1d7ab 100644 >--- a/include/version.php >+++ b/include/version.php >@@ -1180,9 +1180,12 @@ class version { > > echo note::displayNotesForEntry($this->iVersionId); > >- // Comments Section >- if($this->iVersionId) >- Comment::view_app_comments($this->iVersionId); >+ if(sizeof($aMaintainers)>0) >+ { >+ // Display comments section in case version has >maintainers >+ if($this->iVersionId) >+ Comment::view_app_comments($this->iVersionId); >+ } > } > > public static function lookup_name($versionId) >-- >1.7.10.4

3 4

Re: [PATCH 2/2] gdi32: Clip font glyphs to fit within text metrics. (try 3)
by Alexandre Julliard 01 May '13

01 May '13

Sam Edwards <cfsworks(a)gmail.com> writes: > Content-wise, this is the same as try 2. However, there are two differences: > > 1. I merged the tests down into the same patch. > 2. This won't crash anymore: see patch 1 in this series. It still crashes: Program received signal SIGSEGV, Segmentation fault. 0x00007ffff550f680 in get_glyph_outline (incoming_font=<optimized out>, glyph=<optimized out>, format=24, lpgm=0x20, abc=0x22c7d0, buflen=288, buf=0x538c4, lpmat=0x7ffff5535140) at ../../../wine/dlls/gdi32/freetype.c:6389 6389 ((unsigned int)src[hmul * x + rgb_interval * 2] << 0) | (gdb) bt #0 0x00007ffff550f680 in get_glyph_outline (incoming_font=<optimized out>, glyph=<optimized out>, format=24, lpgm=0x20, abc=0x22c7d0, buflen=288, buf=0x538c4, lpmat=0x7ffff5535140) at ../../../wine/dlls/gdi32/freetype.c:6389 #1 0x00007ffff550fd1e in freetype_GetGlyphOutline (dev=0x40df0, glyph=<optimized out>, format=<optimized out>, lpgm=0x22c9f0, buflen=288, buf=0x538c4, lpmat=0x7ffff5535140) at ../../../wine/dlls/gdi32/freetype.c:7133 #2 0x00007ffff54fcd84 in GetGlyphOutlineW (hdc=<optimized out>, uChar=103, fuFormat=17, lpgm=0x22c9f0, cbBuffer=288, lpBuffer=0x538c4, lpmat2=0x7ffff5535140) at ../../../wine/dlls/gdi32/font.c:2813 #3 0x00007ffff54c97b5 in render_string (hdc=0x490031, dib=<optimized out>, font=0x43cb0, x=95, y=11, flags=12288, str=0x51b70, count=13, dx=0x53470, clipped_rects=0x22cbb0, bounds=0x22cba0) at ../../../wine/dlls/gdi32/dibdrv/graphics.c:707 -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 4/4] d3dx9_36: Remove todo in tests as it works now with last d3dxof fixes.
by Matteo Bruni 01 May '13

01 May '13

2013/4/29 Christian Costa <titan.costa(a)gmail.com>: > > --- > dlls/d3dx9_36/tests/xfile.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/d3dx9_36/tests/xfile.c b/dlls/d3dx9_36/tests/xfile.c > index 1238bcd..e514a5f 100644 > --- a/dlls/d3dx9_36/tests/xfile.c > +++ b/dlls/d3dx9_36/tests/xfile.c > @@ -77,7 +77,7 @@ static void test_templates(void) > ok(ret == D3DXFERR_BADFILEFLOATSIZE, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_BADFILEFLOATSIZE); > > ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, templates_parse_error, sizeof(templates_parse_error) - 1); > - todo_wine ok(ret == D3DXFERR_PARSEERROR, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_PARSEERROR); > + ok(ret == D3DXFERR_PARSEERROR, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_PARSEERROR); > > ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, templates, sizeof(templates) - 1); > ok(ret == S_OK, "RegisterTemplates failed with %#x\n", ret); Hi Christian, good catch for that todo_wine. However, this should be merged with the patch actually fixing the test (I guess it's patch 2).

2 1

Re: [PATCH 1/2] gdi32: Clip font glyphs to fit within text metrics. (try 2)
by Alexandre Julliard 30 Apr '13

30 Apr '13

Sam Edwards <cfsworks(a)gmail.com> writes: > From a2905abf287ff1ac44c93119d76b14b6fc3992c3 Mon Sep 17 00:00:00 2001 > From: Sam Edwards <CFSworks(a)gmail.com> > Date: Sat, 20 Apr 2013 05:48:07 -0600 > Subject: gdi32: Clip font glyphs to fit within text metrics. It doesn't work here: ../../../../wine/tools/runtest -q -P wine -M comctl32.dll -T ../../.. -p comctl32_test.exe.so ../../../../wine/dlls/comctl32/tests/listview.c && touch listview.ok wine: Unhandled page fault on write access to 0x400053b34 at address 0x2b4c3d69e6b7 (thread 0398), starting debugger... winedbg: Internal crash at 0x2b53f78066b7 make: *** [listview.ok] Error 84 -- Alexandre Julliard julliard(a)winehq.org

3 5

Re: [2/2] include: Make KNONVOLATILE_CONTEXT_POINTERS match PSDK definition.
by Dmitry Timoshkov 30 Apr '13

30 Apr '13

Hi, This patch has status "Build failure", but it compiles without errors here with 32 and 64-builds. What kind of a failure is that? -- Dmitry.

2 1

Re: kernel32: Add some tests for PEB and loader locks.
by Marvin 30 Apr '13

30 Apr '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=25367 Your paranoid android. === TEST64_W7SP1 (32 bit loader) === loader.c:1952: Test failed: WaitForSingleObject failed: 102 loader.c:1954: Test failed: expected exit code 199, got 259 loader.c:1963: Test failed: WaitForSingleObject failed: 102 loader.c:1968: Test failed: expected 198, got 259 loader.c:1972: Test failed: expected STATUS_PROCESS_IS_TERMINATING, got 0 loader.c:2018: Test failed: expected ERROR_ACCESS_DENIED, got 487 loader.c:2028: Test failed: VirtualFreeEx should fail loader.c:2029: Test failed: expected ERROR_ACCESS_DENIED, got -559038737 loader.c:2032: Test failed: VirtualAllocEx should fail loader.c:2033: Test failed: expected ERROR_ACCESS_DENIED, got -559038737 loader.c:2042: Test failed: expected STATUS_PROCESS_IS_TERMINATING, got 0

1 0

Re: riched20: Fix richtext copy/paste to OOffice.
by Nikolay Sivov 30 Apr '13

30 Apr '13

On 4/30/2013 10:20, Sergey Guralnik wrote: > When copying cyrillic text from wordpad (or any richedit) > to Open Office document I get unreadable text. It seems > like some another codepage was used to display text. > This path solves this problem. > --- > dlls/riched20/writer.c | 8 ++++++++ > 1 files changed, 8 insertions(+), 0 deletions(-) > Is it really supposed to do that? Does native module help?

2 1

Re: server: Map update region to children even if window just moved.
by Sergey Guralnik 30 Apr '13

30 Apr '13

On 2013-04-25 16:06, Sergey Guralnik wrote: > --- > dlls/user32/tests/win.c | 1 - > server/window.c | 5 +++-- > 2 files changed, 3 insertions(+), 3 deletions(-) Is something wrong with this one? -- Sergey

1 0

[GSOC2013] [Tools - Winetest Graphical User Interface]
by Nouri Hamza 29 Apr '13

29 Apr '13

Hi, My name is Hamza Nouri,23 years old. I'm in my second year of computer science engineering at Esprit,Tunis,Tunisia. I'm also Candidate for “Informatique et mathématiques Appliqués à la finance et aux assurances” (I.M.A.F.A) – a one year specialized postgraduate degree in computer science and mathematics applied to finance and insurances. I've took a look at Wine and found the project very promising. and i'm excited to partipate in coding for Wine and giving a help to Wine Users around the world. Regarding my technical skills, i have an experience in c/c++, java ,php,mysql and HTML5. i've done some projects using these languages that you can find in my personnal blog (http://tunisiansimpson.blogspot.com/) Here an example of Kakuro game made with language C that i've made last year : http://tunisiansimpson.blogspot.com/2012/12/kakuro.html I'm interested in the project "Tools - Winetest Graphical User Interface". I've already installed Wine and i'm starting using it. I have no prior experience in Open Source development, and i found this a good opportunity to begin coding for the good wealth of the international community. About my availability at the summer, i'll be free starting from the 9th June. I'll be pleased if you can provide me more details about the "Tools - Winetest Graphical User Interface" project and advice me with the better ways to succed my proposal. Hamza nouri best regards. Email address : hamza.nouri(a)esprit.tn CV : docs.google.com/a/esprit.tn/file/d/0B9vfb3FMh7gDU2JrRUQ2aF9PZGM/edit CV : twitter.com/tunisiansimpson Blog : tunisiansimpson.blogspot.com/ Facebook : www.facebook.com/nourihamza89

1 0