January 2007 - Wine-Devel - list.winehq.org

Re: cmdlg32: update Russian translation

by Dmitry Timoshkov

"Vitaly Lipatov" <lav(a)etersoft.ru> wrote: > Changes: > Done Russian translation PD32_NO_DEVICES translation is missing a comma after 'Проверьте'. IDS_COLOR_MAROON translation has a spelling error. -- Dmitry.

Jan. 25, 2007

Re: [kernel32][tests][locale] Add test for CompareStringA for non latin symbols

by Dmitry Timoshkov

"Anatoly Lyutin" <vostok(a)etersoft.ru> wrote: > --- dlls/kernel32/tests/locale.c 5 Jan 2007 19:37:02 -0000 1.8 > +++ dlls/kernel32/tests/locale.c 24 Jan 2007 14:15:14 -0000 > @@ -35,6 +35,9 @@ > #include "winerror.h" > #include "winnls.h" > > +#include "locale.h" > +#include "tables_CP1251.h" I'd suggest to test specific strings instead of auto-generated tables. Since microsoft apparently uses their own unicode tables that differ from unicode.org ones that's almost impossible to get the exactly same behaviour among Wine and Windows. > +static int compare_string2_non_latin(const void *e1, const void *e2) > +{ > + const char *s1 = (char *)e1; > + const char *s2 = (char *)e2; > + > + return CompareStringA(LOCALE_USER_DEFAULT,0,s1,1, s2,1) - 2; > +} You need to directly specify the locale id, otherwise the test won't pass on a system with different user default locale (like the Alexandre's one). -- Dmitry.

Jan. 25, 2007

Re: winex11.drv: Copy the GL extensions string because it may be freed.

by Chris Robinson

On Wednesday 24 January 2007 21:51, Ken Thomases wrote: > + WineGLInfo.glExtensions = strdup((const char *) pglGetString(GL_EXTENSIONS)); Shouldn't this be free'd somewhere? What about the other strings?

Jan. 25, 2007

Patch to make X11DRV_GetAsyncKeyState work for TacOps

by Martin Cracauer

The appended patch against the CVS version fixes one issue for me. The game "TacOps" (a standalone 2D wargame, not to be mixed up with the Unreal mod "Tac Ops") uses home-grown scrollbars. They have autorepeat, that means holding the mouse button on the "down" or "up" icons will continue to scroll until you release the button. Without the appended patch Wine will never notice when you release the mouse button. That effectively means an application hang since you can never do anything else anymore, as the game continue to execute "down" autorepeat. To reproduce, download the demo at http://www.battlefront.com/products/tacops4/demo.html . Set up your units as per the instructions (place from floating window into the grey box). The scrollbars in question are under artillery support and under air support. Clicking on the up/down icons in the scrollbars will hang the application without the patch and will work with the patch. Please mail me if you want a better walkthrough. In case the patch attachment gets stripped by the list I put a copy of the patch here: http://www.cons.org/cracauer/wine-tacops-2.diff Martin -- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Martin Cracauer <cracauer(a)cons.org> http://www.cons.org/cracauer/ FreeBSD - where you want to go, today. http://www.freebsd.org/

Jan. 24, 2007

make crosstest broken (tmarshal)

by Stefan Leichter

