August 2009 - Wine-devel - list.winehq.org

Re: netapi32/tests: Fix tests on Win7
by Austin English 24 Aug '09

24 Aug '09

On Mon, Aug 24, 2009 at 7:19 AM, Ge van Geldorp<ggeldorp(a)vmware.com> wrote: > Win7 no longer exports NetpGetComputerName() and returns a weird value for > totalEntries in the NetWkstaTransportEnum() call > > Changelog: > netapi32/tests: Fix tests on Win7 > --- > dlls/netapi32/tests/wksta.c | 8 ++++++-- > 1 files changed, 6 insertions(+), 2 deletions(-) @@ -173,7 +173,8 @@ static void run_wkstatransportenum_tests(void) ok(bufPtr != NULL, "got data back\n"); ok(entriesRead > 0, "read at least one transport\n"); - ok(totalEntries > 0, "at least one transport\n"); + ok(totalEntries > 0 || broken(totalEntries == 0) /* Win7 */, Should probably be win_skip rather than broken, so that a similar failure on wine isn't ignored. -- -Austin

1 0

Re: kernel32/tests: Remove test that crashes on Win7
by Austin English 24 Aug '09

24 Aug '09

On Mon, Aug 24, 2009 at 7:15 AM, Ge van Geldorp<ggeldorp(a)vmware.com> wrote: > Changelog: > kernel32/tests: Remove test that crashes on Win7 > > --- > dlls/kernel32/tests/console.c | 12 +----------- > 1 files changed, 1 insertions(+), 11 deletions(-) Rather than removing it, should probably #if 0 it out, so that it's still documented and no one tries to add a similar test in the future. -- -Austin

2 1

Easy starter bug: implement extrac32
by Dan Kegel 24 Aug '09

24 Aug '09

http://bugs.winehq.org/show_bug.cgi?id=18097 Sounds pretty easy... somebody already tried to do it, but didn't finish: http://www.winehq.org/pipermail/wine-devel/2007-July/057886.html http://www.winehq.org/pipermail/wine-patches/2007-July/041280.html http://www.winehq.org/pipermail/wine-patches/2007-July/041144.html (That code was from Etersoft; I think they ship it in their version of Wine, but got tired of trying to get it upstream.)

4 4

Behavior of realloc vs. HeapReAlloc
by Paul Chitescu 24 Aug '09

24 Aug '09

Hi! While trying to debug a crash in msi.dll I noticed that the local msi_realloc() is implemented as a (too) thin wrapper around HeapReAlloc() and differs from the expected behavior of realloc() when the old pointer or the new size are zero. The runtime realloc() works like free() if the new size is zero and it works like alloc() if the old pointer is null. HeapReAlloc never allocates or completely frees memory. realloc: http://msdn.microsoft.com/en-us/library/xbebcx7d(VS.80).aspx HeapReAlloc: http://msdn.microsoft.com/en-us/library/aa366704(VS.85).aspx So I suggest all implementations of heap_realloc to be modified like: if (!size) { HeapFree(...) return 0; } else if (!mem) return HeapAlloc(...) else return HeapReAlloc(...) Any comments? Paul Chitescu

2 1

Re: [2/4] d3dx9: D3DXAssembleShader and D3DXAssembleShaderFromFile stubs
by Henri Verbeet 24 Aug '09

24 Aug '09

2009/8/21 Matteo Bruni <matteo.mystral(a)gmail.com>: > > +HRESULT WINAPI D3DXAssembleShaderFromFileA(LPCSTR pSrcFile, > + CONST D3DXMACRO* pDefines, > + LPD3DXINCLUDE pInclude, > + DWORD Flags, > + LPD3DXBUFFER* ppShader, > + LPD3DXBUFFER* ppErrorMsgs) > +{ > + LPWSTR pSrcFileW = NULL; > + DWORD len; > + HRESULT ret; > + > + if (!pSrcFile) return D3DXERR_INVALIDDATA; > + > + len = MultiByteToWideChar( CP_ACP, 0, pSrcFile, -1, NULL, 0 ); > + pSrcFileW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); > + MultiByteToWideChar( CP_ACP, 0, pSrcFile, -1, pSrcFileW, len ); > + ret=D3DXAssembleShaderFromFileW(pSrcFileW, pDefines, pInclude, Flags, ppShader, ppErrorMsgs); > + HeapFree( GetProcessHeap(), 0, pSrcFileW ); > + return ret; > +} It doesn't matter much which style you pick, but please try to keep it consistent (applies to the other patches as well). Note that HeapAlloc() might fail. Oh, and please don't use hungarian notation.

