wine-devel June 2013

wine-devel@winehq.org

65 participants
128 discussions

Wine's Tahoma...
by Aric Stewart 12 Jun '13

12 Jun '13

Hi, So working on Arabic font issues I have started really looking at wine's Tahoma font. Windows Tahoma covers glyphs in quite a few ranges, Latin, Cyrillic, Hebrew, Arabic, Thai to name a few. Wine's Tahoma has bit a fraction of this coverage. Looking to improve our Arabic support, I found that our Tahoma heavily uses glyphs from DejaVu fonts already, which are public domain. I was wondering if we wanted to take the leap and just replace our Tahoma completely with DejaVu Sans? We can generate a fontforge sfd file for the file and adjust the family names as required. We would retain the copyrights so that we honer the source. But it would give us the glyphs we need to have a fully functional Tahoma. What is the thought on this? If there is strong opposition then I have a patch to include Arabic in our font, but it really seems like many users in other scripts would benefit greatly from having a more fully fleshed out tahoma. -aric

2 1

Re: [PATCH] d3dx9_36: Implement D3DXGetShaderInputSemantics + tests.
by Matteo Bruni 12 Jun '13

12 Jun '13

2013/6/11 Christian Costa <titan.costa(a)gmail.com>: > Fixes bug 22682. > --- > dlls/d3dx9_36/d3dx9_36.spec | 2 +- > dlls/d3dx9_36/shader.c | 50 ++++++++++++++++++++++++++++++++++++++ > dlls/d3dx9_36/tests/shader.c | 55 ++++++++++++++++++++++++++++++++++++++++++ > include/d3dx9shader.h | 1 + > 4 files changed, 107 insertions(+), 1 deletion(-) > > diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec > index f2c229a..0f1387e 100644 > --- a/dlls/d3dx9_36/d3dx9_36.spec > +++ b/dlls/d3dx9_36/d3dx9_36.spec > @@ -159,7 +159,7 @@ > @ stdcall D3DXGetPixelShaderProfile(ptr) > @ stdcall D3DXGetShaderConstantTable(ptr ptr) > @ stdcall D3DXGetShaderConstantTableEx(ptr long ptr) > -@ stub D3DXGetShaderInputSemantics(ptr ptr ptr) > +@ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) > @ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) > @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) > @ stdcall D3DXGetShaderSize(ptr) > diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c > index 75bc9b5..3b71b4b 100644 > --- a/dlls/d3dx9_36/shader.c > +++ b/dlls/d3dx9_36/shader.c > @@ -1,6 +1,7 @@ > /* > * Copyright 2008 Luis Busquets > * Copyright 2009 Matteo Bruni > + * Copyright 2010, 2013 Christian Costa > * Copyright 2011 Travis Athougies > * > * This library is free software; you can redistribute it and/or > @@ -1778,3 +1779,52 @@ HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **sample > > return D3D_OK; > } > + > +HRESULT WINAPI D3DXGetShaderInputSemantics(const DWORD *byte_code, D3DXSEMANTIC *semantics, UINT *count) > +{ > + const DWORD *ptr = byte_code; > + UINT i = 0; > + > + TRACE("byte_code = %p, semantics = %p, count = %p\n", byte_code, semantics, count); > + > + if (!byte_code) > + return D3DERR_INVALIDCALL; > + > + TRACE("Shader version: %#x\n", *ptr); > + > + /* Look for the END token, skipping the VERSION token */ > + while (*++ptr != D3DSIO_END) I think you should be a bit more careful in skipping non-opcode DWORDs, otherwise you could e.g. potentially match with constants from DEF instructions - very unlikely to happen in practice, sure, but since it can be easily avoided, why not? Take a look at shader_skip_opcode() from wined3d/shader_sm1.c. You can probably get away without having to write a table with the parameters count for each SM1 opcode by just skipping DWORDs with the most significant bit set (see shader_skip_unrecognized() from the same file). Of course you still have to special case DEF but that should be it. > + { > + /* Skip comments */ > + if ((*ptr & D3DSI_OPCODE_MASK) == D3DSIO_COMMENT) > + { > + ptr += ((*ptr & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT); > + } > + else if ((*ptr & D3DSI_OPCODE_MASK) == D3DSIO_DCL) > + { > + DWORD param1 = *++ptr; > + DWORD param2 = *++ptr; > + DWORD usage = param1 & 0x1f; > + DWORD usage_index = (param1 >> 16) & 0xf; > + DWORD reg_type = (((param2 >> 11) & 0x3) << 3) | ((param2 >> 28) & 0x7); > + > + TRACE("D3DSIO_DCL param1: %#x, param2: %#x, usage: %u, usage_index: %u, reg_type: %u\n", > + param1, param2, usage, usage_index, reg_type); > + > + if (reg_type == D3DSPR_INPUT) > + { > + if (semantics) > + { > + semantics[i].Usage = usage; > + semantics[i].UsageIndex = usage_index; > + } > + i++; > + } > + } > + } > + > + if (count) > + *count = i; > + > + return D3D_OK; > +} Have you tried to implement D3DXGetShaderOutputSemantics too? I suspect most of the code will be pretty much the same, in that case you could move the common code to a helper function and use it from both. You don't necessarily need to do this right now, just mentioning a potential follow-up. > diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c > index f7be174..471cd8c 100644 > --- a/dlls/d3dx9_36/tests/shader.c > +++ b/dlls/d3dx9_36/tests/shader.c > @@ -1,5 +1,6 @@ > /* > * Copyright 2008 Luis Busquets > + * Copyright 2010, 2013 Christian Costa > * Copyright 2011 Travis Athougies > * > * This library is free software; you can redistribute it and/or > @@ -271,6 +272,22 @@ static const D3DXCONSTANT_DESC ctab_samplers_expected[] = { > {"sampler2", D3DXRS_SAMPLER, 3, 1, D3DXPC_OBJECT, D3DXPT_SAMPLER3D, 1, 1, 1, 0, 4, NULL}, > {"notsampler", D3DXRS_FLOAT4, 2, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 1, 0, 16, NULL}}; > > +static const DWORD semantics_vs11[] = { > + 0xfffe0101, /* vs_1_1 */ > + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position0 v0 (input) */ > + 0x0000001f, 0x80000005, 0x900f0001, /* dcl_texcoord0 v1 (input) */ > + 0x0000001f, 0x80010005, 0x900f0002, /* dcl_texcoord1 v2 (input) */ > + 0x0000001f, 0x8000000a, 0xe00f0000, /* dcl_color0 oD0 (output) */ > + 0x0000ffff}; /* END */ > + > +static const DWORD semantics_vs30[] = { > + 0xfffe0300, /* vs_3_0 */ > + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position0 v0 (input) */ > + 0x0000001f, 0x80000005, 0x900f0001, /* dcl_texcoord0 v1 (input) */ > + 0x0000001f, 0x80010005, 0x900f0002, /* dcl_texcoord1 v2 (input) */ > + 0x0000001f, 0x8000000a, 0xe00f0000, /* dcl_color0 o0 (output) */ > + 0x0000ffff}; /* END */ > + > static void test_get_shader_size(void) > { > UINT shader_size, expected; > @@ -1900,6 +1917,43 @@ static void test_get_shader_constant_variables(void) > ok(count == 0, "Release failed, got %u, expected %u\n", count, 0); > } > > +static void test_get_shader_semantics(void) > +{ > + HRESULT ret; > + D3DXSEMANTIC semantics[MAXD3DDECLLENGTH]; > + UINT count; > + > + /* Check parameters */ > + ret = D3DXGetShaderInputSemantics(NULL, semantics, &count); > + ok(ret == D3DERR_INVALIDCALL, "Returned %#x, expected %#x\n", ret, D3DERR_INVALIDCALL); > + ret = D3DXGetShaderInputSemantics(semantics_vs11, semantics, NULL); > + ok(ret == D3D_OK, "Failed with %#xn", ret); > + count = 0xdeadbeef; > + ret = D3DXGetShaderInputSemantics(semantics_vs11, NULL, &count); > + ok(ret == D3D_OK, "Failed with %#xn", ret); > + ok(count == 3, "Got %u, expected 1\n", count); > + > + ret = D3DXGetShaderInputSemantics(semantics_vs11, semantics, &count); > + ok(ret == D3D_OK, "Failed with %#xn", ret); > + ok(count == 3, "Got %u, expected 1\n", count); > + ok(semantics[0].Usage == D3DDECLUSAGE_POSITION, "Got %u, expected %u\n", semantics[0].Usage, D3DDECLUSAGE_POSITION); > + ok(semantics[0].UsageIndex == 0, "Got %u, expected 0\n", semantics[0].UsageIndex); > + ok(semantics[1].Usage == D3DDECLUSAGE_TEXCOORD, "Got %u, expected %u\n", semantics[1].Usage, D3DDECLUSAGE_TEXCOORD); > + ok(semantics[1].UsageIndex == 0, "Got %u, expected 0\n", semantics[0].UsageIndex); > + ok(semantics[2].Usage == D3DDECLUSAGE_TEXCOORD, "Got %u, expected %u\n", semantics[2].Usage, D3DDECLUSAGE_TEXCOORD); > + ok(semantics[2].UsageIndex == 1, "Got %u, expected 1\n", semantics[0].UsageIndex); > + > + ret = D3DXGetShaderInputSemantics(semantics_vs30, semantics, &count); > + ok(ret == D3D_OK, "Failed with %#xn", ret); > + ok(count == 3, "Got %u, expected 1\n", count); > + ok(semantics[0].Usage == D3DDECLUSAGE_POSITION, "Got %u, expected %u\n", semantics[0].Usage, D3DDECLUSAGE_POSITION); > + ok(semantics[0].UsageIndex == 0, "Got %u, expected 0\n", semantics[0].UsageIndex); > + ok(semantics[1].Usage == D3DDECLUSAGE_TEXCOORD, "Got %u, expected %u\n", semantics[1].Usage, D3DDECLUSAGE_TEXCOORD); > + ok(semantics[1].UsageIndex == 0, "Got %u, expected 0\n", semantics[0].UsageIndex); > + ok(semantics[2].Usage == D3DDECLUSAGE_TEXCOORD, "Got %u, expected %u\n", semantics[2].Usage, D3DDECLUSAGE_TEXCOORD); > + ok(semantics[2].UsageIndex == 1, "Got %u, expected 1\n", semantics[0].UsageIndex); > +} > + > START_TEST(shader) > { > test_get_shader_size(); > @@ -1911,4 +1965,5 @@ START_TEST(shader) > test_get_sampler_index(); > test_get_shader_samplers(); > test_get_shader_constant_variables(); > + test_get_shader_semantics(); > } > diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h > index 0b30519..f5ba1c4 100644 > --- a/include/d3dx9shader.h > +++ b/include/d3dx9shader.h > @@ -269,6 +269,7 @@ DWORD WINAPI D3DXGetShaderVersion(const DWORD *byte_code); > const char * WINAPI D3DXGetVertexShaderProfile(struct IDirect3DDevice9 *device); > HRESULT WINAPI D3DXFindShaderComment(CONST DWORD* byte_code, DWORD fourcc, LPCVOID* data, UINT* size); > HRESULT WINAPI D3DXGetShaderSamplers(CONST DWORD *byte_code, LPCSTR *samplers, UINT *count); > +HRESULT WINAPI D3DXGetShaderInputSemantics(const DWORD *byte_code, D3DXSEMANTIC *semantics, UINT *count); > > HRESULT WINAPI D3DXAssembleShaderFromFileA(const char *filename, const D3DXMACRO *defines, > ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages); > > >

