wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Jacek Caban : mshtml: Added ITargetContainer:: GetFramesContainer implementation.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 537d05fb4bca899d301ff6b1f36d90fc350135a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=537d05fb4bca899d301ff6b1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 19 17:03:24 2012 +0100 mshtml: Added ITargetContainer::GetFramesContainer implementation. --- dlls/mshtml/oleobj.c | 9 +++++++-- dlls/mshtml/tests/htmldoc.c | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 9d50347..9f3d75a 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -924,8 +924,13 @@ static HRESULT WINAPI TargetContainer_GetFrameUrl(ITargetContainer *iface, LPWST static HRESULT WINAPI TargetContainer_GetFramesContainer(ITargetContainer *iface, IOleContainer **ppContainer) { HTMLDocumentObj *This = impl_from_ITargetContainer(iface); - FIXME("(%p)->(%p)\n", This, ppContainer); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppContainer); + + /* NOTE: we should return wrapped interface here */ + IOleContainer_AddRef(&This->basedoc.IOleContainer_iface); + *ppContainer = &This->basedoc.IOleContainer_iface; + return S_OK; } static const ITargetContainerVtbl TargetContainerVtbl = { diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 736e60f..0fb115a 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -310,6 +310,21 @@ static BOOL is_lang_english(void) return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; } +static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) +{ + IUnknown *unk1, *unk2; + + if(iface1 == iface2) + return TRUE; + + IUnknown_QueryInterface(iface1, &IID_IUnknown, (void**)&unk1); + IUnknown_Release(unk1); + IUnknown_QueryInterface(iface2, &IID_IUnknown, (void**)&unk2); + IUnknown_Release(unk2); + + return unk1 == unk2; +} + #define EXPECT_UPDATEUI 1 #define EXPECT_SETTITLE 2 @@ -5212,7 +5227,6 @@ static void test_open_window(IHTMLDocument2 *doc, BOOL do_block) }else { ok(new_window != NULL, "new_window == NULL\n"); - trace("WINDOW %p\n", new_window); hres = IHTMLWindow2_close(new_window); ok(hres == S_OK, "close failed: %08x\n", hres); } @@ -6170,6 +6184,29 @@ static void test_external(IHTMLDocument2 *doc, BOOL initialized) IHTMLWindow2_Release(htmlwin); } +static void test_target_container(IHTMLDocument2 *doc) +{ + IOleContainer *ole_container, *doc_ole_container; + ITargetContainer *target_container; + HRESULT hres; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_ITargetContainer, (void**)&target_container); + ok(hres == S_OK, "Could not get ITargetContainer iface: %08x\n", hres); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleContainer, (void**)&doc_ole_container); + ok(hres == S_OK, "Could not get ITargetContainer iface: %08x\n", hres); + + ole_container = (void*)0xdeadbeef; + hres = ITargetContainer_GetFramesContainer(target_container, &ole_container); + ok(hres == S_OK, "GetFramesContainer failed: %08x\n", hres); + ok(ole_container != NULL, "ole_container == NULL\n"); + ok(iface_cmp((IUnknown*)ole_container, (IUnknown*)doc_ole_container), "ole_container != doc_ole_container\n"); + IOleContainer_Release(ole_container); + + ITargetContainer_Release(target_container); + IOleContainer_Release(doc_ole_container); +} + static void test_StreamLoad(IHTMLDocument2 *doc) { IPersistStreamInit *init; @@ -6354,6 +6391,7 @@ static void test_HTMLDocument(BOOL do_load) test_OnAmbientPropertyChange(doc); test_Window(doc, TRUE); test_external(doc, TRUE); + test_target_container(doc); test_UIDeactivate(); test_OleCommandTarget(doc);

1 0

Jacek Caban : tlogstg.idl: Added new file and ITravelLogClient declaration.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 97f4b22543c44216f5286eb1cd42b201d884eca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f4b22543c44216f5286eb1c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 19 15:49:11 2012 +0100 tlogstg.idl: Added new file and ITravelLogClient declaration. --- .gitignore | 1 + dlls/uuid/uuid.c | 1 + include/Makefile.in | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 9164c25..b97d5b5 100644 --- a/.gitignore +++ b/.gitignore @@ -226,6 +226,7 @@ include/stdole2.tlb include/strmif.h include/structuredquerycondition.h include/textstor.h +include/tlogstg.h include/tom.h include/unknwn.h include/urlhist.h diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 25e98a7..cae55c7 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -83,6 +83,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "sensevts.h" #include "ocmm.h" #include "commoncontrols.h" +#include "tlogstg.h" /* FIXME: cguids declares GUIDs but does not define their values */ diff --git a/include/Makefile.in b/include/Makefile.in index 0c4122e..5ffc5e8 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -92,6 +92,7 @@ PUBLIC_IDL_H_SRCS = \ strmif.idl \ structuredquerycondition.idl \ textstor.idl \ + tlogstg.idl \ tom.idl \ unknwn.idl \ urlhist.idl \

