December 2006 - Wine-devel - list.winehq.org

WineAlsa mmap patch
by Maarten Lankhorst 21 Dec '06

21 Dec '06

This changes the winealsa dsound driver to stop using asynchronous callbacks and use snd_pcm_wait instead, I'm welcoming testing. For me this fixes the mmap_crst deadlock. I don't know what caused the deadlock in the first place, but this seems to have fixed it somehow. My test was basically running max payne 2 on my old pc, for some reason it's prone to this bug. With this patch I didn't have this problem. Detlef Riekenberg helped me testing first (buggy version) and now I hopefully fixed all issues that were found in it. It's not entirely ready yet I think, I'm not satisfied with latency for non-direct hw access. Basically it is the same loop as for direct hardware access at the moment. That means increased latency, which I think is noticable. Welcoming all comments on it and experiences with it. Maarten

1 0

Re: libwine: Fix some typos
by Alexandre Julliard 21 Dec '06

21 Dec '06

Andrew Talbot <Andrew.Talbot(a)talbotville.com> writes: > I believe these identifiers are POSIX ones (from <sys/stat.h>), so they should > not possess one leading underscore (unlike the similar ones in "msvcrt"). These defines are meant for Windows, where they do have underscores. -- Alexandre Julliard julliard(a)winehq.org

2 3

STLPort 5.1 and winegcc / winelib
by gendo＠cox.net 21 Dec '06

21 Dec '06

I was wondering if anyone had tried STLPort 5 with winelib. From searching the archives it seems you need to swap out gcc/c++ for winegcc/wineg++ and pass the -mno-cygwin option. Doing that gives me these errors. make -f gcc.mak all wineg++ -pthread -mno-cygwin -fexceptions -fident -fPIC -O2 -fuse-cxa-atexit -D_REENTRANT -D_GNU_SOURCE -I../../stlport -c -o obj/gcc/so/dll_main.o ../../src/dll_main.cpp /usr/include/../include/stdlib.h:469: error: expected ‘;’ before ‘*’ token /usr/include/../include/stdlib.h:470: error: expected ‘;’ before ‘*’ token /usr/include/../include/stdlib.h:471: error: expected ‘;’ before ‘*’ token /usr/include/../include/stdlib.h:475: error: expected ‘;’ before ‘*’ token /usr/include/../include/stdlib.h:479: error: ‘int32_t’ has not been declared winegcc: g++ failed. make: *** [obj/gcc/so/dll_main.o] Error 2 Anyway these are probably from grabbing the system headers which I have read you should not have happen, but if I try to use a -isystem/usr/include/wine/msvcrt or -Isystem/usr/include/wine/msvcrt and -nostdinc++ you then get tons of errors about the stl headers missing exception, cstring, etc. I was wondering if anyone had any thoughts or ideas on how to get this compiled so it is usable is porting applications. Thanks

3 3

Re: msxml.dll: nextNode and reset functions
by Colin Pitrat 21 Dec '06

21 Dec '06

