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

Alexandre Julliard : user32/tests: Avoid testing uninitialized data.
by Alexandre Julliard 10 Apr '08

10 Apr '08

Module: wine Branch: master Commit: e3ac70c1cbdd9f61272900b29229218a33bf709f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3ac70c1cbdd9f61272900b29… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 10 09:45:34 2008 +0200 user32/tests: Avoid testing uninitialized data. --- dlls/user32/tests/cursoricon.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 2febfbb..7ea79ad 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -649,13 +649,14 @@ static void test_LoadImage(void) error = GetLastError(); ok(error == 0xdeadbeef, "Last error: %u\n", error); - todo_wine { - ok(icon_info.fIcon == FALSE, "fIcon != FALSE.\n"); - ok(icon_info.xHotspot == 1, "xHotspot is %u.\n", icon_info.xHotspot); - ok(icon_info.yHotspot == 1, "yHotspot is %u.\n", icon_info.yHotspot); - ok(icon_info.hbmColor != NULL, "No hbmColor!\n"); + if (ret) + { + ok(icon_info.fIcon == FALSE, "fIcon != FALSE.\n"); + ok(icon_info.xHotspot == 1, "xHotspot is %u.\n", icon_info.xHotspot); + ok(icon_info.yHotspot == 1, "yHotspot is %u.\n", icon_info.yHotspot); + ok(icon_info.hbmColor != NULL, "No hbmColor!\n"); + ok(icon_info.hbmMask != NULL, "No hbmMask!\n"); } - ok(icon_info.hbmMask != NULL, "No hbmMask!\n"); /* Clean up. */ SetLastError(0xdeadbeef);

1 0

Alexandre Julliard : programs: Remove winelauncher from install rules.
by Alexandre Julliard 10 Apr '08

10 Apr '08

Module: wine Branch: master Commit: 669949251d0c7ee469433fda92aa14c6c26b0640 URL: http://source.winehq.org/git/wine.git/?a=commit;h=669949251d0c7ee469433fda9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 10 09:45:44 2008 +0200 programs: Remove winelauncher from install rules. --- programs/Makefile.in | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/Makefile.in b/programs/Makefile.in index 8908930..7565590 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -141,11 +141,10 @@ install-progs.so: $(INSTALLPROGS:%=%/__installprog__) install-progs: # nothing to do here -install:: winelauncher install-progs$(DLLEXT) $(INSTALLDIRS) - $(INSTALL_SCRIPT) winelauncher $(DESTDIR)$(bindir)/winelauncher +install:: install-progs$(DLLEXT) $(INSTALLDIRS) uninstall:: - -cd $(DESTDIR)$(bindir) && $(RM) wineapploader winelauncher $(INSTALLPROGS) + -cd $(DESTDIR)$(bindir) && $(RM) wineapploader $(INSTALLPROGS) -rmdir $(DESTDIR)$(dlldir) # Rules for testing

1 0

Maarten Lankhorst : quartz: Implement stop position in the filtergraph.
by Alexandre Julliard 10 Apr '08

10 Apr '08

Module: wine Branch: master Commit: 43f9fff0a0237efa88de16e8a1ba7da9a58b09d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43f9fff0a0237efa88de16e8a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 9 12:00:13 2008 -0700 quartz: Implement stop position in the filtergraph. --- dlls/quartz/filtergraph.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 91b872d..94e4003 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -203,6 +203,7 @@ typedef struct _IFilterGraphImpl { GUID timeformatseek; LONGLONG start_time; LONGLONG position; + LONGLONG stop_position; } IFilterGraphImpl; static HRESULT WINAPI Filtergraph_QueryInterface(IFilterGraphImpl *This, @@ -2038,10 +2039,23 @@ static HRESULT WINAPI MediaSeeking_GetDuration(IMediaSeeking *iface, static HRESULT WINAPI MediaSeeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *pStop) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaSeeking_vtbl, iface); + HRESULT hr = S_OK; - FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, pStop); + TRACE("(%p/%p)->(%p)\n", This, iface, pStop); - return S_OK; + if (!pStop) + return E_POINTER; + + EnterCriticalSection(&This->cs); + if (This->stop_position < 0) + /* Stop position not set, use duration instead */ + hr = IMediaSeeking_GetDuration(iface, pStop); + else + *pStop = This->stop_position; + + LeaveCriticalSection(&This->cs); + + return hr; } static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, @@ -2116,7 +2130,9 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, else if ((dwCurrentFlags & 0x7) != AM_SEEKING_NoPositioning) FIXME("Adjust method %x not handled yet!\n", dwCurrentFlags & 0x7); - if ((dwStopFlags & 0x7) != AM_SEEKING_NoPositioning) + if ((dwStopFlags & 0x7) == AM_SEEKING_AbsolutePositioning) + This->stop_position = *pStop; + else if ((dwStopFlags & 0x7) != AM_SEEKING_NoPositioning) FIXME("Stop position not handled yet!\n"); args.current = pCurrent; @@ -5084,6 +5100,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->nItfCacheEntries = 0; memcpy(&fimpl->timeformatseek, &TIME_FORMAT_MEDIA_TIME, sizeof(GUID)); fimpl->start_time = fimpl->position = 0; + fimpl->stop_position = -1; hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterMapper2, (LPVOID*)&fimpl->pFilterMapper2); if (FAILED(hr)) {

1 0

Maarten Lankhorst : quartz: Implement stop position in the mpeg splitter.
by Alexandre Julliard 10 Apr '08

10 Apr '08

Module: wine Branch: master Commit: 2734e6332ccceb35182c89fc8cc9d222a0b05dd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2734e6332ccceb35182c89fc8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 9 12:07:14 2008 -0700 quartz: Implement stop position in the mpeg splitter. --- dlls/quartz/mpegsplit.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 5991795..7577174 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -4,6 +4,7 @@ * Copyright 2003 Robert Shearman * Copyright 2004-2005 Christian Costa * Copyright 2007 Chris Robinson + * Copyright 2008 Maarten Lankhorst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -426,16 +427,22 @@ fail: This->remaining_bytes = 0; This->Parser.pInputPin->rtCurrent = MEDIATIME_FROM_BYTES(BYTES_FROM_MEDIATIME(tStop) - cbSrcStream); - if (This->pCurrentSample) + + /* If set to S_FALSE we keep the sample, to transmit it next time */ + if (hr != S_FALSE && This->pCurrentSample) { IMediaSample_SetActualDataLength(This->pCurrentSample, 0); IMediaSample_Release(This->pCurrentSample); This->pCurrentSample = NULL; } + + /* Sample was rejected because of whatever reason (paused/flushing/etc), no need to terminate the processing */ + if (hr == S_FALSE) + hr = S_OK; break; } - if (BYTES_FROM_MEDIATIME(tStop) >= This->EndOfFile) + if (BYTES_FROM_MEDIATIME(tStop) >= This->EndOfFile || This->position >= This->Parser.mediaSeeking.llStop) { int i; @@ -742,6 +749,10 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin) TRACE("Duration: %d seconds\n", (DWORD)(duration / 10000000)); TRACE("Parsing took %u ms\n", GetTickCount() - ticks); This->duration = duration; + + This->Parser.mediaSeeking.llCurrent = 0; + This->Parser.mediaSeeking.llDuration = duration; + This->Parser.mediaSeeking.llStop = duration; break; } case MPEG_VIDEO_HEADER: @@ -829,6 +840,7 @@ static HRESULT MPEGSplitter_seek(IBaseFilter *iface) TRACE("Moving sound to %08u bytes!\n", (DWORD)bytepos); + EnterCriticalSection(&pin->thread_lock); IPin_BeginFlush((IPin *)pin); /* Make sure this is done while stopped, BeginFlush takes care of this */ @@ -848,6 +860,7 @@ static HRESULT MPEGSplitter_seek(IBaseFilter *iface) TRACE("Done flushing\n"); IPin_EndFlush((IPin *)pin); + LeaveCriticalSection(&pin->thread_lock); } return hr; }