1 0

Aric Stewart : wineqtdecoder: Implement QTSplitter_ChangeStart.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 676754d11a08afa29426bdd481a105803aa9559c URL: http://source.winehq.org/git/wine.git/?a=commit;h=676754d11a08afa29426bdd48… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jan 19 09:42:42 2012 -0600 wineqtdecoder: Implement QTSplitter_ChangeStart. --- dlls/wineqtdecoder/qtsplitter.c | 37 +++++++++++++++++---------- include/tlogstg.idl | 52 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 14 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index aab9fc1..9f01094 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -166,6 +166,9 @@ typedef struct QTSplitter { CRITICAL_SECTION csReceive; SourceSeeking sourceSeeking; + TimeValue movie_time; + TimeValue movie_start; + TimeScale movie_scale; } QTSplitter; static const IPinVtbl QT_OutputPin_Vtbl; @@ -468,7 +471,7 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) { QTSplitter *This = (QTSplitter *)data; HRESULT hr = S_OK; - TimeValue movie_time=0, next_time; + TimeValue next_time; CVPixelBufferRef pixelBuffer = NULL; OSStatus err; TimeRecord tr; @@ -486,11 +489,13 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) WaitForSingleObject(This->runEvent, -1); + EnterCriticalSection(&This->csReceive); This->state = State_Running; /* Prime the pump: Needed for MPEG streams */ - GetMovieNextInterestingTime(This->pQTMovie, nextTimeEdgeOK | nextTimeStep, 0, NULL, movie_time, 1, &next_time, NULL); + GetMovieNextInterestingTime(This->pQTMovie, nextTimeEdgeOK | nextTimeStep, 0, NULL, This->movie_time, 1, &next_time, NULL); GetMovieTime(This->pQTMovie, &tr); + LeaveCriticalSection(&This->csReceive); do { LONGLONG tStart=0, tStop=0; @@ -498,7 +503,7 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) float time; EnterCriticalSection(&This->csReceive); - GetMovieNextInterestingTime(This->pQTMovie, nextTimeStep, 0, NULL, movie_time, 1, &next_time, NULL); + GetMovieNextInterestingTime(This->pQTMovie, nextTimeStep, 0, NULL, This->movie_time, 1, &next_time, NULL); if (next_time == -1) { @@ -512,15 +517,15 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) MoviesTask(This->pQTMovie,0); QTVisualContextTask(This->vContext); - TRACE("In loop at time %ld\n",movie_time); + TRACE("In loop at time %ld\n",This->movie_time); TRACE("In Next time %ld\n",next_time); - mStart = movie_time; + mStart = This->movie_time; mStop = next_time; - time = (float)movie_time / tr.scale; + time = (float)(This->movie_time - This->movie_start) / This->movie_scale; tStart = time * 10000000; - time = (float)next_time / tr.scale; + time = (float)(next_time - This->movie_start) / This->movie_scale; tStop = time * 10000000; /* Deliver Audio */ @@ -552,8 +557,8 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) goto audio_error; } - duration = (float)next_time / tr.scale; - time = (float)movie_time / tr.scale; + duration = (float)next_time / This->movie_scale; + time = (float)This->movie_time / This->movie_scale; duration -= time; frames = pvi->nSamplesPerSec * duration; TRACE("Need audio for %f seconds (%li frames)\n",duration,frames); @@ -643,7 +648,7 @@ audio_error: else TRACE("No video to deliver\n"); - movie_time = next_time; + This->movie_time = next_time; LeaveCriticalSection(&This->csReceive); } while (hr == S_OK); @@ -923,7 +928,6 @@ static HRESULT QT_Process_Movie(QTSplitter* filter) DWORD tid; HANDLE thread; LONGLONG time; - TimeScale scale; TRACE("Trying movie connect\n"); @@ -963,8 +967,8 @@ static HRESULT QT_Process_Movie(QTSplitter* filter) hr = QT_Process_Audio_Track(filter, trk); time = GetMovieDuration(filter->pQTMovie); - scale = GetMovieTimeScale(filter->pQTMovie); - filter->sourceSeeking.llDuration = ((double)time / scale) * 10000000; + filter->movie_scale = GetMovieTimeScale(filter->pQTMovie); + filter->sourceSeeking.llDuration = ((double)time / filter->movie_scale) * 10000000; filter->sourceSeeking.llStop = filter->sourceSeeking.llDuration; TRACE("Movie duration is %s\n",wine_dbgstr_longlong(filter->sourceSeeking.llDuration)); @@ -1364,7 +1368,12 @@ static HRESULT QT_AddPin(QTSplitter *This, const PIN_INFO *piOutput, const AM_ME static HRESULT WINAPI QTSplitter_ChangeStart(IMediaSeeking *iface) { - FIXME("(%p) filter hasn't implemented start position change!\n", iface); + QTSplitter *This = impl_from_IMediaSeeking(iface); + TRACE("(%p)\n", iface); + EnterCriticalSection(&This->csReceive); + This->movie_time = (This->sourceSeeking.llCurrent * This->movie_scale)/10000000; + This->movie_start = This->movie_time; + LeaveCriticalSection(&This->csReceive); return S_OK; } diff --git a/include/tlogstg.idl b/include/tlogstg.idl new file mode 100644 index 0000000..ff82ffc --- /dev/null +++ b/include/tlogstg.idl @@ -0,0 +1,52 @@ +/* + * Copyright 2012 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "objidl.idl"; +import "oleidl.idl"; +import "shtypes.idl"; + +typedef struct _WINDOWDATA { + DWORD dwWindowID; + UINT uiCP; + PIDLIST_ABSOLUTE pidl; + [string] LPWSTR lpszUrl; + [string] LPWSTR lpszUrlLocation; + [string] LPWSTR lpszTitle; +} WINDOWDATA; + +typedef WINDOWDATA *LPWINDOWDATA; +typedef const WINDOWDATA *LPCWINDOWDATA; + +[ + uuid(241c033e-e659-43da-aa4d-4086dbc4758d), + object +] +interface ITravelLogClient : IUnknown +{ + HRESULT FindWindowByIndex( + [in] DWORD dwID, + [out] IUnknown **ppunk); + + HRESULT GetWindowData( + [in] IStream *pStream, + [out] LPWINDOWDATA pWinData); + + HRESULT LoadHistoryPosition( + [in] LPWSTR pszUrlLocation, + [in] DWORD dwPosition); +}