OK, I finally managed to cross-compile and run this test under windows and under wine. The patch (test and functions) works well. Colin Pitrat (Bull Services Telco) Bull, Architect of an Open World (TM) Tél : +33 (0) 1 30 80 72 93 www.bull.com Colin Pitrat wrote: > New version of this patch, including corrections suggested by Huw > Davies, a correction and the addition of a test case. > However, I didn't run the test case under Windows because I have a > problem when I run make crosstest : > Undefined reference to _IID_IXMLDOMDocument > and other similar messages with _IID_IXMLDOMNode, _IID_IXMLDOMElement... > > Maybe this error is related to a previous one when running make > crosstest in top directory, occuring for advpack : > Can't find -lcabinet > > Change Log: > Add an iterator to _xmlnodemap struct > Implement nextNode function that give nodes one by one > Implement resetNode that reset the iterator > Add a test case for these functions > > Colin Pitrat (Bull Services Telco) > Bull, Architect of an Open World (TM) > Tél : +33 (0) 1 30 80 72 93 > www.bull.com > > > Colin Pitrat wrote: >> Change Log: >> Add an iterator to _xmlnodemap struct >> Implement nextNode function that give nodes one by one >> Implement resetNode that reset the iterator >> >> It's my first patch, so please tell me if something is wrong. I saw on >> http://www.winehq.com/site/sending_patches that I should write a test >> case, but I don't know how to do this (do I need windows ? because I >> don't have it). >> >> >> ------------------------------------------------------------------------ >> >> diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c >> index 0797436..ead0138 100644 >> --- a/dlls/msxml3/nodemap.c >> +++ b/dlls/msxml3/nodemap.c >> @@ -44,6 +44,7 @@ typedef struct _xmlnodemap >> const struct ISupportErrorInfoVtbl *lpSEIVtbl; >> LONG ref; >> IXMLDOMNode *node; >> + long iterator; >> } xmlnodemap; >> >> static inline xmlnodemap *impl_from_IXMLDOMNamedNodeMap( >> IXMLDOMNamedNodeMap *iface ) >> @@ -297,15 +298,47 @@ static HRESULT WINAPI xmlnodemap_nextNod >> IXMLDOMNamedNodeMap *iface, >> IXMLDOMNode** nextItem) >> { >> - FIXME("\n"); >> - return E_NOTIMPL; >> + xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); >> + xmlNodePtr node; >> + xmlAttrPtr curr; >> + long attrIndex; >> + >> + TRACE("%p %ld\n", This, This->iterator); >> + >> + *nextItem = NULL; >> + >> + node = xmlNodePtr_from_domnode( This->node, 0 ); >> + curr = node->properties; >> + >> + for (attrIndex = 0; attrIndex < This->iterator; attrIndex++) { >> + if (curr->next == NULL) >> + return S_FALSE; >> + else >> + curr = curr->next; >> + } >> + >> + if (curr->next == NULL) >> + return S_FALSE; >> + else >> + curr = curr->next; >> + >> + This->iterator++; >> + + *nextItem = create_node( (xmlNodePtr) curr ); >> + >> + return S_OK; >> } >> >> static HRESULT WINAPI xmlnodemap_reset( >> IXMLDOMNamedNodeMap *iface ) >> { >> - FIXME("\n"); >> - return E_NOTIMPL; >> + xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); >> + >> + TRACE("%p %ld\n", This, This->iterator); >> + >> + This->iterator = 0; >> + >> + return S_OK; >> } >> >> static HRESULT WINAPI xmlnodemap__newEnum( >> > > ------------------------------------------------------------------------ > > diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c > index 0797436..5458542 100644 > --- a/dlls/msxml3/nodemap.c > +++ b/dlls/msxml3/nodemap.c > @@ -44,6 +44,7 @@ typedef struct _xmlnodemap > const struct ISupportErrorInfoVtbl *lpSEIVtbl; > LONG ref; > IXMLDOMNode *node; > + long iterator; > } xmlnodemap; > > static inline xmlnodemap *impl_from_IXMLDOMNamedNodeMap( IXMLDOMNamedNodeMap *iface ) > @@ -258,8 +259,8 @@ static HRESULT WINAPI xmlnodemap_get_len > > first = node->properties; > if (first == NULL) { > - *listLength = 0; > - return S_OK; > + *listLength = 0; > + return S_OK; > } > > curr = first; > @@ -297,15 +298,42 @@ static HRESULT WINAPI xmlnodemap_nextNod > IXMLDOMNamedNodeMap *iface, > IXMLDOMNode** nextItem) > { > - FIXME("\n"); > - return E_NOTIMPL; > + xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); > + xmlNodePtr node; > + xmlAttrPtr curr; > + long attrIndex; > + > + TRACE("%p %ld\n", This, This->iterator); > + > + *nextItem = NULL; > + > + node = xmlNodePtr_from_domnode( This->node, 0 ); > + curr = node->properties; > + > + for (attrIndex = 0; attrIndex < This->iterator; attrIndex++) { > + if (curr->next == NULL) > + return S_FALSE; > + else > + curr = curr->next; > + } > + > + This->iterator++; > + > + *nextItem = create_node( (xmlNodePtr) curr ); > + > + return S_OK; > } > > static HRESULT WINAPI xmlnodemap_reset( > IXMLDOMNamedNodeMap *iface ) > { > - FIXME("\n"); > - return E_NOTIMPL; > + xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); > + > + TRACE("%p %ld\n", This, This->iterator); > + > + This->iterator = 0; > + > + return S_OK; > } > > static HRESULT WINAPI xmlnodemap__newEnum( > @@ -389,6 +417,7 @@ IXMLDOMNamedNodeMap *create_nodemap( IXM > nodemap->lpSEIVtbl = &support_error_vtbl; > nodemap->node = node; > nodemap->ref = 1; > + nodemap->iterator = 0; > > IXMLDOMNode_AddRef( node ); > /* Since we AddRef a node here, we don't need to call xmldoc_add_ref() */ > diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c > index a2824fd..d8f08ac 100644 > --- a/dlls/msxml3/tests/domdoc.c > +++ b/dlls/msxml3/tests/domdoc.c > @@ -114,7 +114,10 @@ static void test_domdoc( void ) > r = CoCreateInstance( &CLSID_DOMDocument, NULL, > CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc ); > if( r != S_OK ) > + { > + printf("CoCreateInstance failed : %d\n",r); > return; > + } > > /* try some stupid things */ > r = IXMLDOMDocument_loadXML( doc, NULL, NULL ); > @@ -411,7 +414,7 @@ todo_wine > ok( node == NULL, "getNamedItem should have returned NULL\n"); > SysFreeString( str ); > > - /* test indexed access of attributes */ > + /* test indexed access of attributes */ > r = IXMLDOMNamedNodeMap_get_length( map, &count ); > ok ( r == S_OK, "get_length wrong code\n"); > ok ( count == 1, "get_length != 1\n"); > @@ -434,6 +437,23 @@ todo_wine > r = IXMLDOMNode_get_nodeName( node, NULL ); > ok ( r == E_INVALIDARG, "get_nodeName (NULL) wrong code\n"); > > + /* test sequential access of attributes */ > + node = NULL; > + r = IXMLDOMNamedNodeMap_nextNode( map, &node ); > + ok ( r == S_OK, "nextNode (first time) wrong code\n"); > + ok ( node != NULL, "nextNode, should be attribute\n"); > + > + r = IXMLDOMNamedNodeMap_nextNode( map, &node ); > + ok ( r != S_OK, "nextNode (second time) wrong code\n"); > + ok ( node == NULL, "nextNode, there is no attribute\n"); > + > + r = IXMLDOMNamedNodeMap_reset( map ); > + ok ( r == S_OK, "reset should return S_OK\n"); > + > + r = IXMLDOMNamedNodeMap_nextNode( map, &node ); > + ok ( r == S_OK, "nextNode (third time) wrong code\n"); > + ok ( node != NULL, "nextNode, should be attribute\n"); > + > /* content doesn't matter here */ > str = SysAllocString( szNonExistentFile ); > r = IXMLDOMNode_get_nodeName( node, &str ); >

1 0

[dinput] regression c17e06d5c0e456d3052a1b6de688956f87c59d3e: No need to copy default constant format. Use already defined static instead
by Christoph Frick 21 Dec '06

21 Dec '06

hiho with that patch: commit c17e06d5c0e456d3052a1b6de688956f87c59d3e Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Dec 10 14:15:08 2006 -0700 dinput: No need to copy default constant format. Use already defined static instead. :100644 100644 c5a35a1... 369c26d... M dlls/dinput/joystick_linuxinput.c The game Richard Burns Rally does no longer get any events. The game worked after some patches some month ago from me. As i had no intention on that pages to make things right but to make the game work i might have not picked the optimal solution. But this patches fixed all the apps, that worked with their own DataFormat. So the problem is like that: The old code copied the default constant format and applied caclulate_ids on it. So the dwTypes where set with proper MAKEINSTANCE(...) calls. So an app, that requested later its own data format with SetDataFormat using the data from EnumObjects. After the change now the default const has ANY_INSTANCE all over the place but the app request a certain instance - so on SetDataFormat there are no matches. So the big question is: is our SetDataFormat wrong or is this patch wrong? Please advice. -- cu

2 3

Re: gdi32: Extract the constituent TrueType files from Mac suitcase fonts into the user's caches directory and use these instead of the original suitcase.
by Pierre d'Herbemont 21 Dec '06

21 Dec '06

> +#ifdef WORDS_BIGENDIAN > +#define GET_BE_WORD(x) (x) > +#else > +#define GET_BE_WORD(x) ((((x) & 0xff) << 8) | (((x) & 0xff00) >> 8)) > +#endif This could be replaced by CoreFoundation's CFSwapInt16BigToHost, which might be a bit more efficient... Pierre.

1 0

Re: gdi32: Extract the constituent TrueType files from Mac suitcase fonts into the user's caches directory and use these instead of the original suitcase.
by Alexandre Julliard 21 Dec '06

21 Dec '06

Huw Davies <huw(a)codeweavers.com> writes: > + ret = malloc(sizeof(*ret)); > + if(!ret) > + { > + CloseResFile(res_ref); > + return NULL; > + } > + list_init(ret); It's better to avoid using malloc() in Wine. Also it seems to me it would be cleaner to return an array of char*, instead of a struct list that forces the caller to make assumptions about the type of the list elements. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: d3d9: Add a render target test
by Ivan Gyurdiev 21 Dec '06

21 Dec '06

H. Verbeet wrote: > On 20/12/06, H. Verbeet <hverbeet(a)gmail.com> wrote: >> This time as part of the device.c test. >> >> Changelog: >> - Add a render target test >> > Use the attached patch instead, the previous version doesn't apply. This test really belongs in stateblock.c, along with every other set <--> get test if you ask me, that's what the framework there was written for. It might be kind of a pain to get this particular one to work though, since changing the rendertarget is currently considered an "event", across which all other set/get tests are ran, but I'm sure it's possible. The question of whether stateblocks track render targets should be answered eventually...

1 0

Re: setupapi: Use GetSystemDirectory() rather than hardcoding 'system32'.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Francois Gouget <fgouget(a)codeweavers.com> writes: > @@ -87,13 +87,13 @@ static HINF search_for_inf(LPCVOID InfSpec, DWORD SearchControl) > HINF hInf = INVALID_HANDLE_VALUE; > WCHAR inf_path[MAX_PATH]; > > + static const WCHAR bslashW[] = {'\\',0}; > static const WCHAR infW[] = {'\\','i','n','f','\\',0}; > - static const WCHAR system32W[] = {'\\','s','y','s','t','e','m','3','2','\\',0}; > > if (SearchControl == INFINFO_REVERSE_DEFAULT_SEARCH) > { > - GetWindowsDirectoryW(inf_path, MAX_PATH); > - lstrcatW(inf_path, system32W); > + GetSystemDirectoryW(inf_path, MAX_PATH); > + lstrcatW(inf_path, bslashW); It's really supposed to hardcode system32, at least according to MSDN. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: usp10: impelment ScriptStringGetLogicalWidths
by Alexandre Julliard 20 Dec '06

20 Dec '06

Clinton Stimpson <cjstimpson(a)utwire.net> writes: > This patch implements ScriptStringGetLogicalWidths. > Update usp10.spec so it isn't a stub anymore. > Also added a test for this function. The test fails for me: ../../../tools/runtest -q -P wine -M usp10.dll -T ../../.. -p usp10_test.exe.so usp10.c && touch usp10.ok usp10.c:1297: Test failed: ScriptStringGetLogicalWidths should return index 4 = 10, not 5 -- Alexandre Julliard julliard(a)winehq.org

2 2