Hello, the tmarshal tests broke cross compiling. Compiling fails for me with i586-mingw32msvc-gcc -c -I../../../../wine-git/dlls/oleaut32/tests -I. -I../../../../wine-git/include -I../../../include -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wwrite-strings -Wpointer-arith -g -O2 -o tmarshal.cross.o ../../../../wine-git/dlls/oleaut32/tests/tmarshal.c ../../../../wine-git/dlls/oleaut32/tests/tmarshal.c:1: warning: -fPIC ignored for target (all code is position independent) ../../../../wine-git/dlls/oleaut32/tests/tmarshal.c:28:22: tmarshal.h: Datei oder Verzeichnis nicht gefunden ../../../../wine-git/dlls/oleaut32/tests/tmarshal.c:218: warning: type defaults to `int' in declaration of `IWidgetVtbl' ../../../../wine-git/dlls/oleaut32/tests/tmarshal.c:218: warning: no semicolon at end of struct or union ... make[2]: *** [tmarshal.cross.o] Fehler 1 make[2]: Leaving directory `/usr/src/wine/wine-mingw/dlls/oleaut32/tests' make[1]: *** [oleaut32/tests/__crosstest__] Fehler 2 make[1]: Leaving directory `/usr/src/wine/wine-mingw/dlls' make: *** [dlls/__crosstest__] Fehler 2 The problem is related to the fact that i'm doing out of tree builds. Therefore i have three directories: 1. wine-git : the source tree 2. wine-build : the normal build (unix) 3. wine-mingw : the cross compile build The missing tmarshal.h file is in wine-build/dlls/oleauth32/tests Bye Stefan

Jan. 24, 2007

Re: riched20: Don't create undos in ME_StreamIn

by Alexandre Julliard

"Matt Finnicum" <mattfinn(a)gmail.com> writes: > This fixes bug 7148 - a regression caused by one of my older patches. > This restores the old code that prevented ME_StreamIn from erroneously > creating undos. > > Changelog: > riched20: Don't create undos in ME_StreamIn It breaks the tests: ../../../tools/runtest -q -P wine -M riched20.dll -T ../../.. -p riched20_test.exe.so editor.c && touch editor.ok editor.c:862: Test failed: EM_SETUNDOLIMIT didn't allow the first undo with UNDOLIMIT set to 2 editor.c:865: Test failed: EM_SETUNDOLIMIT didn't allow a second undo with UNDOLIMIT set to 2 editor.c:1447: Test failed: test paste: strcmp = -1 make[2]: *** [editor.ok] Error 3 -- Alexandre Julliard julliard(a)winehq.org

Jan. 24, 2007

Re: add support for slists

by Tomas Carnecky

Dmitry Timoshkov wrote: > And one more... > > "Damjan Jovanovic" <damjan.jov(a)gmail.com> wrote: > >> +__int64 interlocked_cmpxchg64( __int64 **dest, __int64 *xchg, __int64 >> *compare ) >> +{ >> + _lwp_mutex_lock( &interlocked_mutex ); >> + if (memcmp(*dest, compare, 8) == 0) >> + memcpy(*dest, xchg, 8); >> + else >> + memcpy(compare, *dest); >> + _lwp_mutex_unlock( &interlocked_mutex ); >> + return compare; >> +} > > Is there any particular reason that you use memcmp/memcpy instead of > directly manipulating 64-bit values? > also, compare is a pointer to __int64 but the return type is __int64. Doesn't gcc complain about that? tom

Jan. 24, 2007

Re: add support for slists

by Dmitry Timoshkov

And one more... "Damjan Jovanovic" <damjan.jov(a)gmail.com> wrote: > +__int64 interlocked_cmpxchg64( __int64 **dest, __int64 *xchg, __int64 *compare ) > +{ > + _lwp_mutex_lock( &interlocked_mutex ); > + if (memcmp(*dest, compare, 8) == 0) > + memcpy(*dest, xchg, 8); > + else > + memcpy(compare, *dest); > + _lwp_mutex_unlock( &interlocked_mutex ); > + return compare; > +} Is there any particular reason that you use memcmp/memcpy instead of directly manipulating 64-bit values? -- Dmitry.

Jan. 24, 2007

Re: add support for slists

by Dmitry Timoshkov

And some other problems with the patch: "Damjan Jovanovic" <damjan.jov(a)gmail.com> wrote: > --- a/include/winbase.h 2007-01-09 17:42:47.000000000 +0200 > +++ b/include/winbase.h 2007-01-24 09:50:04.000000000 +0200 > @@ -2343,6 +2343,14 @@ > > #endif /* __i386__ && __GNUC__ && __WINESRC__ && !_NTSYSTEM_ */ > > +#if (_WIN32_WINNT >= 0x0501) > +VOID WINAPI InitializeSListHead(PSLIST_HEADER); > +USHORT WINAPI QueryDepthSList(PSLIST_HEADER); > +PSLIST_ENTRY WINAPI InterlockedFlushSList(PSLIST_HEADER); > +PSLIST_ENTRY WINAPI InterlockedPopEntrySList(PSLIST_HEADER); > +PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY); > +#endif Usually Wine doesn't use and doesn't need the checks for _WIN32_WINNT and similar macros. There are a couple of violations to that rule, but they need to be fixed. libs/port/interlocked.c changes should be sent separately, please remove c++ comments from them first. -- Dmitry.

Jan. 24, 2007

Re: add support for slists

by Dmitry Timoshkov

"Damjan Jovanovic" <damjan.jov(a)gmail.com> wrote: > + kernel32 = LoadLibraryA("KERNEL32.DLL"); All the kernel32 tests are already implicitly linked to kernel32.dll, therefore GetModuleHandle("kernel32.dll") is perfectly enough and is guaranteed to succeed. > + if (kernel32 == NULL) > + { > + trace("couldn't open KERNEL32.DLL, skipping slist tests\n"); > + return; > + } There was a new Wine test function introduced to mark the skipped tests - skip(), please use it when a test is going to be skipped for whatever reason. > + pInitializeSListHead = (void*) GetProcAddress(kernel32, "InitializeSListHead"); > + pQueryDepthSList = (void*) GetProcAddress(kernel32, "QueryDepthSList"); > + pInterlockedFlushSList = (void*) GetProcAddress(kernel32, "InterlockedFlushSList"); > + pInterlockedPopEntrySList = (void*) GetProcAddress(kernel32, "InterlockedPopEntrySList"); > + pInterlockedPushEntrySList = (void*) GetProcAddress(kernel32, "InterlockedPushEntrySList"); > + if (pInitializeSListHead == NULL || > + pQueryDepthSList == NULL || > + pInterlockedFlushSList == NULL || > + pInterlockedPopEntrySList == NULL || > + pInterlockedPushEntrySList == NULL) > + { > + trace("some required slist entrypoints were not found, skipping tests\n"); > + FreeLibrary(kernel32); > + } A 'return;' is missing here, as well as a skip() call. -- Dmitry.

Jan. 24, 2007