September 2010 - Wine-commits

Damjan Jovanovic : windowscodecs: Support ICO files with embedded PNGs.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 666940902db2c69334d8c56f068696e88b0f1dea URL: http://source.winehq.org/git/wine.git/?a=commit;h=666940902db2c69334d8c56f0… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Sep 29 21:24:08 2010 +0200 windowscodecs: Support ICO files with embedded PNGs. --- dlls/windowscodecs/icoformat.c | 49 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index f51b7d1..33fea1f 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -343,6 +343,52 @@ static HRESULT ReadIcoDib(IStream *stream, IcoFrameDecode *result) return hr; } +static HRESULT ReadIcoPng(IStream *stream, IcoFrameDecode *result) +{ + IWICBitmapDecoder *decoder = NULL; + IWICBitmapFrameDecode *sourceFrame = NULL; + IWICBitmapSource *sourceBitmap = NULL; + WICRect rect; + HRESULT hr; + + hr = PngDecoder_CreateInstance(NULL, &IID_IWICBitmapDecoder, (void**)&decoder); + if (FAILED(hr)) + goto end; + hr = IWICBitmapDecoder_Initialize(decoder, stream, WICDecodeMetadataCacheOnLoad); + if (FAILED(hr)) + goto end; + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &sourceFrame); + if (FAILED(hr)) + goto end; + hr = WICConvertBitmapSource(&GUID_WICPixelFormat32bppBGRA, (IWICBitmapSource*)sourceFrame, &sourceBitmap); + if (FAILED(hr)) + goto end; + hr = IWICBitmapFrameDecode_GetSize(sourceFrame, &result->width, &result->height); + if (FAILED(hr)) + goto end; + result->bits = HeapAlloc(GetProcessHeap(), 0, 4 * result->width * result->height); + if (result->bits == NULL) + { + hr = E_OUTOFMEMORY; + goto end; + } + rect.X = 0; + rect.Y = 0; + rect.Width = result->width; + rect.Height = result->height; + hr = IWICBitmapSource_CopyPixels(sourceBitmap, &rect, 4*result->width, + 4*result->width*result->height, result->bits); + +end: + if (decoder != NULL) + IWICBitmapDecoder_Release(decoder); + if (sourceFrame != NULL) + IWICBitmapFrameDecode_Release(sourceFrame); + if (sourceBitmap != NULL) + IWICBitmapSource_Release(sourceBitmap); + return hr; +} + static HRESULT WINAPI IcoDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, void **ppv) { @@ -576,8 +622,7 @@ static HRESULT WINAPI IcoDecoder_GetFrame(IWICBitmapDecoder *iface, hr = ReadIcoDib((IStream*)substream, result); break; case 0x474e5089: - FIXME("PNG decoding not supported\n"); - hr = E_FAIL; + hr = ReadIcoPng((IStream*)substream, result); break; default: FIXME("Unrecognized ICO frame magic: %x\n", magic);

1 0

Alexandre Julliard : winex11: Force setting the cursor again on the first mouse event in case the initial setting failed .
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 536fc57091a80135ac1d6a3fceda3e7a87389897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=536fc57091a80135ac1d6a3fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 30 17:07:24 2010 +0200 winex11: Force setting the cursor again on the first mouse event in case the initial setting failed. --- dlls/winex11.drv/window.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 68084d0..dade30e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -430,6 +430,10 @@ static void sync_window_cursor( struct x11drv_win_data *data ) SERVER_END_REQ; set_window_cursor( data->hwnd, cursor ); + + /* setting the cursor can fail if the window isn't created yet */ + /* so make sure that we try again once we receive a mouse event */ + data->cursor = (HANDLE)~0u; }

1 0