1 0

Re: [3/4] d3d10: Implement ID3D10Effect::GetVariableByIndex.
by Henri Verbeet 24 Aug '09

24 Aug '09

2009/8/21 Rico Schüller <kgbricola(a)web.de>: > + if( index < This->local_buffer_variable_count ) Please use consistent style. > + for (i = 0; i < This->local_buffer_count; ++i) > + { > + struct d3d10_effect_local_buffer *l = &This->local_buffers[i]; > + unsigned int j; > + > + for (j = 0; j < l->variable_count; ++j) > + { > + struct d3d10_effect_variable *v = &l->variables[j]; > + > + if (nr == index) > + { > + TRACE("Returning variable %p.\n", v); > + return (ID3D10EffectVariable *)v; > + } > + nr++; > + } > + } This is unnecessary, you can just keep subtracting "l->variable_count" from "index" until "l->variable_count > index", at which point "index" should have the right value to index "l->variables".

1 0

Re: [2/4] d3d10: Parse local variables.
by Henri Verbeet 24 Aug '09

24 Aug '09

2009/8/21 Rico Schüller <kgbricola(a)web.de>: > --- > dlls/d3d10/d3d10_private.h | 1 + > dlls/d3d10/effect.c | 64 > ++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 65 insertions(+), 0 deletions(-) > Are you sure these are incompatible with buffer variables?

1 0

Linking a winelib application with a windows dll
by Thomas Trummer 23 Aug '09

23 Aug '09

Hi, I have a windows dll without source code (vendor.dll) that I want to use in a winelib application. There are two problems however: 1) Creating a vendor.def file doesn't work. The resulting file has an empty EXPORTS section: winedump spec vendor.dll winebuild --def -E vendor.spec -o vendor.def 2) According to an older mailing post it should be possbile to use the .def file to link: winegcc -o test test.o -lvendor However, this fails: /usr/bin/ld: cannot find -lvendor collect2: ld returned 1 exit status winegcc: i486-linux-gnu-gcc failed Thomas

4 5

Re: programs/msiexec: sign compare fixes
by Jacek Caban 23 Aug '09

23 Aug '09

Hi Austin, static BOOL msi_strequal(LPCWSTR str1, LPCSTR str2) { - DWORD len, ret; + WCHAR len, ret; WCHAR doesn't look like a right type here. Although technically it's integer, it's meant for unicode chars. Jacek

1 0

Regressions when running WoW
by F Capela 23 Aug '09

23 Aug '09

I use Wine mostly to play World of Warcraft and I've had a regression in World of Warcraft (when running fullscreen inside a virtual desktop and using the opengl renderer) with patches from the last two weeks: - Patch 12d1ff8ef6c34533a20008f4cfeb73ee4c601a5d (winex11: Add handling of take focus event on the desktop window.) makes the fullscreen WoW inside the virtual desktop window lose focus when the mouse cursor returns to the virtual desktop window; as a consequence, WoW will minimize inside the virtual desktop whenever the mouse cursor leaves and then returns to the virtual desktop window. For some reason this does not happen if I use the DirectX renderer, only with the OpenGL one. - When the previous patch is reversed, patch e3720c2810dda3895d6734c55117b0a355223b1a (winex11: Use the Globally Active focus model with take focus.) makes the virtual desktop window unable to receive keyboard focus unless it is the only open window, and even then it's decoration will behave as if it hadn't focus. Mouse works fine. This is happening with the current vanilla git; with both above patches reversed the problem disappear. Not sure if this is important, but I'm using Kubuntu 9.04 with KDE 4.3 from the backports repository. Thanks, Fábio Oliveira Schmidt Capela fabio.capela(a)yahoo.com

3 2