1 0

Hans Leidekker : msi: Don' t parse the format string when building the shortcut target path.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: d20c69c54dbc52030162042d78e9fc60c9a93d7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d20c69c54dbc52030162042d7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 19 12:27:05 2012 +0100 msi: Don't parse the format string when building the shortcut target path. It's no longer necessary because target paths are always normalized. --- dlls/msi/action.c | 18 +----------------- 1 files changed, 1 insertions(+), 17 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index baebdc2..2347902 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3601,25 +3601,9 @@ static UINT ITERATE_CreateShortcuts(MSIRECORD *row, LPVOID param) target = MSI_RecordGetString(row, 5); if (strchrW(target, '[')) { - int len; - WCHAR *format_string, *p; - - if (!(p = strchrW( target, ']' ))) goto err; - len = p - target + 1; - format_string = msi_alloc( (len + 1) * sizeof(WCHAR) ); - memcpy( format_string, target, len * sizeof(WCHAR) ); - format_string[len] = 0; - deformat_string( package, format_string, &deformated ); - msi_free( format_string ); - - path = msi_alloc( (strlenW( deformated ) + strlenW( p + 1 ) + 2) * sizeof(WCHAR) ); - strcpyW( path, deformated ); - PathAddBackslashW( path ); - strcatW( path, p + 1 ); + deformat_string( package, target, &path ); TRACE("target path is %s\n", debugstr_w(path)); - IShellLinkW_SetPath( sl, path ); - msi_free( deformated ); msi_free( path ); } else

1 0

