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

Dmitry Timoshkov : user32: SetParent() should use ShowWindow() to make a reparented window visible and move a window to new position.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 847317d01983eed51a93ef57390fb6a266091b70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=847317d01983eed51a93ef573… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 23 16:57:28 2012 +0800 user32: SetParent() should use ShowWindow() to make a reparented window visible and move a window to new position. --- dlls/user32/win.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 3e7d9b1..1cad8aa 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2787,6 +2787,7 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) HWND old_parent = 0; BOOL was_visible; WND *wndPtr; + POINT pt; BOOL ret; if (is_broadcast(hwnd) || is_broadcast(parent)) @@ -2828,6 +2829,9 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) wndPtr = WIN_GetPtr( hwnd ); if (!wndPtr || wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) return 0; + pt.x = wndPtr->rectWindow.left; + pt.y = wndPtr->rectWindow.top; + SERVER_START_REQ( set_parent ) { req->handle = wine_server_user_handle( hwnd ); @@ -2849,10 +2853,9 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) in the x-order and send the expected WM_WINDOWPOSCHANGING and WM_WINDOWPOSCHANGED notification messages. */ - SetWindowPos( hwnd, HWND_TOP, 0, 0, 0, 0, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | (was_visible ? SWP_SHOWWINDOW : 0) ); - /* FIXME: a WM_MOVE is also generated (in the DefWindowProc handler - * for WM_WINDOWPOSCHANGED) in Windows, should probably remove SWP_NOMOVE */ + SetWindowPos( hwnd, HWND_TOP, pt.x, pt.y, 0, 0, SWP_NOSIZE ); + + if (was_visible) ShowWindow( hwnd, SW_SHOW ); return old_parent; }

1 0

Dmitry Timoshkov : user32: SetWindowPos() should check the final window position in screen coords before adding SWP_NOMOVE .
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 38a76ecb0386d37d30b06b7947ed52be77ec9f1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=38a76ecb0386d37d30b06b794… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 23 16:58:13 2012 +0800 user32: SetWindowPos() should check the final window position in screen coords before adding SWP_NOMOVE. --- dlls/user32/winpos.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 42f6b3e..c4b61a8 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1849,6 +1849,7 @@ static BOOL fixup_flags( WINDOWPOS *winpos ) { HWND parent; RECT window_rect; + POINT pt; WND *wndPtr = WIN_GetPtr( winpos->hwnd ); BOOL ret = TRUE; @@ -1880,12 +1881,15 @@ static BOOL fixup_flags( WINDOWPOS *winpos ) if (!(winpos->flags & SWP_SHOWWINDOW)) winpos->flags |= SWP_NOREDRAW; } - WIN_GetRectangles( winpos->hwnd, COORDS_PARENT, &window_rect, NULL ); + WIN_GetRectangles( winpos->hwnd, COORDS_SCREEN, &window_rect, NULL ); if ((window_rect.right - window_rect.left == winpos->cx) && (window_rect.bottom - window_rect.top == winpos->cy)) winpos->flags |= SWP_NOSIZE; /* Already the right size */ - if ((window_rect.left == winpos->x) && (window_rect.top == winpos->y)) + pt.x = winpos->x; + pt.y = winpos->y; + ClientToScreen( parent, &pt ); + if ((window_rect.left == pt.x) && (window_rect.top == pt.y)) winpos->flags |= SWP_NOMOVE; /* Already the right position */ if ((wndPtr->dwStyle & (WS_POPUP | WS_CHILD)) != WS_CHILD)

1 0

