February 2007 - Wine-commits

Rob Shearman : oleaut32: Fix IFont::AddRefHFont and IFont::ReleaseRefHFont.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: 4c40b3974ced816e3a155418830f4f69927b25b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c40b3974ced816e3a1554188… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 19 21:45:12 2007 +0000 oleaut32: Fix IFont::AddRefHFont and IFont::ReleaseRefHFont. The tests show that there is a global cache that keeps references to HFONTs that is released when all IFont objects are released. (Based on a patch by Benjamin Arai.) --- dlls/oleaut32/olefont.c | 151 +++++++++++++++++++++++++++++++++-------- dlls/oleaut32/tests/olefont.c | 66 ++++++++---------- 2 files changed, 151 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c40b3974ced816e3a155…

1 0

Christian Costa : winealsa: Recognize alsa application ports as generic midi ports.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: 0b43e9b552252f3630350f89a5ee06c59fc3d7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b43e9b552252f3630350f89a… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Feb 19 22:25:26 2007 +0100 winealsa: Recognize alsa application ports as generic midi ports. --- dlls/winealsa.drv/midi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 0e1343c..09018aa 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -158,7 +158,7 @@ static int MIDI_AlsaToWindowsDeviceType(int type) if (type & (SND_SEQ_PORT_TYPE_DIRECT_SAMPLE|SND_SEQ_PORT_TYPE_SAMPLE)) return MOD_SYNTH; - if (type & SND_SEQ_PORT_TYPE_MIDI_GENERIC) + if (type & (SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION)) return MOD_MIDIPORT; ERR("Cannot determine the type (alsa type is %x) of this midi device. Assuming FM Synth\n", type);

1 0