Alexandre Julliard : dinput: Clip the mouse to the entire window instead of a 1x1 rectangle in exclusive mode .
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: f6368c4202afd47685d2d727c728a2e62dbe9735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6368c4202afd47685d2d727c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 19 13:34:55 2012 +0100 dinput: Clip the mouse to the entire window instead of a 1x1 rectangle in exclusive mode. --- dlls/dinput/mouse.c | 32 +++++++++++++++----------------- 1 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 06403e1..20de328 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -65,7 +65,6 @@ struct SysMouseImpl /* SysMouseAImpl */ /* These are used in case of relative -> absolute transitions */ POINT org_coords; - POINT mapped_center; BOOL clipped; /* warping: whether we need to move mouse back to middle once we * reach window borders (for e.g. shooters, "surface movement" games) */ @@ -320,20 +319,18 @@ static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM { MSLLHOOKSTRUCT *hook = (MSLLHOOKSTRUCT *)lparam; SysMouseImpl* This = impl_from_IDirectInputDevice8A(iface); - int wdata = 0, inst_id = -1, ret; + int wdata = 0, inst_id = -1; TRACE("msg %lx @ (%d %d)\n", wparam, hook->pt.x, hook->pt.y); EnterCriticalSection(&This->base.crit); - ret = This->clipped; switch(wparam) { case WM_MOUSEMOVE: { POINT pt, pt1; - if (This->clipped) pt = This->mapped_center; - else GetCursorPos(&pt); + GetCursorPos(&pt); This->m_state.lX += pt.x = hook->pt.x - pt.x; This->m_state.lY += pt.y = hook->pt.y - pt.y; @@ -403,8 +400,6 @@ static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_BUTTONS_INSTANCE + 2 + HIWORD(hook->mouseData)) | DIDFT_PSHBUTTON; This->m_state.rgbButtons[2 + HIWORD(hook->mouseData)] = wdata = 0x00; break; - default: - ret = 0; } @@ -416,7 +411,7 @@ static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM } LeaveCriticalSection(&This->base.crit); - return ret; + return 0; } static void warp_check( SysMouseImpl* This, BOOL force ) @@ -426,25 +421,28 @@ static void warp_check( SysMouseImpl* This, BOOL force ) if (force || (This->need_warp && (now - This->last_warped > interval))) { - RECT rect, new_rect; + RECT rect; + POINT mapped_center; This->last_warped = now; This->need_warp = FALSE; if (!GetWindowRect(This->base.win, &rect)) return; - This->mapped_center.x = (rect.left + rect.right) / 2; - This->mapped_center.y = (rect.top + rect.bottom) / 2; if (!This->clipped) { - TRACE("Warping mouse to %d - %d\n", This->mapped_center.x, This->mapped_center.y); - SetCursorPos( This->mapped_center.x, This->mapped_center.y ); + mapped_center.x = (rect.left + rect.right) / 2; + mapped_center.y = (rect.top + rect.bottom) / 2; + TRACE("Warping mouse to %d - %d\n", mapped_center.x, mapped_center.y); + SetCursorPos( mapped_center.x, mapped_center.y ); } if (This->base.dwCoopLevel & DISCL_EXCLUSIVE) { - SetRect( &rect, This->mapped_center.x, This->mapped_center.y, - This->mapped_center.x + 1, This->mapped_center.y + 1 ); + /* make sure we clip even if the window covers the whole screen */ + rect.left = max( rect.left, GetSystemMetrics( SM_XVIRTUALSCREEN ) + 1 ); + rect.top = max( rect.top, GetSystemMetrics( SM_YVIRTUALSCREEN ) + 1 ); + rect.right = min( rect.right, rect.left + GetSystemMetrics( SM_CXVIRTUALSCREEN ) - 2 ); + rect.bottom = min( rect.bottom, rect.top + GetSystemMetrics( SM_CYVIRTUALSCREEN ) - 2 ); TRACE("Clipping mouse to %s\n", wine_dbgstr_rect( &rect )); - ClipCursor( &rect ); - This->clipped = GetClipCursor( &new_rect ) && EqualRect( &rect, &new_rect ); + This->clipped = ClipCursor( &rect ); } } }

1 0

Dmitry Timoshkov : winex11.drv: Use dialog window type also for owned windows with WS_EX_DLGMODALFRAME style set .
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: c0cf49d50c3c7e18f0d39ada3f6679f8a6b08b17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0cf49d50c3c7e18f0d39ada3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 19 18:28:00 2012 +0800 winex11.drv: Use dialog window type also for owned windows with WS_EX_DLGMODALFRAME style set. --- dlls/winex11.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index e6affcb..48ba000 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1197,7 +1197,7 @@ static void set_wm_hints( Display *display, struct x11drv_win_data *data ) * only normal windows, and doesn't handle correctly TRANSIENT_FOR hint for * dialogs owned by fullscreen windows. */ - if ((style & WS_POPUP) && owner) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); + if (((style & WS_POPUP) || (ex_style & WS_EX_DLGMODALFRAME)) && owner) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); else window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_WINDOW_TYPE),

