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

Re: [PATCH 3/3] msvcrt: Updated spec file
by Alexandre Julliard 28 Apr '11

28 Apr '11

Piotr Caban <piotr(a)codeweavers.com> writes: > +@ cdecl -arch=win32 __p___argc() > +@ cdecl -arch=win32 __p___argv() > +@ cdecl -arch=win32 __p___initenv() > +@ cdecl -arch=win32 __p___mb_cur_max() MSVCRT____mb_cur_max_func > +@ cdecl -arch=win32 __p___wargv() > +@ cdecl -arch=win32 __p___winitenv() > +@ cdecl -arch=win32 __p__acmdln() > +@ cdecl -arch=win32 __p__amblksiz() > +@ cdecl -arch=win32 __p__commode() > +@ cdecl -arch=win32 __p__daylight() MSVCRT___p__daylight > +@ cdecl -arch=win32 __p__dstbias() > +@ cdecl -arch=win32 __p__environ() > +@ stub -arch=win32 __p__fileinfo #() > +@ cdecl -arch=win32 __p__fmode() > +@ cdecl -arch=win32 __p__iob() MSVCRT___iob_func > +@ stub -arch=win32 __p__mbcasemap #() > +@ cdecl -arch=win32 __p__mbctype() > +@ cdecl -arch=win32 __p__osver() > +@ cdecl -arch=win32 __p__pctype() MSVCRT___pctype_func > +@ cdecl -arch=win32 __p__pgmptr() > +@ stub -arch=win32 __p__pwctype #() > +@ cdecl -arch=win32 __p__timezone() MSVCRT___p__timezone > +@ cdecl -arch=win32 __p__tzname() > +@ cdecl -arch=win32 __p__wcmdln() > +@ cdecl -arch=win32 __p__wenviron() > +@ cdecl -arch=win32 __p__winmajor() > +@ cdecl -arch=win32 __p__winminor() > +@ cdecl -arch=win32 __p__winver() > +@ cdecl -arch=win32 __p__wpgmptr() I just changed this the other way around recently. These are exported in at least some 64-bit versions. -- Alexandre Julliard julliard(a)winehq.org

1 0

[PATCH] Add undocumented function to unify MultiByteToWideChar conversation
by Alexey Fisher 28 Apr '11

28 Apr '11