Thomas Weidenmueller : comctl32: Implement LM_GETIDEALSIZE for the syslink control.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: 254b97732befd7e7bd29f369d2878ef38bfd4488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=254b97732befd7e7bd29f369d… Author: Thomas Weidenmueller <wine-patches(a)reactsoft.com> Date: Mon Feb 19 16:25:01 2007 +0100 comctl32: Implement LM_GETIDEALSIZE for the syslink control. --- dlls/comctl32/syslink.c | 163 ++++++++++++++++++++++++++++++----------------- include/commctrl.h | 1 + 2 files changed, 106 insertions(+), 58 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 304e407..d631244 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -643,18 +643,24 @@ static BOOL SYSLINK_WrapLine (HDC hdc, LPWSTR Text, WCHAR BreakChar, int *LineLe * SYSLINK_Render * Renders the document in memory */ -static VOID SYSLINK_Render (SYSLINK_INFO *infoPtr, HDC hdc) +static VOID SYSLINK_Render (SYSLINK_INFO *infoPtr, HDC hdc, PRECT pRect) { RECT rc; PDOC_ITEM Current; HGDIOBJ hOldFont; int x, y, LineHeight; - - GetClientRect(infoPtr->Self, &rc); + SIZE szDoc; + + szDoc.cx = szDoc.cy = 0; + + rc = *pRect; rc.right -= SL_RIGHTMARGIN; rc.bottom -= SL_BOTTOMMARGIN; - - if(rc.right - SL_LEFTMARGIN < 0 || rc.bottom - SL_TOPMARGIN < 0) return; + + if(rc.right - SL_LEFTMARGIN < 0) + rc.right = MAXLONG; + if (rc.bottom - SL_TOPMARGIN < 0) + rc.bottom = MAXLONG; hOldFont = SelectObject(hdc, infoPtr->Font); @@ -715,6 +721,7 @@ static VOID SYSLINK_Render (SYSLINK_INFO *infoPtr, HDC hdc) { int LineLen = n; BOOL Wrap = FALSE; + PDOC_TEXTBLOCK nbl; if(n != 0) { @@ -753,30 +760,12 @@ static VOID SYSLINK_Render (SYSLINK_INFO *infoPtr, HDC hdc) } } - if(bl != NULL) - { - PDOC_TEXTBLOCK nbl = ReAlloc(bl, (nBlocks + 1) * sizeof(DOC_TEXTBLOCK)); - if (nbl != NULL) - { - bl = nbl; - nBlocks++; - } - else - { - Free(bl); - bl = NULL; - nBlocks = 0; - } - } - else - { - bl = Alloc(sizeof(DOC_TEXTBLOCK)); - if (bl != NULL) - nBlocks++; - } - - if(bl != NULL) + nbl = ReAlloc(bl, (nBlocks + 1) * sizeof(DOC_TEXTBLOCK)); + if (nbl != NULL) { + bl = nbl; + nBlocks++; + cbl = bl + nBlocks - 1; cbl->nChars = LineLen; @@ -785,7 +774,12 @@ static VOID SYSLINK_Render (SYSLINK_INFO *infoPtr, HDC hdc) cbl->rc.top = y; cbl->rc.right = x + szDim.cx; cbl->rc.bottom = y + szDim.cy; - + + if (cbl->rc.right > szDoc.cx) + szDoc.cx = cbl->rc.right; + if (cbl->rc.bottom > szDoc.cy) + szDoc.cy = cbl->rc.bottom; + if(LineLen != 0) { x += szDim.cx; @@ -801,6 +795,10 @@ static VOID SYSLINK_Render (SYSLINK_INFO *infoPtr, HDC hdc) } else { + Free(bl); + bl = NULL; + nBlocks = 0; + ERR("Failed to alloc DOC_TEXTBLOCK structure!\n"); break; } @@ -820,6 +818,9 @@ static VOID SYSLINK_Render (SYSLINK_INFO *infoPtr, HDC hdc) } SelectObject(hdc, hOldFont); + + pRect->right = pRect->left + szDoc.cx; + pRect->bottom = pRect->top + szDoc.cy; } /*********************************************************************** @@ -920,6 +921,7 @@ static HFONT SYSLINK_SetFont (SYSLINK_INFO *infoPtr, HFONT hFont, BOOL bRedraw) HDC hdc; LOGFONTW lf; TEXTMETRICW tm; + RECT rcClient; HFONT hOldFont = infoPtr->Font; infoPtr->Font = hFont; @@ -931,24 +933,27 @@ static HFONT SYSLINK_SetFont (SYSLINK_INFO *infoPtr, HFONT hFont, BOOL bRedraw) } /* Render text position and word wrapping in memory */ - hdc = GetDC(infoPtr->Self); - if(hdc != NULL) + if (GetClientRect(infoPtr->Self, &rcClient)) { - /* create a new underline font */ - if(GetTextMetricsW(hdc, &tm) && - GetObjectW(infoPtr->Font, sizeof(LOGFONTW), &lf)) - { - lf.lfUnderline = TRUE; - infoPtr->LinkFont = CreateFontIndirectW(&lf); - infoPtr->BreakChar = tm.tmBreakChar; - } - else + hdc = GetDC(infoPtr->Self); + if(hdc != NULL) { - ERR("Failed to create link font!\n"); - } + /* create a new underline font */ + if(GetTextMetricsW(hdc, &tm) && + GetObjectW(infoPtr->Font, sizeof(LOGFONTW), &lf)) + { + lf.lfUnderline = TRUE; + infoPtr->LinkFont = CreateFontIndirectW(&lf); + infoPtr->BreakChar = tm.tmBreakChar; + } + else + { + ERR("Failed to create link font!\n"); + } - SYSLINK_Render(infoPtr, hdc); - ReleaseDC(infoPtr->Self, hdc); + SYSLINK_Render(infoPtr, hdc, &rcClient); + ReleaseDC(infoPtr->Self, hdc); + } } if(bRedraw) @@ -978,14 +983,19 @@ static LRESULT SYSLINK_SetText (SYSLINK_INFO *infoPtr, LPCWSTR Text) /* let's parse the string and create a document */ if(SYSLINK_ParseText(infoPtr, Text) > 0) { + RECT rcClient; + /* Render text position and word wrapping in memory */ - HDC hdc = GetDC(infoPtr->Self); - if (hdc != NULL) + if (GetClientRect(infoPtr->Self, &rcClient)) { - SYSLINK_Render(infoPtr, hdc); - ReleaseDC(infoPtr->Self, hdc); + HDC hdc = GetDC(infoPtr->Self); + if (hdc != NULL) + { + SYSLINK_Render(infoPtr, hdc, &rcClient); + ReleaseDC(infoPtr->Self, hdc); - InvalidateRect(infoPtr->Self, NULL, TRUE); + InvalidateRect(infoPtr->Self, NULL, TRUE); + } } } @@ -1076,6 +1086,7 @@ static LRESULT SYSLINK_SetItem (SYSLINK_INFO *infoPtr, PLITEM Item) else { Free(szId); + ERR("Unable to allocate memory for link url\n"); return FALSE; } @@ -1503,6 +1514,33 @@ static BOOL SYSLINK_NoNextLink (SYSLINK_INFO *infoPtr, BOOL Prev) } /*********************************************************************** + * SYSLINK_GetIdealSize + * Calculates the ideal size of a link control at a given maximum width. + */ +static VOID SYSLINK_GetIdealSize (SYSLINK_INFO *infoPtr, int cxMaxWidth, LPSIZE lpSize) +{ + RECT rc; + HDC hdc; + + rc.left = rc.top = rc.bottom = 0; + rc.right = cxMaxWidth; + + hdc = GetDC(infoPtr->Self); + if (hdc != NULL) + { + HGDIOBJ hOldFont = SelectObject(hdc, infoPtr->Font); + + SYSLINK_Render(infoPtr, hdc, &rc); + + SelectObject(hdc, hOldFont); + ReleaseDC(infoPtr->Self, hdc); + + lpSize->cx = rc.right; + lpSize->cy = rc.bottom; + } +} + +/*********************************************************************** * SysLinkWindowProc */ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, @@ -1542,11 +1580,15 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, case WM_SIZE: { - HDC hdc = GetDC(infoPtr->Self); - if(hdc != NULL) + RECT rcClient; + if (GetClientRect(infoPtr->Self, &rcClient)) { - SYSLINK_Render(infoPtr, hdc); - ReleaseDC(infoPtr->Self, hdc); + HDC hdc = GetDC(infoPtr->Self); + if(hdc != NULL) + { + SYSLINK_Render(infoPtr, hdc, &rcClient); + ReleaseDC(infoPtr->Self, hdc); + } } return 0; } @@ -1651,6 +1693,11 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, return SYSLINK_GetItem(infoPtr, (PLITEM)lParam); case LM_GETIDEALHEIGHT: + if (lParam) + { + /* LM_GETIDEALSIZE */ + SYSLINK_GetIdealSize(infoPtr, (int)wParam, (LPSIZE)lParam); + } return SYSLINK_GetIdealHeight(infoPtr); case WM_SETFOCUS: @@ -1660,10 +1707,10 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, return SYSLINK_KillFocus(infoPtr, (HWND)wParam); case WM_ENABLE: - infoPtr->Style &= ~WS_DISABLED; - infoPtr->Style |= (wParam ? 0 : WS_DISABLED); - InvalidateRect (infoPtr->Self, NULL, FALSE); - return 0; + infoPtr->Style &= ~WS_DISABLED; + infoPtr->Style |= (wParam ? 0 : WS_DISABLED); + InvalidateRect (infoPtr->Self, NULL, FALSE); + return 0; case WM_STYLECHANGED: if (wParam == GWL_STYLE) @@ -1710,7 +1757,7 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, HandleDefaultMessage: if ((message >= WM_USER) && (message < WM_APP)) { - ERR("unknown msg %04x wp=%04x lp=%08lx\n", message, wParam, lParam ); + ERR("unknown msg %04x wp=%04x lp=%08lx\n", message, wParam, lParam ); } return DefWindowProcW(hwnd, message, wParam, lParam); } diff --git a/include/commctrl.h b/include/commctrl.h index 1415a30..3225e1b 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -4889,6 +4889,7 @@ static const WCHAR WC_LINK[] = { 'S','y','s','L','i','n','k',0 }; /* SysLink messages */ #define LM_HITTEST (WM_USER + 768) #define LM_GETIDEALHEIGHT (WM_USER + 769) +#define LM_GETIDEALSIZE (LM_GETIDEALHEIGHT) #define LM_SETITEM (WM_USER + 770) #define LM_GETITEM (WM_USER + 771)

1 0

