July 2008 - Wine-commits - list.winehq.org

Reece Dunn : shell32: Do not use a fixed path in the shelllink tests.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: 29c66b3a9e87e477c7b5fa897492452230c15166 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c66b3a9e87e477c7b5fa897… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Sun Jul 20 14:40:19 2008 +0100 shell32: Do not use a fixed path in the shelllink tests. --- dlls/shell32/tests/shelllink.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 5b905b4..44e314d 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -49,7 +49,6 @@ static const GUID _IID_IShellLinkDataList = { { 0xb9, 0x2f, 0x00, 0xa0, 0xc9, 0x03, 0x12, 0xe1 } }; -static const WCHAR lnkfile[]= { 'C',':','\\','t','e','s','t','.','l','n','k',0 }; static const WCHAR notafile[]= { 'C',':','\\','n','o','n','e','x','i','s','t','e','n','t','\\','f','i','l','e',0 }; @@ -494,6 +493,12 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo) static void test_load_save(void) { + WCHAR lnkfile[MAX_PATH]; + static const WCHAR lnkfile_name[] = { '\\', 't', 'e', 's', 't', '.', 'l', 'n', 'k', '\0' }; + + char lnkfileA[MAX_PATH]; + static const char lnkfileA_name[] = "\\test.lnk"; + lnk_desc_t desc; char mypath[MAX_PATH]; char mydir[MAX_PATH]; @@ -508,6 +513,12 @@ static void test_load_save(void) return; } + /* Don't used a fixed path for the test.lnk file */ + GetTempPathW(MAX_PATH, lnkfile); + lstrcatW(lnkfile, lnkfile_name); + GetTempPathA(MAX_PATH, lnkfileA); + lstrcatA(lnkfileA, lnkfileA_name); + /* Save an empty .lnk file */ memset(&desc, 0, sizeof(desc)); create_lnk(lnkfile, &desc, 0); @@ -608,8 +619,8 @@ static void test_load_save(void) */ /* DeleteFileW is not implemented on Win9x */ - r=DeleteFileA("c:\\test.lnk"); - ok(r, "failed to delete link (%d)\n", GetLastError()); + r=DeleteFileA(lnkfileA); + ok(r, "failed to delete link '%s' (%d)\n", lnkfileA, GetLastError()); } static void test_datalink(void)

1 0

Frans Kool : wordpad: Added missing Dutch translations.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: c91eb084ce3f927d9163f6511a6a256c9c5dee65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c91eb084ce3f927d9163f6511… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Sun Jul 20 09:01:34 2008 +0200 wordpad: Added missing Dutch translations. --- programs/wordpad/Nl.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index d491b21..73da63f 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -237,4 +237,6 @@ BEGIN STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documenten zijn niet ondersteund" STRING_WRITE_FAILED, "Bestand kon niet opgeslagen worden." STRING_WRITE_ACCESS_DENIED, "Onvoldoende rechten om het bestand op te slaan." + STRING_OPEN_FAILED, "Bestand kon niet geopend worden." + STRING_OPEN_ACCESS_DENIED, "Onvoldoende rechten om het bestand te openen." END

1 0

Detlef Riekenberg : crypt32/tests: Make the msg tests usable on win9x ( avoid crash).
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: 07eeb4e406436ea7c34da12dae360cc46e016a6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=07eeb4e406436ea7c34da12da… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jul 20 13:59:04 2008 +0200 crypt32/tests: Make the msg tests usable on win9x (avoid crash). --- dlls/crypt32/tests/msg.c | 179 +++++++++++++++++++++++++++++++++------------- 1 files changed, 130 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07eeb4e406436ea7c34da…

1 0

