wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Jacek Caban : shdocvw: Fixed typo in async_doc_navigate.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 1e7b754bbb5314aa5314fda0acc0c2f392aba061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e7b754bbb5314aa5314fda0a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Apr 25 13:36:45 2010 +0200 shdocvw: Fixed typo in async_doc_navigate. --- dlls/shdocvw/navigate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 8ba5f69..db6a3c4 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -642,7 +642,7 @@ static HRESULT async_doc_navigate(DocHost *This, LPCWSTR url, LPCWSTR headers, P return free_doc_navigate_task(task, TRUE); } - if(task->post_data) { + if(post_data) { task->post_data = SafeArrayCreateVector(VT_UI1, 0, post_data_size); if(!task->post_data) return free_doc_navigate_task(task, TRUE);

1 0

Vincent Povirk : user32: Focus editboxes when the context menu is opened.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: a5fd32eb84989e39b962798e3b3e5ec7121d7fdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5fd32eb84989e39b962798e3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Apr 24 14:33:00 2010 -0500 user32: Focus editboxes when the context menu is opened. --- dlls/user32/edit.c | 3 ++ dlls/user32/tests/edit.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 9898bc4..05a68ea 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3115,6 +3115,9 @@ static void EDIT_WM_ContextMenu(EDITSTATE *es, INT x, INT y) y = rc.top + (rc.bottom - rc.top) / 2; } + if (!(es->flags & EF_FOCUSED)) + SetFocus(es->hwndSelf); + TrackPopupMenu(popup, TPM_LEFTALIGN | TPM_RIGHTBUTTON, x, y, 0, es->hwndSelf, NULL); DestroyMenu(menu); } diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index ee181f2..9e4f336 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -537,6 +537,7 @@ static HINSTANCE hinst; static HWND hwndET2; static const char szEditTest2Class[] = "EditTest2Class"; static const char szEditTest3Class[] = "EditTest3Class"; +static const char szEditTest4Class[] = "EditTest4Class"; static const char szEditTextPositionClass[] = "EditTextPositionWindowClass"; static HWND create_editcontrol (DWORD style, DWORD exstyle) @@ -2081,10 +2082,63 @@ static void test_child_edit_wmkeydown(void) destroy_child_editcontrol(hwEdit); } +static int got_en_setfocus = 0; +static int got_wm_capturechanged = 0; + +static LRESULT CALLBACK edit4_wnd_procA(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) { + case WM_COMMAND: + switch (HIWORD(wParam)) { + case EN_SETFOCUS: + got_en_setfocus = 1; + break; + } + break; + case WM_CAPTURECHANGED: + if (hWnd != (HWND)lParam) + { + got_wm_capturechanged = 1; + EndMenu(); + } + break; + } + return DefWindowProcA(hWnd, msg, wParam, lParam); +} + +static void test_contextmenu_focus(void) +{ + HWND hwndMain, hwndEdit; + + hwndMain = CreateWindow(szEditTest4Class, "ET4", WS_OVERLAPPEDWINDOW|WS_VISIBLE, + 0, 0, 200, 200, NULL, NULL, hinst, NULL); + assert(hwndMain); + + hwndEdit = CreateWindow("EDIT", NULL, + WS_CHILD|WS_BORDER|WS_VISIBLE|ES_LEFT|ES_AUTOHSCROLL, + 0, 0, 150, 50, /* important this not be 0 size. */ + hwndMain, (HMENU) ID_EDITTEST2, hinst, NULL); + assert(hwndEdit); + + SetFocus(NULL); + + SetCapture(hwndMain); + + SendMessage(hwndEdit, WM_CONTEXTMENU, (WPARAM)hwndEdit, MAKEWORD(10, 10)); + + ok(got_en_setfocus, "edit box didn't get focused\n"); + + ok(got_wm_capturechanged, "main window capture did not change\n"); + + DestroyWindow (hwndEdit); + DestroyWindow (hwndMain); +} + static BOOL RegisterWindowClasses (void) { WNDCLASSA test2; WNDCLASSA test3; + WNDCLASSA test4; WNDCLASSA text_position; test2.style = 0; @@ -2110,6 +2164,18 @@ static BOOL RegisterWindowClasses (void) test3.lpszMenuName = NULL; test3.lpszClassName = szEditTest3Class; if (!RegisterClassA(&test3)) return FALSE; + + test4.style = 0; + test4.lpfnWndProc = edit4_wnd_procA; + test4.cbClsExtra = 0; + test4.cbWndExtra = 0; + test4.hInstance = hinst; + test4.hIcon = NULL; + test4.hCursor = LoadCursorA (NULL, IDC_ARROW); + test4.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + test4.lpszMenuName = NULL; + test4.lpszClassName = szEditTest4Class; + if (!RegisterClassA(&test4)) return FALSE; text_position.style = CS_HREDRAW | CS_VREDRAW; text_position.cbClsExtra = 0; @@ -2130,6 +2196,7 @@ static void UnregisterWindowClasses (void) { UnregisterClassA(szEditTest2Class, hinst); UnregisterClassA(szEditTest3Class, hinst); + UnregisterClassA(szEditTest4Class, hinst); UnregisterClassA(szEditTextPositionClass, hinst); } @@ -2385,6 +2452,7 @@ START_TEST(edit) test_child_edit_wmkeydown(); test_fontsize(); test_dialogmode(); + test_contextmenu_focus(); UnregisterWindowClasses(); }

