December 2008 - Wine-Commits

Andrew Talbot : winealsa.drv: Do nothing if HAVE_ALSA is not defined.
by Alexandre Julliard Dec. 22, 2008

Dec. 22, 2008

Module: wine Branch: master Commit: a3a2506d5225dfbafdcce29aaff81fe36efb25b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3a2506d5225dfbafdcce29aa… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 20 15:02:38 2008 +0000 winealsa.drv: Do nothing if HAVE_ALSA is not defined. --- dlls/winealsa.drv/waveinit.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/waveinit.c b/dlls/winealsa.drv/waveinit.c index 4bdaeff..450c2ca 100644 --- a/dlls/winealsa.drv/waveinit.c +++ b/dlls/winealsa.drv/waveinit.c @@ -25,6 +25,9 @@ */ #include "config.h" + +#ifdef HAVE_ALSA + #include "wine/port.h" #include <stdlib.h> @@ -65,8 +68,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave); -#ifdef HAVE_ALSA - /*---------------------------------------------------------------------------- ** ALSA_TestDeviceForWine **

1 0

Andrew Talbot : sxs: Remove unused Wine debug channel.
by Alexandre Julliard Dec. 22, 2008

Dec. 22, 2008

Module: wine Branch: master Commit: e0cd5b1e3789deeb23de89ca1b178c59150e4b82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0cd5b1e3789deeb23de89ca1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 20 15:02:36 2008 +0000 sxs: Remove unused Wine debug channel. --- dlls/sxs/sxs.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c index cd64de5..06e6672 100644 --- a/dlls/sxs/sxs.c +++ b/dlls/sxs/sxs.c @@ -22,9 +22,6 @@ #include "windef.h" #include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(sxs); /***********************************************************************

1 0

Andrew Talbot : dmstyle: Remove unused Wine debug channel.
by Alexandre Julliard Dec. 22, 2008

Dec. 22, 2008