MultiByteToWideChar are called directly only from one function. All other colls in comctl32 go thrue this function. It was recovered with from dissassambled code. Signed-off-by: Alexey Fisher <bug-track(a)fisher-privat.net> --- dlls/comctl32/comctl32undoc.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index ff94051..6eb6c0f 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c @@ -560,6 +560,47 @@ INT WINAPI AddMRUStringW(HANDLE hList, LPCWSTR lpszString) } /************************************************************************** + * comctl_MultiByteToWideChar (internal) + * Convert Multibyte string to WideChar string. + * + * PARAMS + * CodePage [I] COdepage of lpMultiByteStr + * lpMultiByteStr [I] multibyte string + * + * RETURNS + * Pointer to lpWideCharStr [O] or NULL if failed. Do not forget to + * Free the lpWideCharStr after use! + */ +LPWSTR comctl_MultiByteToWideChar(UINT CodePage, LPCSTR lpMultiByteStr) +{ + LPWSTR lpWideCharStr; + int len; + + if (lpMultiByteStr == NULL || lpMultiByteStr == -1) + return NULL; + + if (IsBadReadPtr(lpMultiByteStr, 1)) + return NULL; + + len = MultiByteToWideChar(CodePage, NULL, lpMultiByteStr, -1, NULL, NULL); + if (!len) + len = 1; + + lpWideCharStr = LocalAlloc(len * sizeof(WCHAR), 0); + if (!lpWideCharStr) + return NULL; + + if (!MultiByteToWideChar(CodePage, 1, lpMultiByteStr, -1, + lpWideCharStr, len)) { + LocalFree(lpWideCharStr); + lpWideCharStr = NULL; + return NULL; + } + + return lpWideCharStr; +} + +/************************************************************************** * AddMRUStringA [COMCTL32.153] * * See AddMRUStringW. -- 1.7.4.1

3 6

Re: infosoft/tests: COM cleanup in infosoft.c.
by Marvin 27 Apr '11

27 Apr '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=10605 Your paranoid android. === WVISTAADM (32 bit infosoft) === infosoft.c:185: Test failed: failed infosoft.c:199: Test failed: failed === W2K8SE (32 bit infosoft) === infosoft.c:185: Test failed: failed infosoft.c:199: Test failed: failed === W7PRO (32 bit infosoft) === infosoft.c:185: Test failed: failed infosoft.c:199: Test failed: failed === W7PROX64 (32 bit infosoft) === infosoft.c:185: Test failed: failed infosoft.c:199: Test failed: failed === W7PROX64 (64 bit infosoft) === infosoft.c:185: Test failed: failed infosoft.c:199: Test failed: failed

2 1

Question on Conformance Test
by James McKenzie 27 Apr '11

27 Apr '11

All: I am writing a conformance test for the richedit function EM_FINDWORDBREAK. I realize that WindowsNT 4.0 is our base configuration and most of the values process the same. However, a couple of values process differently for Windows NT 4.0/Windows2000, WindowsXP/Windows2003 and Windows Vista onward. What would be the BEST method of annotating this: Per the development guide: ok ( GetLastError() == WINXP_ERROR || GetLastError() == WINNT40_ERROR, ...); or: ok ( GetLastError() == WINXP_ERROR || Broken (GetLastError() == WINNT40_ERROR)); In other words, should I avoid the use of Broken() in this case, as the returned value is correct? Thank you. James McKenzie

3 2

Re: wined3d: Track when the FBO is dirty. (try 4)
by Adam Martinson 27 Apr '11

27 Apr '11

On Tuesday 26 April 18:16:27 Henri Verbeet wrote: > This is mostly the same as the previous version. Yes, it's just rebased. I'm happy to change it however you see fit, but I need to know what you'd like changed and how.

1 0

winealsa.drv: Add mmdevapi driver.
by Joerg-Cyril.Hoehle＠t-systems.com 27 Apr '11

27 Apr '11

Andrew, + fmt->Format.nSamplesPerSec = 41100; + fmt->nSamplesPerSec != 41100 && 44100. IIRC, there was an error exactly like this somewhere in the old drivers. But why does your IsFormatSupported only accept 48kHz, 44.1, 22.050, etc.? Do the native drivers behave like this? Is this a reasonable subset such that Wine behaves the same on most HW (disregarding CONTINUOUS_RATE)? dump_fmt + TRACE("cbSize: %u\n", fmt->cbSize); Old Wine code contains several comments about never ever reading cbSize in the WAVE_FORMAT_PCM case because it's a potential read past the structure and may cause a segmentation fault. Is it not a valid concern anymore? WAVEFORMATEX contains the cbSize slot. However if the winmm:wave* functions pass through their argument to mmdevapi, it may well end up to be the smaller PCMWAVEFORMAT only. IsFormatSupported MSDN says that CoTaskMemFree will be used to free the output variable ppClosestMatch. Wine uses clone_format=>HeapAlloc to allocate it. Does CoTaskMemFree match HeapAlloc? I'd have expected CoTaskMemAlloc, but I've never used these OLE functions. + switch(fmt->wBitsPerSample){ + case 64: + if(!snd_pcm_format_mask_test(formats, SND_PCM_FORMAT_FLOAT64_LE)){ vs. + if(fmt->wBitsPerSample != 32){ + WARN("Unsupported float size: %u\n", fmt->wBitsPerSample); IsFormatSupported may accept 64 bit fp samples, but Initialize will refuse it. Did you add that code to hear about sound cards that process 64 bits so we know they exist? Regards, Jörg Höhle

3 4

Re: wined3d: Track when the FBO is dirty. (try 4)
by Adam Martinson 27 Apr '11

27 Apr '11

On Wednesday 27 Apr 2011 01:19:51 Stefan Dösinger wrote: > > > On Tuesday 26 April 2011 19:35:06 Adam Martinson wrote: > > - FIXME("Unrecognized D3DZBUFFERTYPE value %#x.\n", > > + WARN("treating unrecognized D3DZBUFFERTYPE value %#x as > WINED3DZB_TRUE.\n", > > stateblock->state.render_states[WINED3DRS_ZENABLE]); > > + /* falltrough */ > > + case WINED3DZB_TRUE: > Please provide a test for this. Will do, but this is for http://source.winehq.org/patches/data/73534 not http://source.winehq.org/patches/data/73533.

2 1

Re: wined3d: Track when the FBO is dirty. (try 4)
by Henri Verbeet 27 Apr '11

27 Apr '11

This is mostly the same as the previous version.

2 1

Question on Conformance Test
by Joerg-Cyril.Hoehle＠t-systems.com 27 Apr '11

27 Apr '11

Hi, James McKenzie wrote: >I realize that WindowsNT 4.0 is our base configuration IMHO that doesn't matter. Winecfg's default changed from w95 to w2k to xp while I was looking. >What would be the BEST method of annotating this: >ok ( GetLastError() == WINXP_ERROR || GetLastError() == WINNT40_ERROR, ...); >or: >ok ( GetLastError() == WINXP_ERROR || Broken (GetLastError() == WINNT40_ERROR)); You judge: - If you feel both results are quite logical, use ||. - I've used broken() to document which values Wine shall *not* return. That's IMHO an underestimated use of broken(). - OTOH, I've used || specifically when I thought Wine might/should perhaps change behavior in the future, such that no future patch would be needed to turn GetLastError() == WINXP_ERROR || broken(GetLastError() == WINNT40_ERROR) into broken(GetLastError() == WINXP_ERROR || GetLastError() == WINNT40_ERROR - ... which never prevented me from writing todo_wine ok(broken(NT.../*what Wine returns today*/) || XP /*what I want it to return*/, ... (rather than that, put broken last). Regards, Jörg Höhle

1 0

Re: wined3d: Track when the FBO is dirty. (try 4)
by Stefan Dösinger 26 Apr '11

26 Apr '11

On Tuesday 26 April 2011 19:35:06 Adam Martinson wrote: > - FIXME("Unrecognized D3DZBUFFERTYPE value %#x.\n", > + WARN("treating unrecognized D3DZBUFFERTYPE value %#x as WINED3DZB_TRUE.\n", > stateblock->state.render_states[WINED3DRS_ZENABLE]); > + /* falltrough */ > + case WINED3DZB_TRUE: Please provide a test for this.

1 1