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

Maarten Lankhorst : quartz: Fix bugs that occur during connection.
by Alexandre Julliard July 21, 2008

July 21, 2008

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

Maarten Lankhorst : quartz: Fix handling of zero byte samples and endofstreams.
by Alexandre Julliard July 21, 2008

July 21, 2008

Module: wine Branch: master Commit: 0f9356eb16cceba6f39f4be5a5d865ccff2af56c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f9356eb16cceba6f39f4be5a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Jul 18 15:49:31 2008 -0700 quartz: Fix handling of zero byte samples and endofstreams. --- dlls/quartz/avisplit.c | 30 +++++++++++++++++++----------- 1 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index ed9d3f1..fe6297f 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -147,7 +147,6 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe PullPin *pin = This->Parser.pInputPin; IMediaSample *sample = NULL; HRESULT hr; - BOOL endofstream = FALSE; TRACE("(%p, %u)->()\n", This, streamnumber); @@ -198,7 +197,7 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe TRACE("offset(%u) size(%u)\n", (DWORD)BYTES_FROM_MEDIATIME(rtSampleStart), (DWORD)BYTES_FROM_MEDIATIME(rtSampleStop - rtSampleStart)); /* End of file */ - if (stream->index_next >= stream->entries) + if (stream->index >= stream->entries) { ERR("END OF STREAM ON %u\n", streamnumber); IMediaSample_Release(sample); @@ -239,14 +238,14 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe && StreamFromFOURCC(This->oldindex->aIndex[stream->pos_next].dwChunkId) != streamnumber); /* End of file */ - if (stream->pos_next * sizeof(This->oldindex->aIndex[0]) >= This->oldindex->cb) + if (stream->index) { IMediaSample_Release(sample); stream->pos_next = 0; ++stream->index_next; ERR("END OF STREAM ON %u\n", streamnumber); hr = AVISplitter_SendEndOfFile(This, streamnumber); - endofstream = TRUE; + return S_FALSE; } } else /* TODO: Generate an index automagically */ @@ -255,12 +254,21 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe assert(0); } - hr = IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); + if (rtSampleStart != rtSampleStop) + { + hr = IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); - hr = IAsyncReader_Request(pin->pReader, sample, streamnumber); + hr = IAsyncReader_Request(pin->pReader, sample, streamnumber); - if (FAILED(hr)) - assert(IMediaSample_Release(sample) == 0); + if (FAILED(hr)) + assert(IMediaSample_Release(sample) == 0); + } + else + { + stream->sample = sample; + IMediaSample_SetActualDataLength(sample, 0); + SetEvent(stream->packet_queued); + } } else { @@ -272,9 +280,6 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe } TRACE("--> %08x\n", hr); - if (endofstream && hr == S_OK) - return S_FALSE; - return hr; } @@ -360,7 +365,10 @@ static HRESULT AVISplitter_Sample(LPVOID iface, IMediaSample * pSample, DWORD_PT HRESULT hr = S_OK; if (!IMediaSample_GetActualDataLength(pSample)) + { + ERR("Received empty sample\n"); return S_OK; + } /* Send the sample to whatever thread is appropiate * That thread should also not have a sample queued at the moment

1 0

Kirill K. Smirnov : shell32: Avoid usage of undefined xdg_results variable, since XDG_UserDirLookup() always corrupts it.
by Alexandre Julliard July 21, 2008

July 21, 2008

Module: wine Branch: master Commit: de3afabf084c3ee3e5b94d9f61bfec69ec4251dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=de3afabf084c3ee3e5b94d9f6… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Sat Jul 19 00:38:03 2008 +0400 shell32: Avoid usage of undefined xdg_results variable, since XDG_UserDirLookup() always corrupts it. --- dlls/shell32/shellpath.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index fb0c309..362a25a 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2139,7 +2139,7 @@ static void _SHCreateSymbolicLinks(void) const char *pszHome; HRESULT hr; const unsigned int num = sizeof(xdg_dirs) / sizeof(xdg_dirs[0]); - char ** xdg_results = NULL; + char ** xdg_results; char * xdg_desktop_dir; /* Create all necessary profile sub-dirs up to 'My Documents' and get the unix path. */ @@ -2149,7 +2149,8 @@ static void _SHCreateSymbolicLinks(void) pszPersonal = wine_get_unix_file_name(wszTempPath); if (!pszPersonal) return; - XDG_UserDirLookup(xdg_dirs, num, &xdg_results); + hr = XDG_UserDirLookup(xdg_dirs, num, &xdg_results); + if (FAILED(hr)) xdg_results = NULL; pszHome = getenv("HOME"); if (pszHome && !stat(pszHome, &statFolder) && S_ISDIR(statFolder.st_mode)) {

1 0

Dmitry Timoshkov : Revert "gdi32: Reselect objects into the DC only if scaling factors change.".
by Alexandre Julliard July 21, 2008

July 21, 2008

Module: wine Branch: master Commit: 02631adc8acd0d56f63bc73355666f78d9b3e157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02631adc8acd0d56f63bc7335… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jul 21 17:15:55 2008 +0900 Revert "gdi32: Reselect objects into the DC only if scaling factors change.". This reverts commit 3cbd9639da103bb6b5dcd7b78b4fc72edca1b765. --- dlls/gdi32/dc.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 801a3fd..8e4601d 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -315,9 +315,8 @@ void DC_UpdateXforms( DC *dc ) /* Reselect the font and pen back into the dc so that the size gets updated. */ - if ((oldworld2vport.eM11 != dc->xformWorld2Vport.eM11 || - oldworld2vport.eM22 != dc->xformWorld2Vport.eM22) && - !GdiIsMetaFileDC(dc->hSelf)) + if (memcmp(&oldworld2vport, &dc->xformWorld2Vport, sizeof(oldworld2vport)) && + !GdiIsMetaFileDC(dc->hSelf)) { SelectObject(dc->hSelf, GetCurrentObject(dc->hSelf, OBJ_FONT)); SelectObject(dc->hSelf, GetCurrentObject(dc->hSelf, OBJ_PEN));

1 0

Dmitry Timoshkov : gdi32: Relax the gm.gmCellIncX comparison.
by Alexandre Julliard July 21, 2008

July 21, 2008

Module: wine Branch: master Commit: 7976d993f5cbc4e7841edf607f01ce1ec547d122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7976d993f5cbc4e7841edf607… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jul 21 17:15:16 2008 +0900 gdi32: Relax the gm.gmCellIncX comparison. --- dlls/gdi32/tests/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index d143949..ad99a4d 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -514,7 +514,7 @@ static void test_outline_font(void) pt.x = width_orig; pt.y = 0; LPtoDP(hdc, &pt, 1); ok(gm.gmCellIncX == pt.x/2, "incX %d != %d\n", gm.gmCellIncX, pt.x/2); - ok(gm.gmCellIncX == 10 * width_orig, "incX %d != %d\n", gm.gmCellIncX, 10 * width_orig); + ok(near_match(gm.gmCellIncX, 10 * width_orig), "incX %d != %d\n", gm.gmCellIncX, 10 * width_orig); ok(gm.gmCellIncY == 0, "incY %d != 0\n", gm.gmCellIncY); SelectObject(hdc, old_hfont);

1 0

Alexandre Julliard : winetest: Fix a compiler warning with the size_t type.
by Alexandre Julliard July 21, 2008

July 21, 2008

Module: wine Branch: master Commit: b4e26f04199ecefc545b8f18f5b1f0ef360addec URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4e26f04199ecefc545b8f18f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 21 13:00:14 2008 +0200 winetest: Fix a compiler warning with the size_t type. --- programs/winetest/send.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winetest/send.c b/programs/winetest/send.c index c8372f3..947f2c1 100644 --- a/programs/winetest/send.c +++ b/programs/winetest/send.c @@ -109,7 +109,7 @@ send_file (const char *name) #define BUFLEN 8192 char buffer[BUFLEN+1]; DWORD bytes_read, filesize; - size_t total; + size_t total, count; char *str; int ret; @@ -208,9 +208,9 @@ send_file (const char *name) return 1; } - str = strmake (&bytes_read, "Received %s (%d bytes).\n", + str = strmake (&count, "Received %s (%d bytes).\n", name, filesize); - ret = memcmp (str, buffer + total - bytes_read, bytes_read); + ret = memcmp (str, buffer + total - count, count); free (str); if (ret) { buffer[total] = 0;

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard July 21, 2008

July 21, 2008

Module: wine Branch: master Commit: bc5ce27947a53c207b47baae94cc07e374f10d09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc5ce27947a53c207b47baae9… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jul 20 23:51:31 2008 +0200 Assorted spelling fixes. --- dlls/kernel32/tests/sync.c | 6 +++--- dlls/quartz/avisplit.c | 4 ++-- dlls/quartz/tests/avisplitter.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index b01498b..06b1e5c 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -549,7 +549,7 @@ static void test_timer_queue(void) HANDLE e; BOOL ret; - /* Test asyncronous deletion of the queue. */ + /* Test asynchronous deletion of the queue. */ q = CreateTimerQueue(); todo_wine ok(q != NULL, "CreateTimerQueue\n"); @@ -560,7 +560,7 @@ static void test_timer_queue(void) todo_wine ok(GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueEx\n"); - /* Test syncronous deletion of the queue and running timers. */ + /* Test synchronous deletion of the queue and running timers. */ q = CreateTimerQueue(); todo_wine ok(q != NULL, "CreateTimerQueue\n"); @@ -614,7 +614,7 @@ static void test_timer_queue(void) todo_wine ok(n5 == 1, "Timer callback 5\n"); - /* Test syncronous deletion of the queue with event trigger. */ + /* Test synchronous deletion of the queue with event trigger. */ e = CreateEvent(NULL, TRUE, FALSE, NULL); if (!e) { diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 2bbd8f1..ed9d3f1 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ /* FIXME: - * - Reference leaks, if they are still existant + * - Reference leaks, if they still exist * - Files without an index are not handled correctly yet. * - When stopping/starting, a sample is lost. This should be compensated by * keeping track of previous index/position. @@ -410,7 +410,7 @@ static HRESULT AVISplitter_first_request(LPVOID iface) stream->pos_next = stream->pos; stream->index_next = stream->index; - /* There should be a a packet queued from AVISplitter_next_request last time + /* There should be a packet queued from AVISplitter_next_request last time * It needs to be done now because this is the only way to ensure that every * stream will have at least 1 packet processed * If this is done after the threads start it could go all awkward and we diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index d3cdaac..a7461f4 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -177,7 +177,7 @@ static const char afile[] = "test.avi"; /* This test doesn't use the quartz filtergraph because it makes it impossible * to be certain that a thread is really one owned by the avi splitter * A lot of the decoder filters will also have their own thread, and windows' - * filtergraph has a seperate thread for start/stop/seeking requests. + * filtergraph has a separate thread for start/stop/seeking requests. * By avoiding the filtergraph all together and connecting streams directly to * the null renderer I am sure that this is not the case here. */

1 0

Francois Gouget : regedit: Remove a couple of left-over debug statements.
by Alexandre Julliard July 21, 2008

July 21, 2008

Module: wine Branch: master Commit: 22ff8c9b29dec54d66cfd537fc0c2b3f82fc9603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22ff8c9b29dec54d66cfd537f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jul 20 23:51:41 2008 +0200 regedit: Remove a couple of left-over debug statements. --- programs/regedit/regproc.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 2b2daf1..13bfc17 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1177,11 +1177,9 @@ BOOL import_registry_file(FILE* reg_file) { if (s[0] == 0xff && s[1] == 0xfe) { - printf("Trying to open unicode file\n"); processRegLinesW(reg_file); } else { - printf("ansi file\n"); rewind(reg_file); processRegLinesA(reg_file); }

1 0

Francois Gouget : sane.ds: Use 'sane-config --ldflags'.
by Alexandre Julliard July 21, 2008

July 21, 2008

Module: wine Branch: master Commit: a9d7babd991d2d145f68a8c41ab900213b382ee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9d7babd991d2d145f68a8c41… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jul 20 22:41:41 2008 +0200 sane.ds: Use 'sane-config --ldflags'. --- configure | 3 ++- configure.ac | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 5baf8dc..20b9b40 100755 --- a/configure +++ b/configure @@ -13031,6 +13031,7 @@ fi if test "$sane_devel" != "no" -a "x$with_sane" != "xno" then ac_sane_incl="`$sane_devel --cflags`" + ac_sane_libs="`$sane_devel --ldflags`" ac_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $ac_sane_incl" if test "${ac_cv_header_sane_sane_h+set}" = set; then @@ -13170,7 +13171,7 @@ if test "${ac_cv_lib_soname_sane+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-lsane $LIBS" +LIBS="-lsane $ac_sane_libs $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF diff --git a/configure.ac b/configure.ac index a32bb73..23cff81 100644 --- a/configure.ac +++ b/configure.ac @@ -920,10 +920,11 @@ AC_CHECK_PROG(sane_devel,sane-config,sane-config,no) if test "$sane_devel" != "no" -a "x$with_sane" != "xno" then ac_sane_incl="`$sane_devel --cflags`" + ac_sane_libs="`$sane_devel --ldflags`" ac_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $ac_sane_incl" AC_CHECK_HEADER(sane/sane.h, - [WINE_CHECK_SONAME(sane,sane_init,[AC_SUBST(SANEINCL,"$ac_sane_incl")])]) + [WINE_CHECK_SONAME(sane,sane_init,[AC_SUBST(SANEINCL,"$ac_sane_incl")],,[$ac_sane_libs])]) CPPFLAGS="$ac_save_CPPFLAGS" fi WINE_NOTICE_WITH(sane,[test "x$ac_cv_lib_soname_sane" = "x"],

1 0

Francois Gouget : wintrust/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard July 21, 2008

July 21, 2008

Module: wine Branch: master Commit: 32974e25a2d1cb0d429f6f4e5b27677443ed216b URL: http://source.winehq.org/git/wine.git/?a=commit;h=32974e25a2d1cb0d429f6f4e5… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jul 20 22:39:26 2008 +0200 wintrust/tests: Fix compilation on systems that don't support nameless unions. --- dlls/wintrust/tests/softpub.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index aa27333..01902dd 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -437,7 +437,7 @@ static void test_wintrust(void) wtd.dwUIChoice = WTD_UI_NONE; wtd.fdwRevocationChecks = WTD_REVOKE_WHOLECHAIN; wtd.dwUnionChoice = WTD_CHOICE_FILE; - wtd.pFile = &file; + U(wtd).pFile = &file; wtd.dwStateAction = WTD_STATEACTION_VERIFY; memset(&file, 0, sizeof(file)); file.cbStruct = sizeof(file);

1 0