Module: wine Branch: master Commit: cf69003867dee882b1e43926b10310aa4f58fc67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf69003867dee882b1e43926b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 20 15:02:33 2008 +0000 dmstyle: Remove unused Wine debug channel. --- dlls/dmstyle/dmutils.c | 47 +++++++++++++++++++++++------------------------ 1 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index 7201461..e3663aa 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -40,44 +40,43 @@ #include "dmutils.h" -WINE_DEFAULT_DEBUG_CHANNEL(dmusic); -WINE_DECLARE_DEBUG_CHANNEL(dmfile); +WINE_DEFAULT_DEBUG_CHANNEL(dmfile); HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) { switch (pChunk->fccID) { case DMUS_FOURCC_GUID_CHUNK: { - TRACE_(dmfile)(": GUID chunk\n"); + TRACE(": GUID chunk\n"); pDesc->dwValidData |= DMUS_OBJ_OBJECT; IStream_Read (pStm, &pDesc->guidObject, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_DATE_CHUNK: { - TRACE_(dmfile)(": file date chunk\n"); + TRACE(": file date chunk\n"); pDesc->dwValidData |= DMUS_OBJ_DATE; IStream_Read (pStm, &pDesc->ftDate, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_NAME_CHUNK: { - TRACE_(dmfile)(": name chunk\n"); + TRACE(": name chunk\n"); pDesc->dwValidData |= DMUS_OBJ_NAME; IStream_Read (pStm, pDesc->wszName, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_FILE_CHUNK: { - TRACE_(dmfile)(": file name chunk\n"); + TRACE(": file name chunk\n"); pDesc->dwValidData |= DMUS_OBJ_FILENAME; IStream_Read (pStm, pDesc->wszFileName, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_VERSION_CHUNK: { - TRACE_(dmfile)(": version chunk\n"); + TRACE(": version chunk\n"); pDesc->dwValidData |= DMUS_OBJ_VERSION; IStream_Read (pStm, &pDesc->vVersion, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_CATEGORY_CHUNK: { - TRACE_(dmfile)(": category chunk\n"); + TRACE(": category chunk\n"); pDesc->dwValidData |= DMUS_OBJ_CATEGORY; IStream_Read (pStm, pDesc->wszCategory, pChunk->dwSize, NULL); break; @@ -102,37 +101,37 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseUNFOGeneric (DMUS_PRIVATE_CHUNK* p case mmioFOURCC('I','N','A','M'): case DMUS_FOURCC_UNAM_CHUNK: { - TRACE_(dmfile)(": name chunk\n"); + TRACE(": name chunk\n"); pDesc->dwValidData |= DMUS_OBJ_NAME; IStream_Read (pStm, pDesc->wszName, pChunk->dwSize, NULL); - TRACE_(dmfile)(" - wszName: %s\n", debugstr_w(pDesc->wszName)); + TRACE(" - wszName: %s\n", debugstr_w(pDesc->wszName)); break; } case mmioFOURCC('I','A','R','T'): case DMUS_FOURCC_UART_CHUNK: { - TRACE_(dmfile)(": artist chunk (ignored)\n"); + TRACE(": artist chunk (ignored)\n"); liMove.QuadPart = pChunk->dwSize; IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); break; } case mmioFOURCC('I','C','O','P'): case DMUS_FOURCC_UCOP_CHUNK: { - TRACE_(dmfile)(": copyright chunk (ignored)\n"); + TRACE(": copyright chunk (ignored)\n"); liMove.QuadPart = pChunk->dwSize; IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); break; } case mmioFOURCC('I','S','B','J'): case DMUS_FOURCC_USBJ_CHUNK: { - TRACE_(dmfile)(": subject chunk (ignored)\n"); + TRACE(": subject chunk (ignored)\n"); liMove.QuadPart = pChunk->dwSize; IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); break; } case mmioFOURCC('I','C','M','T'): case DMUS_FOURCC_UCMT_CHUNK: { - TRACE_(dmfile)(": comment chunk (ignored)\n"); + TRACE(": comment chunk (ignored)\n"); liMove.QuadPart = pChunk->dwSize; IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); break; @@ -158,7 +157,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, memset(&ref_desc, 0, sizeof(ref_desc)); if (pChunk->fccID != DMUS_FOURCC_REF_LIST) { - ERR_(dmfile)(": %s chunk should be a REF list\n", debugstr_fourcc (pChunk->fccID)); + ERR(": %s chunk should be a REF list\n", debugstr_fourcc (pChunk->fccID)); return E_FAIL; } @@ -168,7 +167,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); hr = IDirectMusicUtils_IPersistStream_ParseDescGeneric(&Chunk, pStm, &ref_desc); if (FAILED(hr)) return hr; @@ -176,29 +175,29 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, if (hr == S_FALSE) { switch (Chunk.fccID) { case DMUS_FOURCC_REF_CHUNK: { - TRACE_(dmfile)(": Reference chunk\n"); + TRACE(": Reference chunk\n"); if (Chunk.dwSize != sizeof(DMUS_IO_REFERENCE)) return E_FAIL; IStream_Read (pStm, &ref, sizeof(DMUS_IO_REFERENCE), NULL); - TRACE_(dmfile)(" - guidClassID: %s\n", debugstr_dmguid(&ref.guidClassID)); - TRACE_(dmfile)(" - dwValidData: %u\n", ref.dwValidData); + TRACE(" - guidClassID: %s\n", debugstr_dmguid(&ref.guidClassID)); + TRACE(" - dwValidData: %u\n", ref.dwValidData); break; } default: { - TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n"); + TRACE(": unknown chunk (irrevelant & skipping)\n"); liMove.QuadPart = Chunk.dwSize; IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); break; } } } - TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); + TRACE(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); } while (ListCount[0] < ListSize[0]); ref_desc.dwValidData |= DMUS_OBJ_CLASS; ref_desc.guidClass = ref.guidClassID; - TRACE_(dmfile)("** DM Reference Begin of Load ***\n"); - TRACE_(dmfile)("With Desc:\n"); + TRACE("** DM Reference Begin of Load ***\n"); + TRACE("With Desc:\n"); debugstr_DMUS_OBJECTDESC(&ref_desc); { @@ -212,7 +211,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, hr = IDirectMusicLoader_GetObject (pLoader, &ref_desc, &IID_IDirectMusicObject, (LPVOID*)ppObject); IDirectMusicLoader_Release (pLoader); /* release loader */ } - TRACE_(dmfile)("** DM Reference End of Load ***\n"); + TRACE("** DM Reference End of Load ***\n"); return S_OK; }