1 0

Paul Vriens : wineconsole: Update Dutch translation.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 62644ee1a2763ed6a1ffabaa4a1780bf6db46805 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62644ee1a2763ed6a1ffabaa4… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Apr 23 19:03:09 2010 +0200 wineconsole: Update Dutch translation. --- programs/wineconsole/wineconsole_Nl.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/wineconsole_Nl.rc b/programs/wineconsole/wineconsole_Nl.rc index 8500763..df3556e 100644 --- a/programs/wineconsole/wineconsole_Nl.rc +++ b/programs/wineconsole/wineconsole_Nl.rc @@ -29,7 +29,7 @@ IDS_EDIT, "&Bewerken" IDS_DEFAULT, "&Standaardinstellingen" IDS_PROPERTIES, "&Eigenschappen" IDS_MARK, "&Markeren" -IDS_COPY, "&Kopi�ren�" +IDS_COPY, "&Kopi�ren" IDS_PASTE, "&Plakken" IDS_SELECTALL, "&Alles selecteren" IDS_SCROLL, "Sc&rollen" @@ -53,7 +53,7 @@ IDS_USAGE_BACKEND " --backend={user|curses} Kiezen voor user zal een " curses zal proberen de huidige terminal om te zetten\n"\ " in een Wine console\n" IDS_USAGE_COMMAND " <commando> Het Wine programma dat zal starten in de Wine console\n" -IDS_USAGE_FOOTER "\nExample:\n wineconsole cmd\nStarts the Wine command prompt in a Wine console\n\n" +IDS_USAGE_FOOTER "\nVoorbeeld:\n wineconsole cmd\nStart de Wine command prompt in een Wine console\n\n" END

1 0

