March 2011 - Wine-devel - list.winehq.org

Re: [2/5] d3dx9: Support triangulation of complex glyphs in D3DXCreateText.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Dylan Smith <dylan.ah.smith(a)gmail.com> writes: > +static void sort_vertex_indices(struct point2d_index *start, int count) > +{ > + struct point2d_index *current, *middle_value, *last; > + int below_count; > + > + if (count <= 1) > + return; > + > + /* quick sort */ > + last = start + count - 1; > + middle_value = last--; > + current = start; > + while (current <= last) > + { > + if (compare_vertex_indices(current, middle_value) < 0) { > + current++; > + } else { > + swap_vertex_indices(current, last); > + last--; > + } > + } > + swap_vertex_indices(current, middle_value); > + > + below_count = current - start; > + sort_vertex_indices(start, below_count); > + sort_vertex_indices(current + 1, count - below_count - 1); > +} Is there a reason for not using qsort? -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 4/4] d3d9: Surfaces always have resource type WINED3DRTYPE_SURFACE.
by Stefan Dösinger 08 Mar '11

08 Mar '11

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Actually I think we have a test that shows that if the surface is part of a texture it has resource type WINED3DRTYPE_TEXTURE. (Unverified, it's too late so I am too lazy to look for the exact test atm) Am 08.03.2011 um 19:41 schrieb Henri Verbeet: > --- > dlls/d3d9/device.c | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c > index 1dd6895..e008b31 100644 > --- a/dlls/d3d9/device.c > +++ b/dlls/d3d9/device.c > @@ -1081,8 +1081,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ColorFill(IDirect3DDevice9Ex *iface, > > /* This method is only allowed with surfaces that are render targets, or > * offscreen plain surfaces in D3DPOOL_DEFAULT. */ > - if (!(desc.usage & WINED3DUSAGE_RENDERTARGET) > - && (desc.pool != WINED3DPOOL_DEFAULT || desc.resource_type != WINED3DRTYPE_SURFACE)) > + if (!(desc.usage & WINED3DUSAGE_RENDERTARGET) && desc.pool != WINED3DPOOL_DEFAULT) > { > wined3d_mutex_unlock(); > WARN("Surface is not a render target, or not a stand-alone D3DPOOL_DEFAULT surface\n"); > -- > 1.7.3.4 > > > -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.17 (Darwin) iQIcBAEBAgAGBQJNdrJeAAoJEN0/YqbEcdMwx3kP/0FGwYvZM7+YUz1atAfcpTQH mFsaWRKCMac9FHWHsoK++HyeN0R0F69NMnJzH33u2xxhrM6DvPfHsDrP0kcySHDN 3sVP/87U1cdHaVmURjnx6o0+3elj/IikmM0rGkTT3eityItp5hgj+OiizuD+wwQ5 jxrcsvI1tS4iZe+j+2s8zt1zJYhGNhJRI5n8IFCpPP3MXFqDPxxiUwua7MRweWx3 MRZQVkmJ4/3Jy5rTKjf4LROBqY2ZLP8Yeyo0jgAS3Wn+1LEJqKtgEhz03/rxGNPQ Lwpx+1gLsl2XonbZMPUXfhoE4ETi70S7OC2Z3EVOBY+XbEPRdEq6qIsoAQwFfHFQ AVo8qjSndjcd9sxQ4MQyarxHfRuL9OlCnO+WKfMOHo1WFdBg7I8uPrYKuZmlDZ2c lEwSOgh2Td0PCs0Gha0uqt8Gav5t1M40zKoGE2Lmd8gKAu4+Ot1IwbhU0tebaKMC JUD0d83oNgxbPsoKUdbbnq4oeDBMNnnFKQ18m9H7N1LABe9hzE13IfcxCfVLWfzk CtJlYWBeqa5hD5Chf1eNMuZEHyooaRhgy6Q0Vd5DVVpTMj9JzURIo7Mnb43GG9QT H7EkmVR2Ivn8ZHzF7nqeAJxqcWQKPmpn5/RTqapPbVx5mN7CYIICj5pvkJi8A0Zs Qvn8oiJ+qivoIPKlIyTP =Pm4w -----END PGP SIGNATURE-----

2 1

re: winegcc preprocessor macro containing wine version?
by Dan Kegel 08 Mar '11

08 Mar '11

Robert McDonald asked: > I want to be able to define a structure if I'm compiling with Wine 1.2.2 > but not with Wine 1.3.15, since the structure definition exists in the > latter but not the former. Is there a preprocessor macro pre-defined by > winegcc that holds the Wine version? #include "config.h" gives you PACKAGE_VERSION, but that's a string. Looking at 'git blame commctrl.h, I see that MCM_SETCALENDARBORDER is a preprocessor symbol of similar vintage to TASKDIALOG_BUTTON, testing for that should suffice. (But Wine doesn't implement task dialogs, hope you're not expecting them to work. There has been some interest in implementing it, and some code is floating around, but I haven't heard anything concrete yet.) - Dan

2 1

winealsa.drv: Waveout rewrite to allow multiple waveopens
by Joerg-Cyril.Hoehle＠t-systems.com 08 Mar '11

08 Mar '11