1 0

Andrew Talbot : dmime: Remove unused Wine debug channel.
by Alexandre Julliard Dec. 22, 2008

Dec. 22, 2008

Module: wine Branch: master Commit: 348df701acd20efec6138953e6cef93673bb6016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=348df701acd20efec6138953e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 20 15:02:30 2008 +0000 dmime: Remove unused Wine debug channel. --- dlls/dmime/dmutils.c | 47 +++++++++++++++++++++++------------------------ 1 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index ad46303..614677c 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -43,44 +43,43 @@ #include "dmutils.h" -WINE_DEFAULT_DEBUG_CHANNEL(dmusic); -WINE_DECLARE_DEBUG_CHANNEL(dmfile); +WINE_DEFAULT_DEBUG_CHANNEL(dmfile); HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) { switch (pChunk->fccID) { case DMUS_FOURCC_GUID_CHUNK: { - TRACE_(dmfile)(": GUID chunk\n"); + TRACE(": GUID chunk\n"); pDesc->dwValidData |= DMUS_OBJ_OBJECT; IStream_Read (pStm, &pDesc->guidObject, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_DATE_CHUNK: { - TRACE_(dmfile)(": file date chunk\n"); + TRACE(": file date chunk\n"); pDesc->dwValidData |= DMUS_OBJ_DATE; IStream_Read (pStm, &pDesc->ftDate, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_NAME_CHUNK: { - TRACE_(dmfile)(": name chunk\n"); + TRACE(": name chunk\n"); pDesc->dwValidData |= DMUS_OBJ_NAME; IStream_Read (pStm, pDesc->wszName, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_FILE_CHUNK: { - TRACE_(dmfile)(": file name chunk\n"); + TRACE(": file name chunk\n"); pDesc->dwValidData |= DMUS_OBJ_FILENAME; IStream_Read (pStm, pDesc->wszFileName, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_VERSION_CHUNK: { - TRACE_(dmfile)(": version chunk\n"); + TRACE(": version chunk\n"); pDesc->dwValidData |= DMUS_OBJ_VERSION; IStream_Read (pStm, &pDesc->vVersion, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_CATEGORY_CHUNK: { - TRACE_(dmfile)(": category chunk\n"); + TRACE(": category chunk\n"); pDesc->dwValidData |= DMUS_OBJ_CATEGORY; IStream_Read (pStm, pDesc->wszCategory, pChunk->dwSize, NULL); break; @@ -105,37 +104,37 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseUNFOGeneric (DMUS_PRIVATE_CHUNK* p case mmioFOURCC('I','N','A','M'): case DMUS_FOURCC_UNAM_CHUNK: { - TRACE_(dmfile)(": name chunk\n"); + TRACE(": name chunk\n"); pDesc->dwValidData |= DMUS_OBJ_NAME; IStream_Read (pStm, pDesc->wszName, pChunk->dwSize, NULL); - TRACE_(dmfile)(" - wszName: %s\n", debugstr_w(pDesc->wszName)); + TRACE(" - wszName: %s\n", debugstr_w(pDesc->wszName)); break; } case mmioFOURCC('I','A','R','T'): case DMUS_FOURCC_UART_CHUNK: { - TRACE_(dmfile)(": artist chunk (ignored)\n"); + TRACE(": artist chunk (ignored)\n"); liMove.QuadPart = pChunk->dwSize; IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); break; } case mmioFOURCC('I','C','O','P'): case DMUS_FOURCC_UCOP_CHUNK: { - TRACE_(dmfile)(": copyright chunk (ignored)\n"); + TRACE(": copyright chunk (ignored)\n"); liMove.QuadPart = pChunk->dwSize; IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); break; } case mmioFOURCC('I','S','B','J'): case DMUS_FOURCC_USBJ_CHUNK: { - TRACE_(dmfile)(": subject chunk (ignored)\n"); + TRACE(": subject chunk (ignored)\n"); liMove.QuadPart = pChunk->dwSize; IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); break; } case mmioFOURCC('I','C','M','T'): case DMUS_FOURCC_UCMT_CHUNK: { - TRACE_(dmfile)(": comment chunk (ignored)\n"); + TRACE(": comment chunk (ignored)\n"); liMove.QuadPart = pChunk->dwSize; IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); break; @@ -161,7 +160,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, memset(&ref_desc, 0, sizeof(ref_desc)); if (pChunk->fccID != DMUS_FOURCC_REF_LIST) { - ERR_(dmfile)(": %s chunk should be a REF list\n", debugstr_fourcc (pChunk->fccID)); + ERR(": %s chunk should be a REF list\n", debugstr_fourcc (pChunk->fccID)); return E_FAIL; } @@ -171,7 +170,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); hr = IDirectMusicUtils_IPersistStream_ParseDescGeneric(&Chunk, pStm, &ref_desc); if (FAILED(hr)) return hr; @@ -179,29 +178,29 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, if (hr == S_FALSE) { switch (Chunk.fccID) { case DMUS_FOURCC_REF_CHUNK: { - TRACE_(dmfile)(": Reference chunk\n"); + TRACE(": Reference chunk\n"); if (Chunk.dwSize != sizeof(DMUS_IO_REFERENCE)) return E_FAIL; IStream_Read (pStm, &ref, sizeof(DMUS_IO_REFERENCE), NULL); - TRACE_(dmfile)(" - guidClassID: %s\n", debugstr_dmguid(&ref.guidClassID)); - TRACE_(dmfile)(" - dwValidData: %u\n", ref.dwValidData); + TRACE(" - guidClassID: %s\n", debugstr_dmguid(&ref.guidClassID)); + TRACE(" - dwValidData: %u\n", ref.dwValidData); break; } default: { - TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n"); + TRACE(": unknown chunk (irrevelant & skipping)\n"); liMove.QuadPart = Chunk.dwSize; IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); break; } } } - TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); + TRACE(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); } while (ListCount[0] < ListSize[0]); ref_desc.dwValidData |= DMUS_OBJ_CLASS; ref_desc.guidClass = ref.guidClassID; - TRACE_(dmfile)("** DM Reference Begin of Load ***\n"); - TRACE_(dmfile)("With Desc:\n"); + TRACE("** DM Reference Begin of Load ***\n"); + TRACE("With Desc:\n"); debugstr_DMUS_OBJECTDESC(&ref_desc); { @@ -215,7 +214,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, hr = IDirectMusicLoader_GetObject (pLoader, &ref_desc, &IID_IDirectMusicObject, (LPVOID*)ppObject); IDirectMusicLoader_Release (pLoader); /* release loader */ } - TRACE_(dmfile)("** DM Reference End of Load ***\n"); + TRACE("** DM Reference End of Load ***\n"); return S_OK; }

