November 2011 - Wine-commits

Francois Gouget : include: Move the language and sort macros to winnt.rh.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 5f6a8c2b6090fe57f9389afca3664a8d85b522e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f6a8c2b6090fe57f9389afca… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 7 16:42:25 2011 +0100 include: Move the language and sort macros to winnt.rh. --- include/Makefile.in | 1 + include/winnt.h | 406 +----------------------------------------------- include/winnt.rh | 437 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/winresrc.h | 2 +- 4 files changed, 440 insertions(+), 406 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f6a8c2b6090fe57f9389…

1 0

Francois Gouget : winealsa.drv: Delete the g_sessions_lock critical section when unloading the dll.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 9b55cc9e6fdd33c4c9a11ea21e0683b0952fe666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b55cc9e6fdd33c4c9a11ea21… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 7 16:52:40 2011 +0100 winealsa.drv: Delete the g_sessions_lock critical section when unloading the dll. --- dlls/winealsa.drv/mmdevdrv.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 25693c0..bc1ca94 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -219,12 +219,19 @@ static inline SessionMgr *impl_from_IAudioSessionManager2(IAudioSessionManager2 BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { - if(reason == DLL_PROCESS_ATTACH){ + switch (reason) + { + case DLL_PROCESS_ATTACH: g_timer_q = CreateTimerQueue(); if(!g_timer_q) return FALSE; - } + break; + case DLL_PROCESS_DETACH: + g_sessions_lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&g_sessions_lock); + break; + } return TRUE; }

1 0