Maarten, let me apologize for barely taking the time to look at the extra patches you write outside of the main git tree. I hope other people find more time to try them out with real apps and report on their findings. Here are a few comments of mine on your winealsa rewrite (beside bug #22261, comment #6). - It's been a pleasure to hear mciwave+winealsa open multiple devices concurrently with dmix mixing all playing sounds thanks to this rewrite. - wodNotifyDoneList is called from within a critical section in wodTick(). This may break havoc with DCB_FUNCTION callbacks, as the driver does not appear to be re-entrant. EnterCriticalSection offers no protection from within the same thread. Some apps are known to call waveOutClose() from within the DONE callback. Of course you may delegate this issue to a solution to bug #3930. I'd be curious if you have any ideas about how to delay notification to a later point in time, "until it is safe to do" -- native appears to delay as well. - You may wish to look into bug #22880. Lemmix is a small (143KB) downloadable application that opens two waveout devices. It plays both music and sound effects on Mac OS using the winecoreaudio driver, but fails to do so with your ALSA driver, although both devices open and WINEDEBUG=+wave shows calls to waveOutWrite. I could not figure out what goes wrong. - I've seen old apps ask for ~7000 samples per second. Your limit of 8000 is too high. Here's a patch to use DSBFREQUENCY_* like the other devices do. Lemmix needs it (although I did not investigate why the msacm/pcmconverter did not kick in and resample to a higher frequency). >From 54224dbf35354036934d7791acafe0353cbef7bc Mon Sep 17 00:00:00 2001 From: =?utf-8?q?J=C3=B6rg=20H=C3=B6hle?= <hoehle(a)users.sourceforge.net> Date: Sat, 5 Mar 2011 19:28:00 +0100 Subject: winealsa: Use DSBFREQUENCY_* as lower and upper bounds. --- dlls/winealsa.drv/waveout.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 23560cc..b15164b 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -225,7 +225,7 @@ static DWORD wodGetDevCaps(waveimpl *dev, LPWAVEOUTCAPSW lpCaps, DWORD dwSize) { static snd_pcm_format_t get_format(WAVEFORMATEX *wfx) { WAVEFORMATEXTENSIBLE *wfe = (WAVEFORMATEXTENSIBLE *)wfx; - if (!wfx->nChannels || wfx->nSamplesPerSec < 8000 || wfx->nSamplesPerSec > 192000) + if (!wfx->nChannels || wfx->nSamplesPerSec < DSBFREQUENCY_MIN || wfx->nSamplesPerSec > DSBFREQUENCY_MAX) return SND_PCM_FORMAT_UNKNOWN; if (wfx->wFormatTag == WAVE_FORMAT_PCM) { -- 1.5.6.3 Regards, Jörg Höhle

2 1

winegcc preprocessor macro containing wine version?
by Robert McDonald 08 Mar '11

08 Mar '11

I want to be able to define a structure if I'm compiling with Wine 1.2.2 but not with Wine 1.3.15, since the structure definition exists in the latter but not the former. Is there a preprocessor macro pre-defined by winegcc that holds the Wine version? Maybe that's not the best long-term solution but that will help for awhile. #if defined ...? typedef struct tagTASKDIALOG_BUTTON { int nButtonID; ctstr pszButtonText; } TASKDIALOG_BUTTON, MsgBoxOption; #else typedef TASKDIALOG_BUTTON MsgBoxOption; #endif -- Robert McDonald BitTorrent, Inc.

1 0

Re: widl: Pass the switchtype attribute from an alias to the base type
by Alexandre Julliard 08 Mar '11

08 Mar '11

Eric Kohl <eric.kohl(a)t-online.de> writes: > Hi, > > this patch ensures that client and server code for non-encapsulated > unions is generated correctly. The switchtype attribute must be passed > to from a type alias to the base type in order to get recognized by > write_union_tfs(). Modifying the base type doesn't seem right. You should add some test cases. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [1/2] wininet: Partially implement FreeUrlCacheSpaceW.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> writes: > + if (file == INVALID_HANDLE_VALUE) > + { > + if (GetLastError() == ERROR_SHARING_VIOLATION) > + { > + WCHAR title[128]; > + LoadStringW(WININET_hModule, IDS_CACHE_IN_USE, message, sizeof(message)/sizeof(*message)); > + LoadStringW(WININET_hModule, IDS_WARNING, title, sizeof(title)/sizeof(*title)); > + MessageBoxW(NULL, message, title, MB_OK); > + } I don't think you want to show message boxes, particularly not for such harmless errors. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: wininet(3/7): Account for disk space used by cache
by Alexandre Julliard 08 Mar '11

08 Mar '11

Juan Lang <juan.lang(a)gmail.com> writes: > +{ > + ULARGE_INTEGER currentSize, addedSize, limit; > + > + currentSize.u.LowPart = pHeader->dwCacheUsageLow; > + currentSize.u.HighPart = pHeader->dwCacheUsageHigh; > + addedSize.u.HighPart = fileSizeHigh; > + addedSize.u.LowPart = fileSizeLow; > + currentSize.QuadPart += addedSize.QuadPart; > + limit.u.LowPart = pHeader->dwCacheLimitLow; > + limit.u.HighPart = pHeader->dwCacheLimitHigh; > + if (commit) > + { > + pHeader->dwCacheUsageLow = currentSize.u.LowPart; > + pHeader->dwCacheUsageHigh = currentSize.u.HighPart; > + } > + return currentSize.QuadPart > limit.QuadPart; You should store the fields as large integer in the header structure, that would save a lot of redundant manipulations. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [3/3] msi: Assume a file is present if the target exists with the same size and there's no file version or hash to verif
by Marvin 08 Mar '11

08 Mar '11

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=9778 Your paranoid android. === WNT4WSSP6 (32 bit install) === install.c:5993: 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: [2/3] msi: Load media info even if there's no file to install.
by Marvin 08 Mar '11

08 Mar '11

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=9777 Your paranoid android. === WNT4WSSP6 (32 bit install) === install.c:5958: 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