1 0

Nikolay Sivov : ole32: Fix return value for IDataObject_GetData.
by Alexandre Julliard Dec. 22, 2008

Dec. 22, 2008

Module: wine Branch: master Commit: 55658d061c92e401e255474ac2c1d7a5eef8f32e URL: http://source.winehq.org/git/wine.git/?a=commit;h=55658d061c92e401e255474ac… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Dec 20 12:43:36 2008 +0300 ole32: Fix return value for IDataObject_GetData. --- dlls/ole32/clipboard.c | 3 ++- dlls/ole32/tests/clipboard.c | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 762afc7..9b290bb 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1246,7 +1246,8 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_GetData( } if ( pformatetcIn->lindex != -1 ) - return DV_E_LINDEX; + return DV_E_FORMATETC; + if ( (pformatetcIn->tymed & TYMED_HGLOBAL) != TYMED_HGLOBAL ) return DV_E_TYMED; /* diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 7e3809e..8445f8b 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -200,7 +200,7 @@ static HRESULT WINAPI DataObjectImpl_GetData(IDataObject* iface, FORMATETC *pfor DataObjectImpl_GetData_calls++; if(pformatetc->lindex != -1) - return DV_E_LINDEX; + return DV_E_FORMATETC; if(!(pformatetc->tymed & TYMED_HGLOBAL)) return DV_E_TYMED; @@ -400,7 +400,6 @@ static void test_get_clipboard(void) InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); fmtetc.lindex = 256; hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); - todo_wine ok(hr == DV_E_FORMATETC || broken(hr == S_OK), "IDataObject_GetData should have failed with DV_E_FORMATETC instead of 0x%08x\n", hr); if (hr == S_OK) {