Mathias Kosch : advapi32: Fix RegGetValue when dwFlags includes RRF_RT_ANY.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: 9a7dc15979fee61d39edef13b12c2f9a4f5f6377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a7dc15979fee61d39edef13b… Author: Mathias Kosch <info(a)mkosch.de> Date: Sat Jul 19 18:54:20 2008 +0200 advapi32: Fix RegGetValue when dwFlags includes RRF_RT_ANY. --- dlls/advapi32/registry.c | 8 ++++++-- dlls/advapi32/tests/registry.c | 10 ++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 9ce3da0..089cf3e 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1466,6 +1466,8 @@ static VOID ADVAPI_ApplyRestrictions( DWORD dwFlags, DWORD dwType, * expanded and pdwType is set to REG_SZ instead. * - Restrictions are applied after expanding, using RRF_RT_REG_EXPAND_SZ * without RRF_NOEXPAND is thus not allowed. + * An exception is the case where RRF_RT_ANY is specified, because then + * RRF_NOEXPAND is allowed. */ LSTATUS WINAPI RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue, DWORD dwFlags, LPDWORD pdwType, PVOID pvData, @@ -1481,7 +1483,8 @@ LSTATUS WINAPI RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue, if (pvData && !pcbData) return ERROR_INVALID_PARAMETER; - if ((dwFlags & RRF_RT_REG_EXPAND_SZ) && !(dwFlags & RRF_NOEXPAND)) + if ((dwFlags & RRF_RT_REG_EXPAND_SZ) && !(dwFlags & RRF_NOEXPAND) && + ((dwFlags & RRF_RT_ANY) != RRF_RT_ANY)) return ERROR_INVALID_PARAMETER; if (pszSubKey && pszSubKey[0]) @@ -1576,7 +1579,8 @@ LSTATUS WINAPI RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, if (pvData && !pcbData) return ERROR_INVALID_PARAMETER; - if ((dwFlags & RRF_RT_REG_EXPAND_SZ) && !(dwFlags & RRF_NOEXPAND)) + if ((dwFlags & RRF_RT_REG_EXPAND_SZ) && !(dwFlags & RRF_NOEXPAND) && + ((dwFlags & RRF_RT_ANY) != RRF_RT_ANY)) return ERROR_INVALID_PARAMETER; if (pszSubKey && pszSubKey[0]) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index c4f039a..9d5d4c2 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -858,6 +858,16 @@ static void test_get_value(void) /* Query REG_EXPAND_SZ using RRF_RT_REG_EXPAND_SZ (not allowed without RRF_NOEXPAND) */ ret = pRegGetValueA(hkey_main, NULL, "TP1_EXP_SZ", RRF_RT_REG_EXPAND_SZ, NULL, NULL, NULL); ok(ret == ERROR_INVALID_PARAMETER, "ret=%d\n", ret); + + /* Query REG_EXPAND_SZ using RRF_RT_ANY */ + buf[0] = 0; type = 0xdeadbeef; size = sizeof(buf); + ret = pRegGetValueA(hkey_main, NULL, "TP1_EXP_SZ", RRF_RT_ANY, &type, buf, &size); + ok(ret == ERROR_SUCCESS, "ret=%d\n", ret); + /* At least v5.2.3790.1830 (2003 SP1) returns the unexpanded sTestpath1 length + 1 here. */ + ok(size == strlen(expanded)+1 || broken(size == strlen(sTestpath1)+1), + "strlen(expanded)=%d, strlen(sTestpath1)=%d, size=%d\n", lstrlenA(expanded), lstrlenA(sTestpath1), size); + ok(type == REG_SZ, "type=%d\n", type); + ok(!strcmp(expanded, buf), "expanded=\"%s\" buf=\"%s\"\n", expanded, buf); } static void test_reg_open_key(void)

1 0

Dan Kegel : tools: Allow running tests with valgrind.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: d18cd895674dc7cac1a5155f2c4b65752818743f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d18cd895674dc7cac1a5155f2… Author: Dan Kegel <dank(a)kegel.com> Date: Fri Jul 18 16:31:43 2008 -0700 tools: Allow running tests with valgrind. --- tools/runtest | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/tools/runtest b/tools/runtest index 43f513f..a3c9331 100755 --- a/tools/runtest +++ b/tools/runtest @@ -118,4 +118,10 @@ fi WINETEST_PLATFORM=${platform:-wine} export WINETEST_PLATFORM WINETEST_DEBUG -exec "$topobjdir/wine" "$program" "$infile" "$@" +# WINETEST_WRAPPER is normally empty, but can be set by caller, e.g. +# WINETEST_WRAPPER=time +# would give data about how long each test takes, and +# WINETEST_WRAPPER=valgrind +# would run the tests under valgrind to look for memory errors. + +exec $WINETEST_WRAPPER "$topobjdir/wine" "$program" "$infile" "$@"