1 0

Maarten Lankhorst : include: Add ISeekingPassThru interface.
by Alexandre Julliard 10 Apr '08

10 Apr '08

Module: wine Branch: master Commit: 7fa1c9d024231847c3385a82d478a7b9f59b32cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fa1c9d024231847c3385a82d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 9 11:44:46 2008 -0700 include: Add ISeekingPassThru interface. --- include/axextend.idl | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/axextend.idl b/include/axextend.idl index f262f3a..03ca187 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -982,3 +982,13 @@ interface IKsPropertySet : IUnknown [out] DWORD *pTypeSupport); } cpp_quote("#endif /* _IKsPropertySet_ */") + +[ + object, + uuid(36b73883-c2c8-11cf-8b46-00805f6cef60), + pointer_default(unique) +] +interface ISeekingPassThru : IUnknown +{ + HRESULT Init( [in] BOOL bSupportRendering, [in] IPin *pPin); +}

1 0

Austin English : ole32: Spelling fixes.
by Alexandre Julliard 10 Apr '08

10 Apr '08

Module: wine Branch: master Commit: 1b24da3aa070c63b8ded0800b2745ced67dfd8bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b24da3aa070c63b8ded0800b… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Apr 9 14:33:37 2008 -0500 ole32: Spelling fixes. --- dlls/ole32/antimoniker.c | 4 ++-- dlls/ole32/bindctx.c | 2 +- dlls/ole32/compobj.c | 4 ++-- dlls/ole32/compositemoniker.c | 6 +++--- dlls/ole32/datacache.c | 4 ++-- dlls/ole32/defaulthandler.c | 2 +- dlls/ole32/filemoniker.c | 6 +++--- dlls/ole32/ifs.c | 2 +- dlls/ole32/itemmoniker.c | 6 +++--- dlls/ole32/moniker.c | 8 ++++---- dlls/ole32/ole16.c | 2 +- dlls/ole32/pointermoniker.c | 2 +- dlls/ole32/rpc.c | 6 +++--- dlls/ole32/stg_prop.c | 2 +- dlls/ole32/storage.c | 2 +- dlls/ole32/storage32.c | 22 +++++++++++----------- dlls/ole32/storage32.h | 2 +- 17 files changed, 41 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b24da3aa070c63b8ded0…