Nikolay Sivov : comctl32/listview: Remove forward declaration and unused parameter from edit box creation helper .
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 1ccbadcf23ecd2bbc132227edf942064d56c0027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ccbadcf23ecd2bbc132227ed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 23 18:52:13 2010 +0400 comctl32/listview: Remove forward declaration and unused parameter from edit box creation helper. --- dlls/comctl32/listview.c | 256 +++++++++++++++++++++++----------------------- 1 files changed, 128 insertions(+), 128 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 68ad0a9..256d4c6 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -462,7 +462,6 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *, INT, const LVITEMW *); static LRESULT LISTVIEW_VScroll(LISTVIEW_INFO *, INT, INT, HWND); static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *, INT, INT, HWND); static BOOL LISTVIEW_EnsureVisible(LISTVIEW_INFO *, INT, BOOL); -static HWND CreateEditLabelT(LISTVIEW_INFO *, LPCWSTR, DWORD, BOOL); static HIMAGELIST LISTVIEW_SetImageList(LISTVIEW_INFO *, INT, HIMAGELIST); static INT LISTVIEW_HitTest(const LISTVIEW_INFO *, LPLVHITTESTINFO, BOOL, BOOL); static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *, BOOL, BOOL); @@ -5733,6 +5732,133 @@ cleanup: /*** * DESCRIPTION: + * Subclassed edit control windproc function + * + * PARAMETER(S): + * [I] hwnd : the edit window handle + * [I] uMsg : the message that is to be processed + * [I] wParam : first message parameter + * [I] lParam : second message parameter + * [I] isW : TRUE if input is Unicode + * + * RETURN: + * Zero. + */ +static LRESULT EditLblWndProcT(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL isW) +{ + LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongPtrW(GetParent(hwnd), 0); + BOOL save = TRUE; + + TRACE("(hwnd=%p, uMsg=%x, wParam=%lx, lParam=%lx, isW=%d)\n", + hwnd, uMsg, wParam, lParam, isW); + + switch (uMsg) + { + case WM_GETDLGCODE: + return DLGC_WANTARROWS | DLGC_WANTALLKEYS; + + case WM_DESTROY: + { + WNDPROC editProc = infoPtr->EditWndProc; + infoPtr->EditWndProc = 0; + SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (DWORD_PTR)editProc); + return CallWindowProcT(editProc, hwnd, uMsg, wParam, lParam, isW); + } + + case WM_KEYDOWN: + if (VK_ESCAPE == (INT)wParam) + { + save = FALSE; + break; + } + else if (VK_RETURN == (INT)wParam) + break; + + default: + return CallWindowProcT(infoPtr->EditWndProc, hwnd, uMsg, wParam, lParam, isW); + } + + /* kill the edit */ + if (infoPtr->hwndEdit) + LISTVIEW_EndEditLabelT(infoPtr, save, isW); + + SendMessageW(hwnd, WM_CLOSE, 0, 0); + return 0; +} + +/*** + * DESCRIPTION: + * Subclassed edit control Unicode windproc function + * + * PARAMETER(S): + * [I] hwnd : the edit window handle + * [I] uMsg : the message that is to be processed + * [I] wParam : first message parameter + * [I] lParam : second message parameter + * + * RETURN: + */ +static LRESULT CALLBACK EditLblWndProcW(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return EditLblWndProcT(hwnd, uMsg, wParam, lParam, TRUE); +} + +/*** + * DESCRIPTION: + * Subclassed edit control ANSI windproc function + * + * PARAMETER(S): + * [I] hwnd : the edit window handle + * [I] uMsg : the message that is to be processed + * [I] wParam : first message parameter + * [I] lParam : second message parameter + * + * RETURN: + */ +static LRESULT CALLBACK EditLblWndProcA(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return EditLblWndProcT(hwnd, uMsg, wParam, lParam, FALSE); +} + +/*** + * DESCRIPTION: + * Creates a subclassed edit control + * + * PARAMETER(S): + * [I] infoPtr : valid pointer to the listview structure + * [I] text : initial text for the edit + * [I] style : the window style + * [I] isW : TRUE if input is Unicode + * + * RETURN: + */ +static HWND CreateEditLabelT(LISTVIEW_INFO *infoPtr, LPCWSTR text, BOOL isW) +{ + static const DWORD style = WS_CHILDWINDOW|WS_CLIPSIBLINGS|ES_LEFT|ES_AUTOHSCROLL|WS_BORDER|WS_VISIBLE; + HINSTANCE hinst = (HINSTANCE)GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_HINSTANCE); + HWND hedit; + + TRACE("(%p, text=%s, isW=%d)\n", infoPtr, debugtext_t(text, isW), isW); + + /* Window will be resized and positioned after LVN_BEGINLABELEDIT */ + if (isW) + hedit = CreateWindowW(WC_EDITW, text, style, 0, 0, 0, 0, infoPtr->hwndSelf, 0, hinst, 0); + else + hedit = CreateWindowA(WC_EDITA, (LPCSTR)text, style, 0, 0, 0, 0, infoPtr->hwndSelf, 0, hinst, 0); + + if (!hedit) return 0; + + infoPtr->EditWndProc = (WNDPROC) + (isW ? SetWindowLongPtrW(hedit, GWLP_WNDPROC, (DWORD_PTR)EditLblWndProcW) : + SetWindowLongPtrA(hedit, GWLP_WNDPROC, (DWORD_PTR)EditLblWndProcA) ); + + SendMessageW(hedit, WM_SETFONT, (WPARAM)infoPtr->hFont, FALSE); + + return hedit; +} + +/*** + * DESCRIPTION: * Begin in place editing of specified list view item * * PARAMETER(S): @@ -5786,7 +5912,7 @@ static HWND LISTVIEW_EditLabelT(LISTVIEW_INFO *infoPtr, INT nItem, BOOL isW) dispInfo.item.cchTextMax = DISP_TEXT_SIZE; if (!LISTVIEW_GetItemT(infoPtr, &dispInfo.item, isW)) return 0; - infoPtr->hwndEdit = CreateEditLabelT(infoPtr, dispInfo.item.pszText, WS_VISIBLE, isW); + infoPtr->hwndEdit = CreateEditLabelT(infoPtr, dispInfo.item.pszText, isW); if (!infoPtr->hwndEdit) return 0; if (notify_dispinfoT(infoPtr, LVN_BEGINLABELEDITW, &dispInfo, isW)) @@ -11516,130 +11642,4 @@ static LRESULT LISTVIEW_Command(LISTVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lP } -/*** - * DESCRIPTION: - * Subclassed edit control windproc function - * - * PARAMETER(S): - * [I] hwnd : the edit window handle - * [I] uMsg : the message that is to be processed - * [I] wParam : first message parameter - * [I] lParam : second message parameter - * [I] isW : TRUE if input is Unicode - * - * RETURN: - * Zero. - */ -static LRESULT EditLblWndProcT(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL isW) -{ - LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongPtrW(GetParent(hwnd), 0); - BOOL save = TRUE; - - TRACE("(hwnd=%p, uMsg=%x, wParam=%lx, lParam=%lx, isW=%d)\n", - hwnd, uMsg, wParam, lParam, isW); - - switch (uMsg) - { - case WM_GETDLGCODE: - return DLGC_WANTARROWS | DLGC_WANTALLKEYS; - - case WM_DESTROY: - { - WNDPROC editProc = infoPtr->EditWndProc; - infoPtr->EditWndProc = 0; - SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (DWORD_PTR)editProc); - return CallWindowProcT(editProc, hwnd, uMsg, wParam, lParam, isW); - } - - case WM_KEYDOWN: - if (VK_ESCAPE == (INT)wParam) - { - save = FALSE; - break; - } - else if (VK_RETURN == (INT)wParam) - break; - - default: - return CallWindowProcT(infoPtr->EditWndProc, hwnd, uMsg, wParam, lParam, isW); - } - /* kill the edit */ - if (infoPtr->hwndEdit) - LISTVIEW_EndEditLabelT(infoPtr, save, isW); - - SendMessageW(hwnd, WM_CLOSE, 0, 0); - return 0; -} - -/*** - * DESCRIPTION: - * Subclassed edit control Unicode windproc function - * - * PARAMETER(S): - * [I] hwnd : the edit window handle - * [I] uMsg : the message that is to be processed - * [I] wParam : first message parameter - * [I] lParam : second message parameter - * - * RETURN: - */ -static LRESULT CALLBACK EditLblWndProcW(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - return EditLblWndProcT(hwnd, uMsg, wParam, lParam, TRUE); -} - -/*** - * DESCRIPTION: - * Subclassed edit control ANSI windproc function - * - * PARAMETER(S): - * [I] hwnd : the edit window handle - * [I] uMsg : the message that is to be processed - * [I] wParam : first message parameter - * [I] lParam : second message parameter - * - * RETURN: - */ -static LRESULT CALLBACK EditLblWndProcA(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - return EditLblWndProcT(hwnd, uMsg, wParam, lParam, FALSE); -} - -/*** - * DESCRIPTION: - * Creates a subclassed edit control - * - * PARAMETER(S): - * [I] infoPtr : valid pointer to the listview structure - * [I] text : initial text for the edit - * [I] style : the window style - * [I] isW : TRUE if input is Unicode - * - * RETURN: - */ -static HWND CreateEditLabelT(LISTVIEW_INFO *infoPtr, LPCWSTR text, DWORD style, BOOL isW) -{ - HWND hedit; - HINSTANCE hinst = (HINSTANCE)GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_HINSTANCE); - - TRACE("(text=%s, ..., isW=%d)\n", debugtext_t(text, isW), isW); - - style |= WS_CHILDWINDOW|WS_CLIPSIBLINGS|ES_LEFT|ES_AUTOHSCROLL|WS_BORDER; - - /* Window will be resized and positioned after LVN_BEGINLABELEDIT */ - if (isW) - hedit = CreateWindowW(WC_EDITW, text, style, 0, 0, 0, 0, infoPtr->hwndSelf, 0, hinst, 0); - else - hedit = CreateWindowA(WC_EDITA, (LPCSTR)text, style, 0, 0, 0, 0, infoPtr->hwndSelf, 0, hinst, 0); - - if (!hedit) return 0; - - infoPtr->EditWndProc = (WNDPROC) - (isW ? SetWindowLongPtrW(hedit, GWLP_WNDPROC, (DWORD_PTR)EditLblWndProcW) : - SetWindowLongPtrA(hedit, GWLP_WNDPROC, (DWORD_PTR)EditLblWndProcA) ); - - SendMessageW(hedit, WM_SETFONT, (WPARAM)infoPtr->hFont, FALSE); - - return hedit; -}