1 0

Lei Zhang : gdi32: CreateDIBitmap should check for SetDIBits failure.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: ce552d4451ffecbb3c61eeb3982541a56872bae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce552d4451ffecbb3c61eeb39… Author: Lei Zhang <thestig(a)google.com> Date: Fri Jul 18 15:28:44 2008 -0700 gdi32: CreateDIBitmap should check for SetDIBits failure. --- dlls/gdi32/dib.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 677cda5..440857d 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1118,7 +1118,14 @@ HBITMAP WINAPI CreateDIBitmap( HDC hdc, const BITMAPINFOHEADER *header, if (handle) { - if (init == CBM_INIT) SetDIBits( hdc, handle, 0, height, bits, data, coloruse ); + if (init == CBM_INIT) + { + if (SetDIBits( hdc, handle, 0, height, bits, data, coloruse ) == 0) + { + DeleteObject( handle ); + handle = 0; + } + } else if (hdc && ((dc = get_dc_ptr( hdc )) != NULL) ) {

1 0

Lei Zhang : oleaut32: Check return values in several functions.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: 4fe68a9e1e8a4267217e9b2808d32f67c4411df4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fe68a9e1e8a4267217e9b280… Author: Lei Zhang <thestig(a)google.com> Date: Fri Jul 18 15:25:31 2008 -0700 oleaut32: Check return values in several functions. --- dlls/oleaut32/olepicture.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index ea0297f..8dc10ed 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1365,6 +1365,8 @@ static HRESULT OLEPictureImpl_LoadDIB(OLEPictureImpl *This, BYTE *xbuf, ULONG xr DIB_RGB_COLORS ); DeleteDC(hdcref); + if (This->desc.u.bmp.hbitmap == 0) + return E_FAIL; This->desc.picType = PICTYPE_BITMAP; OLEPictureImpl_SetBitmap(This); return S_OK; @@ -1869,6 +1871,8 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { } else { This->datalen = toread+(headerisdata?8:0); xbuf = This->data = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, This->datalen); + if (!xbuf) + return E_OUTOFMEMORY; if (headerisdata) memcpy (xbuf, header, 8); @@ -2644,8 +2648,15 @@ HRESULT WINAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, *ppvObj = NULL; return hr; } - IPersistStream_Load(ps,lpstream); + hr = IPersistStream_Load(ps,lpstream); IPersistStream_Release(ps); + if (FAILED(hr)) + { + ERR("IPersistStream_Load failed\n"); + IPicture_Release(newpic); + *ppvObj = NULL; + return hr; + } hr = IPicture_QueryInterface(newpic,riid,ppvObj); if (hr) FIXME("Failed to get interface %s from IPicture.\n",debugstr_guid(riid));

1 0

Lei Zhang : winex11: X11DRV_DIB_[GS]etImageBits should return 0 on failure.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: e031ef4807fdcda10d60c27dd0058232cd4abbe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e031ef4807fdcda10d60c27dd… Author: Lei Zhang <thestig(a)google.com> Date: Fri Jul 18 15:28:06 2008 -0700 winex11: X11DRV_DIB_[GS]etImageBits should return 0 on failure. --- dlls/winex11.drv/dib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 6fddb0a..9348281 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -3525,7 +3525,7 @@ static int X11DRV_DIB_SetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr ) ERR("Out of memory!\n"); XDestroyImage( bmpImage ); wine_tsx11_unlock(); - return lines; + return 0; } } wine_tsx11_unlock(); @@ -3654,7 +3654,7 @@ static int X11DRV_DIB_GetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr ) ERR("Out of memory!\n"); XDestroyImage( bmpImage ); wine_tsx11_unlock(); - return lines; + return 0; } }

1 0