1 0

Lei Zhang : user32: Fix a typo.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 5cc671eec57dde6659ae058af0b98b4ec1bb71eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cc671eec57dde6659ae058af… Author: Lei Zhang <thestig(a)google.com> Date: Tue Apr 8 20:10:36 2008 -0700 user32: Fix a typo. --- dlls/user32/edit.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 7fd62cc..85de02e 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -855,10 +855,8 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, if (charW == VK_RETURN || charW == VK_ESCAPE) { if (SendMessageW(GetParent(hwnd), CB_GETDROPPEDSTATE, 0, 0)) - { SendMessageW(GetParent(hwnd), WM_KEYDOWN, charW, 0); - break; - } + break; } } result = EDIT_WM_Char(es, charW);

1 0

Tomasz Jezierski : hhctrl.ocx: Fix for writing outside allocated memory in HH_AddToolbar.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 0b64b866a42b9a5a00f835047363ac076d24436d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b64b866a42b9a5a00f835047… Author: Tomasz Jezierski <developers(a)tefnet.pl> Date: Wed Apr 9 10:03:58 2008 +0200 hhctrl.ocx: Fix for writing outside allocated memory in HH_AddToolbar. --- dlls/hhctrl.ocx/help.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 3ee522e..900cfd9 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -575,7 +575,7 @@ static BOOL HH_AddToolbar(HHInfo *pHHInfo) { LPWSTR szBuf = HH_LoadString(buttons[dwIndex].idCommand); DWORD dwLen = strlenW(szBuf); - szBuf[dwLen + 2] = 0; /* Double-null terminate */ + szBuf[dwLen + 1] = 0; /* Double-null terminate */ buttons[dwIndex].iString = (DWORD)SendMessageW(hToolbar, TB_ADDSTRINGW, 0, (LPARAM)szBuf); heap_free(szBuf);

1 0

Alexandre Julliard : winex11: Added an error handler to catch bad atoms in clipboard selections.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 704ac5a51ef54de92851638d0860c697fa39d7ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=704ac5a51ef54de92851638d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 9 20:09:40 2008 +0200 winex11: Added an error handler to catch bad atoms in clipboard selections. --- dlls/winex11.drv/clipboard.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index cdf54c1..af5ff9d 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1728,6 +1728,11 @@ static BOOL X11DRV_CLIPBOARD_QueryTargets(Display *display, Window w, Atom selec } +static int is_atom_error( Display *display, XErrorEvent *event, void *arg ) +{ + return (event->error_code == BadAtom); +} + /************************************************************************** * X11DRV_CLIPBOARD_InsertSelectionProperties * @@ -1759,7 +1764,7 @@ static VOID X11DRV_CLIPBOARD_InsertSelectionProperties(Display *display, Atom* p lpFormat = X11DRV_CLIPBOARD_LookupProperty(lpFormat, properties[i]); } } - else + else if (properties[i]) { /* add it to the list of atoms that we don't know about yet */ if (!atoms) atoms = HeapAlloc( GetProcessHeap(), 0, @@ -1774,13 +1779,13 @@ static VOID X11DRV_CLIPBOARD_InsertSelectionProperties(Display *display, Atom* p char **names = HeapAlloc( GetProcessHeap(), 0, nb_atoms * sizeof(*names) ); if (names) { - wine_tsx11_lock(); - /* FIXME: we're at the mercy of the app sending the event here. - * Currently if they send a bogus atom, we will crash. - * We should handle BadAtom errors gracefully in this call. - */ - XGetAtomNames( display, atoms, nb_atoms, names ); - wine_tsx11_unlock(); + X11DRV_expect_error( display, is_atom_error, NULL ); + if (!XGetAtomNames( display, atoms, nb_atoms, names )) nb_atoms = 0; + if (X11DRV_check_error()) + { + WARN( "got some bad atoms, ignoring\n" ); + nb_atoms = 0; + } for (i = 0; i < nb_atoms; i++) { WINE_CLIPFORMAT *lpFormat;

1 0

Alexandre Julliard : winex11: Flush the display after creating X windows.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 731d77f762776a7e5f6a62390c4281ff74f7feeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=731d77f762776a7e5f6a62390… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 9 20:24:27 2008 +0200 winex11: Flush the display after creating X windows. --- 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 6edfbc5..4d5da02 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -610,6 +610,7 @@ static Window create_icon_window( Display *display, struct x11drv_win_data *data InputOutput, visual, CWEventMask | CWBitGravity | CWBackingStore | CWColormap, &attr ); XSaveContext( display, data->icon_window, winContext, (char *)data->hwnd ); + XFlush( display ); /* make sure the window exists before we start painting to it */ wine_tsx11_unlock(); TRACE( "created %lx\n", data->icon_window ); @@ -1097,6 +1098,9 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat if (GetWindowRgn( data->hwnd, hrgn ) != ERROR) sync_window_region( display, data, hrgn ); DeleteObject( hrgn ); } + wine_tsx11_lock(); + XFlush( display ); /* make sure the window exists before we start painting to it */ + wine_tsx11_unlock(); return data->whole_window; }

1 0