Alexandre Julliard : msi/tests: Avoid corrupting the pending file renames key on failure.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 9fe16f8ae9d955508221caf00f4e135c5854fc04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fe16f8ae9d955508221caf00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 30 13:42:37 2010 +0200 msi/tests: Avoid corrupting the pending file renames key on failure. --- dlls/msi/tests/install.c | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 345c63f..11b1de1 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -8995,17 +8995,18 @@ static char rename_ops[] = "PendingFileRenameOperations"; static void process_pending_renames(HKEY hkey) { char *buf, *src, *dst, *buf2, *buf2ptr; - DWORD size, buf2len = 0; + DWORD size; LONG ret; BOOL found = FALSE; ret = RegQueryValueExA(hkey, rename_ops, NULL, NULL, NULL, &size); - buf = HeapAlloc(GetProcessHeap(), 0, size); - buf2ptr = buf2 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - buf[0] = 0; + buf = HeapAlloc(GetProcessHeap(), 0, size + 1); + buf2ptr = buf2 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size + 1); ret = RegQueryValueExA(hkey, rename_ops, NULL, NULL, (LPBYTE)buf, &size); - ok(!ret, "RegQueryValueExA failed %d (%u)\n", ret, GetLastError()); + buf[size] = 0; + ok(!ret, "RegQueryValueExA failed %d\n", ret); + if (ret) return; for (src = buf; *src; src = dst + strlen(dst) + 1) { @@ -9016,16 +9017,13 @@ static void process_pending_renames(HKEY hkey) if (!strstr(src, "msitest")) { lstrcpyA(buf2ptr, src); - buf2len += strlen(src) + 1; buf2ptr += strlen(src) + 1; if (*dst) { lstrcpyA(buf2ptr, dst); buf2ptr += strlen(dst) + 1; - buf2len += strlen(dst) + 1; } buf2ptr++; - buf2len++; continue; } @@ -9049,10 +9047,7 @@ static void process_pending_renames(HKEY hkey) ok(found, "Expected a 'msitest' entry\n"); if (*buf2) - { - buf2len++; - RegSetValueExA(hkey, rename_ops, 0, REG_MULTI_SZ, (LPBYTE)buf2, buf2len); - } + RegSetValueExA(hkey, rename_ops, 0, REG_MULTI_SZ, (LPBYTE)buf2, buf2ptr + 1 - buf2); else RegDeleteValueA(hkey, rename_ops);

1 0

Alexandre Julliard : msi/tests: Fix a test failure on 64-bit.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: b4109a079fff2287fb123a253008e69f8d80e8f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4109a079fff2287fb123a253… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 30 14:12:55 2010 +0200 msi/tests: Fix a test failure on 64-bit. --- dlls/msi/tests/automation.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index f883eac..07760d9 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -2546,8 +2546,9 @@ static void test_Installer_InstallProduct(void) ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); /* Remove registry keys written by RegisterProduct standard action */ - res = RegDeleteKeyA(HKEY_LOCAL_MACHINE, - "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{F1C3AF50-8B56-4A69-A00C-00773FE42F30}"); + res = delete_key_portable(HKEY_LOCAL_MACHINE, + "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{F1C3AF50-8B56-4A69-A00C-00773FE42F30}", + KEY_WOW64_32KEY); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); res = delete_key_portable(HKEY_LOCAL_MACHINE,

1 0

Jacek Caban : urlmon: Skip tests on IEs older than 6 by checking for CompareSecurityIds.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 651fc5a2896343c16f1c0a1dc203fc256c3c4219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=651fc5a2896343c16f1c0a1dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 30 13:02:44 2010 +0200 urlmon: Skip tests on IEs older than 6 by checking for CompareSecurityIds. --- dlls/urlmon/tests/misc.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 558fc42..0dacd12 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -74,6 +74,7 @@ static HRESULT (WINAPI *pFindMimeFromData)(LPBC, LPCWSTR, LPVOID, DWORD, LPCWSTR static HRESULT (WINAPI *pObtainUserAgentString)(DWORD, LPSTR, DWORD*); static HRESULT (WINAPI *pReleaseBindInfo)(BINDINFO*); static HRESULT (WINAPI *pUrlMkGetSessionOption)(DWORD, LPVOID, DWORD, DWORD *, DWORD); +static HRESULT (WINAPI *pCompareSecurityIds)(BYTE*,DWORD,BYTE*,DWORD,DWORD); static void test_CreateFormatEnum(void) @@ -1472,10 +1473,11 @@ START_TEST(misc) pObtainUserAgentString = (void*) GetProcAddress(hurlmon, "ObtainUserAgentString"); pReleaseBindInfo = (void*) GetProcAddress(hurlmon, "ReleaseBindInfo"); pUrlMkGetSessionOption = (void*) GetProcAddress(hurlmon, "UrlMkGetSessionOption"); + pCompareSecurityIds = (void*) GetProcAddress(hurlmon, "CompareSecurityIds"); if (!pCoInternetCompareUrl || !pCoInternetGetSecurityUrl || - !pCoInternetGetSession || !pCoInternetParseUrl) { - win_skip("Various needed functions not present in IE 4.0\n"); + !pCoInternetGetSession || !pCoInternetParseUrl || !pCompareSecurityIds) { + win_skip("Various needed functions not present, too old IE\n"); return; }

1 0

Vitaly Perov : shdocvw: Silence QueryInterface FIXME.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 042ecec8b6bddb617e3a01f534b6e7ca2eb1cba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=042ecec8b6bddb617e3a01f53… Author: Vitaly Perov <vitperov(a)etersoft.ru> Date: Wed Sep 29 16:01:36 2010 +0400 shdocvw: Silence QueryInterface FIXME. --- dlls/shdocvw/tests/webbrowser.c | 5 +++++ dlls/shdocvw/webbrowser.c | 3 +++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 85f71b7..04a0b8e 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -2436,6 +2436,7 @@ static void test_QueryInterface(IUnknown *unk) IOleCache *cache = (void*)0xdeadbeef; IObjectWithSite *site = (void*)0xdeadbeef; IViewObjectEx *viewex = (void*)0xdeadbeef; + IOleLink *link = (void*)0xdeadbeef; HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IQuickActivate, (void**)&qa); @@ -2466,6 +2467,10 @@ static void test_QueryInterface(IUnknown *unk) ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); ok(viewex == NULL, "viewex=%p, expected NULL\n", viewex); + hres = IUnknown_QueryInterface(unk, &IID_IOleLink, (void**)&link); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(link == NULL, "link=%p, expected NULL\n", link); + } static void test_WebBrowser(BOOL do_download) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 5115de7..0c1bb12 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -127,6 +127,9 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid }else if(IsEqualGUID(&IID_IViewObjectEx, riid)) { TRACE("(%p)->(IID_IViewObjectEx %p) returning NULL\n", This, ppv); return E_NOINTERFACE; + }else if(IsEqualGUID(&IID_IOleLink, riid)) { + TRACE("(%p)->(IID_IOleLink %p) returning NULL\n", This, ppv); + return E_NOINTERFACE; }else if(HlinkFrame_QI(&This->hlink_frame, riid, ppv)) { return S_OK; }