3 4

Possible wine bug concerning the case of the DbgHelp.h header filename
by Alan W. Irwin 12 Jun '13

12 Jun '13

I successfully built the ultra-fast ninja build tool on Wine using the MinGW g++ compiler. To achieve that success I had to deal with a small number of issues including one wine/ninja header name inconsistency which is that DbgHelp.h (#included by the ninja code) has a lower-case name (dbghelp.h) on wine, and the MinGW suite of compilers is sensitive to the case of header file names. I worked around this issue with the following symlink /home/wine/wine_build/install-git/include/wine/windows/DbgHelp.h -> dbghelp.h where /home/wine/wine_build/install-git is my install prefix for my wine-git build. Is Wine following the correct Windows naming convention for this header? For what it is worth, I did a google search for <windows dbghelp.h> and most of the hits were for DbgHelp.h rather than dbghelp.h so I can understand why the ninja developers used #include<DbgHelp.h> rather than the lower-case version of that name. If the wine developers here decide this is definitely a wine issue, I am willing to write up the bug report on your bugtracker so this issue doesn't get lost. A search there for <header case filename> did not turn up anything relevant. Alan __________________________ Alan W. Irwin Astronomical research affiliation with Department of Physics and Astronomy, University of Victoria (astrowww.phys.uvic.ca). Programming affiliations with the FreeEOS equation-of-state implementation for stellar interiors (freeeos.sf.net); the Time Ephemerides project (timeephem.sf.net); PLplot scientific plotting software package (plplot.sf.net); the libLASi project (unifont.org/lasi); the Loads of Linux Links project (loll.sf.net); and the Linux Brochure Project (lbproject.sf.net). __________________________ Linux-powered Science __________________________

4 4

Re: [PATCH] d3dx9_36: Set compilation_errors to NULL when no error encountered + tests.
by Rico Schüller 12 Jun '13

12 Jun '13

On 11.06.2013 22:08, Christian Costa wrote: > Fixes bug 26598. > --- > dlls/d3dx9_36/effect.c | 4 ++++ > dlls/d3dx9_36/tests/effect.c | 17 +++++++++++++++++ > 2 files changed, 21 insertions(+) > > diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c > index 1924c07..bab4560 100644 > --- a/dlls/d3dx9_36/effect.c > +++ b/dlls/d3dx9_36/effect.c > @@ -5792,6 +5792,10 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s > > *effect = &object->ID3DXEffect_iface; > > + /* Must be set to NULL if no compilation error */ > + if (compilation_errors) > + *compilation_errors = NULL; > + No, this is wrong! Your test case doesn't cover all cases. Cheers Rico

2 2

Re: wininet/tests: Avoid proxy test failures on old wininet.
by Marvin 12 Jun '13

12 Jun '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=25946 Your paranoid android. === WXPX64 (32 bit http) === http.c:4459: Test failed: 4630: expected status 100 got 10 http.c:4459: Test failed: 4674: expected status 100 got 40 http.c:4432: Test failed: ar->dwResult = 0, expected 1 http.c:4459: Test failed: 4683: expected status 70 got 100 http: unhandled exception c0000005 at 7722EDEA

1 0

Re: [PATCH] d3dx9_36: Implement D3DXGetShaderInputSemantics + tests.
by Rico Schüller 12 Jun '13

12 Jun '13

On 11.06.2013 22:08, Christian Costa wrote: > + TRACE("byte_code = %p, semantics = %p, count = %p\n", byte_code, semantics, count); The rest of the file seems to use the trace without the "=". > + ok(ret == D3D_OK, "Failed with %#xn", ret); > + ok(count == 3, "Got %u, expected 1\n", count); Should be "\n" and "expected 3". Both several times. As the return value for semantics is in both tests the same, it might be useful to initialize the semantics first to check that the values are really set in both cases. What does D3DXGetShaderInputSemantics(semantics_vs11, NULL, NULL); and D3DXGetShaderInputSemantics(NULL, NULL, NULL); return? Well both are corner cases without much meaning. You may check for the semantics where the count is NULL like D3DXGetShaderInputSemantics(semantics_vs11, semantics, NULL); Cheers Rico

2 1

Re: comdlg32: Store client GUID with SetClientGuid()
by Marvin 12 Jun '13

12 Jun '13

1 0

[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

Patch 96712
by Christian Costa 11 Jun '13

11 Jun '13

Hi, Is there something wrong with this patch? The only feedback I got is a typo (fixed). http://source.winehq.org/patches/data/96712 Thanks

1 0

Re: [PATCH 1/1] wined3d: Introduce a helper function for printing floats in GLSL shaders.
by Stefan Dösinger 11 Jun '13

11 Jun '13

Am 11.06.2013 um 09:27 schrieb Henri Verbeet: > We always want to use '.' as decimal separator in GLSL, instead of the locale > specific one. Reported on IRC. I think this should be added as a code comment above shader_glsl_ftoa, I don't think the reason why we need our own conversion function is obvious. The ARB shader backend will need this as well, but I can take care of this. What external software triggers this behavior? > case WINED3D_DATA_FLOAT: > - sprintf(register_name, "%.8e", *(const float *)reg->immconst_data); > + shader_glsl_ftoa(*(const float *)reg->immconst_data, register_name); > break; shader_glsl_ftoa doesn't handle inf or nan. I assume that's intentional because they would only trigger a parser error.

2 1

← Newer
1
...
7
8
9
10
11
12
13
Older →

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 June 2013