1 0

Huw Davies : wineps.drv: Add world transform support for fonts.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 8ce10f14268e936c38eb6b2db26a7c60240b48a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ce10f14268e936c38eb6b2db… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 23 13:15:05 2010 +0100 wineps.drv: Add world transform support for fonts. --- dlls/wineps.drv/builtin.c | 6 ++++-- dlls/wineps.drv/download.c | 21 ++++++++++++++++++++- dlls/wineps.drv/ps.c | 8 ++++---- dlls/wineps.drv/psdrv.h | 9 +++++++-- 4 files changed, 35 insertions(+), 9 deletions(-) diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index e0a3951..b57cfb2 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -79,7 +79,9 @@ static VOID ScaleFont(const AFM *afm, LONG lfHeight, PSFONT *font, (float)(wm->usWinAscent + wm->usWinDescent); } - font->size = (INT)Round(font->fontinfo.Builtin.scale * (float)wm->usUnitsPerEm); + font->size.xx = (INT)Round(font->fontinfo.Builtin.scale * (float)wm->usUnitsPerEm); + font->size.xy = font->size.yx = 0; + font->size.yy = -(INT)Round(font->fontinfo.Builtin.scale * (float)wm->usUnitsPerEm); usUnitsPerEm = (USHORT)Round((float)(wm->usUnitsPerEm) * font->fontinfo.Builtin.scale); sAscender = (SHORT)Round((float)(wm->sAscender) * font->fontinfo.Builtin.scale); @@ -140,7 +142,7 @@ static VOID ScaleFont(const AFM *afm, LONG lfHeight, PSFONT *font, font->strikeoutThickness = font->underlineThickness; TRACE("Selected PS font '%s' size %d weight %d.\n", afm->FontName, - font->size, tm->tmWeight ); + font->size.xx, tm->tmWeight ); TRACE("H = %d As = %d Des = %d IL = %d EL = %d\n", tm->tmHeight, tm->tmAscent, tm->tmDescent, tm->tmInternalLeading, tm->tmExternalLeading); diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 5a873e1..8be03c9 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -33,6 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); +BOOL WINAPI GetTransform( HDC hdc, DWORD which, XFORM *xform ); + #define MS_MAKE_TAG( _x1, _x2, _x3, _x4 ) \ ( ( (DWORD)_x4 << 24 ) | \ ( (DWORD)_x3 << 16 ) | \ @@ -233,6 +235,10 @@ static UINT calc_ppem_for_height(HDC hdc, LONG height) return MulDiv(emsize, height, ascent + descent); } +static inline float ps_round(float f) +{ + return (f > 0) ? (f + 0.5) : (f - 0.5); +} /**************************************************************************** * PSDRV_WriteSetDownloadFont * @@ -247,6 +253,7 @@ BOOL PSDRV_WriteSetDownloadFont(PSDRV_PDEVICE *physDev) DOWNLOAD *pdl; LOGFONTW lf; UINT ppem; + XFORM xform; assert(physDev->font.fontloc == Download); @@ -261,7 +268,19 @@ BOOL PSDRV_WriteSetDownloadFont(PSDRV_PDEVICE *physDev) ppem = calc_ppem_for_height(physDev->hdc, lf.lfHeight); - physDev->font.size = abs(PSDRV_YWStoDS(physDev, ppem)); + /* Retrieve the world -> device transform */ + GetTransform(physDev->hdc, 0x204, &xform); + + physDev->font.size.xx = ps_round(ppem * xform.eM11); + physDev->font.size.xy = ps_round(ppem * xform.eM12); + physDev->font.size.yx = ps_round(ppem * xform.eM21); + physDev->font.size.yy = ps_round(ppem * xform.eM22); + + if(GetMapMode(physDev->hdc) == MM_TEXT) + { + physDev->font.size.yx *= -1; + physDev->font.size.yy *= -1; + } physDev->font.underlineThickness = potm->otmsUnderscoreSize; physDev->font.underlinePosition = potm->otmsUnderscorePosition; diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 89728fd..e06e892 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -115,9 +115,9 @@ static const char psrectangle[] = /* x, y, width, height, -width */ static const char psglyphshow[] = /* glyph name */ "/%s glyphshow\n"; -static const char pssetfont[] = /* fontname, xscale, yscale, ascent, escapement */ +static const char pssetfont[] = /* fontname, xx_scale, xy_scale, yx_scale, yy_scale, escapement */ "/%s findfont\n" -"[%d 0 0 %d 0 0]\n" +"[%d %d %d %d 0 0]\n" "%d 10 div matrix rotate\n" "matrix concatmatrix\n" "makefont setfont\n"; @@ -501,7 +501,7 @@ BOOL PSDRV_WriteArc(PSDRV_PDEVICE *physDev, INT x, INT y, INT w, INT h, double a } -BOOL PSDRV_WriteSetFont(PSDRV_PDEVICE *physDev, const char *name, INT size, INT escapement) +BOOL PSDRV_WriteSetFont(PSDRV_PDEVICE *physDev, const char *name, matrix size, INT escapement) { char *buf; @@ -513,7 +513,7 @@ BOOL PSDRV_WriteSetFont(PSDRV_PDEVICE *physDev, const char *name, INT size, INT return FALSE; } - sprintf(buf, pssetfont, name, size, -size, -escapement); + sprintf(buf, pssetfont, name, size.xx, size.xy, size.yx, size.yy, -escapement); PSDRV_WriteSpool(physDev, buf, strlen(buf)); HeapFree(PSDRV_Heap, 0, buf); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 9b2ec50..854cdd2 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -298,6 +298,11 @@ enum fontloc { Builtin, Download }; +typedef struct +{ + INT xx, xy, yx, yy; +} matrix; + typedef struct { enum fontloc fontloc; union { @@ -305,7 +310,7 @@ typedef struct { DOWNLOAD *Download; } fontinfo; - int size; + matrix size; PSCOLOR color; BOOL set; /* Have we done a setfont yet */ @@ -436,7 +441,7 @@ extern BOOL PSDRV_WriteRectangle(PSDRV_PDEVICE *physDev, INT x, INT y, INT width INT height); extern BOOL PSDRV_WriteRRectangle(PSDRV_PDEVICE *physDev, INT x, INT y, INT width, INT height); -extern BOOL PSDRV_WriteSetFont(PSDRV_PDEVICE *physDev, const char *name, INT size, +extern BOOL PSDRV_WriteSetFont(PSDRV_PDEVICE *physDev, const char *name, matrix size, INT escapement); extern BOOL PSDRV_WriteGlyphShow(PSDRV_PDEVICE *physDev, LPCSTR g_name); extern BOOL PSDRV_WriteSetPen(PSDRV_PDEVICE *physDev);