1 0

Adam Martinson : msxml3: Expose the XML parser SAX callback interface.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 776a8662f088e75e88284cc0fc8e72d768771a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=776a8662f088e75e88284cc0f… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed Sep 29 16:04:38 2010 -0500 msxml3: Expose the XML parser SAX callback interface. This eliminates a few function calls; libxml will call this indirectly through the old method. By writing our own callback functions or wrapping the default ones we can manipulate the xmlDoc as it's being parsed, allowing us to match the way msxml parses. --- dlls/msxml3/domdoc.c | 59 ++++++++++++++++++++++++++++++++++++------------- 1 files changed, 43 insertions(+), 16 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 8d6c5f1..ad1a858 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -50,6 +50,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #include <libxml/xpathInternals.h> #include <libxml/xmlsave.h> +#include <libxml/SAX2.h> /* not defined in older versions */ #define XML_SAVE_FORMAT 1 @@ -287,21 +288,47 @@ xmlNodePtr xmldoc_unlink_xmldecl(xmlDocPtr doc) return node; } -static xmlDocPtr doparse( char *ptr, int len, const char *encoding ) +static xmlDocPtr doparse(domdoc* This, char *ptr, int len) { xmlDocPtr doc; - -#ifdef HAVE_XMLREADMEMORY - /* - * use xmlReadMemory if possible so we can suppress - * writing errors to stderr - */ - doc = xmlReadMemory( ptr, len, NULL, encoding, - XML_PARSE_NOERROR | XML_PARSE_NOWARNING | XML_PARSE_NOBLANKS ); -#else - doc = xmlParseMemory( ptr, len ); -#endif - + static xmlSAXHandler sax_handler = { + xmlSAX2InternalSubset, /* internalSubset */ + xmlSAX2IsStandalone, /* isStandalone */ + xmlSAX2HasInternalSubset, /* hasInternalSubset */ + xmlSAX2HasExternalSubset, /* hasExternalSubset */ + xmlSAX2ResolveEntity, /* resolveEntity */ + xmlSAX2GetEntity, /* getEntity */ + xmlSAX2EntityDecl, /* entityDecl */ + xmlSAX2NotationDecl, /* notationDecl */ + xmlSAX2AttributeDecl, /* attributeDecl */ + xmlSAX2ElementDecl, /* elementDecl */ + xmlSAX2UnparsedEntityDecl, /* unparsedEntityDecl */ + xmlSAX2SetDocumentLocator, /* setDocumentLocator */ + xmlSAX2StartDocument, /* startDocument */ + xmlSAX2EndDocument, /* endDocument */ + xmlSAX2StartElement, /* startElement */ + xmlSAX2EndElement, /* endElement */ + xmlSAX2Reference, /* reference */ + xmlSAX2Characters, /* characters */ + NULL, /* TODO: ignorableWhitespace */ + xmlSAX2ProcessingInstruction, /* processingInstruction */ + xmlSAX2Comment, /* comment */ + NULL, /* TODO: warning */ + NULL, /* TODO: error */ + NULL, /* TODO: fatalError */ + xmlSAX2GetParameterEntity, /* getParameterEntity */ + xmlSAX2CDataBlock, /* cdataBlock */ + xmlSAX2ExternalSubset, /* externalSubset */ + 0, /* initialized */ + NULL, /* _private */ + xmlSAX2StartElementNs, /* startElementNs */ + xmlSAX2EndElementNs, /* endElementNs */ + NULL /* TODO: serror */ + }; + + doc = xmlSAXParseMemoryWithData(&sax_handler, ptr, len, 0, This); + + /* TODO: put this in one of the SAX callbacks */ /* create first child as a <?xml...?> */ if (doc && doc->standalone != -1) { @@ -531,7 +558,7 @@ static HRESULT WINAPI domdoc_IPersistStreamInit_Load( len = GlobalSize(hglobal); ptr = GlobalLock(hglobal); if (len != 0) - xmldoc = doparse(ptr, len, NULL); + xmldoc = doparse(This, ptr, len); GlobalUnlock(hglobal); if (!xmldoc) @@ -1718,7 +1745,7 @@ static HRESULT domdoc_onDataAvailable(void *obj, char *ptr, DWORD len) domdoc *This = obj; xmlDocPtr xmldoc; - xmldoc = doparse( ptr, len, NULL ); + xmldoc = doparse(This, ptr, len); if(xmldoc) { xmldoc->_private = create_priv(); return attach_xmldoc(This, xmldoc); @@ -1956,7 +1983,7 @@ static HRESULT WINAPI domdoc_loadXML( if ( bstrXML && bstr_to_utf8( bstrXML, &str, &len ) ) { - xmldoc = doparse( str, len, "UTF-8" ); + xmldoc = doparse(This, str, len); heap_free( str ); if ( !xmldoc ) This->error = E_FAIL;

