- wine-devel - winehq.org

[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

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=24289 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

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

kernel32: Use the monotonic counter in GetTickCount64.
by Joerg-Cyril.Hoehle＠t-systems.com 06 Feb '13

06 Feb '13

Hi, I believe we should use this opportunity and review the usage of timers in Wine. E.g. I have a patch to have CreateTimerqueue use the monotonic timer too that I'll submit after some more testing. Mmdevapi's audio currently depends on the TimerQueue which IMHO erroneously depends on gettimeofday() instead of clocks not affected by DST and NTP. As a result, strange things should happen to Wine audio each time the clock is adjusted... What do you think? BTW, MSDN is wonderfully inconsistent - witness "system time": "System time is the current date and time of day. [...] The system bases system time on coordinated universal time (UTC)." http://msdn.microsoft.com/en-us/library/windows/desktop/ms724961%28v=vs.85%… "The system time is the time, in milliseconds, since the Microsoft Windows operating system was started." http://msdn.microsoft.com/en-us/library/windows/desktop/dd743637%28v=vs.85%… The latter is within the context of windows multimedia. I believe different teams at MS wrote documents without cross-checking their use of vocabulary. As a result, expressions don't mean the same things. Regards, Jörg Höhle

1 0

Re: kernel32/tests : added tests for copyfileex try7
by Alexandre Julliard 06 Feb '13

06 Feb '13

Patrick Rudolph <siro(a)das-labor.org> writes: > + if( !GetTempPathA( MAX_PATH,tmppath ) ) > + { > + win_skip("GetTempPathA failed\n"); > + return; > + } > + > + /* create a dummy file for copy tests */ > + if( !GetTempFileNameA( tmppath,"IN",0,source_name ) ) > + { > + win_skip("GetTempFileNameA failed\n"); > + return; > + } > + > + /* create a dummy file for copy tests */ > + if( !GetTempFileNameA( tmppath,"OUT",0,dest_name ) ) > + { > + win_skip("GetTempFileNameA failed\n"); > + return; > + } > + > + source_handle = CreateFileA( source_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0 ); > + if( !source_handle ) > + { > + win_skip("CreateFileA failed (%d)\n", GetLastError()); > + return; > + } > + > +#define COPYFILEEXFILESIZE 10000000 > + > + /* set filesize to COPYFILEEXFILESIZE */ > + TotalFileSize.QuadPart = COPYFILEEXFILESIZE; > + > + if( !pSetFilePointerEx(source_handle,TotalFileSize,NULL,FILE_BEGIN) ) > + { > + win_skip("SetFilePointerEx failed (%d)\n", GetLastError()); > + return; > + } > + > + if( !pSetEndOfFile(source_handle) ) > + { > + win_skip("SetEndOfFile failed (%d)\n", GetLastError()); > + return; > + } All these calls are not supposed to fail on Windows either. win_skip is not appropriate. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] Support a protection scheme which reset the GS selector
by Alexandre Julliard 06 Feb '13

06 Feb '13

Alessandro Pignotti <a.pignotti(a)sssup.it> writes: > Hi everyone, > > I've found two different games: > > -) Of orcs and men > -) The testament of sherlock holmes > > which are using a protection scheme which reset the GS segment selector, > possibly to confuse virtual machines. Since on linux the GS selector is > used internally by glibc the game would crash as soon as a native glibc > method is called by wine. The proposed patch tries to workaround this > problem by restoring the GS to a known working value in wine's SEGFAULS > handler and try the instruction again. This should be done similarly to the other checks in raise_segv_exception. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [2/5] windowscodecs: Basic tests for tiff encoder options (try2)
by Vincent Povirk 05 Feb '13

05 Feb '13

> @Vincent: I thought about adding the properties one at a time but it seemed > a bit like overkill for the tiff encoder, which has only two options. But I > will defenitly do this for the jpeg encoder, which has much more options. Well, actually, on further consideration I can understand why you did it this way, since adding a property is very easy and doesn't really require implementing that property. Though it'd be nice to get some notification when a property is used that we don't support.

1 0

Re: [2/5] windowscodecs: Basic tests for tiff encoder options
by Vincent Povirk 05 Feb '13

05 Feb '13

+ { wszTiffCompressionMethod, VT_UI1, VT_UI1, {.iVal=WICTiffCompressionDontCare} }, This .field=value initialization syntax is not acceptable for Wine (not in C89). I don't know another way to initialize unions. + if (clsid_encoder == &CLSID_WICTiffEncoder) + todo_wine test_specific_encoder_properties(options, testdata_tiff_props, all_props, cProperties2); It might be better to mark the individual properties with a todo, so they can be added one at a time.

1 0

Compiling Wine on Mac OS X 10.8.2?
by Jeremiah Flerchinger 05 Feb '13

05 Feb '13

Is anyone compiling Wine from the git repository for OS X version 10.8.2? At first I thought I broke my toolchain and could no longer compile Wine at all, but this is not the case. I can still compile old releases, but can no longer compile from git. I'm just curious if anyone else has tried...

5 8

Re: comctl32/listview: do not touch icon spacing if set explicitly
by Marvin 04 Feb '13

04 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=24258 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: comctl32/listview: always use large icon size when calculating icon spacing
by Marvin 04 Feb '13

04 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=24257 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: comctl32/listview: correct icon spacing calculation when set to 0 or -1
by Marvin 04 Feb '13

04 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=24256 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [2/5] windowscodecs: Implement IPropertyBag2::CountProperties
by Marvin 04 Feb '13

04 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=24252 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

2 1

Re: [3/5] windowscodecs: Add initializations for tiff encoder options
by Marvin 04 Feb '13

04 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=24254 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: Keynote made me remember Mac Icons
by Ken Thomases 03 Feb '13

03 Feb '13

Hi, On Feb 3, 2013, at 3:56 AM, Austin English wrote: > On Sun, Feb 3, 2013 at 9:45 AM, Jeremiah Flerchinger > <jeremiah.flerchinger(a)gmail.com> wrote: >> The keynote made me realize I have some Mac icons for Wine. Would anyone be >> interested in them? It's definitely more functional than just using the >> default terminal icon. I also had a winecfg icon somewhere but I can't >> remember where that one is right now. >> >> Let me know and tell me where to send them. > > Ken Thomases (cc'ed) is the person on winemac.drv, though wine-devel > or attaching them to bugzilla would likely be best to preserve a copy > of it. I may be missing some context. What icons is this referring to? Do you mean just the various icons for Wine and its programs (e.g. Notepad) but in ICNS format? I'm not sure yet how useful that will be. Although I haven't gotten this far in my Mac driver patch submissions, the Mac driver will eventually attempt to extract the icon for the current .exe and use that for the application icon of the running process. Not all executables have an icon, though, so in some cases it will still default to the terminal-looking icon. It probably would be better to use Wine's wine-glass icon in that case. However, there's a question of how to deploy the icon. I'm not sure a .icns file is useful. I don't know where such a .icns file would be kept and how it would be located relative to the Wine installation (or build directory, if running from there). So, it may just be easiest to embed a Windows ICO resource into the Mac driver .so file and extract it at runtime just like the code will extract the icon from the .exe file. So, thanks for the offer and I'll keep it in mind, but at this point I'm not sure what I would do with Mac icons for Wine. -Ken

2 1

Support for game DRM which overwrite the GS segment selector
by Alessandro Pignotti 03 Feb '13

03 Feb '13

Hi everyone, I'm trying to get a specific game which employs a seemingly custom protection scheme to work. The DRM does various bad things as usual, but a very bad one is manipulating to GS segment selector and setting it to a NULL segment. The GS segment is used by libc though in various ways (stack protection and syscall support, and probably others). I managed to get the activation procedure to go further and further by enclosing each offending syscall using the following 2 macros. #define SAFE_GS_START \ do { \ wine_set_gs(ntdll_get_thread_data()->gs); \ do #define SAFE_GS_END \ while(0); \ } while(0) Still, this method is very cumbersome since system calls happens in many places even outside of ntdll. Fixing the GS is also needed to support sigsetjmp which is used by wine's exception handling. I'd like to ask for feedback about what would be a sane way of supporting this application. A possible solution would be to modify wine's segfault handler to check if the instruction has a GS prefix (0x65 IIRC) and try to execute the instruction again after fixing the GS. Please keep me in CC since I'm not subscribed to the ML. Regards, Alessandro Pignotti

2 3

Re: fusion: return correct error for null public token
by Nikolay Sivov 03 Feb '13

03 Feb '13

> + ok(hr == FUSION_E_PRIVATE_ASM_DISALLOWED, "Expected S_OK, got %08x\n", hr); You could just strip excepted value message part to avoid typos like that. On Fri, Feb 1, 2013 at 8:10 AM, Alistair Leslie-Hughes < leslie_alistair(a)hotmail.com> wrote: > Hi, > The other fusion patch is superseded by this one. > > Changelog: > fusion: return correct error for null public token > > > Best Regards > Alistair Leslie-Hughes > > > > > >

1 0

Re: [PATCH] cryptui: use add_oid_to_usage correctly (Coverity)
by Juan Lang 02 Feb '13

02 Feb '13

Hi Marcus, - add_oid_to_usage(usage, ptr); + usage = add_oid_to_usage(usage, ptr); This looks fine, but would you mind making the same change on line 337? Thanks, --Juan

2 3

Re: kernel32/tests : added tests for copyfileex try7
by Marvin 01 Feb '13

01 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=24239 Your paranoid android. === WNT4WSSP6 (32 bit path) === path: unhandled exception c0000005 at 00000000

1 0

Re: kernel32/tests : added tests for copyfileex try6
by Marvin 31 Jan '13

31 Jan '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=24237 Your paranoid android. === WNT4WSSP6 (32 bit path) === Timeout

1 0

Re: [website] Added Simplified Chinese translation
by Jeremy Newman 31 Jan '13

31 Jan '13

Nice work. I did end up moving a few things around, and had to patch my language detection function, but it worked when I switched my browser over to zn-ch. I fixed the image as well. Also, please set your text editor to output 4 spaces instead of tabs. Thanks! -N On 01/30/2013 09:34 PM, Jactry Zeng wrote: > Hi folks, > this is Simplified Chinese translation for Wine's website, it's my first > patch, thanks Qian Hong, Aron Xu, Jeremy and Hin-Tak for review. > I appreciate for any comment. :-)

2 1

[website] Added simplified chinese
by Jactry 31 Jan '13

31 Jan '13

5 7

Re: kernel32/tests : added tests for copyfileex try5
by Marvin 31 Jan '13

31 Jan '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=24228 Your paranoid android. === WNT4WSSP6 (32 bit path) === Timeout === W2KPROSP4 (32 bit path) === path.c:1814: Test failed: Expected GetFileAttributesEx to return zero, got 1 === WXPPROSP3 (32 bit path) === path.c:1814: Test failed: Expected GetFileAttributesEx to return zero, got 1 === W2K3R2SESP2 (32 bit path) === path.c:1814: Test failed: Expected GetFileAttributesEx to return zero, got 1 === WVISTAADM (32 bit path) === path.c:1814: Test failed: Expected GetFileAttributesEx to return zero, got 1 === W2K8SE (32 bit path) === path.c:1814: Test failed: Expected GetFileAttributesEx to return zero, got 1 === W7PRO (32 bit path) === path.c:1814: Test failed: Expected GetFileAttributesEx to return zero, got 1 === W7PROX64 (32 bit path) === path.c:1814: Test failed: Expected GetFileAttributesEx to return zero, got 1 === TEST64_W7SP1 (32 bit path) === path.c:1814: Test failed: Expected GetFileAttributesEx to return zero, got 1 === W7PROX64 (64 bit path) === path.c:1814: Test failed: Expected GetFileAttributesEx to return zero, got 1 === TEST64_W7SP1 (64 bit path) === path.c:1814: Test failed: Expected GetFileAttributesEx to return zero, got 1

1 0

Re: [3/3] msi: Improve parsing of the supported platforms string.
by Marvin 31 Jan '13

31 Jan '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=24227 Your paranoid android. === WNT4WSSP6 (32 bit install) === install.c:6051: Test failed: Per-user icon file isn't where it's expected (C:\WINNT\Profiles\Default User\Application Data\Microsoft\Installer\{7DF88A49-996F-4EC8-A022-BF956F9B2CBB}\testicon)

1 0

Re: Makedll.rules.in: Explicitly specify DLL name when building importlib
by Alexandre Julliard 31 Jan '13

31 Jan '13

Jacek Caban <jacek(a)codeweavers.com> writes: > --- > dlls/Makedll.rules.in | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Why do you need this? -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: fusion: Allow null to be the value of the public key
by Hans Leidekker 31 Jan '13

31 Jan '13

On Thu, 2013-01-31 at 19:35 +1100, Alistair Leslie-Hughes wrote: > diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c > index 162a76b..2c4b379 100644 > --- a/dlls/fusion/asmname.c > +++ b/dlls/fusion/asmname.c > @@ -561,6 +561,10 @@ static HRESULT parse_pubkey(IAssemblyNameImpl *name, LPCWSTR pubkey) > { > int i; > BYTE val; > + static WCHAR nullstr[] = {'n','u','l','l',0}; This should be const. > + if(lstrcmpiW(pubkey, nullstr) == 0) > + return S_OK; Please add a test to show that it's case insensitive. > if (lstrlenW(pubkey) < CHARS_PER_PUBKEY) > return FUSION_E_INVALID_NAME; > diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c > index e97cfbe..79f8709 100644 > --- a/dlls/fusion/tests/asmcache.c > +++ b/dlls/fusion/tests/asmcache.c > @@ -1016,6 +1016,10 @@ static void test_QueryAssemblyInfo(void) > 'p','u','b','l','i','c','K','e','y','T','o','k','e','n','=', > '2','d','0','3','6','1','7','b','1','c','3','1','e','2','f','5',',', > 'c','u','l','t','u','r','e','=','n','e','u','t','r','a','l',0}; > + static const WCHAR nullpublickey[] = { > + 'm','s','c','o','r','l','i','n',',','v','e','r','s','i','o','n','=','0', > + 'p','u','b','l','i','c','K','e','y','T','o','k','e','n','=','n','u','l', > + 'c','u','l','t','u','r','e','=','n','e','u','t','r','a','l',0}; > > size = MAX_PATH; > hr = pGetCachePath(ASM_CACHE_GAC, asmpath, &size); > @@ -1386,6 +1390,17 @@ static void test_QueryAssemblyInfo(void) > "Assembly path was changed\n"); > ok(info.cchBuf == MAX_PATH, "Expected MAX_PATH, got %d\n", info.cchBuf); > > + /* display name is "mscorlib.dll,version=0.0.0.0,publicKeyToken=null,culture=neutral" */ This comment doesn't agree with the string initialized above. > + INIT_ASM_INFO(); > + lstrcpyW(name, nullpublickey); > + hr = IAssemblyCache_QueryAssemblyInfo(cache, 0, name, &info); > + ok(info.cbAssemblyInfo == sizeof(ASSEMBLY_INFO), > + "Expected sizeof(ASSEMBLY_INFO), got %d\n", info.cbAssemblyInfo); You should check the return value of QueryAssemblyInfo but CreateAssemblyNameObject is actually a better way to test this.

1 0

Re: fusion: Allow null to be the value of the public key
by Nikolay Sivov 31 Jan '13

31 Jan '13

On 1/31/2013 12:35, Alistair Leslie-Hughes wrote: > Hi, > > > Changelog: > fusion: Allow null to be the value of the public key > + static const WCHAR nullpublickey[] = { > + 'm','s','c','o','r','l','i','n',',','v','e','r','s','i','o','n','=','0', > + 'p','u','b','l','i','c','K','e','y','T','o','k','e','n','=','n','u','l', > + 'c','u','l','t','u','r','e','=','n','e','u','t','r','a','l',0}; You have 'nul' here, not 'null'.

1 0

Clang warnings on OS X ML
by C.W. Betts 31 Jan '13

31 Jan '13

When compiling Wine using Clang, there are a bunch of warnings that pop up, such as: ld: warning: could not create compact unwind for .L__wine_spec_call16_p_pw: dwarf uses DW_CFA_same_value ld: warning: could not create compact unwind for ___wine_stub_VARBSTRFROMR8: stack subq instruction is too different from dwarf stack size On win16 DLLs. And these warnings are with general DLL: ld: warning: could not create compact unwind for ___wine_stub__aullshr: stack subq instruction is too different from dwarf stack size ld: warning: could not create compact unwind for .L__wine_spec_relay_entry_point_52: stack subq instruction is too different from dwarf stack size Another worrying warning is that __force_align_arg_pointer__ being an unknown attribute. There's also a lot of enum conversion warnings. There was also a linker warning about register usage, but I can't seem to find it again. I could upload the whole log, but it is fairly large: 6.4 MB.

2 1

Re: [website] Added Simplified Chinese translation
by Qian Hong 31 Jan '13

31 Jan '13

On Thu, Jan 31, 2013 at 11:34 AM, Jactry Zeng <jactry92(a)gmail.com> wrote: > Hi folks, > this is Simplified Chinese translation for Wine's website The translation looks good to me, thanks for the great work! -- Regards, Qian Hong - Sent from Ubuntu http://www.ubuntu.com/

1 0

[PATCH for valgrind] coregrind: implement GS override for arch_prctl on linux
by Maarten Lankhorst 30 Jan '13

30 Jan '13

Allows wine64 to run in valgrind! Apply with -Np0. :D Yes I know that %gs is still zero on linux amd64. Details details.. Signed-off-by: Maarten Lankhorst <maarten.lankhorst(a)ubuntu.com> --- Index: coregrind/m_translate.c =================================================================== --- coregrind/m_translate.c (revision 13279) +++ coregrind/m_translate.c (working copy) @@ -1486,7 +1486,7 @@ # if defined(VGP_amd64_linux) vex_abiinfo.guest_amd64_assume_fs_is_zero = True; # endif -# if defined(VGP_amd64_darwin) +# if defined(VGP_amd64_darwin) || defined(VGP_amd64_linux) vex_abiinfo.guest_amd64_assume_gs_is_0x60 = True; # endif # if defined(VGP_ppc32_linux) Index: coregrind/m_syswrap/syswrap-amd64-linux.c =================================================================== --- coregrind/m_syswrap/syswrap-amd64-linux.c (revision 13279) +++ coregrind/m_syswrap/syswrap-amd64-linux.c (working copy) @@ -564,6 +564,16 @@ *(unsigned long *)ARG2 = tst->arch.vex.guest_FS_ZERO; POST_MEM_WRITE(ARG2, sizeof(unsigned long)); } + else if (ARG1 == VKI_ARCH_SET_GS) { + tst = VG_(get_ThreadState)(tid); + tst->arch.vex.guest_GS_0x60 = ARG2; + } + else if (ARG1 == VKI_ARCH_GET_GS) { + PRE_MEM_WRITE("arch_prctl(addr)", ARG2, sizeof(unsigned long)); + tst = VG_(get_ThreadState)(tid); + *(unsigned long *)ARG2 = tst->arch.vex.guest_GS_0x60; + POST_MEM_WRITE(ARG2, sizeof(unsigned long)); + } else { VG_(core_panic)("Unsupported arch_prtctl option"); }

1 0

Re: [PATCH 8/8] wininet: Get rid of WORKREQ* types
by Juan Lang 30 Jan '13

30 Jan '13

Hi Jacek, just wanted to say these series of patches make me happy :) lpfnHungarianNotationDieDieDie ;) --Juan