Daniel Jelinski : comctl32/tests: Added test for treeview expand notifications on keyboard events.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: c52d7acf5464747c1eed521b287e0bec4ef042a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c52d7acf5464747c1eed521b2… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sun Apr 1 00:03:56 2012 +0200 comctl32/tests: Added test for treeview expand notifications on keyboard events. --- dlls/comctl32/tests/treeview.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 8c0ec93..61a3ce6 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -204,6 +204,20 @@ static const struct message parent_expand_seq[] = { { 0 } }; +static const struct message parent_expand_kb_seq[] = { + { WM_NOTIFY, sent|id|optional, 0, 0, TVN_KEYDOWN }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, + { WM_CHANGEUISTATE, sent|optional }, + { 0 } +}; + +static const struct message parent_expand_empty_kb_seq[] = { + { WM_NOTIFY, sent|id|optional, 0, 0, TVN_KEYDOWN }, + { WM_CHANGEUISTATE, sent|optional }, + { 0 } +}; + static const struct message parent_singleexpand_seq[] = { { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGINGA }, { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGEDA }, @@ -1423,6 +1437,31 @@ static void test_expandnotify(void) ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "toggle node (collapse)", FALSE); DestroyWindow(hTree); + + /* some keyboard events are also translated to expand */ + hTree = create_treeview_control(0); + fill_tree(hTree); + + /* preselect root node here */ + ret = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); + expect(TRUE, ret); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, WM_KEYDOWN, VK_ADD, 0); + expect(FALSE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_expand_kb_seq, "expand node", FALSE); + + /* go to child */ + ret = SendMessageA(hTree, WM_KEYDOWN, VK_RIGHT, 0); + expect(FALSE, ret); + + /* try to expand child that doesn't have children itself */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, WM_KEYDOWN, VK_ADD, 0); + expect(FALSE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_expand_empty_kb_seq, "expand node with no children", TRUE); + + DestroyWindow(hTree); } static void test_expandedimage(void)

1 0

Kusanagi Kouichi : gdi32: Improve font cache.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: c0c7547f373b2d418bdff8949f781b1ea54da277 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0c7547f373b2d418bdff8949… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Mon Apr 2 19:58:22 2012 +0900 gdi32: Improve font cache. --- dlls/gdi32/freetype.c | 22 ++++++---------------- 1 files changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index fd362ab..72b74be 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -484,10 +484,9 @@ static const WCHAR wine_fonts_key[] = {'S','o','f','t','w','a','r','e','\\','W', static const WCHAR wine_fonts_cache_key[] = {'C','a','c','h','e',0}; static const WCHAR english_name_value[] = {'E','n','g','l','i','s','h',' ','N','a','m','e',0}; static const WCHAR face_index_value[] = {'I','n','d','e','x',0}; -static const WCHAR face_italic_value[] = {'I','t','a','l','i','c',0}; -static const WCHAR face_bold_value[] = {'B','o','l','d',0}; +static const WCHAR face_ntmflags_value[] = {'N','t','m','f','l','a','g','s',0}; static const WCHAR face_version_value[] = {'V','e','r','s','i','o','n',0}; -static const WCHAR face_external_value[] = {'E','x','t','e','r','n','a','l',0}; +static const WCHAR face_vertical_value[] = {'V','e','r','t','i','c','a','l',0}; static const WCHAR face_height_value[] = {'H','e','i','g','h','t',0}; static const WCHAR face_width_value[] = {'W','i','d','t','h',0}; static const WCHAR face_size_value[] = {'S','i','z','e',0}; @@ -1316,7 +1315,6 @@ static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family) key of a bunch of non-scalable strikes */ if(RegQueryValueExA(hkey_face, "File Name", NULL, NULL, NULL, &needed) == ERROR_SUCCESS) { - DWORD italic, bold; Face *face; face = HeapAlloc(GetProcessHeap(), 0, sizeof(*face)); face->cached_enum_data = NULL; @@ -1325,7 +1323,6 @@ static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family) RegQueryValueExA(hkey_face, "File Name", NULL, NULL, (BYTE*)face->file, &needed); face->StyleName = strdupW(face_name); - face->vertical = (family->FamilyName[0] == '@'); if(RegQueryValueExW(hkey_face, face_full_name_value, NULL, NULL, NULL, &needed) == ERROR_SUCCESS) { @@ -1337,10 +1334,9 @@ static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family) face->FullName = NULL; reg_load_dword(hkey_face, face_index_value, (DWORD*)&face->face_index); - reg_load_dword(hkey_face, face_italic_value, &italic); - reg_load_dword(hkey_face, face_bold_value, &bold); + reg_load_dword(hkey_face, face_ntmflags_value, &face->ntmFlags); reg_load_dword(hkey_face, face_version_value, (DWORD*)&face->font_version); - reg_load_dword(hkey_face, face_external_value, (DWORD*)&face->external); + reg_load_dword(hkey_face, face_vertical_value, (DWORD*)&face->vertical); needed = sizeof(face->fs); RegQueryValueExW(hkey_face, face_font_sig_value, NULL, NULL, (BYTE*)&face->fs, &needed); @@ -1364,11 +1360,6 @@ static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family) face->size.x_ppem >> 6, face->size.y_ppem >> 6); } - face->ntmFlags = 0; - if (italic) face->ntmFlags |= NTM_ITALIC; - if (bold) face->ntmFlags |= NTM_BOLD; - if (face->ntmFlags == 0) face->ntmFlags = NTM_REGULAR; - TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", face->fs.fsCsb[0], face->fs.fsCsb[1], face->fs.fsUsb[0], face->fs.fsUsb[1], @@ -1517,10 +1508,9 @@ static void add_face_to_cache(Face *face) (strlenW(face->FullName) + 1) * sizeof(WCHAR)); reg_save_dword(hkey_face, face_index_value, face->face_index); - reg_save_dword(hkey_face, face_italic_value, (face->ntmFlags & NTM_ITALIC) != 0); - reg_save_dword(hkey_face, face_bold_value, (face->ntmFlags & NTM_BOLD) != 0); + reg_save_dword(hkey_face, face_ntmflags_value, face->ntmFlags); reg_save_dword(hkey_face, face_version_value, face->font_version); - reg_save_dword(hkey_face, face_external_value, face->external); + reg_save_dword(hkey_face, face_vertical_value, face->vertical); RegSetValueExW(hkey_face, face_font_sig_value, 0, REG_BINARY, (BYTE*)&face->fs, sizeof(face->fs));