1 0

Jacek Caban : mshtml: Don't access url in translate_url after freeing it.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 5075f00f2590e95283d2c02fd1b391bd7aa59944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5075f00f2590e95283d2c02fd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 22 21:36:08 2010 +0200 mshtml: Don't access url in translate_url after freeing it. --- dlls/mshtml/nsio.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index c9bb54a..d55f169 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -196,16 +196,15 @@ static BOOL translate_url(HTMLDocumentObj *doc, nsWineURI *uri) url = heap_strdupW(uri->wine_url); hres = IDocHostUIHandler_TranslateUrl(doc->hostui, 0, url, &new_url); - heap_free(url); - if(hres != S_OK || !new_url) - return FALSE; - - if(strcmpW(url, new_url)) { - FIXME("TranslateUrl returned new URL %s -> %s\n", debugstr_w(url), debugstr_w(new_url)); - ret = TRUE; + if(hres == S_OK && new_url) { + if(strcmpW(url, new_url)) { + FIXME("TranslateUrl returned new URL %s -> %s\n", debugstr_w(url), debugstr_w(new_url)); + ret = TRUE; + } + CoTaskMemFree(new_url); } - CoTaskMemFree(new_url); + heap_free(url); return ret; }

1 0

Jacek Caban : shldisp.idl: Added IAsyncOperation declaration.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 0800158e0181623609a58b1c84a880137d273b8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0800158e0181623609a58b1c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 22 21:30:14 2010 +0200 shldisp.idl: Added IAsyncOperation declaration. --- include/shldisp.idl | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/include/shldisp.idl b/include/shldisp.idl index 4e2d2fe..07c3059 100644 --- a/include/shldisp.idl +++ b/include/shldisp.idl @@ -118,3 +118,29 @@ coclass ShellFolderViewOC [default] interface IFolderViewOC; [default, source] dispinterface DShellFolderViewEvents; } + +/***************************************************************************** + * IAsyncOperation interface + */ +[ + uuid(3d8b0590-f691-11d2-8ea9-006097df5bd4), + object, +] + +interface IAsyncOperation : IUnknown +{ + typedef [unique] IAsyncOperation *LPASYNCOPERATION; + + HRESULT SetAsyncMode([in] BOOL fDoOpAsync); + + HRESULT GetAsyncMode([out] BOOL *pfIsOpAsync); + + HRESULT StartOperation([in, unique, optional] IBindCtx *pbcReserved); + + HRESULT InOperation([out] BOOL *pfInAsyncOp); + + HRESULT EndOperation( + [in] HRESULT hResult, + [in, unique] IBindCtx *pbcReserved, + [in] DWORD dwEffects); +}

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to fb_copy_to_texture_hwstretch ().
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: bea50a39de21624b327b9af24348ae7fbef6090c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bea50a39de21624b327b9af24… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 22 18:56:01 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to fb_copy_to_texture_hwstretch(). --- dlls/wined3d/surface.c | 107 ++++++++++++++++++++++++++---------------------- 1 files changed, 58 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bea50a39de21624b327b9…

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to fb_copy_to_texture_direct().
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 99994f885c517faa430186efcaf7bd9c90237b35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99994f885c517faa430186efc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 22 18:56:00 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to fb_copy_to_texture_direct(). --- dlls/wined3d/surface.c | 36 +++++++++++++++++++----------------- 1 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7d6d175..50dbe7b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2988,13 +2988,12 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Flip(IWineD3DSurface *iface, IWineD3DS /* Does a direct frame buffer -> texture copy. Stretching is done * with single pixel copy calls */ -static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3DSurface *SrcSurface, +static void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *dst_surface, IWineD3DSurfaceImpl *src_surface, const RECT *src_rect, const RECT *dst_rect_in, WINED3DTEXTUREFILTERTYPE Filter) { - IWineD3DDeviceImpl *device = This->resource.device; + IWineD3DDeviceImpl *device = dst_surface->resource.device; float xrel, yrel; UINT row; - IWineD3DSurfaceImpl *Src = (IWineD3DSurfaceImpl *) SrcSurface; struct wined3d_context *context; BOOL upsidedown = FALSE; RECT dst_rect = *dst_rect_in; @@ -3009,14 +3008,14 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D upsidedown = TRUE; } - context = context_acquire(device, Src, CTXUSAGE_BLIT); - surface_internal_preload((IWineD3DSurface *) This, SRGB_RGB); + context = context_acquire(device, src_surface, CTXUSAGE_BLIT); + surface_internal_preload((IWineD3DSurface *)dst_surface, SRGB_RGB); ENTER_GL(); /* Bind the target texture */ - glBindTexture(This->texture_target, This->texture_name); + glBindTexture(dst_surface->texture_target, dst_surface->texture_name); checkGLcall("glBindTexture"); - if (surface_is_offscreen(Src)) + if (surface_is_offscreen(src_surface)) { TRACE("Reading from an offscreen target\n"); upsidedown = !upsidedown; @@ -3024,7 +3023,7 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D } else { - glReadBuffer(surface_get_gl_buffer(Src)); + glReadBuffer(surface_get_gl_buffer(src_surface)); } checkGLcall("glReadBuffer"); @@ -3051,12 +3050,12 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D { /* Upside down copy without stretching is nice, one glCopyTexSubImage call will do */ - glCopyTexSubImage2D(This->texture_target, This->texture_level, + glCopyTexSubImage2D(dst_surface->texture_target, dst_surface->texture_level, dst_rect.left /*xoffset */, dst_rect.top /* y offset */, - src_rect->left, Src->currentDesc.Height - src_rect->bottom, + src_rect->left, src_surface->currentDesc.Height - src_rect->bottom, dst_rect.right - dst_rect.left, dst_rect.bottom - dst_rect.top); } else { - UINT yoffset = Src->currentDesc.Height - src_rect->top + dst_rect.top - 1; + UINT yoffset = src_surface->currentDesc.Height - src_rect->top + dst_rect.top - 1; /* I have to process this row by row to swap the image, * otherwise it would be upside down, so stretching in y direction * doesn't cost extra time @@ -3071,13 +3070,16 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D */ UINT col; - for(col = dst_rect.left; col < dst_rect.right; col++) { - glCopyTexSubImage2D(This->texture_target, This->texture_level, + for (col = dst_rect.left; col < dst_rect.right; ++col) + { + glCopyTexSubImage2D(dst_surface->texture_target, dst_surface->texture_level, dst_rect.left + col /* x offset */, row /* y offset */, src_rect->left + col * xrel, yoffset - (int) (row * yrel), 1, 1); } - } else { - glCopyTexSubImage2D(This->texture_target, This->texture_level, + } + else + { + glCopyTexSubImage2D(dst_surface->texture_target, dst_surface->texture_level, dst_rect.left /* x offset */, row /* y offset */, src_rect->left, yoffset - (int) (row * yrel), dst_rect.right - dst_rect.left, 1); } @@ -3091,7 +3093,7 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D /* The texture is now most up to date - If the surface is a render target and has a drawable, this * path is never entered */ - IWineD3DSurface_ModifyLocation((IWineD3DSurface *) This, SFLAG_INTEXTURE, TRUE); + IWineD3DSurface_ModifyLocation((IWineD3DSurface *)dst_surface, SFLAG_INTEXTURE, TRUE); } /* Uses the hardware to stretch and flip the image */ @@ -3584,7 +3586,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const || dst_rect.bottom - dst_rect.top > Src->currentDesc.Height) { TRACE("No stretching in x direction, using direct framebuffer -> texture copy\n"); - fb_copy_to_texture_direct(This, SrcSurface, &src_rect, &dst_rect, Filter); + fb_copy_to_texture_direct(This, Src, &src_rect, &dst_rect, Filter); } else { TRACE("Using hardware stretching to flip / stretch the texture\n"); fb_copy_to_texture_hwstretch(This, SrcSurface, &src_rect, &dst_rect, Filter);

1 0

Henri Verbeet : wined3d: Introduce basetexture_get_sub_resource() to simplify retrieving texture sub-resources.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 339f7ef1002e8532d285d746151e5f77cd44f813 URL: http://source.winehq.org/git/wine.git/?a=commit;h=339f7ef1002e8532d285d7461… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 22 18:55:59 2010 +0200 wined3d: Introduce basetexture_get_sub_resource() to simplify retrieving texture sub-resources. --- dlls/wined3d/basetexture.c | 17 ++++++ dlls/wined3d/cubetexture.c | 70 +++++++++--------------- dlls/wined3d/texture.c | 118 +++++++++++++++++++++++----------------- dlls/wined3d/volumetexture.c | 50 ++++++++++------- dlls/wined3d/wined3d_private.h | 2 + 5 files changed, 142 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=339f7ef1002e8532d285d…

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
90
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 April 2010