1 0

Re: windowscodecs: Implement GetThumbnail in the ICO frame decoder.
by Hans Leidekker 30 Jan '13

30 Jan '13

On Wed, 2013-01-30 at 18:02 +0800, Dmitry Timoshkov wrote: > diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c > index 7aec245..da5a733 100644 > --- a/dlls/windowscodecs/icoformat.c > +++ b/dlls/windowscodecs/icoformat.c > @@ -200,8 +200,12 @@ static HRESULT WINAPI IcoFrameDecode_GetColorContexts(IWICBitmapFrameDecode *ifa > static HRESULT WINAPI IcoFrameDecode_GetThumbnail(IWICBitmapFrameDecode *iface, > IWICBitmapSource **ppIThumbnail) > { > - FIXME("(%p,%p)\n", iface, ppIThumbnail); > - return E_NOTIMPL; > + TRACE("(%p,%p)\n", iface, ppIThumbnail); > + > + if (!ppIThumbnail) return E_INVALIDARG; > + > + *ppIThumbnail = NULL; > + return WINCODEC_ERR_CODECNOTHUMBNAIL; > } The test added by 6395af1ae7b0cc5f2f1f82796502e2a605bc5a6b says otherwise, GetThumbnail is supported for ICO frames.

2 3

Re: [2/6] windowscodecs: Implement ComponentFactory::CreateEncoderPropertyBag
by Alexandre Julliard 29 Jan '13

29 Jan '13

Ludger Sprenker <Ludger(a)sprenker.net> writes: > Previous "[2/5]" should have been "[3/6]" ... It doesn't build on Mac: gcc -m32 -c -I. -I. -I../../include -I../../include -D__WINESRC__ -DENTRY_PREFIX=WIC_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wstrict-prototypes -Wwrite-strings -gstabs+ -fno-omit-frame-pointer -Wpointer-arith -I/sw/include/freetype2 -I/sw/include -I/sw/include -g -O2 -o icnsformat.o icnsformat.c icnsformat.c: In function 'IcnsEncoder_CreateNewFrame': icnsformat.c:666: warning: passing argument 1 of 'CreatePropertyBag2' from incompatible pointer type icnsformat.c:666: error: too few arguments to function 'CreatePropertyBag2' -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: gdiplus: Avoid not necessary memory allocation for BITMAPINFO.
by Vincent Povirk 29 Jan '13

29 Jan '13

Did you try running the tests in valgrind with this change? You're essentially reverting 0ecd8daa16e4aa3df157a1175c611cdffc66d6fe which I think was done to make valgrind happy.

1 0

Re: kernel32: dstlen < 0 causes error in codepage conversion
by Alexandre Julliard 29 Jan '13

29 Jan '13

Alex Henrie <alexhenrie24(a)gmail.com> writes: > This is a pretty straightforward patch to resolve a couple of test > failures marked todo_wine. Hopefully it's not controversial, but if it > is, I am willing to make any reasonable modifications that are > communicated to me. If it was that easy it would have been done already. There are places in Wine that depend on being able to use negative sizes, so it would need a code review of all callers before we can make that change. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: winealsa: Have the MIDI recorder wait in poll(), not snd_seq_event_input().
by Johannes Kroll 29 Jan '13

29 Jan '13

On Thu, 24 Jan 2013 10:33:58 +0100 <Joerg-Cyril.Hoehle(a)t-systems.com> wrote: > Compare with wineoss which uses poll <= 0 already... > > Johannes Kroll mentioned that MIDIIn takes a long time to end. > Indeed, our testsuite ran 3 times into the "kill after 5s" timeout due to this bug. > Now the tests execute much faster. Just a quick note to confirm that this patch does fix the waiting problem for me. Thanks a lot! - Johannes

1 0

Re: riched20: ME_StrDup() is no longer used so remove it.
by Huw Davies 29 Jan '13

29 Jan '13

On Tue, Jan 29, 2013 at 07:05:13AM +0100, Francois Gouget wrote: > --- > dlls/riched20/editor.h | 1 - > dlls/riched20/string.c | 5 ----- > 2 files changed, 6 deletions(-) I'm about to send in a patch that uses this again, so please hold off on this one. Huw.

1 0

Re: winemenubuilder: Try to wait for creating icon files (try 2).
by Sergey Guralnik 29 Jan '13

29 Jan '13

On 2013-01-23 16:34, Sergey Guralnik wrote: > It supersedes next patch: > > From 4ca51cf16c5be2bcf34dddb7f33fe043c1d777c4 Mon Sep 17 00:00:00 > 2001 > From: Sergey Guralnik <serhio(a)etersoft.ru> > Date: Tue, 22 Jan 2013 15:58:20 +0200 > Subject: winemenubuilder: Use only existing file for icon creating. > > The logic is the same as before - wait for parent process termination > if > required icon file doesn't exist yet. But now used easier way to do > this. Is something wrong with this patch? It's in queue about a week without any feedback. -- Sergey

1 0

Re: [PATCH] winebuild: Use Clang to assemble if found. (try 5)
by Alexandre Julliard 28 Jan '13

28 Jan '13

Charles Davis <cdavis5x(a)gmail.com> writes: > Try 5: Don't use strstr(3). > > The configure script invokes the C compiler to figure out if .cfi > pseudo-ops are supported, on the assumption that it will invoke the > system assembler. Winebuild, on the other hand, invokes the system > assembler directly. This caused a problem on Mac OS hosts when compiling > with Clang: configure would detect that .cfi ops were supported, because > Clang's integrated assembler supports them; however, when winebuild then > emitted assembly with .cfi ops in them, the system assembler would then > choke. This patch makes winebuild invoke Clang's assembler if it is > found in the path. It's causing warnings on my Mac: clang: warning: /usr/bin/clang: 'linker' input unused when '-c' is present clang: warning: /usr/bin/clang: 'linker' input unused when '-c' is present -- Alexandre Julliard julliard(a)winehq.org

1 0

Why 0.1.0.0 as local socket address instead of 127.0.0.1?
by Francois Gouget 27 Jan '13

27 Jan '13

The ws2_32:sock fails on some of my machines with the following error: sock.c:4794: Test failed: Local socket address is different 0.1.0.0 != 127.0.0.1 Does anyone know why we GetAcceptExSockaddrs() would return 0.1.0.0 instead of 127.0.0.1? Looking at the Windows 7 winetest results it does not appear to be correlated with either the SP1 or IE9. For instance got an error on Windows 7 + SP1 + IE9 (32 and 64-bit): http://test.winehq.org/data/b233d2054e64e216a5b3868f301bfc934b019b4b/win7_f… http://test.winehq.org/data/b233d2054e64e216a5b3868f301bfc934b019b4b/win7_f… But not here (Windows 7 + SP1 + IE9 64-bit): http://test.winehq.org/data/83846cd131aac33228bf08aefae0bf0ea93d4273/win7_f… I also got it failing at least once on a Windows 2000 SP4 VM: http://test.winehq.org/data/b233d2054e64e216a5b3868f301bfc934b019b4b/2000_f… But never saw it fail on my Windows XP or 2003 VMs. -- Francois Gouget <fgouget(a)codeweavers.com>

2 1

FOSDEM logistics
by Jeremy White 27 Jan '13

27 Jan '13

Hi folks, Alright, this is it - we're going to try to get together at FOSDEM starting this Friday. If you are planning on being there, you should make sure to subscribe to the wineconf mailing list: http://www.winehq.org/mailman/listinfo/wineconf All further logistics emails and discussions will take place there. So if you're not subscribed, you can't complain we didn't try to include you in the planning. We plan on informally assembling in the lobby / bar of the Best Western Hotel Royal Centre (http://www.royalcentre.be/) on Friday, most likely starting in late afternoon. I don't have any plans for Saturday; I'll likely go harangue the Xorg guys, and maybe catch the key note. We may try to informally gather as well. However, there is no plan for Saturday dinner (sorry, no sponsored dinner by CodeWeavers this year). I have no idea how FOSDEM usually works on Saturday night, so I figured we'd just play it be year. Advice is welcome. Our devroom starts Sunday at 9:00 am. We're in building K, which you can see on this map: http://www.ulb.ac.be/campus/solbosch/plan-K.html Main FOSDEM entrance / registration is in building H on that map. One bit of unsolicited advice - when I naively copy/paste the address on the FOSDEM page into Google maps for directions, I end up with the wrong location. If you're at the Best Western, it looks like Tram 94 goes to the Legrand stop in 16 minutes, and then a 10 minute walk carries you the rest of the way there. Looking forward to seeing you all on Friday! Cheers, Jeremy

1 0

Re: wined3d: Rebind texture before checking for its content in check_fbo_compat().
by Stefan Dösinger 27 Jan '13

27 Jan '13

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2013-01-26 22:32, schrieb Matteo Bruni: > + > gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, > GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tex, 0); Do you really have to re-attach it to the FBO? Or does glBindTexture(GL_TEXTURE_2D, tex) work as well? -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJRBFTlAAoJEN0/YqbEcdMw7bcQAIfUM81xBr3zIpcEYek3gMso jXPq49+8Dp8Y3xiJGU/nFD8yLH9Y24SXpyageueCMWZR2jnEQcXBL0l76MmL5ZYK Y/L1ytRwrOvdXP07pJ8p3ZXxmA6hl82fuNxMvYhlSYP8PVCoobhaH7MwGp9WPpGF Ij20eOOR3GQnDjb6M2qHHfP9s+mNREu5NrvZ76NCf/lURXLJyDECuMz+6TbSl4CM qv0xCKdtqxm13gTZio3ftKc3QZZUSstiYjUYQmFh5NXQe5oIr9j2/iueU2K0zA/M CqswN4divbFFbh7QwCIDaubwfGidRfiwIG3lCCiNpfIvnowQouELIoFKjIipQ1AL ihIIS7iyekasAxkErVZ3E8O8IJCKYbTC+tAXBfK3niKmSRfdUB9cmfo5nVZw4Xjb 3/Zz84WnjMlIznyBGsKyKX+VLKlqzXY5zCyboHuEWPxTXdS0FAbwHzz06Kv0zIqc Pe4X6dJOUz6EPnx2gkbtFygGFbAa8haWhiIcY01H1bMSa7NnZPU3QgQXimrvXaKK SbQofZfhbNSVv0dL1kxqUYeLPb5hKXqMRHO7yi/GeyejTie9onzjxrjt4zn4rxe3 9IEZ0ymUYs499ahUnW/DAe0yFJvX+EXiPIiWwLBGVpx/Dzduk0WADOLBaN/YwrEz 1gxkuQjF2tbVSTkP41yr =xi8z -----END PGP SIGNATURE-----

3 3

Implement D3DXSHEvalConeLight
by Nozomi Kodama 26 Jan '13

26 Jan '13

Hello what is the problem with the patch http://source.winehq.org/patches/data/93498 Nozomi

1 0

Re: [PATCH] gdi32: Adjust a fixed-pitch full-width character has double advance of a half-width character. (try 5)
by Alexandre Julliard 26 Jan '13

26 Jan '13

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > Hi, > > This patch enhances full-width character glyph advance when we choose > fixed-pitch font. > > Windows 2000 (or XP for Japanese) and later adjust fixed-pitch > full-width character glyph advances so that two half-width characters' > advance equals to one full-width character's advance. Because CJK > fixed-pitch font, such as MS Gothic, is designed as full-width character > (e.g. Kanji) has a double advance of half-width character (e.g. ASCII) > and many developpers expect that. > > Please refer Microsoft document KB 417434 [1] and white paper [2] for > details. > > [1] ... http://support.microsoft.com/kb/417434/ja (written in Japanese) > [2] ... http://msdn.microsoft.com/ja-jp/library/cc979401.aspx (written in Japanese) > > try 5: > - Add patch description above. > - Fix avgAdvance's rounding method. (as in get_outline_text_metrics) > - Refine a commit message, "Ensure" to "Adjust" and "double width" to > "double advance". > > try 4: > - Fix full-width character detection that causes test failure. > > try 3: > - Improve full-width character detection. > - Support fake italic transformation. > - Choose non-linked fonts in the test case. > - Add more trace messages. > > try 2: > - Add rotated transformation tests. > > Regards, > Akihiro Sagawa > > --- > dlls/gdi32/freetype.c | 37 ++++++++++++++++++-- > dlls/gdi32/tests/font.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 121 insertions(+), 3 deletions(-) This is still failing here: ../../../tools/runtest -q -P wine -M gdi32.dll -T ../../.. -p gdi32_test.exe.so font.c && touch font.ok font.c:2549: Tests skipped: Font Droid Arabic Naskh doesn't contain 'x', skipping the test font.c:2549: Tests skipped: Font Droid Sans Armenian doesn't contain 'x', skipping the test font.c:2549: Tests skipped: Font Droid Sans Ethiopic doesn't contain 'x', skipping the test font.c:2549: Tests skipped: Font Droid Sans Georgian doesn't contain 'x', skipping the test font.c:2549: Tests skipped: Font Droid Sans Hebrew doesn't contain 'x', skipping the test font.c:2549: Tests skipped: Font Droid Sans Hebrew doesn't contain 'x', skipping the test font.c:3008: Tests skipped: Unable to retrieve first and last glyphs from cmap font.c:2549: Tests skipped: Font Droid Sans Japanese doesn't contain 'x', skipping the test font.c:2549: Tests skipped: Font Droid Sans Thai doesn't contain 'x', skipping the test font.c:2549: Tests skipped: Font OpenSymbol doesn't contain 'x', skipping the test font.c:2549: Tests skipped: Font rsfs10 doesn't contain 'x', skipping the test font.c:3756: Test failed: expected 19, got 0 (@IPAGothic:128) make[1]: *** [font.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH] winebuild: Use Clang to assemble if found. (try 4)
by Alexandre Julliard 25 Jan '13

25 Jan '13

Charles Davis <cdavis5x(a)gmail.com> writes: > @@ -346,13 +352,26 @@ struct strarray *get_as_command(void) > struct strarray *args = strarray_init(); > > if (!as_command) > + as_command = find_tool( "clang", NULL ); > + > + if (!as_command) > { > static const char * const commands[] = { "gas", "as", NULL }; > as_command = find_tool( "as", commands ); > } > + > + if (!as_command) > + fatal_error( "cannot find suitable assembler\n" ); > + > strarray_add_one( args, as_command ); > > - if (force_pointer_size) > + if (strstr( as_command, "clang" )) It's looking better, but strstr is not appropriate here. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/2] jscript: Fixed a leak in regexp_match function
by Marcus Meissner 25 Jan '13

25 Jan '13

On Fri, Jan 25, 2013 at 04:26:59PM +0100, Piotr Caban wrote: > --- > dlls/jscript/regexp.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > > diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c > index 0d66551..fa2668c 100644 > --- a/dlls/jscript/regexp.c > +++ b/dlls/jscript/regexp.c > @@ -3466,10 +3466,15 @@ static HRESULT regexp_match(script_ctx_t *ctx, jsdisp_t *dispex, jsstr_t *str, B > break; > > if(ret_size == i) { > - if(ret) > - ret = heap_realloc(ret, (ret_size <<= 1) * sizeof(match_result_t)); > - else > + if(ret) { > + match_result_t *old_ret = ret; > + > + ret = heap_realloc(old_ret, (ret_size <<= 1) * sizeof(match_result_t)); > + if(!ret) > + heap_free(old_ret); Should be probably if (ret) heap_free(old_ret); here. > + }else { > ret = heap_alloc((ret_size=4) * sizeof(match_result_t)); > + } > if(!ret) { > hres = E_OUTOFMEMORY; > break; > >

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