1 0

Hans Leidekker : msi: Use the state parameter passed to MsiSetMode.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: a6b3d77021f97fa3c801c639e1c194f111fcb521 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6b3d77021f97fa3c801c639e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 2 13:15:33 2012 +0200 msi: Use the state parameter passed to MsiSetMode. --- dlls/msi/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index d78e604..709f4dc 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -814,7 +814,7 @@ UINT WINAPI MsiSetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode, BOOL fState) switch (iRunMode) { case MSIRUNMODE_REBOOTATEND: - package->need_reboot_at_end = 1; + package->need_reboot_at_end = (fState != 0); r = ERROR_SUCCESS; break;

1 0

Hans Leidekker : msi: Implement MsiGet/SetMode(MSIRUNMODE_REBOOTNOW).
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 15ee85dee89e892c2850f4b05c886b9d6b2c6276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15ee85dee89e892c2850f4b05… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 2 13:15:56 2012 +0200 msi: Implement MsiGet/SetMode(MSIRUNMODE_REBOOTNOW). --- dlls/msi/install.c | 8 ++++++-- dlls/msi/msipriv.h | 1 + dlls/msi/tests/automation.c | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 709f4dc..a6c832a 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -764,6 +764,10 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) r = package->need_reboot_at_end; break; + case MSIRUNMODE_REBOOTNOW: + r = package->need_reboot_now; + break; + case MSIRUNMODE_LOGENABLED: r = (package->log_file != INVALID_HANDLE_VALUE); break; @@ -819,8 +823,8 @@ UINT WINAPI MsiSetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode, BOOL fState) break; case MSIRUNMODE_REBOOTNOW: - FIXME("unimplemented run mode: %d\n", iRunMode); - r = ERROR_FUNCTION_FAILED; + package->need_reboot_now = (fState != 0); + r = ERROR_SUCCESS; break; default: diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index bf15f50..4ed4fd6 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -407,6 +407,7 @@ typedef struct tagMSIPACKAGE unsigned char commit_action_running : 1; unsigned char rollback_action_running : 1; unsigned char need_reboot_at_end : 1; + unsigned char need_reboot_now : 1; unsigned char need_rollback : 1; } MSIPACKAGE; diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 8ae18bd..630ff76 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1887,7 +1887,7 @@ static void test_Session(IDispatch *pSession) ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, TRUE); - todo_wine ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); if (hr == DISP_E_EXCEPTION) ok_exception(hr, szModeFlag); hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTNOW, &bool); @@ -1895,7 +1895,7 @@ static void test_Session(IDispatch *pSession) ok(bool, "Reboot now mode is %d, expected 1\n", bool); hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, FALSE); /* set it again so we don't reboot */ - todo_wine ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); if (hr == DISP_E_EXCEPTION) ok_exception(hr, szModeFlag); hr = Session_ModePut(pSession, MSIRUNMODE_MAINTENANCE, TRUE);