Vincent Povirk : ole32: Always return false when asked if NULL is the current clipboard.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: a0249babcd5124ef283822fb8699ea96e600a020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0249babcd5124ef283822fb8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 17 17:33:48 2008 -0500 ole32: Always return false when asked if NULL is the current clipboard. --- dlls/ole32/clipboard.c | 3 +++ dlls/ole32/tests/clipboard.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index a74e71a..909b215 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -583,6 +583,9 @@ HRESULT WINAPI OleIsCurrentClipboard(IDataObject *pDataObject) if (!theOleClipboard) return E_OUTOFMEMORY; + if (pDataObject == NULL) + return S_FALSE; + return (pDataObject == theOleClipboard->pIDataObjectSrc) ? S_OK : S_FALSE; } diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index c231d49..ee912ce 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -472,7 +472,7 @@ static void test_set_clipboard(void) hr = OleIsCurrentClipboard(data2); ok(hr == S_FALSE, "did not expect current clipboard to be data2, hr = 0x%08x\n", hr); hr = OleIsCurrentClipboard(NULL); - todo_wine ok(hr == S_FALSE, "expect S_FALSE, hr = 0x%08x\n", hr); + ok(hr == S_FALSE, "expect S_FALSE, hr = 0x%08x\n", hr); ok(OleSetClipboard(NULL) == S_OK, "failed to clear clipboard, hr = 0x%08x\n", hr);

1 0

Maarten Lankhorst : quartz: Fix bugs that occur during connection.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: 271ee48301838dd549d368100bfcf63cb7a8df48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=271ee48301838dd549d368100… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jul 17 17:37:51 2008 -0700 quartz: Fix bugs that occur during connection. --- dlls/quartz/pin.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 5daaf7e..e2b868e 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -192,19 +192,15 @@ static HRESULT OutputPin_ConnectSpecific(IPin * iface, IPin * pReceivePin, const hr = IMemInputPin_GetAllocator(This->pMemInputPin, &pMemAlloc); if (hr == VFW_E_NO_ALLOCATOR) - { /* Input pin provides no allocator, use standard memory allocator */ hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (LPVOID*)&pMemAlloc); - if (SUCCEEDED(hr)) - { - hr = IMemInputPin_NotifyAllocator(This->pMemInputPin, pMemAlloc, This->readonly); - } - } - if (SUCCEEDED(hr)) hr = IMemAllocator_SetProperties(pMemAlloc, &This->allocProps, &actual); + if (SUCCEEDED(hr)) + hr = IMemInputPin_NotifyAllocator(This->pMemInputPin, pMemAlloc, This->readonly); + if (pMemAlloc) IMemAllocator_Release(pMemAlloc); } @@ -940,7 +936,9 @@ HRESULT WINAPI OutputPin_Connect(IPin * iface, IPin * pReceivePin, const AM_MEDI while (S_OK == IEnumMediaTypes_Next(pEnumCandidates, 1, &pmtCandidate, NULL)) { assert(pmtCandidate); - if (!IsEqualGUID(&FORMAT_None, &pmtCandidate->formattype)) + dump_AM_MEDIA_TYPE(pmtCandidate); + if (!IsEqualGUID(&FORMAT_None, &pmtCandidate->formattype) + && !IsEqualGUID(&GUID_NULL, &pmtCandidate->formattype)) assert(pmtCandidate->pbFormat); if (( !pmt || CompareMediaTypes(pmt, pmtCandidate, TRUE) ) && (This->pConnectSpecific(iface, pReceivePin, pmtCandidate) == S_OK)) @@ -963,7 +961,9 @@ HRESULT WINAPI OutputPin_Connect(IPin * iface, IPin * pReceivePin, const AM_MEDI while (S_OK == IEnumMediaTypes_Next(pEnumCandidates, 1, &pmtCandidate, NULL)) { assert(pmtCandidate); - if (!IsEqualGUID(&FORMAT_None, &pmtCandidate->formattype)) + dump_AM_MEDIA_TYPE(pmtCandidate); + if (!IsEqualGUID(&FORMAT_None, &pmtCandidate->formattype) + && !IsEqualGUID(&GUID_NULL, &pmtCandidate->formattype)) assert(pmtCandidate->pbFormat); if (( !pmt || CompareMediaTypes(pmt, pmtCandidate, TRUE) ) && (This->pConnectSpecific(iface, pReceivePin, pmtCandidate) == S_OK))

1 0