1 0

Alexandre Julliard : Wine release 1.1.11
by Alexandre Julliard Dec. 20, 2008

Dec. 20, 2008

Module: website Branch: master Commit: 2f87ff34f1f5817121ea5a309e90566b09873f40 URL: http://source.winehq.org/git/website.git/?a=commit;h=2f87ff34f1f5817121ea5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 20 16:10:17 2008 +0100 Wine release 1.1.11 --- news/en/2008122001.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2008122001.xml b/news/en/2008122001.xml new file mode 100644 index 0000000..64ce539 --- /dev/null +++ b/news/en/2008122001.xml @@ -0,0 +1,17 @@ +<news> +<date>December 20, 2008</date> +<title>Wine 1.1.11 Released</title> +<body> + The Wine development release 1.1.11 is now available. + <a href="{$root}/announce/1.1.11">What's new</a> in this release: +<ul> + <li>Numerous fixes for IE7 support.</li> + <li>Support for 64-bit cross-compile using Mingw64.</li> + <li>User interface support for crypto certificates.</li> + <li>Better support for MSI installation patches.</li> + <li>Various Direct3D optimizations.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.11.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.1.11 : Alexandre Julliard : Release 1.1.11
by Alexandre Julliard Dec. 20, 2008

Dec. 20, 2008

Module: wine Branch: refs/tags/wine-1.1.11 Tag: 3f52d60ed36257658d7a31e72f0557ca55c6ccb4 URL: http://source.winehq.org/git/wine.git/?a=tag;h=3f52d60ed36257658d7a31e72f05… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 20 15:55:38 2008 +0100 Release 1.1.11

1 0

Alexandre Julliard : Release 1.1.11.
by Alexandre Julliard Dec. 20, 2008

Dec. 20, 2008

Module: wine Branch: master Commit: 0b3b6e67ea663e853cc6bb93f4da447ab934e50d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b3b6e67ea663e853cc6bb93f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 20 15:55:38 2008 +0100 Release 1.1.11. --- ANNOUNCE | 1459 +++++++++++++++++++++++++++++++++---------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 805 insertions(+), 674 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b3b6e67ea663e853cc6b…

1 0

Alexandre Julliard : msvcrt/tests: Avoid sizeof in a trace.
by Alexandre Julliard Dec. 20, 2008

Dec. 20, 2008

Module: wine Branch: master Commit: d77eba57f13114b02a3e6ecb1cb1289b62005584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d77eba57f13114b02a3e6ecb1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 20 13:33:08 2008 +0100 msvcrt/tests: Avoid sizeof in a trace. --- dlls/msvcrt/tests/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 38f16c1..66a0035 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -338,7 +338,7 @@ static void test_asciimode2(void) ok(getc(fp) == '0', "first char not 0\n"); memset(ibuf, 0, sizeof(ibuf)); i = fread(ibuf, 1, sizeof(ibuf), fp); - ok(i == sizeof(ibuf), "fread i %d != sizeof(ibuf) %d\n", i, sizeof(ibuf)); + ok(i == sizeof(ibuf), "fread i %d != sizeof(ibuf)\n", i); ok(0 == strncmp(ibuf, obuf+1, sizeof(ibuf)), "ibuf != obuf\n"); fclose(fp); unlink("ascii2.tst");

1 0

Alexandre Julliard : d3dxof/tests: Avoid size_t in a trace.
by Alexandre Julliard Dec. 20, 2008

Dec. 20, 2008

Module: wine Branch: master Commit: 7b2f7ed3e7a0141ffbc6dd41004da42962f640fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b2f7ed3e7a0141ffbc6dd410… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 20 13:32:39 2008 +0100 d3dxof/tests: Avoid size_t in a trace. --- dlls/d3dxof/tests/d3dxof.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 3315721..f707586 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -227,7 +227,7 @@ static void test_dump(void) goto exit; } - printf("Load %d (%d) bytes\n", cbSize, strlen(pvData)); + printf("Load %d bytes\n", cbSize); hr = pDirectXFileCreate(&lpDirectXFile); ok(hr == DXFILE_OK, "DirectXFileCreate: %x\n", hr);

1 0