1 0

Hans Leidekker : msi: Suspend the installation if an action sets MSIRUNMODE_REBOOTNOW.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 350449fc4305a99a99385ab699e0f9e9c6b299d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=350449fc4305a99a99385ab69… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 2 13:16:32 2012 +0200 msi: Suspend the installation if an action sets MSIRUNMODE_REBOOTNOW. --- dlls/msi/action.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 5ecf8a5..5e9ef35 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -536,6 +536,12 @@ static UINT ITERATE_Actions(MSIRECORD *row, LPVOID param) if (rc != ERROR_SUCCESS) ERR("Execution halted, action %s returned %i\n", debugstr_w(action), rc); + if (package->need_reboot_now) + { + TRACE("action %s asked for immediate reboot, suspending installation\n", + debugstr_w(action)); + rc = ACTION_ForceReboot( package ); + } return rc; }

1 0

Aric Stewart : quartz: COM cleanup for AsyncReader and FileAsyncReader.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: e7d4d9e4f63fd21d26999f915b6694369afc3eac URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7d4d9e4f63fd21d26999f915… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 30 20:09:49 2012 -0500 quartz: COM cleanup for AsyncReader and FileAsyncReader. --- dlls/quartz/filesource.c | 119 +++++++++++++++++++++++++++++----------------- 1 files changed, 75 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7d4d9e4f63fd21d26999…

1 0