Francois Gouget : winecoreaudio.drv: Give a name to the midi and mmdevapi critical sections.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: cfce8ab45961b974a01a4745ee4e8b41f539a666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfce8ab45961b974a01a4745e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 7 17:10:26 2011 +0100 winecoreaudio.drv: Give a name to the midi and mmdevapi critical sections. --- dlls/winecoreaudio.drv/midi.c | 2 ++ dlls/winecoreaudio.drv/mmdevdrv.c | 19 ++++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index a50fc78..55d04b5 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -126,6 +126,7 @@ LONG CoreAudio_MIDIInit(void) if (MIDIIn_NumDevs > 0) { InitializeCriticalSection(&midiInLock); + midiInLock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": midiInLock"); MIDIInThreadPortName = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("MIDIInThreadPortName.%u"), getpid()); CreateThread(NULL, 0, MIDIIn_MessageThread, NULL, 0, NULL); @@ -207,6 +208,7 @@ LONG CoreAudio_MIDIRelease(void) CFMessagePortSendRequest(messagePort, 1, NULL, 0.0, 0.0, NULL, NULL); CFRelease(messagePort); + midiInLock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&midiInLock); } diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index a35f18c..c6f2382 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -172,6 +172,13 @@ typedef struct _SessionMgr { static HANDLE g_timer_q; static CRITICAL_SECTION g_sessions_lock; +static CRITICAL_SECTION_DEBUG g_sessions_lock_debug = +{ + 0, 0, &g_sessions_lock, + { &g_sessions_lock_debug.ProcessLocksList, &g_sessions_lock_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": g_sessions_lock") } +}; +static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, 0 }; static struct list g_sessions = LIST_INIT(g_sessions); static HRESULT AudioClock_GetPosition_nolock(ACImpl *This, UINT64 *pos, @@ -231,14 +238,19 @@ static inline SessionMgr *impl_from_IAudioSessionManager2(IAudioSessionManager2 BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { - if(reason == DLL_PROCESS_ATTACH){ + switch (reason) + { + case DLL_PROCESS_ATTACH: g_timer_q = CreateTimerQueue(); if(!g_timer_q) return FALSE; + break; - InitializeCriticalSection(&g_sessions_lock); + case DLL_PROCESS_DETACH: + g_sessions_lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&g_sessions_lock); + break; } - return TRUE; } @@ -777,6 +789,7 @@ static AudioSession *create_session(const GUID *guid, IMMDevice *device, list_add_head(&g_sessions, &ret->entry); InitializeCriticalSection(&ret->lock); + ret->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": AudioSession.lock"); session_init_vols(ret, num_channels);

1 0

Nikolay Sivov : msxml3: Implement get_line() and get_linepos().
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 945dccb7d60afd636bca380e80e14f7aa3f107c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=945dccb7d60afd636bca380e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 4 23:26:53 2011 +0300 msxml3: Implement get_line() and get_linepos(). --- dlls/msxml3/parseerror.c | 23 +++++++++++++++-------- dlls/msxml3/tests/domdoc.c | 26 ++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c index b8cc381..c461095 100644 --- a/dlls/msxml3/parseerror.c +++ b/dlls/msxml3/parseerror.c @@ -135,13 +135,10 @@ static HRESULT WINAPI parseError_GetTypeInfo( ITypeInfo** ppTInfo ) { parse_error_t *This = impl_from_IXMLDOMParseError( iface ); - HRESULT hr; TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - hr = get_typeinfo(IXMLDOMParseError_tid, ppTInfo); - - return hr; + return get_typeinfo(IXMLDOMParseError_tid, ppTInfo); } static HRESULT WINAPI parseError_GetIDsOfNames( @@ -255,8 +252,13 @@ static HRESULT WINAPI parseError_get_line( LONG *line ) { parse_error_t *This = impl_from_IXMLDOMParseError( iface ); - FIXME("(%p)->(%p)\n", This, line); - return E_NOTIMPL; + + TRACE("(%p)->(%p): stub\n", This, line); + + if (!line) return E_INVALIDARG; + + *line = This->line; + return S_OK; } static HRESULT WINAPI parseError_get_linepos( @@ -264,8 +266,13 @@ static HRESULT WINAPI parseError_get_linepos( LONG *linepos ) { parse_error_t *This = impl_from_IXMLDOMParseError( iface ); - FIXME("(%p)->(%p)\n", This, linepos); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, linepos); + + if (!linepos) return E_INVALIDARG; + + *linepos = This->linepos; + return S_OK; } static HRESULT WINAPI parseError_get_filepos( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index a883da0..eeff419 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10752,6 +10752,31 @@ static void test_dispex(void) free_bstrs(); } +static void test_parseerror(void) +{ + IXMLDOMParseError *error; + IXMLDOMDocument *doc; + HRESULT hr; + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_get_parseError(doc, &error); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMParseError_get_line(error, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + hr = IXMLDOMParseError_get_srcText(error, NULL); + todo_wine EXPECT_HR(hr, E_INVALIDARG); + + hr = IXMLDOMParseError_get_linepos(error, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + IXMLDOMParseError_Release(error); + + IXMLDOMDocument_Release(doc); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -10824,6 +10849,7 @@ START_TEST(domdoc) test_selection(); test_load(); test_dispex(); + test_parseerror(); test_xsltemplate();

1 0

Nikolay Sivov : msxml3: Implement get_srcText().
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 9397fb2ad76f4ea581313f3b28e90dc7eb5eb909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9397fb2ad76f4ea581313f3b2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 4 23:27:39 2011 +0300 msxml3: Implement get_srcText(). --- dlls/msxml3/parseerror.c | 10 ++++++++-- dlls/msxml3/tests/domdoc.c | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c index c461095..3d32b32 100644 --- a/dlls/msxml3/parseerror.c +++ b/dlls/msxml3/parseerror.c @@ -243,8 +243,14 @@ static HRESULT WINAPI parseError_get_srcText( BSTR *srcText ) { parse_error_t *This = impl_from_IXMLDOMParseError( iface ); - FIXME("(%p)->(%p)\n", This, srcText); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, srcText); + + if (!srcText) return E_INVALIDARG; + + *srcText = SysAllocString(This->srcText); + + return S_OK; } static HRESULT WINAPI parseError_get_line( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index eeff419..197a5ac 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10767,7 +10767,7 @@ static void test_parseerror(void) EXPECT_HR(hr, E_INVALIDARG); hr = IXMLDOMParseError_get_srcText(error, NULL); - todo_wine EXPECT_HR(hr, E_INVALIDARG); + EXPECT_HR(hr, E_INVALIDARG); hr = IXMLDOMParseError_get_linepos(error, NULL); EXPECT_HR(hr, E_INVALIDARG);

1 0

Nikolay Sivov : msxml3: Some tests to show that leading spaces are not allowed for xml stream.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 674fb3c096b2be0e5976575efa7cc5c3e27297d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=674fb3c096b2be0e5976575ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 5 12:04:18 2011 +0300 msxml3: Some tests to show that leading spaces are not allowed for xml stream. --- dlls/msxml3/tests/domdoc.c | 33 ++++++++++++++++++++++++++++----- 1 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 197a5ac..54ec8fc 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1737,6 +1737,15 @@ static const char xpath_simple_list[] = " <d/>" "</root>"; +static const char* leading_spaces[] = { + "\n<?xml version=\"1.0\"?><root/>", + " <?xml version=\"1.0\"?><root/>", + "\t<?xml version=\"1.0\"?><root/>", + "\r\n<?xml version=\"1.0\"?><root/>", + "\r<?xml version=\"1.0\"?><root/>", + 0 +}; + static const WCHAR szNonExistentFile[] = { 'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', '.', 'x', 'm', 'l', 0 }; @@ -1999,7 +2008,7 @@ static char *list_to_string(IXMLDOMNodeList *list) static void test_domdoc( void ) { - HRESULT r; + HRESULT r, hr; IXMLDOMDocument *doc; IXMLDOMParseError *error; IXMLDOMElement *element = NULL; @@ -2016,6 +2025,7 @@ static void test_domdoc( void ) LONG code; LONG nLength = 0; WCHAR buff[100]; + const char **ptr; doc = create_document(&IID_IXMLDOMDocument); if (!doc) return; @@ -2027,14 +2037,27 @@ if (0) } /* try some stupid things */ - r = IXMLDOMDocument_loadXML( doc, NULL, NULL ); - ok( r == S_FALSE, "loadXML succeeded\n"); + hr = IXMLDOMDocument_loadXML( doc, NULL, NULL ); + EXPECT_HR(hr, S_FALSE); b = VARIANT_TRUE; - r = IXMLDOMDocument_loadXML( doc, NULL, &b ); - ok( r == S_FALSE, "loadXML succeeded\n"); + hr = IXMLDOMDocument_loadXML( doc, NULL, &b ); + EXPECT_HR(hr, S_FALSE); ok( b == VARIANT_FALSE, "failed to load XML string\n"); + /* load document with leading spaces */ + ptr = leading_spaces; + while (*ptr) + { + b = VARIANT_TRUE; + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = _bstr_(*ptr); + hr = IXMLDOMDocument_load( doc, var, &b); + EXPECT_HR(hr, S_FALSE); + ok( b == VARIANT_FALSE, "got %x\n", b); + ptr++; + } + /* try to load a document from a nonexistent file */ b = VARIANT_TRUE; str = SysAllocString( szNonExistentFile );

1 0

Nikolay Sivov : msxml3: Test that IXMLHTTPRequest doesn' t support IDispatchEx.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: ff0bc51f9de209f1a165b6ce7c3d983bc8e52544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff0bc51f9de209f1a165b6ce7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 5 12:27:55 2011 +0300 msxml3: Test that IXMLHTTPRequest doesn't support IDispatchEx. --- dlls/msxml3/httprequest.c | 5 +---- dlls/msxml3/tests/domdoc.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 0265c1a..32cfc2c 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -607,13 +607,10 @@ static HRESULT WINAPI httprequest_GetTypeInfo(IXMLHTTPRequest *iface, UINT iTInf LCID lcid, ITypeInfo **ppTInfo) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); - HRESULT hr; TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - hr = get_typeinfo(IXMLHTTPRequest_tid, ppTInfo); - - return hr; + return get_typeinfo(IXMLHTTPRequest_tid, ppTInfo); } static HRESULT WINAPI httprequest_GetIDsOfNames(IXMLHTTPRequest *iface, REFIID riid, diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 54ec8fc..b124eaa 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10671,6 +10671,7 @@ static void test_dispex(void) IXMLDOMParseError *error; IXMLDOMNamedNodeMap *map; IXMLDOMDocument *doc; + IXMLHTTPRequest *req; IXMLDOMElement *elem; IDispatchEx *dispex; IXMLDOMNode *node; @@ -10772,6 +10773,17 @@ static void test_dispex(void) IXMLDOMElement_Release(elem); IXMLDOMDocument_Release(doc); + + /* IXMLHTTPRequest */ + hr = CoCreateInstance(&CLSID_XMLHTTPRequest, NULL, CLSCTX_INPROC_SERVER, + &IID_IXMLHttpRequest, (void**)&req); + if (hr == S_OK) + { + hr = IXMLHTTPRequest_QueryInterface(req, &IID_IDispatchEx, (void**)&dispex); + EXPECT_HR(hr, E_NOINTERFACE); + IXMLHTTPRequest_Release(req); + } + free_bstrs(); }

1 0

Nikolay Sivov : msxml3: Move XSLPattern test data to a table.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: de8e11f5d837465ee01063a0f2dd42e60eac6638 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de8e11f5d837465ee01063a0f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 6 19:08:45 2011 +0300 msxml3: Move XSLPattern test data to a table. --- dlls/msxml3/tests/domdoc.c | 560 +++++++++++++------------------------------- 1 files changed, 161 insertions(+), 399 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de8e11f5d837465ee0106…

1 0

Austin English : include: Define _WIN64 on sparc/powerpc64.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: d67275fed84e74072d202fc98c205f40c6d18b63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d67275fed84e74072d202fc98… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 7 13:51:48 2011 -0600 include: Define _WIN64 on sparc/powerpc64. --- include/basetsd.h | 2 +- include/msvcrt/crtdefs.h | 2 +- include/windef.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index 922c91c..698dd5c 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -36,7 +36,7 @@ extern "C" { * 64-bit. */ -#if defined(__x86_64__) && !defined(_WIN64) +#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__)) && !defined(_WIN64) #define _WIN64 #endif diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index bc017c4..06ce9c3 100644 --- a/include/msvcrt/crtdefs.h +++ b/include/msvcrt/crtdefs.h @@ -29,7 +29,7 @@ # error You cannot use both wine/port.h and msvcrt headers #endif -#if defined(__x86_64__) && !defined(_WIN64) +#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__)) && !defined(_WIN64) #define _WIN64 #endif diff --git a/include/windef.h b/include/windef.h index 8f5ea30..9cf98e7 100644 --- a/include/windef.h +++ b/include/windef.h @@ -37,7 +37,7 @@ extern "C" { /* Calling conventions definitions */ -#if defined(__x86_64__) && !defined(_WIN64) +#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__)) && !defined(_WIN64) #define _WIN64 #endif

1 0

Henri Verbeet : wined3d: Only report a broken pitch in wined3d_surface_map( ).
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 604d15400274a07f3eb0231688e2e09b6edb8355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=604d15400274a07f3eb023168… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 7 21:19:57 2011 +0100 wined3d: Only report a broken pitch in wined3d_surface_map(). We'd like the correct pitch for internal calls to wined3d_surface_get_pitch(). --- dlls/wined3d/surface.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1a44f72..4529ad0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3096,7 +3096,7 @@ DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) TRACE("surface %p.\n", surface); - if ((format->flags & (WINED3DFMT_FLAG_BLOCKS | WINED3DFMT_FLAG_BROKEN_PITCH)) == WINED3DFMT_FLAG_BLOCKS) + if (format->flags & WINED3DFMT_FLAG_BLOCKS) { /* Since compressed formats are block based, pitch means the amount of * bytes to the next row of block rather than the next row of pixels. */ @@ -3743,7 +3743,10 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, surface->surface_ops->surface_map(surface, rect, flags); - locked_rect->Pitch = wined3d_surface_get_pitch(surface); + if (format->flags & WINED3DFMT_FLAG_BROKEN_PITCH) + locked_rect->Pitch = surface->resource.width * format->byte_count; + else + locked_rect->Pitch = wined3d_surface_get_pitch(surface); if (!rect) {

1 0