1 0

Alexandre Julliard : ntdll/tests: Fix a test failure on 64-bit platforms.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 7a151d5e3e43231896d610603eec0f842f11f170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a151d5e3e43231896d610603… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 30 11:19:31 2010 +0200 ntdll/tests: Fix a test failure on 64-bit platforms. --- dlls/ntdll/tests/info.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index ee3d0c6..d228816 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1125,7 +1125,8 @@ static void test_queryvirtualmemory(void) ok (mbi.AllocationBase == module, "mbi.AllocationBase is 0x%p, expected 0x%p\n", mbi.AllocationBase, module); ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT); - ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%x, expected 0x%X\n", mbi.Protect, PAGE_READWRITE); + ok (mbi.Protect == PAGE_READWRITE || mbi.Protect == PAGE_WRITECOPY, + "mbi.Protect is 0x%x\n", mbi.Protect); trace("Check flags of read-write uninitialized data (.bss) at %p\n", rwtestbuf); status = pNtQueryVirtualMemory(NtCurrentProcess(), rwtestbuf, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount);

1 0

Alexandre Julliard : dsound/tests: Mark some Vmware sound driver failures as broken.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 19da00a6a3a3e95cb43f7c5918151797a7992167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19da00a6a3a3e95cb43f7c591… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 30 11:31:11 2010 +0200 dsound/tests: Mark some Vmware sound driver failures as broken. --- dlls/dsound/tests/ds3d.c | 4 ++-- dlls/dsound/tests/dsound.c | 12 ++++++------ dlls/dsound/tests/propset.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index ad380d8..9ad4e12 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -805,8 +805,8 @@ static HRESULT test_secondary(LPGUID lpGuid, int play, wfx1.nSamplesPerSec,wfx1.wBitsPerSample,wfx1.nChannels); } rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - ok(rc==DS_OK && secondary!=NULL,"IDirectSound_CreateSoundBuffer() " - "failed to create a %s%ssecondary buffer %s%s%s%sat %dx%dx%d (%s): %08x\n", + ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */ + "IDirectSound_CreateSoundBuffer() failed to create a %s%ssecondary buffer %s%s%s%sat %dx%dx%d (%s): %08x\n", has_3dbuffer?"3D ":"", has_duplicate?"duplicated ":"", listener!=NULL||move_sound?"with ":"", move_listener?"moving ":"", listener!=NULL?"listener ":"", diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index f059c20..02d93fd 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -326,7 +326,7 @@ static HRESULT test_dsound(LPGUID lpGuid) wfx.nBlockAlign); bufdesc.lpwfxFormat=&wfx; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - ok(rc==DS_OK && secondary!=NULL, + ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */ "IDirectSound_CreateSoundBuffer() failed to create a secondary " "buffer %08x\n",rc); if (rc==DS_OK && secondary!=NULL) { @@ -618,7 +618,7 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) wfx2.nSamplesPerSec,wfx2.wBitsPerSample,wfx2.nChannels); } rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - ok(rc==DS_OK && secondary!=NULL, + ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */ "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc); if (rc==DS_OK && secondary!=NULL) { @@ -729,7 +729,7 @@ static HRESULT test_secondary(LPGUID lpGuid) "should have returned (DSERR_CONTROLUNAVAIL or DSERR_INVALIDCALL) " "and NULL, returned: %08x %p\n", rc, secondary); else - ok(rc==DS_OK && secondary!=NULL, + ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */ "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc); } else @@ -883,8 +883,8 @@ static HRESULT test_block_align(LPGUID lpGuid) bufdesc.dwBufferBytes=wfx.nAvgBytesPerSec + 1; bufdesc.lpwfxFormat=&wfx; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - ok(rc==DS_OK,"IDirectSound_CreateSoundBuffer() " - "should have returned DS_OK, returned: %08x\n", rc); + ok(rc == DS_OK || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */ + "IDirectSound_CreateSoundBuffer() should have returned DS_OK, returned: %08x\n", rc); if (rc==DS_OK && secondary!=NULL) { ZeroMemory(&dsbcaps, sizeof(dsbcaps)); @@ -993,7 +993,7 @@ static HRESULT test_frequency(LPGUID lpGuid) wfx1.nSamplesPerSec,wfx1.wBitsPerSample,wfx1.nChannels); } rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - ok(rc==DS_OK && secondary!=NULL, + ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */ "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc); if (rc==DS_OK && secondary!=NULL) { diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index 5007fcc..fb902a4 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -616,8 +616,8 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, trace(" Testing a secondary buffer at %dx%dx%d\n", wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels); rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - ok(rc==DS_OK&&secondary!=NULL,"IDirectSound_CreateSoundBuffer() " - "failed to create a secondary buffer: %08x\n",rc); + ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */ + "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer: %08x\n",rc); if (rc==DS_OK&&secondary!=NULL) { IKsPropertySet * pPropertySet=NULL; rc=IDirectSoundBuffer_QueryInterface(secondary,

1 0

Alexandre Julliard : server: Make the fd passing code slightly more portable.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 179715251dbb399768ae0ef423ae094c4438face URL: http://source.winehq.org/git/wine.git/?a=commit;h=179715251dbb399768ae0ef42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 30 11:53:07 2010 +0200 server: Make the fd passing code slightly more portable. --- dlls/ntdll/server.c | 76 +++++++++++++++++-------------------------- server/request.c | 88 ++++++++++++++++++++++++++++----------------------- 2 files changed, 78 insertions(+), 86 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index b3a8b21..f7c2ef5 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -99,20 +99,6 @@ static const enum cpu_type client_cpu = CPU_ARM; unsigned int server_cpus = 0; int is_wow64 = FALSE; -#ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS -/* data structure used to pass an fd with sendmsg/recvmsg */ -struct cmsg_fd -{ - struct - { - size_t len; /* size of structure */ - int level; /* SOL_SOCKET */ - int type; /* SCM_RIGHTS */ - } header; - int fd; /* fd to pass */ -}; -#endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ - timeout_t server_start_time = 0; /* time of server startup */ sigset_t server_block_set; /* signals to block during server calls */ @@ -334,35 +320,36 @@ void server_leave_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sig */ void CDECL wine_server_send_fd( int fd ) { -#ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS - struct cmsg_fd cmsg; -#endif struct send_fd data; struct msghdr msghdr; struct iovec vec; int ret; - vec.iov_base = (void *)&data; - vec.iov_len = sizeof(data); - - msghdr.msg_name = NULL; - msghdr.msg_namelen = 0; - msghdr.msg_iov = &vec; - msghdr.msg_iovlen = 1; - #ifdef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS msghdr.msg_accrights = (void *)&fd; msghdr.msg_accrightslen = sizeof(fd); #else /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ - cmsg.header.len = sizeof(cmsg.header) + sizeof(fd); - cmsg.header.level = SOL_SOCKET; - cmsg.header.type = SCM_RIGHTS; - cmsg.fd = fd; - msghdr.msg_control = &cmsg; - msghdr.msg_controllen = sizeof(cmsg.header) + sizeof(fd); + char cmsg_buffer[256]; + struct cmsghdr *cmsg; + msghdr.msg_control = cmsg_buffer; + msghdr.msg_controllen = sizeof(cmsg_buffer); msghdr.msg_flags = 0; + cmsg = CMSG_FIRSTHDR( &msghdr ); + cmsg->cmsg_len = CMSG_LEN( sizeof(fd) ); + cmsg->cmsg_level = SOL_SOCKET; + cmsg->cmsg_type = SCM_RIGHTS; + *(int *)CMSG_DATA(cmsg) = fd; + msghdr.msg_controllen = cmsg->cmsg_len; #endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ + msghdr.msg_name = NULL; + msghdr.msg_namelen = 0; + msghdr.msg_iov = &vec; + msghdr.msg_iovlen = 1; + + vec.iov_base = (void *)&data; + vec.iov_len = sizeof(data); + data.tid = GetCurrentThreadId(); data.fd = fd; @@ -385,24 +372,16 @@ void CDECL wine_server_send_fd( int fd ) static int receive_fd( obj_handle_t *handle ) { struct iovec vec; - int ret, fd; - -#ifdef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS struct msghdr msghdr; + int ret, fd = -1; - fd = -1; +#ifdef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS msghdr.msg_accrights = (void *)&fd; msghdr.msg_accrightslen = sizeof(fd); #else /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ - struct msghdr msghdr; - struct cmsg_fd cmsg; - - cmsg.header.len = sizeof(cmsg.header) + sizeof(fd); - cmsg.header.level = SOL_SOCKET; - cmsg.header.type = SCM_RIGHTS; - cmsg.fd = -1; - msghdr.msg_control = &cmsg; - msghdr.msg_controllen = sizeof(cmsg.header) + sizeof(fd); + char cmsg_buffer[256]; + msghdr.msg_control = cmsg_buffer; + msghdr.msg_controllen = sizeof(cmsg_buffer); msghdr.msg_flags = 0; #endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ @@ -418,8 +397,13 @@ static int receive_fd( obj_handle_t *handle ) if ((ret = recvmsg( fd_socket, &msghdr, MSG_CMSG_CLOEXEC )) > 0) { #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS - fd = cmsg.fd; -#endif + struct cmsghdr *cmsg; + for (cmsg = CMSG_FIRSTHDR( &msghdr ); cmsg; cmsg = CMSG_NXTHDR( &msghdr, cmsg )) + { + if (cmsg->cmsg_level != SOL_SOCKET) continue; + if (cmsg->cmsg_type == SCM_RIGHTS) fd = *(int *)CMSG_DATA(cmsg); + } +#endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ if (fd != -1) fcntl( fd, F_SETFD, FD_CLOEXEC ); /* in case MSG_CMSG_CLOEXEC is not supported */ return fd; } diff --git a/server/request.c b/server/request.c index d2aebb3..cea23ef 100644 --- a/server/request.c +++ b/server/request.c @@ -126,23 +126,6 @@ int config_dir_fd = -1; /* file descriptor for the config dir */ static struct master_socket *master_socket; /* the master socket object */ static struct timeout_user *master_timeout; -/* socket communication static structures */ -static struct iovec myiovec; -static struct msghdr msghdr; -#ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS -struct cmsg_fd -{ - struct - { - size_t len; /* size of structure */ - int level; /* SOL_SOCKET */ - int type; /* SCM_RIGHTS */ - } header; - int fd; /* fd to pass */ -}; -static struct cmsg_fd cmsg = { { sizeof(cmsg.header) + sizeof(cmsg.fd), SOL_SOCKET, SCM_RIGHTS }, -1 }; -#endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ - /* complain about a protocol error and terminate the client connection */ void fatal_protocol_error( struct thread *thread, const char *err, ... ) { @@ -359,25 +342,41 @@ error: /* receive a file descriptor on the process socket */ int receive_fd( struct process *process ) { + struct iovec vec; struct send_fd data; - int fd, ret; + struct msghdr msghdr; + int fd = -1, ret; #ifdef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS msghdr.msg_accrightslen = sizeof(int); msghdr.msg_accrights = (void *)&fd; #else /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ - msghdr.msg_control = &cmsg; - msghdr.msg_controllen = sizeof(cmsg.header) + sizeof(fd); - cmsg.fd = -1; + char cmsg_buffer[256]; + msghdr.msg_control = cmsg_buffer; + msghdr.msg_controllen = sizeof(cmsg_buffer); + msghdr.msg_flags = 0; #endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ - myiovec.iov_base = (void *)&data; - myiovec.iov_len = sizeof(data); + msghdr.msg_name = NULL; + msghdr.msg_namelen = 0; + msghdr.msg_iov = &vec; + msghdr.msg_iovlen = 1; + vec.iov_base = (void *)&data; + vec.iov_len = sizeof(data); ret = recvmsg( get_unix_fd( process->msg_fd ), &msghdr, 0 ); + #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS - fd = cmsg.fd; -#endif + if (ret > 0) + { + struct cmsghdr *cmsg; + for (cmsg = CMSG_FIRSTHDR( &msghdr ); cmsg; cmsg = CMSG_NXTHDR( &msghdr, cmsg )) + { + if (cmsg->cmsg_level != SOL_SOCKET) continue; + if (cmsg->cmsg_type == SCM_RIGHTS) fd = *(int *)CMSG_DATA(cmsg); + } + } +#endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ if (ret == sizeof(data)) { @@ -412,6 +411,7 @@ int receive_fd( struct process *process ) { fprintf( stderr, "Protocol error: process %04x: partial recvmsg %d for fd\n", process->id, ret ); + if (fd != -1) close( fd ); kill_process( process, 1 ); } else @@ -429,23 +429,37 @@ int receive_fd( struct process *process ) /* send an fd to a client */ int send_client_fd( struct process *process, int fd, obj_handle_t handle ) { + struct iovec vec; + struct msghdr msghdr; int ret; - if (debug_level) - fprintf( stderr, "%04x: *fd* %04x -> %d\n", - current ? current->id : process->id, handle, fd ); - #ifdef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS msghdr.msg_accrightslen = sizeof(fd); msghdr.msg_accrights = (void *)&fd; #else /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ - msghdr.msg_control = &cmsg; - msghdr.msg_controllen = sizeof(cmsg.header) + sizeof(fd); - cmsg.fd = fd; + char cmsg_buffer[256]; + struct cmsghdr *cmsg; + msghdr.msg_control = cmsg_buffer; + msghdr.msg_controllen = sizeof(cmsg_buffer); + msghdr.msg_flags = 0; + cmsg = CMSG_FIRSTHDR( &msghdr ); + cmsg->cmsg_len = CMSG_LEN( sizeof(fd) ); + cmsg->cmsg_level = SOL_SOCKET; + cmsg->cmsg_type = SCM_RIGHTS; + *(int *)CMSG_DATA(cmsg) = fd; + msghdr.msg_controllen = cmsg->cmsg_len; #endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ - myiovec.iov_base = (void *)&handle; - myiovec.iov_len = sizeof(handle); + msghdr.msg_name = NULL; + msghdr.msg_namelen = 0; + msghdr.msg_iov = &vec; + msghdr.msg_iovlen = 1; + + vec.iov_base = (void *)&handle; + vec.iov_len = sizeof(handle); + + if (debug_level) + fprintf( stderr, "%04x: *fd* %04x -> %d\n", current ? current->id : process->id, handle, fd ); ret = sendmsg( get_unix_fd( process->msg_fd ), &msghdr, 0 ); @@ -797,12 +811,6 @@ void open_master_socket(void) acquire_lock(); } - /* setup msghdr structure constant fields */ - msghdr.msg_name = NULL; - msghdr.msg_namelen = 0; - msghdr.msg_iov = &myiovec; - msghdr.msg_iovlen = 1; - /* init the process tracing mechanism */ init_tracing_mechanism(); }

1 0