Aric Stewart : quartz: COM cleanup for AVIDecImpl.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 26d33bb1c1c8236522828395cb072827a7a397cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=26d33bb1c1c8236522828395c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 30 20:10:15 2012 -0500 quartz: COM cleanup for AVIDecImpl. --- dlls/quartz/avidec.c | 32 +++++++++++++++++++++----------- 1 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 011e5ff..5537db9 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -53,9 +53,19 @@ typedef struct AVIDecImpl static const IBaseFilterVtbl AVIDec_Vtbl; +static inline AVIDecImpl *impl_from_IBaseFilter( IBaseFilter *iface ) +{ + return CONTAINING_RECORD(iface, AVIDecImpl, tf.filter.IBaseFilter_iface); +} + +static inline AVIDecImpl *impl_from_TransformFilter( TransformFilter *iface ) +{ + return CONTAINING_RECORD(iface, AVIDecImpl, tf.filter); +} + static HRESULT WINAPI AVIDec_StartStreaming(TransformFilter* pTransformFilter) { - AVIDecImpl* This = (AVIDecImpl*)pTransformFilter; + AVIDecImpl* This = impl_from_TransformFilter(pTransformFilter); DWORD result; TRACE("(%p)->()\n", This); @@ -71,13 +81,13 @@ static HRESULT WINAPI AVIDec_StartStreaming(TransformFilter* pTransformFilter) } static HRESULT WINAPI AVIDec_EndFlush(TransformFilter *pTransformFilter) { - AVIDecImpl* This = (AVIDecImpl*)pTransformFilter; + AVIDecImpl* This = impl_from_TransformFilter(pTransformFilter); This->late = -1; return S_OK; } static HRESULT WINAPI AVIDec_NotifyDrop(TransformFilter *pTransformFilter, IBaseFilter *sender, Quality qm) { - AVIDecImpl *This = (AVIDecImpl*)pTransformFilter; + AVIDecImpl *This = impl_from_TransformFilter(pTransformFilter); EnterCriticalSection(&This->tf.filter.csFilter); if (qm.Late > 0) @@ -102,7 +112,7 @@ static int AVIDec_DropSample(AVIDecImpl *This, REFERENCE_TIME tStart) { static HRESULT WINAPI AVIDec_Receive(TransformFilter *tf, IMediaSample *pSample) { - AVIDecImpl* This = (AVIDecImpl *)tf; + AVIDecImpl* This = impl_from_TransformFilter(tf); AM_MEDIA_TYPE amt; HRESULT hr; DWORD res; @@ -208,7 +218,7 @@ error: static HRESULT WINAPI AVIDec_StopStreaming(TransformFilter* pTransformFilter) { - AVIDecImpl* This = (AVIDecImpl*)pTransformFilter; + AVIDecImpl* This = impl_from_TransformFilter(pTransformFilter); DWORD result; TRACE("(%p)->()\n", This); @@ -227,7 +237,7 @@ static HRESULT WINAPI AVIDec_StopStreaming(TransformFilter* pTransformFilter) static HRESULT WINAPI AVIDec_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE * pmt) { - AVIDecImpl* This = (AVIDecImpl*)tf; + AVIDecImpl* This = impl_from_TransformFilter(tf); HRESULT hr = VFW_E_TYPE_NOT_ACCEPTED; TRACE("(%p)->(%p)\n", This, pmt); @@ -328,7 +338,7 @@ failed: static HRESULT WINAPI AVIDec_CompleteConnect(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) { - AVIDecImpl* This = (AVIDecImpl*)tf; + AVIDecImpl* This = impl_from_TransformFilter(tf); TRACE("(%p)\n", This); @@ -337,7 +347,7 @@ static HRESULT WINAPI AVIDec_CompleteConnect(TransformFilter *tf, PIN_DIRECTION static HRESULT WINAPI AVIDec_BreakConnect(TransformFilter *tf, PIN_DIRECTION dir) { - AVIDecImpl *This = (AVIDecImpl *)tf; + AVIDecImpl *This = impl_from_TransformFilter(tf); TRACE("(%p)->()\n", This); @@ -360,7 +370,7 @@ static HRESULT WINAPI AVIDec_BreakConnect(TransformFilter *tf, PIN_DIRECTION dir static HRESULT WINAPI AVIDec_DecideBufferSize(TransformFilter *tf, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) { - AVIDecImpl *pAVI = (AVIDecImpl*)tf; + AVIDecImpl *pAVI = impl_from_TransformFilter(tf); ALLOCATOR_PROPERTIES actual; if (!ppropInputRequest->cbAlign) @@ -412,7 +422,7 @@ HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv) ISeekingPassThru *passthru; hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)This, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&This->seekthru_unk); IUnknown_QueryInterface(This->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); - ISeekingPassThru_Init(passthru, FALSE, (IPin*)This->tf.ppPins[0]); + ISeekingPassThru_Init(passthru, FALSE, This->tf.ppPins[0]); ISeekingPassThru_Release(passthru); } @@ -428,7 +438,7 @@ HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv) static HRESULT WINAPI AVIDec_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) { HRESULT hr; - AVIDecImpl *This = (AVIDecImpl *)iface; + AVIDecImpl *This = impl_from_IBaseFilter(iface); TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); if (IsEqualIID(riid, &IID_IMediaSeeking))

1 0

Aric Stewart : quartz: COM cleanup in ACMWrapperImpl.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: c6289fecec4afa1355222c29dd525fbc180880c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6289fecec4afa1355222c29d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 30 20:10:47 2012 -0500 quartz: COM cleanup in ACMWrapperImpl. --- dlls/quartz/acmwrapper.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 1c840b7..300559e 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -54,9 +54,19 @@ typedef struct ACMWrapperImpl static const IBaseFilterVtbl ACMWrapper_Vtbl; +static inline ACMWrapperImpl *impl_from_TransformFilter( TransformFilter *iface ) +{ + return CONTAINING_RECORD(iface, ACMWrapperImpl, tf.filter); +} + +static inline ACMWrapperImpl *impl_from_IBaseFilter( IBaseFilter *iface ) +{ + return CONTAINING_RECORD(iface, ACMWrapperImpl, tf.filter.IBaseFilter_iface); +} + static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSample) { - ACMWrapperImpl* This = (ACMWrapperImpl*)tf; + ACMWrapperImpl* This = impl_from_TransformFilter(tf); AM_MEDIA_TYPE amt; IMediaSample* pOutSample = NULL; DWORD cbDstStream, cbSrcStream; @@ -244,7 +254,7 @@ error: static HRESULT WINAPI ACMWrapper_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE * pmt) { - ACMWrapperImpl* This = (ACMWrapperImpl *)tf; + ACMWrapperImpl* This = impl_from_TransformFilter(tf); MMRESULT res; TRACE("(%p)->(%i %p)\n", This, dir, pmt); @@ -301,7 +311,7 @@ static HRESULT WINAPI ACMWrapper_SetMediaType(TransformFilter *tf, PIN_DIRECTION static HRESULT WINAPI ACMWrapper_CompleteConnect(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) { - ACMWrapperImpl* This = (ACMWrapperImpl *)tf; + ACMWrapperImpl* This = impl_from_TransformFilter(tf); MMRESULT res; HACMSTREAM drv; @@ -325,7 +335,7 @@ static HRESULT WINAPI ACMWrapper_CompleteConnect(TransformFilter *tf, PIN_DIRECT static HRESULT WINAPI ACMWrapper_BreakConnect(TransformFilter *tf, PIN_DIRECTION dir) { - ACMWrapperImpl *This = (ACMWrapperImpl *)tf; + ACMWrapperImpl *This = impl_from_TransformFilter(tf); TRACE("(%p)->(%i)\n", This,dir); @@ -343,7 +353,7 @@ static HRESULT WINAPI ACMWrapper_BreakConnect(TransformFilter *tf, PIN_DIRECTION static HRESULT WINAPI ACMWrapper_DecideBufferSize(TransformFilter *tf, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) { - ACMWrapperImpl *pACM = (ACMWrapperImpl*)tf; + ACMWrapperImpl *pACM = impl_from_TransformFilter(tf); ALLOCATOR_PROPERTIES actual; if (!ppropInputRequest->cbAlign) @@ -394,7 +404,7 @@ HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) ISeekingPassThru *passthru; hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)This, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&This->seekthru_unk); IUnknown_QueryInterface(This->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); - ISeekingPassThru_Init(passthru, FALSE, (IPin*)This->tf.ppPins[0]); + ISeekingPassThru_Init(passthru, FALSE, This->tf.ppPins[0]); ISeekingPassThru_Release(passthru); } @@ -407,7 +417,7 @@ HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) static HRESULT WINAPI ACMWrapper_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) { HRESULT hr; - ACMWrapperImpl *This = (ACMWrapperImpl *)iface; + ACMWrapperImpl *This = impl_from_IBaseFilter(iface); TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); if (IsEqualIID(riid, &IID_IMediaSeeking))

1 0