1 0

Huw Davies : gdi32: The clip region should stop the flooding.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 3dc4f259e9093463b4ee87ae8c35ea8f8f726e80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dc4f259e9093463b4ee87ae8… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 19 10:11:44 2012 +0000 gdi32: The clip region should stop the flooding. --- dlls/gdi32/dibdrv/graphics.c | 29 ++++++++++++++++------------- dlls/gdi32/tests/dib.c | 31 +++++++++++++++++++------------ 2 files changed, 35 insertions(+), 25 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index ace7c6d..17d6994 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -678,17 +678,20 @@ BOOL dibdrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) return dibdrv_RoundRect( dev, left, top, right, bottom, right - left, bottom - top ); } -static inline BOOL is_interior( dib_info *dib, int x, int y, DWORD pixel, UINT type) +static inline BOOL is_interior( dib_info *dib, HRGN clip, int x, int y, DWORD pixel, UINT type) { + /* the clip rgn stops the flooding */ + if (!PtInRegion( clip, x, y )) return FALSE; + if (type == FLOODFILLBORDER) return dib->funcs->get_pixel( dib, x, y ) != pixel; else return dib->funcs->get_pixel( dib, x, y ) == pixel; } -static void fill_row( dib_info *dib, RECT *row, DWORD pixel, UINT type, HRGN rgn ); +static void fill_row( dib_info *dib, HRGN clip, RECT *row, DWORD pixel, UINT type, HRGN rgn ); -static inline void do_next_row( dib_info *dib, const RECT *row, int offset, DWORD pixel, UINT type, HRGN rgn ) +static inline void do_next_row( dib_info *dib, HRGN clip, const RECT *row, int offset, DWORD pixel, UINT type, HRGN rgn ) { RECT next; @@ -697,26 +700,26 @@ static inline void do_next_row( dib_info *dib, const RECT *row, int offset, DWOR next.left = next.right = row->left; while (next.right < row->right) { - if (is_interior( dib, next.right, next.top, pixel, type)) next.right++; + if (is_interior( dib, clip, next.right, next.top, pixel, type)) next.right++; else { if (next.left != next.right && !PtInRegion( rgn, next.left, next.top )) - fill_row( dib, &next, pixel, type, rgn ); + fill_row( dib, clip, &next, pixel, type, rgn ); next.left = ++next.right; } } if (next.left != next.right && !PtInRegion( rgn, next.left, next.top )) - fill_row( dib, &next, pixel, type, rgn ); + fill_row( dib, clip, &next, pixel, type, rgn ); } -static void fill_row( dib_info *dib, RECT *row, DWORD pixel, UINT type, HRGN rgn ) +static void fill_row( dib_info *dib, HRGN clip, RECT *row, DWORD pixel, UINT type, HRGN rgn ) { - while (row->left > 0 && is_interior( dib, row->left - 1, row->top, pixel, type)) row->left--; - while (row->right < dib->width && is_interior( dib, row->right, row->top, pixel, type)) row->right++; + while (row->left > 0 && is_interior( dib, clip, row->left - 1, row->top, pixel, type)) row->left--; + while (row->right < dib->width && is_interior( dib, clip, row->right, row->top, pixel, type)) row->right++; add_rect_to_region( rgn, row ); - if (row->top > 0) do_next_row( dib, row, -1, pixel, type, rgn ); - if (row->top < dib->height - 1) do_next_row( dib, row, 1, pixel, type, rgn ); + if (row->top > 0) do_next_row( dib, clip, row, -1, pixel, type, rgn ); + if (row->top < dib->height - 1) do_next_row( dib, clip, row, 1, pixel, type, rgn ); return; } @@ -733,7 +736,7 @@ BOOL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) TRACE( "(%p, %d, %d, %08x, %d\n", pdev, x, y, color, type ); - if (!is_interior( &pdev->dib, x, y, pixel, type )) return FALSE; + if (!is_interior( &pdev->dib, pdev->clip, x, y, pixel, type )) return FALSE; rgn = CreateRectRgn( 0, 0, 0, 0 ); row.left = x; @@ -741,7 +744,7 @@ BOOL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) row.top = y; row.bottom = y + 1; - fill_row( &pdev->dib, &row, pixel, type, rgn ); + fill_row( &pdev->dib, pdev->clip, &row, pixel, type, rgn ); brush_region( pdev, rgn ); diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index fba4243..0846175 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -145,7 +145,7 @@ static const char *sha1_graphics_a8r8g8b8[] = "f451a05f699ac3bbe155d059e7871a2636887b5f", "5dca709c60e0cd50fa85274a2836aec9eb6168e3", "dccaef62738ff90da4554a85d8cb846d6436799e", - "57b3c6ece2c4f322d5cb5e5dde596714607d5502", + "cc4e1372ddf6e303a7fd159090c9d3a1f8ec2a89", NULL }; @@ -217,7 +217,7 @@ static const char *sha1_graphics_a8r8g8b8_bitfields[] = "f451a05f699ac3bbe155d059e7871a2636887b5f", "5dca709c60e0cd50fa85274a2836aec9eb6168e3", "dccaef62738ff90da4554a85d8cb846d6436799e", - "57b3c6ece2c4f322d5cb5e5dde596714607d5502", + "cc4e1372ddf6e303a7fd159090c9d3a1f8ec2a89", NULL }; @@ -289,7 +289,7 @@ static const char *sha1_graphics_a8b8g8r8[] = "707bc44fc9fed68ff1f537f0473e0cd825dd660f", "f19f5d8e2c96328f06f3985d02ff474fa37b1ea8", "175a7bcb73c74eceecc000657a0100bccf158ff4", - "71085fe7617b710a27a3ee4478d94e4d9209804e", + "d26eeb6b2d345b587d4305a1234ec0842a96d4b6", NULL }; @@ -361,7 +361,7 @@ static const char *sha1_graphics_r10g10b10[] = "88cfa7b7c1487f8eda05fce92b622942c9fb7ca4", "64cf929548bc5324fb14b053077bf5bc4be3e15c", "ad91dde8566dceaadc3523cdc8149cd7415a1b70", - "a56731d5c808a8a37ce057818d8c61d563ae4432", + "1936661eee8073068506131c9e89265b2f8403e8", NULL }; @@ -433,7 +433,7 @@ static const char *sha1_graphics_r6g6b6[] = "8e32ea3614c3b20899d748db48258761c7158d2b", "5da35bad12e3e9b26a0444d30820099481281e45", "94f004e98ae8035af948611770a4a2dd6643f510", - "130b503745311a795cd565f667c76870326b82d4", + "045ddaf752e7ffc7ded792f36af3c7c0cfeeae42", NULL }; @@ -505,7 +505,7 @@ static const char *sha1_graphics_24[] = "09cb4ab070083144bed4271c0a2a34ccb6ed13c0", "cc5ed4c9e925f0a457a7437fbb8054528cdd9469", "c95afd0a020e68a76982fe8663b5d64113987233", - "64d9e7cf03118d096a9a5bc5b5ee8c48df8bc0f6", + "48658ff76c137185c56a53f3ccf0e958d0296742", NULL }; @@ -581,7 +581,7 @@ static const char *sha1_graphics_r5g5b5[] = "7de23c68ca224818fdf127c5e96729dcd0de2b8b", "a848b1b0293b05b3f9358a3ffcb21a2e5fdecf05", "1a0fd0df17fa4c455a4a91cad30b5242f77fd233", - "1511523f4c6fd76a10867c44cc87a95446387425", + "af45bf81d119be5cf6845ad41191ba52637e65e9", NULL }; @@ -652,7 +652,7 @@ static const char *sha1_graphics_r4g4b4[] = "6fd751b7328c02954bce98bed94b3ce3c73db118", "91d50b5a604d6c38aa0d08b9af995490f8ec246b", "8585783d0373e9696b508776b6e6b18a80b09888", - "2e8fc36b1e534314c153375b9d3f6d217ccc08f1", + "b53cde47b0e28063770d3b1328c3cc2f774a6300", NULL }; @@ -729,7 +729,7 @@ static const char *sha1_graphics_8_color[] = "d7ffa3893c6fa937569791cf49986518a4a4d96e", "26bc25a011e2b60961ee9d6c6141d928ae24389b", "8771d5ff7b93b9dd9d077e672b342235dfb28472", - "6591276cda7784d91c79ed66ad4558b3f17426bc", + "6a1f6e1d494bf6b0ece7af5fa164ebaadb3a19bd", NULL }; @@ -886,7 +886,7 @@ static const char *sha1_graphics_8[] = "a6311d74fc058079a327abb536e69353be719925", "fbaa8848a1d3896469c37fd43ab44233f5b875a3", "0000000000000000000000000000000000000000", - "f3e856449b0ad00297cae027f51e3586746f9918", + "c2ac98ef716fd8a5ac8f08ce66293d9a96344337", NULL }; @@ -957,7 +957,7 @@ static const char *sha1_graphics_4[] = "6fe7d0d17b892032cfd171c3d7c365f030b5be38", "7ae780dcc7cf04dda50648bfc07cc6a7a2f2189e", "0000000000000000000000000000000000000000", - "3b6e78e568ed3e60e77f45fdf38cdfed4c341bb9", + "9ab46e0c42f82dc73df8a55cbf881abd72397cec", NULL }; @@ -1840,6 +1840,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh pSetLayout(hdc, LAYOUT_LTR); } + DeleteObject( hrgn ); for(i = 0, y = 10; i < 256; i++) { @@ -2554,6 +2555,11 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh solid_patblt( hdc, 100, 160, 50, 50, RGB( 0, 0, 0xff ) ); solid_patblt( hdc, 90, 160, 70, 10, RGB( 0, 0, 0xff ) ); + /* add a vertical 'bar' to show that the clip rgn stops the flooding */ + hrgn = CreateRectRgn( 180, 10, 190, 210 ); + ExtSelectClipRgn( hdc, hrgn, RGN_DIFF ); + DeleteObject( hrgn ); + solid_brush = CreateSolidBrush( RGB( 0xff, 0, 0 ) ); SelectObject( hdc, solid_brush ); @@ -2562,9 +2568,10 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh compare_hash(bmi, bits, sha1, "flood fill" ); memset(bits, 0xcc, dib_size); + ExtSelectClipRgn( hdc, NULL, RGN_COPY ); + SelectObject(hdc, orig_brush); SelectObject(hdc, orig_pen); - DeleteObject(hrgn); DeleteObject(dib_brush); DeleteObject(solid_brush); DeleteObject(wide_pen);

1 0

Jörg Höhle : winmm/tests: Properly recover from the WAVERR_STILLPLAYING case.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 32c23cbc80a3ce9690e255f0fb31e1d27114b99d URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c23cbc80a3ce9690e255f0f… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jan 18 20:30:31 2012 +0100 winmm/tests: Properly recover from the WAVERR_STILLPLAYING case. --- dlls/winmm/tests/wave.c | 43 +++++++++++++++++++++++++++++++------------ 1 files changed, 31 insertions(+), 12 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index a7614a5..a96d088 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -684,7 +684,8 @@ static void wave_out_test_deviceOut(int device, double duration, if (rc!=MMSYSERR_NOERROR) goto EXIT; - WaitForSingleObject(hevent,10000); + rc=WaitForSingleObject(hevent,9000); + ok(rc==WAIT_OBJECT_0, "missing WOM_OPEN notification\n"); ok(pwfx->nChannels==nChannels && pwfx->wBitsPerSample==wBitsPerSample && @@ -787,7 +788,8 @@ static void wave_out_test_deviceOut(int device, double duration, ok(rc==MMSYSERR_NOERROR,"waveOutWrite(%s, header[%d]): rc=%s\n", dev_name(device),(i+1)%headers,wave_out_error(rc)); } - WaitForSingleObject(hevent,10000); + rc=WaitForSingleObject(hevent,8000); + ok(rc==WAIT_OBJECT_0, "missing WOM_DONE notification\n"); } } @@ -807,12 +809,29 @@ static void wave_out_test_deviceOut(int device, double duration, "waveOutUnprepareHeader(%s): rc=%s\n",dev_name(device), wave_out_error(rc)); } - HeapFree(GetProcessHeap(), 0, buffer); - rc=waveOutClose(wout); ok(rc==MMSYSERR_NOERROR,"waveOutClose(%s): rc=%s\n",dev_name(device), wave_out_error(rc)); - WaitForSingleObject(hevent,10000); + if (rc==WAVERR_STILLPLAYING) { + /* waveOutReset ought to return all buffers s.t. waveOutClose succeeds */ + rc=waveOutReset(wout); + ok(rc==MMSYSERR_NOERROR,"waveOutReset(%s): rc=%s\n",dev_name(device), + wave_out_error(rc)); + + for (i = 0; i < headers; i++) { + rc=waveOutUnprepareHeader(wout, &frags[i], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR, + "waveOutUnprepareHeader(%s): rc=%s\n",dev_name(device), + wave_out_error(rc)); + } + rc=waveOutClose(wout); + ok(rc==MMSYSERR_NOERROR,"waveOutClose(%s): rc=%s\n",dev_name(device), + wave_out_error(rc)); + } + rc=WaitForSingleObject(hevent,1500); + ok(rc==WAIT_OBJECT_0, "missing WOM_CLOSE notification\n"); + + HeapFree(GetProcessHeap(), 0, buffer); EXIT: if ((flags & CALLBACK_TYPEMASK) == CALLBACK_THREAD) { PostThreadMessage(thread_id, WM_APP, 0, 0); @@ -970,20 +989,20 @@ static void wave_out_test_device(UINT_PTR device) format.nBlockAlign=format.nChannels*format.wBitsPerSample/8; format.nAvgBytesPerSec=format.nSamplesPerSec*format.nBlockAlign; format.cbSize=0; - wave_out_test_deviceOut(device,1.0,1,0,&format,WAVE_FORMAT_2M08, + wave_out_test_deviceOut(device,0.6,1,0,&format,WAVE_FORMAT_2M08, CALLBACK_EVENT,&capsA,TRUE,FALSE,FALSE); - wave_out_test_deviceOut(device,1.0,1,0,&format,WAVE_FORMAT_2M08, + wave_out_test_deviceOut(device,0.6,1,0,&format,WAVE_FORMAT_2M08, CALLBACK_EVENT,&capsA,TRUE,FALSE,TRUE); - wave_out_test_deviceOut(device,1.0,1,0,&format,WAVE_FORMAT_2M08, + wave_out_test_deviceOut(device,0.6,1,0,&format,WAVE_FORMAT_2M08, CALLBACK_FUNCTION,&capsA,TRUE,FALSE,FALSE); - wave_out_test_deviceOut(device,1.0,1,0,&format,WAVE_FORMAT_2M08, + wave_out_test_deviceOut(device,0.6,1,0,&format,WAVE_FORMAT_2M08, CALLBACK_FUNCTION,&capsA,TRUE,FALSE,TRUE); - wave_out_test_deviceOut(device,1.0,1,0,&format,WAVE_FORMAT_2M08, + wave_out_test_deviceOut(device,0.6,1,0,&format,WAVE_FORMAT_2M08, CALLBACK_THREAD,&capsA,TRUE,FALSE,FALSE); - wave_out_test_deviceOut(device,1.0,1,0,&format,WAVE_FORMAT_2M08, + wave_out_test_deviceOut(device,0.6,1,0,&format,WAVE_FORMAT_2M08, CALLBACK_THREAD,&capsA,TRUE,FALSE,TRUE); - wave_out_test_deviceOut(device,1.0,10,0,&format,WAVE_FORMAT_2M08, + wave_out_test_deviceOut(device,0.8,10,0,&format,WAVE_FORMAT_2M08, CALLBACK_EVENT,&capsA,TRUE,FALSE,FALSE); wave_out_test_deviceOut(device,1.0,5,1,&format,WAVE_FORMAT_2M08, CALLBACK_EVENT,&capsA,TRUE,FALSE,FALSE);

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 478273849743be5b4710af2130166f71331231b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=478273849743be5b4710af213… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jan 19 10:26:55 2012 +0100 po: Update French translation. --- po/fr.po | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/po/fr.po b/po/fr.po index 564e377..35e1c8c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -13386,6 +13386,7 @@ msgstr "Erreur lors de l'enregistrement" #: winedbg.rc:41 msgid "Loading detailed information, please wait..." msgstr "" +"Chargement des informations détaillées en cours ; veuillez patienter..." #: winefile.rc:26 msgid "&Open\tEnter"

1 0

Michael Stefaniuc : dsound: Merge IDirectSound3DBuffer into the secondary buffer object.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: e0d81e55e22eff4f2be3926dfa6c1745b9438e22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d81e55e22eff4f2be3926df… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 19 01:18:30 2012 +0100 dsound: Merge IDirectSound3DBuffer into the secondary buffer object. --- dlls/dsound/buffer.c | 22 +-- dlls/dsound/dsound_private.h | 22 +--- dlls/dsound/sound3d.c | 369 +++++++++++++++++++----------------------- 3 files changed, 174 insertions(+), 239 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0d81e55e22eff4f2be39…

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
98
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2012