Dmitry Timoshkov : user32: Add a test for DefDlgProc(WM_SETFOCUS), make the test pass under Wine.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: 8c5d169a2092c72ff21ef14b1e6b6604b000d744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c5d169a2092c72ff21ef14b1… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Feb 20 17:06:21 2007 +0800 user32: Add a test for DefDlgProc(WM_SETFOCUS), make the test pass under Wine. --- dlls/user32/defdlg.c | 11 +---- dlls/user32/tests/msg.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 9 deletions(-) diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index 9c2aba4..794ae0e 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -59,13 +59,6 @@ static DLGPROC DEFDLG_GetDlgProc( HWND hwnd ) */ static void DEFDLG_SetFocus( HWND hwndDlg, HWND hwndCtrl ) { - HWND hwndPrev = GetFocus(); - - if (IsChild( hwndDlg, hwndPrev )) - { - if (SendMessageW( hwndPrev, WM_GETDLGCODE, 0, 0 ) & DLGC_HASSETSEL) - SendMessageW( hwndPrev, EM_SETSEL, -1, 0 ); - } if (SendMessageW( hwndCtrl, WM_GETDLGCODE, 0, 0 ) & DLGC_HASSETSEL) SendMessageW( hwndCtrl, EM_SETSEL, 0, -1 ); SetFocus( hwndCtrl ); @@ -102,9 +95,9 @@ static void DEFDLG_RestoreFocus( HWND hwnd ) /* If no saved focus control exists, set focus to the first visible, non-disabled, WS_TABSTOP control in the dialog */ infoPtr->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE ); - if (!IsWindow( infoPtr->hwndFocus )) return; + if (!IsWindow( infoPtr->hwndFocus )) return; } - SetFocus( infoPtr->hwndFocus ); + DEFDLG_SetFocus( hwnd, infoPtr->hwndFocus ); /* This used to set infoPtr->hwndFocus to NULL for no apparent reason, sometimes losing focus when receiving WM_SETFOCUS messages. */ diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index cf92ccf..b5440a5 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4278,6 +4278,7 @@ static void subclass_button(void) cls.hInstance = GetModuleHandle(0); cls.lpfnWndProc = button_hook_proc; cls.lpszClassName = "my_button_class"; + UnregisterClass(cls.lpszClassName, cls.hInstance); if (!RegisterClassA(&cls)) assert(0); } @@ -4415,6 +4416,7 @@ static void subclass_static(void) cls.hInstance = GetModuleHandle(0); cls.lpfnWndProc = static_hook_proc; cls.lpszClassName = "my_static_class"; + UnregisterClass(cls.lpszClassName, cls.hInstance); if (!RegisterClassA(&cls)) assert(0); } @@ -7630,6 +7632,7 @@ static void subclass_edit(void) cls.hInstance = GetModuleHandle(0); cls.lpfnWndProc = edit_hook_proc; cls.lpszClassName = "my_edit_class"; + UnregisterClass(cls.lpszClassName, cls.hInstance); if (!RegisterClassA(&cls)) assert(0); } @@ -8832,6 +8835,110 @@ static void test_ShowWindow(void) DestroyWindow(hwnd); } +static const struct message WmDefDlgSetFocus_1[] = { + { WM_GETDLGCODE, sent|wparam|lparam, 0, 0 }, + { WM_GETTEXTLENGTH, sent|wparam|lparam|optional, 0, 0 }, /* XP */ + { WM_GETTEXT, sent|wparam|optional, 6 }, /* XP */ + { WM_GETTEXT, sent|wparam|optional, 12 }, /* XP */ + { EM_SETSEL, sent|wparam, 0 }, /* XP sets lparam to text length, Win9x to -2 */ + { HCBT_SETFOCUS, hook }, + { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, + { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_SETFOCUS, sent|wparam, 0 }, + { WM_CTLCOLOREDIT, sent }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, OBJID_CARET, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, OBJID_CARET, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, OBJID_CARET, 0 }, + { WM_COMMAND, sent|wparam, MAKEWPARAM(1, EN_SETFOCUS) }, + { 0 } +}; +static const struct message WmDefDlgSetFocus_2[] = { + { WM_GETDLGCODE, sent|wparam|lparam, 0, 0 }, + { WM_GETTEXTLENGTH, sent|wparam|lparam|optional, 0, 0 }, /* XP */ + { WM_GETTEXT, sent|wparam|optional, 6 }, /* XP */ + { WM_GETTEXT, sent|wparam|optional, 12 }, /* XP */ + { EM_SETSEL, sent|wparam, 0 }, /* XP sets lparam to text length, Win9x to -2 */ + { 0 } +}; + +static void test_dialog_messages(void) +{ + HWND hdlg, hedit1, hedit2, hfocus; + LRESULT ret; + +#define set_selection(hctl, start, end) \ + ret = SendMessage(hctl, EM_SETSEL, start, end); \ + ok(ret == 1, "EM_SETSEL returned %ld\n", ret); + +#define check_selection(hctl, start, end) \ + ret = SendMessage(hctl, EM_GETSEL, 0, 0); \ + ok(ret == MAKELRESULT(start, end), "wrong selection (%d - %d)\n", LOWORD(ret), HIWORD(ret)); + + subclass_edit(); + + hdlg = CreateWindowEx(WS_EX_DLGMODALFRAME, "TestDialogClass", NULL, + WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_DLGFRAME, + 0, 0, 100, 100, 0, 0, 0, NULL); + ok(hdlg != 0, "Failed to create custom dialog window\n"); + + hedit1 = CreateWindowEx(0, "my_edit_class", NULL, + WS_CHILD|WS_BORDER|WS_VISIBLE|WS_TABSTOP, + 0, 0, 80, 20, hdlg, (HMENU)1, 0, NULL); + ok(hedit1 != 0, "Failed to create edit control\n"); + hedit2 = CreateWindowEx(0, "my_edit_class", NULL, + WS_CHILD|WS_BORDER|WS_VISIBLE|WS_TABSTOP, + 0, 40, 80, 20, hdlg, (HMENU)2, 0, NULL); + ok(hedit2 != 0, "Failed to create edit control\n"); + + SendMessage(hedit1, WM_SETTEXT, 0, (LPARAM)"hello"); + SendMessage(hedit2, WM_SETTEXT, 0, (LPARAM)"bye"); + + hfocus = GetFocus(); + ok(hfocus == hdlg, "wrong focus %p\n", hfocus); + + SetFocus(hedit2); + hfocus = GetFocus(); + ok(hfocus == hedit2, "wrong focus %p\n", hfocus); + + check_selection(hedit1, 0, 0); + check_selection(hedit2, 0, 0); + + set_selection(hedit2, 0, -1); + check_selection(hedit2, 0, 3); + + SetFocus(0); + hfocus = GetFocus(); + ok(hfocus == 0, "wrong focus %p\n", hfocus); + + flush_sequence(); + ret = DefDlgProc(hdlg, WM_SETFOCUS, 0, 0); + ok(ret == 0, "WM_SETFOCUS returned %ld\n", ret); + ok_sequence(WmDefDlgSetFocus_1, "DefDlgProc(WM_SETFOCUS) 1", FALSE); + + hfocus = GetFocus(); + ok(hfocus == hedit1, "wrong focus %p\n", hfocus); + + check_selection(hedit1, 0, 5); + check_selection(hedit2, 0, 3); + + flush_sequence(); + ret = DefDlgProc(hdlg, WM_SETFOCUS, 0, 0); + ok(ret == 0, "WM_SETFOCUS returned %ld\n", ret); + ok_sequence(WmDefDlgSetFocus_2, "DefDlgProc(WM_SETFOCUS) 2", FALSE); + + hfocus = GetFocus(); + ok(hfocus == hedit1, "wrong focus %p\n", hfocus); + + check_selection(hedit1, 0, 5); + check_selection(hedit2, 0, 3); + + EndDialog(hdlg, 0); + +#undef set_selection +#undef check_selection +} + START_TEST(msg) { BOOL ret; @@ -8901,6 +9008,7 @@ START_TEST(msg) test_TrackMouseEvent(); test_SetWindowRgn(); test_sys_menu(); + test_dialog_messages(); UnhookWindowsHookEx(hCBT_hook); if (pUnhookWinEvent)

1 0

Anatoly Lyutin : wineconsole: Added range of value for an up-down control.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: 3c981715ad2b1cecadce961945e97f305b37d05a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c981715ad2b1cecadce96194… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Mon Feb 19 16:53:39 2007 +0300 wineconsole: Added range of value for an up-down control. --- programs/wineconsole/dialog.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c index cc43684..0ec3bac 100644 --- a/programs/wineconsole/dialog.c +++ b/programs/wineconsole/dialog.c @@ -67,6 +67,8 @@ static INT_PTR WINAPI WCUSER_OptionDlgProc(HWND hDlg, UINT msg, WPARAM wParam, L di->hDlg = hDlg; SetWindowLongPtr(hDlg, DWLP_USER, (LONG_PTR)di); + SendMessage(GetDlgItem(hDlg,IDC_OPT_HIST_SIZE_UD), UDM_SETRANGE, 0, MAKELPARAM (500, 0)); + if (di->config.cursor_size <= 25) idc = IDC_OPT_CURSOR_SMALL; else if (di->config.cursor_size <= 50) idc = IDC_OPT_CURSOR_MEDIUM; else idc = IDC_OPT_CURSOR_LARGE;

1 0

Dmitry Timoshkov : gdi32: Move get_glyph_indices near its caller test_font_charset.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: 14478b8ba2913747971b5bb8634aa044fa8af0f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14478b8ba2913747971b5bb86… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Feb 20 16:35:19 2007 +0800 gdi32: Move get_glyph_indices near its caller test_font_charset. --- dlls/gdi32/tests/font.c | 166 +++++++++++++++++++++++----------------------- 1 files changed, 83 insertions(+), 83 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index f491459..0a9f8d3 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -821,89 +821,6 @@ static void test_GetOutlineTextMetrics(void) ReleaseDC(0, hdc); } -static BOOL get_glyph_indices(INT charset, UINT code_page, WORD *idx, UINT count, BOOL unicode) -{ - HDC hdc; - LOGFONTA lf; - HFONT hfont, hfont_old; - CHARSETINFO csi; - FONTSIGNATURE fs; - INT cs; - DWORD i, ret; - char name[64]; - - assert(count <= 128); - - memset(&lf, 0, sizeof(lf)); - - lf.lfCharSet = charset; - lf.lfHeight = 10; - lstrcpyA(lf.lfFaceName, "Arial"); - SetLastError(0xdeadbeef); - hfont = CreateFontIndirectA(&lf); - ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError()); - - hdc = GetDC(0); - hfont_old = SelectObject(hdc, hfont); - - cs = GetTextCharsetInfo(hdc, &fs, 0); - ok(cs == charset, "expected %d, got %d\n", charset, cs); - - SetLastError(0xdeadbeef); - ret = GetTextFace(hdc, sizeof(name), name); - ok(ret, "GetTextFace error %u\n", GetLastError()); - - if (charset == SYMBOL_CHARSET) - { - ok(strcmp("Arial", name), "face name should NOT be Arial\n"); - ok(fs.fsCsb[0] & (1 << 31), "symbol encoding should be available\n"); - } - else - { - ok(!strcmp("Arial", name), "face name should be Arial, not %s\n", name); - ok(!(fs.fsCsb[0] & (1 << 31)), "symbol encoding should NOT be available\n"); - } - - if (!TranslateCharsetInfo((DWORD *)cs, &csi, TCI_SRCCHARSET)) - { - trace("Can't find codepage for charset %d\n", cs); - ReleaseDC(0, hdc); - return FALSE; - } - ok(csi.ciACP == code_page, "expected %d, got %d\n", code_page, csi.ciACP); - - if (unicode) - { - char ansi_buf[128]; - WCHAR unicode_buf[128]; - - for (i = 0; i < count; i++) ansi_buf[i] = (BYTE)(i + 128); - - MultiByteToWideChar(code_page, 0, ansi_buf, count, unicode_buf, count); - - SetLastError(0xdeadbeef); - ret = pGetGlyphIndicesW(hdc, unicode_buf, count, idx, 0); - ok(ret == count, "GetGlyphIndicesA error %u\n", GetLastError()); - } - else - { - char ansi_buf[128]; - - for (i = 0; i < count; i++) ansi_buf[i] = (BYTE)(i + 128); - - SetLastError(0xdeadbeef); - ret = pGetGlyphIndicesA(hdc, ansi_buf, count, idx, 0); - ok(ret == count, "GetGlyphIndicesA error %u\n", GetLastError()); - } - - SelectObject(hdc, hfont_old); - DeleteObject(hfont); - - ReleaseDC(0, hdc); - - return TRUE; -} - static void testJustification(HDC hdc, PSTR str, RECT *clientArea) { INT x, y, @@ -1033,6 +950,89 @@ static void test_SetTextJustification(void) DestroyWindow(hwnd); } +static BOOL get_glyph_indices(INT charset, UINT code_page, WORD *idx, UINT count, BOOL unicode) +{ + HDC hdc; + LOGFONTA lf; + HFONT hfont, hfont_old; + CHARSETINFO csi; + FONTSIGNATURE fs; + INT cs; + DWORD i, ret; + char name[64]; + + assert(count <= 128); + + memset(&lf, 0, sizeof(lf)); + + lf.lfCharSet = charset; + lf.lfHeight = 10; + lstrcpyA(lf.lfFaceName, "Arial"); + SetLastError(0xdeadbeef); + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError()); + + hdc = GetDC(0); + hfont_old = SelectObject(hdc, hfont); + + cs = GetTextCharsetInfo(hdc, &fs, 0); + ok(cs == charset, "expected %d, got %d\n", charset, cs); + + SetLastError(0xdeadbeef); + ret = GetTextFace(hdc, sizeof(name), name); + ok(ret, "GetTextFace error %u\n", GetLastError()); + + if (charset == SYMBOL_CHARSET) + { + ok(strcmp("Arial", name), "face name should NOT be Arial\n"); + ok(fs.fsCsb[0] & (1 << 31), "symbol encoding should be available\n"); + } + else + { + ok(!strcmp("Arial", name), "face name should be Arial, not %s\n", name); + ok(!(fs.fsCsb[0] & (1 << 31)), "symbol encoding should NOT be available\n"); + } + + if (!TranslateCharsetInfo((DWORD *)cs, &csi, TCI_SRCCHARSET)) + { + trace("Can't find codepage for charset %d\n", cs); + ReleaseDC(0, hdc); + return FALSE; + } + ok(csi.ciACP == code_page, "expected %d, got %d\n", code_page, csi.ciACP); + + if (unicode) + { + char ansi_buf[128]; + WCHAR unicode_buf[128]; + + for (i = 0; i < count; i++) ansi_buf[i] = (BYTE)(i + 128); + + MultiByteToWideChar(code_page, 0, ansi_buf, count, unicode_buf, count); + + SetLastError(0xdeadbeef); + ret = pGetGlyphIndicesW(hdc, unicode_buf, count, idx, 0); + ok(ret == count, "GetGlyphIndicesA error %u\n", GetLastError()); + } + else + { + char ansi_buf[128]; + + for (i = 0; i < count; i++) ansi_buf[i] = (BYTE)(i + 128); + + SetLastError(0xdeadbeef); + ret = pGetGlyphIndicesA(hdc, ansi_buf, count, idx, 0); + ok(ret == count, "GetGlyphIndicesA error %u\n", GetLastError()); + } + + SelectObject(hdc, hfont_old); + DeleteObject(hfont); + + ReleaseDC(0, hdc); + + return TRUE; +} + static void test_font_charset(void) { static struct charset_data

1 0

Dmitry Timoshkov : msvcrt: Pack the structures on a 8-byte boundary like in PSDK.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: 2af96fe590a6e2996c87b760c53f332356cbc4ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=2af96fe590a6e2996c87b760c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Feb 20 16:35:41 2007 +0800 msvcrt: Pack the structures on a 8-byte boundary like in PSDK. --- include/msvcrt/direct.h | 4 ++++ include/msvcrt/dos.h | 4 ++++ include/msvcrt/eh.h | 4 ++++ include/msvcrt/io.h | 4 ++++ include/msvcrt/math.h | 4 ++++ include/msvcrt/mbstring.h | 4 ++++ include/msvcrt/setjmp.h | 4 ++++ include/msvcrt/stdio.h | 4 ++++ include/msvcrt/stdlib.h | 4 ++++ include/msvcrt/sys/stat.h | 4 ++++ include/msvcrt/sys/timeb.h | 4 ++++ include/msvcrt/sys/utime.h | 4 ++++ include/msvcrt/time.h | 4 ++++ include/msvcrt/wchar.h | 4 ++++ include/msvcrt/wctype.h | 4 ++++ 15 files changed, 60 insertions(+), 0 deletions(-) diff --git a/include/msvcrt/direct.h b/include/msvcrt/direct.h index 167e7d7..f0fce97 100644 --- a/include/msvcrt/direct.h +++ b/include/msvcrt/direct.h @@ -11,6 +11,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + #ifdef __cplusplus extern "C" { #endif @@ -77,4 +79,6 @@ static inline char* getcwd(char * buf, int size) { return _getcwd(buf, size); } static inline int mkdir(const char* newdir) { return _mkdir(newdir); } static inline int rmdir(const char* dir) { return _rmdir(dir); } +#include <poppack.h> + #endif /* __WINE_DIRECT_H */ diff --git a/include/msvcrt/dos.h b/include/msvcrt/dos.h index a35e642..be6d444 100644 --- a/include/msvcrt/dos.h +++ b/include/msvcrt/dos.h @@ -11,6 +11,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + /* The following are also defined in io.h */ #define _A_NORMAL 0x00000000 #define _A_RDONLY 0x00000001 @@ -44,4 +46,6 @@ unsigned int _getdiskfree(unsigned int, struct _diskfree_t *); #define diskfree_t _diskfree_t +#include <poppack.h> + #endif /* __WINE_DOS_H */ diff --git a/include/msvcrt/eh.h b/include/msvcrt/eh.h index fb8b2c7..2f8281e 100644 --- a/include/msvcrt/eh.h +++ b/include/msvcrt/eh.h @@ -27,6 +27,8 @@ #error "eh.h is meant only for C++ applications" #endif +#include <pshpack8.h> + struct _EXCEPTION_POINTERS; typedef void (*terminate_handler)(void); @@ -42,4 +44,6 @@ _se_translator_function _set_se_translator(_se_translator_function func); void terminate(void); void unexpected(void); +#include <poppack.h> + #endif /* __WINE_EH_H */ diff --git a/include/msvcrt/io.h b/include/msvcrt/io.h index c3cd315..55444f0 100644 --- a/include/msvcrt/io.h +++ b/include/msvcrt/io.h @@ -11,6 +11,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + #ifndef _WCHAR_T_DEFINED #define _WCHAR_T_DEFINED #ifndef __cplusplus @@ -183,4 +185,6 @@ extern int sopen(const char*,int,int,...) __attribute__((alias("_sopen"))); #define sopen _sopen #endif /* __GNUC__ */ +#include <poppack.h> + #endif /* __WINE_IO_H */ diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index 81a51a6..4192378 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -12,6 +12,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + #ifdef __cplusplus extern "C" { #endif @@ -94,4 +96,6 @@ static const union { } #endif +#include <poppack.h> + #endif /* __WINE_MATH_H */ diff --git a/include/msvcrt/mbstring.h b/include/msvcrt/mbstring.h index 1da3213..7e82ce8 100644 --- a/include/msvcrt/mbstring.h +++ b/include/msvcrt/mbstring.h @@ -23,6 +23,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + #if !defined(_MSC_VER) && !defined(__int64) #define __int64 long long #endif @@ -134,4 +136,6 @@ int _ismbstrail(const unsigned char*,const unsigned char*); } #endif +#include <poppack.h> + #endif /* __WINE_MBSTRING_H */ diff --git a/include/msvcrt/setjmp.h b/include/msvcrt/setjmp.h index 56eb5b8..cf3b294 100644 --- a/include/msvcrt/setjmp.h +++ b/include/msvcrt/setjmp.h @@ -23,6 +23,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + #ifdef __i386__ typedef struct __JUMP_BUFFER @@ -61,4 +63,6 @@ int longjmp(jmp_buf,int); #define setjmp _setjmp +#include <poppack.h> + #endif /* __WINE_SETJMP_H */ diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index dfa983f..01ae243 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -11,6 +11,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + #ifndef RC_INVOKED #include <stdarg.h> #endif @@ -250,4 +252,6 @@ static inline int getw(FILE* file) { return _getw(file); } static inline int putw(int val, FILE* file) { return _putw(val, file); } static inline FILE* wpopen(const wchar_t* command,const wchar_t* mode) { return _wpopen(command, mode); } +#include <poppack.h> + #endif /* __WINE_STDIO_H */ diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index a8b6ab5..27e8dbe 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -11,6 +11,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + #ifndef NULL #ifdef __cplusplus #define NULL 0 @@ -246,4 +248,6 @@ static inline ldiv_t __wine_msvcrt_ldiv(long num, long denom) #define ldiv(num,denom) __wine_msvcrt_ldiv(num,denom) #endif +#include <poppack.h> + #endif /* __WINE_STDLIB_H */ diff --git a/include/msvcrt/sys/stat.h b/include/msvcrt/sys/stat.h index dcedcd5..a81a9ec 100644 --- a/include/msvcrt/sys/stat.h +++ b/include/msvcrt/sys/stat.h @@ -11,6 +11,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + #include <sys/types.h> #ifndef _WCHAR_T_DEFINED @@ -174,4 +176,6 @@ static inline int umask(int fd) { return _umask(fd); } #define _UMASK_DEFINED #endif +#include <poppack.h> + #endif /* __WINE_SYS_STAT_H */ diff --git a/include/msvcrt/sys/timeb.h b/include/msvcrt/sys/timeb.h index 7bea2ed..253b581 100644 --- a/include/msvcrt/sys/timeb.h +++ b/include/msvcrt/sys/timeb.h @@ -23,6 +23,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + #ifndef _TIME_T_DEFINED typedef long time_t; #define _TIME_T_DEFINED @@ -55,4 +57,6 @@ void _ftime(struct _timeb*); static inline void ftime(struct _timeb* ptr) { return _ftime(ptr); } +#include <poppack.h> + #endif /* __WINE_SYS_TIMEB_H */ diff --git a/include/msvcrt/sys/utime.h b/include/msvcrt/sys/utime.h index ba65976..65a855c 100644 --- a/include/msvcrt/sys/utime.h +++ b/include/msvcrt/sys/utime.h @@ -23,6 +23,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + #ifndef _WCHAR_T_DEFINED #define _WCHAR_T_DEFINED #ifndef __cplusplus @@ -62,4 +64,6 @@ int _wutime(const wchar_t*,struct _utimbuf*); static inline int utime(const char* path, struct _utimbuf* buf) { return _utime(path, buf); } +#include <poppack.h> + #endif /* __WINE_SYS_UTIME_H */ diff --git a/include/msvcrt/time.h b/include/msvcrt/time.h index 0fbf1df..60ec444 100644 --- a/include/msvcrt/time.h +++ b/include/msvcrt/time.h @@ -23,6 +23,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + #ifndef _WCHAR_T_DEFINED #define _WCHAR_T_DEFINED #ifndef __cplusplus @@ -127,4 +129,6 @@ wchar_t*_wstrtime(wchar_t*); } #endif +#include <poppack.h> + #endif /* __WINE_TIME_H */ diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 48aa311..e298a70 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -11,6 +11,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + #include <stdarg.h> #ifdef __cplusplus @@ -428,4 +430,6 @@ int wctob(wint_t); } #endif +#include <poppack.h> + #endif /* __WINE_WCHAR_H */ diff --git a/include/msvcrt/wctype.h b/include/msvcrt/wctype.h index 372e102..0f70e4d 100644 --- a/include/msvcrt/wctype.h +++ b/include/msvcrt/wctype.h @@ -23,6 +23,8 @@ #define __WINE_USE_MSVCRT #endif +#include <pshpack8.h> + #ifndef _WCHAR_T_DEFINED #define _WCHAR_T_DEFINED #ifndef __cplusplus @@ -84,4 +86,6 @@ wchar_t towupper(wchar_t); } #endif +#include <poppack.h> + #endif /* __WINE_WCTYPE_H */

1 0

Chris Robinson : quartz: Add IMediaPosition interface and stubs.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: 7d597264dc9d70afdf86cee09c4d51028f11168f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d597264dc9d70afdf86cee09… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Mon Feb 19 17:31:19 2007 -0800 quartz: Add IMediaPosition interface and stubs. --- dlls/quartz/filtergraph.c | 122 ++++++++++++++++++++++++++++++++++++++++++++- include/control.idl | 25 +++++++++ 2 files changed, 146 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 9f41f9f..fca3299 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -157,6 +157,7 @@ typedef struct _IFilterGraphImpl { const IMediaFilterVtbl *IMediaFilter_vtbl; const IMediaEventSinkVtbl *IMediaEventSink_vtbl; const IGraphConfigVtbl *IGraphConfig_vtbl; + const IMediaPositionVtbl *IMediaPosition_vtbl; /* IAMGraphStreams */ /* IAMStats */ /* IBasicVideo2 */ @@ -164,7 +165,6 @@ typedef struct _IFilterGraphImpl { /* IFilterGraph2 */ /* IFilterMapper2 */ /* IGraphVersion */ - /* IMediaPosition */ /* IQueueCommand */ /* IRegisterServiceProvider */ /* IResourceMananger */ @@ -232,6 +232,9 @@ static HRESULT Filtergraph_QueryInterface(IFilterGraphImpl *This, } else if (IsEqualGUID(&IID_IGraphConfig, riid)) { *ppvObj = &(This->IGraphConfig_vtbl); TRACE(" returning IGraphConfig interface (%p)\n", *ppvObj); + } else if (IsEqualGUID(&IID_IMediaPosition, riid)) { + *ppvObj = &(This->IMediaPosition_vtbl); + TRACE(" returning IMediaPosition interface (%p)\n", *ppvObj); } else { *ppvObj = NULL; FIXME("unknown interface %s\n", debugstr_guid(riid)); @@ -1754,6 +1757,122 @@ static const IMediaSeekingVtbl IMediaSeeking_VTable = MediaSeeking_GetPreroll }; +/*** IUnknown methods ***/ +static HRESULT WINAPI MediaPosition_QueryInterface(IMediaPosition* iface, REFIID riid, void** ppvObject){ + FIXME("(%p) stub!\n", iface); + return E_NOTIMPL; +} + +static ULONG WINAPI MediaPosition_AddRef(IMediaPosition *iface){ + FIXME("(%p) stub!\n", iface); + return E_NOTIMPL; +} + +static ULONG WINAPI MediaPosition_Release(IMediaPosition *iface){ + FIXME("(%p) stub!\n", iface); + return E_NOTIMPL; +} + +/*** IDispatch methods ***/ +static HRESULT WINAPI MediaPosition_GetTypeInfoCount(IMediaPosition *iface, UINT* pctinfo){ + FIXME("(%p) stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaPosition_GetTypeInfo(IMediaPosition *iface, UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo){ + FIXME("(%p) stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaPosition_GetIDsOfNames(IMediaPosition* iface, REFIID riid, LPOLESTR* rgszNames, UINT cNames, LCID lcid, DISPID* rgDispId){ + FIXME("(%p) stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaPosition_Invoke(IMediaPosition* iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr){ + FIXME("(%p) stub!\n", iface); + return E_NOTIMPL; +} + +/*** IMediaPosition methods ***/ +static HRESULT WINAPI MediaPosition_get_Duration(IMediaPosition * iface, REFTIME *plength){ + FIXME("(%p)->(%p) stub!\n", iface, plength); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaPosition_put_CurrentPosition(IMediaPosition * iface, REFTIME llTime){ + FIXME("(%p)->(%f) stub!\n", iface, llTime); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaPosition_get_CurrentPosition(IMediaPosition * iface, REFTIME *pllTime){ + FIXME("(%p)->(%p) stub!\n", iface, pllTime); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaPosition_get_StopTime(IMediaPosition * iface, REFTIME *pllTime){ + FIXME("(%p)->(%p) stub!\n", iface, pllTime); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaPosition_put_StopTime(IMediaPosition * iface, REFTIME llTime){ + FIXME("(%p)->(%f) stub!\n", iface, llTime); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaPosition_get_PrerollTime(IMediaPosition * iface, REFTIME *pllTime){ + FIXME("(%p)->(%p) stub!\n", iface, pllTime); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaPosition_put_PrerollTime(IMediaPosition * iface, REFTIME llTime){ + FIXME("(%p)->(%f) stub!\n", iface, llTime); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaPosition_put_Rate(IMediaPosition * iface, double dRate){ + FIXME("(%p)->(%f) stub!\n", iface, dRate); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaPosition_get_Rate(IMediaPosition * iface, double *pdRate){ + FIXME("(%p)->(%p) stub!\n", iface, pdRate); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaPosition_CanSeekForward(IMediaPosition * iface, LONG *pCanSeekForward){ + FIXME("(%p)->(%p) stub!\n", iface, pCanSeekForward); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaPosition_CanSeekBackward(IMediaPosition * iface, LONG *pCanSeekBackward){ + FIXME("(%p)->(%p) stub!\n", iface, pCanSeekBackward); + return E_NOTIMPL; +} + + +static const IMediaPositionVtbl IMediaPosition_VTable = +{ + MediaPosition_QueryInterface, + MediaPosition_AddRef, + MediaPosition_Release, + MediaPosition_GetTypeInfoCount, + MediaPosition_GetTypeInfo, + MediaPosition_GetIDsOfNames, + MediaPosition_Invoke, + MediaPosition_get_Duration, + MediaPosition_put_CurrentPosition, + MediaPosition_get_CurrentPosition, + MediaPosition_get_StopTime, + MediaPosition_put_StopTime, + MediaPosition_get_PrerollTime, + MediaPosition_put_PrerollTime, + MediaPosition_put_Rate, + MediaPosition_get_Rate, + MediaPosition_CanSeekForward, + MediaPosition_CanSeekBackward +}; + static HRESULT GetTargetInterface(IFilterGraphImpl* pGraph, REFIID riid, LPVOID* ppvObj) { HRESULT hr = E_NOINTERFACE; @@ -4375,6 +4494,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->IMediaFilter_vtbl = &IMediaFilter_VTable; fimpl->IMediaEventSink_vtbl = &IMediaEventSink_VTable; fimpl->IGraphConfig_vtbl = &IGraphConfig_VTable; + fimpl->IMediaPosition_vtbl = &IMediaPosition_VTable; fimpl->ref = 1; fimpl->ppFiltersInGraph = NULL; fimpl->pFilterNames = NULL; diff --git a/include/control.idl b/include/control.idl index c224f5a..7831640 100644 --- a/include/control.idl +++ b/include/control.idl @@ -28,6 +28,7 @@ interface IBasicVideo; interface IVideoWindow; interface IMediaEvent; interface IMediaEventEx; +interface IMediaPosition; typedef long OAFilterState; typedef LONG_PTR OAHWND; @@ -206,3 +207,27 @@ interface IMediaEventEx : IMediaEvent HRESULT SetNotifyFlags( [in] long lNoNotifyFlags ); HRESULT GetNotifyFlags( [out] long *lplNoNotifyFlags ); } + + +/***************************************************************************** + * IMediaPosition interface + */ +[ + object, + uuid(56a868b2-0ad4-11ce-b03a-0020af0ba770), + pointer_default(unique) +] +interface IMediaPosition : IDispatch +{ + HRESULT get_Duration( [out] REFTIME *plength ); + HRESULT put_CurrentPosition( [in] REFTIME llTime ); + HRESULT get_CurrentPosition( [out] REFTIME *pllTime ); + HRESULT get_StopTime( [out] REFTIME *pllTime ); + HRESULT put_StopTime( [in] REFTIME llTime ); + HRESULT get_PrerollTime( [out] REFTIME *pllTime ); + HRESULT put_PrerollTime( [in] REFTIME llTime ); + HRESULT put_Rate( [in] double dRate ); + HRESULT get_Rate( [out] double *pdRate ); + HRESULT CanSeekForward( [out] LONG *pCanSeekForward ); + HRESULT CanSeekBackward( [out] LONG *pCanSeekBackward ); +}

1 0

Chris Robinson : quartz: Initialize a pointer to NULL for the case of no enumerated filters.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: 4284c504abe3fcf8c0ecd0febc89251fba77b12c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4284c504abe3fcf8c0ecd0feb… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Mon Feb 19 17:33:19 2007 -0800 quartz: Initialize a pointer to NULL for the case of no enumerated filters. --- dlls/quartz/filtergraph.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index fca3299..b894781 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -963,7 +963,7 @@ static HRESULT WINAPI GraphBuilder_RenderFile(IGraphBuilder *iface, ICOM_THIS_MULTI(IFilterGraphImpl, IGraphBuilder_vtbl, iface); static const WCHAR string[] = {'R','e','a','d','e','r',0}; IBaseFilter* preader = NULL; - IBaseFilter* psplitter; + IBaseFilter* psplitter = NULL; IPin* ppinreader; IPin* ppinsplitter; IEnumPins* penumpins;

1 0

Chris Robinson : quartz: Better handle error conditions when connections fail.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: 31407d2659e1c19e7633ab478aa845f30d1387ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=31407d2659e1c19e7633ab478… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Mon Feb 19 17:26:10 2007 -0800 quartz: Better handle error conditions when connections fail. --- dlls/quartz/filtergraph.c | 43 +++++++++++++++++++++++++++---------------- 1 files changed, 27 insertions(+), 16 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index a3db8dd..9f41f9f 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -773,6 +773,8 @@ static HRESULT WINAPI GraphBuilder_Connect(IGraphBuilder *iface, } hr = IEnumPins_Next(penumpins, 1, &ppinfilter, &pin); + IEnumPins_Release(penumpins); + if (FAILED(hr)) { ERR("Next (%x)\n", hr); goto error; @@ -781,7 +783,6 @@ static HRESULT WINAPI GraphBuilder_Connect(IGraphBuilder *iface, ERR("No Pin\n"); goto error; } - IEnumPins_Release(penumpins); hr = IPin_Connect(ppinOut, ppinfilter, NULL); if (FAILED(hr)) { @@ -795,6 +796,10 @@ static HRESULT WINAPI GraphBuilder_Connect(IGraphBuilder *iface, if (SUCCEEDED(hr)) { int i; + if (nb == 0) { + IPin_Disconnect(ppinOut); + goto error; + } TRACE("pins to consider: %d\n", nb); for(i = 0; i < nb; i++) { TRACE("Processing pin %d\n", i); @@ -1009,7 +1014,7 @@ static HRESULT WINAPI GraphBuilder_RenderFile(IGraphBuilder *iface, return hr; } - hr = E_FAIL; + hr = VFW_E_CANNOT_RENDER; while(IEnumMoniker_Next(pEnumMoniker, 1, &pMoniker, &nb) == S_OK) { VARIANT var; @@ -1046,29 +1051,35 @@ static HRESULT WINAPI GraphBuilder_RenderFile(IGraphBuilder *iface, if (SUCCEEDED(hr)) hr = IPin_Connect(ppinreader, ppinsplitter, NULL); - if (SUCCEEDED(hr)) { - /* Make sure there's some output pins in the filter */ + + /* Make sure there's some output pins in the filter */ + if (SUCCEEDED(hr)) hr = GetInternalConnections(psplitter, ppinsplitter, &ppins, &nb); - if (SUCCEEDED(hr)) { - if(nb > 0) { - TRACE("Successfully connected to filter\n"); - break; - } - CoTaskMemFree(ppins); - ppins = NULL; + if (SUCCEEDED(hr)) { + if(nb == 0) { + IPin_Disconnect(ppinreader); + TRACE("No output pins found in filter\n"); + hr = VFW_E_CANNOT_RENDER; } - - TRACE("No output pins found in filter\n"); - hr = VFW_E_CANNOT_RENDER; } IPin_Release(ppinsplitter); ppinsplitter = NULL; + + if (SUCCEEDED(hr)) { + TRACE("Successfully connected to filter\n"); + break; + } + + TRACE("Cannot connect to filter (%x), trying next one\n", hr); + + if (ppins) { + CoTaskMemFree(ppins); + ppins = NULL; + } IGraphBuilder_RemoveFilter(iface, psplitter); IBaseFilter_Release(psplitter); ppinsplitter = NULL; - - TRACE("Cannot connect to filter (%x), trying next one\n", hr); } /* Render all output pin of the splitter by calling IGraphBuilder_Render on each of them */

1 0