April 2010 - Wine-Commits - list.winehq.org

Joel Holdsworth : makefiles: Added a rule for building BMPs from SVGs.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: 66bd5f79cc9b9529c1a1a496a1d9c16907e4d107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66bd5f79cc9b9529c1a1a496a… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sat Apr 24 14:06:11 2010 +0100 makefiles: Added a rule for building BMPs from SVGs. --- Make.rules.in | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 7b571ed..cc6d602 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -136,7 +136,7 @@ filter: dummy # Implicit rules -.SUFFIXES: .mc .rc .mc.rc .res .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .man.in .man _c.c _i.c _p.c _s.c .cross.o @MAINTAINER_MODE@ .sfd .ttf .svg .ico +.SUFFIXES: .mc .rc .mc.rc .res .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .man.in .man _c.c _i.c _p.c _s.c .cross.o @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp .c.o: $(CC) -c $(ALLCFLAGS) -o $@ $< @@ -192,6 +192,11 @@ filter: dummy .svg.ico: CONVERT="$(CONVERT)" ICOTOOL="$(ICOTOOL)" RSVG="$(RSVG)" $(BUILDICON) $< $@ +.svg.bmp: + $(RSVG) $< $<.png + $(CONVERT) $<.png -alpha off $@ + $(RM) $<.png + # Rules for IDL files dlldata.c: $(WIDL) Makefile.in

1 0

Nikolay Sivov : comctl32/listview: Remove forward declaration and unused parameter from edit box creation helper .
by Alexandre Julliard April 26, 2010

April 26, 2010

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 April 26, 2010

April 26, 2010

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

Joel Holdsworth : regedit: Fixed flaws in the icon.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: 00b40ac447d79eea4cc8188220857eca31540e21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00b40ac447d79eea4cc818822… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sat Apr 24 14:06:07 2010 +0100 regedit: Fixed flaws in the icon. --- programs/regedit/regedit.ico | Bin 25214 -> 25214 bytes programs/regedit/regedit.svg | 143 ++++++++++++++++++++++-------------------- 2 files changed, 75 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00b40ac447d79eea4cc81…

1 0

Nikolay Sivov : user32/tests: Add some GetDlgItem() tests regarding children windows Z-order.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: 0af447ce9f0685b8cc222fb3b1c8b4d6aad44325 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0af447ce9f0685b8cc222fb3b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 23 20:52:13 2010 +0400 user32/tests: Add some GetDlgItem() tests regarding children windows Z-order. --- dlls/user32/tests/dialog.c | 51 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 43 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 1b36c53..d18ba0e 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -338,7 +338,7 @@ static int id (HWND h) * (tab test) */ -static void GetNextDlgItemTest (void) +static void test_GetNextDlgItem(void) { static test_record test [] = { @@ -574,7 +574,7 @@ static BOOL RegisterWindowClasses (void) return TRUE; } -static void WM_NEXTDLGCTLTest(void) +static void test_WM_NEXTDLGCTL(void) { DWORD dwVal; @@ -681,7 +681,7 @@ static void WM_NEXTDLGCTLTest(void) DestroyWindow(g_hwndTestDlg); } -static void IsDialogMessageWTest (void) +static void test_IsDialogMessage(void) { MSG msg; @@ -795,7 +795,7 @@ static const char * GetHwndString(HWND hw) return "unknown handle"; } -static void InitialFocusTest (void) +static void test_initial_focus(void) { /* Test 1: * This test intentionally returns FALSE in response to WM_INITDIALOG @@ -897,6 +897,40 @@ static void test_GetDlgItemText(void) "string retrieved using GetDlgItemText should have been NULL terminated\n"); } +static void test_GetDlgItem(void) +{ + HWND hwnd, child1, child2, hwnd2; + BOOL ret; + + hwnd = CreateWindowA("button", "parent", WS_VISIBLE, 0, 0, 100, 100, NULL, 0, g_hinst, NULL); + ok(hwnd != NULL, "failed to created window\n"); + + /* created with the same ID */ + child1 = CreateWindowA("button", "child1", WS_VISIBLE|WS_CHILD, 0, 0, 10, 10, hwnd, 0, g_hinst, NULL); + ok(child1 != NULL, "failed to create first child\n"); + child2 = CreateWindowA("button", "child2", WS_VISIBLE|WS_CHILD, 0, 0, 10, 10, hwnd, 0, g_hinst, NULL); + ok(child2 != NULL, "failed to create second child\n"); + + hwnd2 = GetDlgItem(hwnd, 0); + ok(hwnd2 == child1, "expected first child, got %p\n", hwnd2); + + hwnd2 = GetTopWindow(hwnd); + ok(hwnd2 == child1, "expected first child to be top, got %p\n", hwnd2); + + ret = SetWindowPos(child1, child2, 0, 0, 0, 0, SWP_NOMOVE); + ok(ret, "got %d\n", ret); + hwnd2 = GetTopWindow(hwnd); + ok(hwnd2 == child2, "expected second child to be top, got %p\n", hwnd2); + + /* top window from child list is picked */ + hwnd2 = GetDlgItem(hwnd, 0); + ok(hwnd2 == child2, "expected second child, got %p\n", hwnd2); + + DestroyWindow(child1); + DestroyWindow(child2); + DestroyWindow(hwnd); +} + static INT_PTR CALLBACK DestroyDlgWinProc (HWND hDlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) { @@ -1212,10 +1246,11 @@ START_TEST(dialog) if (!RegisterWindowClasses()) assert(0); - GetNextDlgItemTest(); - IsDialogMessageWTest(); - WM_NEXTDLGCTLTest(); - InitialFocusTest(); + test_GetNextDlgItem(); + test_IsDialogMessage(); + test_WM_NEXTDLGCTL(); + test_initial_focus(); + test_GetDlgItem(); test_GetDlgItemText(); test_DialogBoxParamA(); test_DisabledDialogTest();

1 0

Vincent Povirk : user32: Focus editboxes when the context menu is opened.
by Alexandre Julliard April 26, 2010

April 26, 2010

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

Alexandre Julliard : winex11: Use a format with 8 bits of alpha for the AlphaBlend mask.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: 11c7a67ac317130ecd980a5880fb1a2974570f33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11c7a67ac317130ecd980a588… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 22 20:48:30 2010 +0200 winex11: Use a format with 8 bits of alpha for the AlphaBlend mask. --- dlls/winex11.drv/xrender.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 83f8048..0d4ef60 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1581,11 +1581,11 @@ static Picture get_mask_pict( int alpha ) if (!pixmap) { - const WineXRenderFormat *fmt = get_xrender_format( WXR_FORMAT_MONO ); + const WineXRenderFormat *fmt = get_xrender_format( WXR_FORMAT_A8R8G8B8 ); XRenderPictureAttributes pa; wine_tsx11_lock(); - pixmap = XCreatePixmap( gdi_display, root_window, 1, 1, 1 ); + pixmap = XCreatePixmap( gdi_display, root_window, 1, 1, 32 ); pa.repeat = RepeatNormal; pict = pXRenderCreatePicture( gdi_display, pixmap, fmt->pict_format, CPRepeat, &pa ); wine_tsx11_unlock();

1 0

Jacek Caban : shldisp.idl: Added IAsyncOperation declaration.
by Alexandre Julliard April 26, 2010

April 26, 2010

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: Introduce basetexture_get_sub_resource() to simplify retrieving texture sub-resources.
by Alexandre Julliard April 26, 2010

April 26, 2010

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

Alexandre Julliard : winex11: Add some tracing to AlphaBlend.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: f0460e3cfde240c0bd775725edad57a05f2ac938 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0460e3cfde240c0bd775725e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 22 20:48:17 2010 +0200 winex11: Add some tracing to AlphaBlend. --- dlls/winex11.drv/bitblt.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 94620df..653e418 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1691,6 +1691,12 @@ BOOL CDECL X11DRV_AlphaBlend( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, IN if (!BITBLT_GetVisRectangles( physDevDst, physDevSrc, &dst, &src )) return TRUE; + TRACE( "format %x alpha %u rectdst=%d,%d %dx%d orgdst=%d,%d visdst=%s rectsrc=%d,%d %dx%d orgsrc=%d,%d vissrc=%s\n", + blendfn.AlphaFormat, blendfn.SourceConstantAlpha, dst.x, dst.y, dst.width, dst.height, + physDevDst->dc_rect.left, physDevDst->dc_rect.top, wine_dbgstr_rect( &dst.visrect ), + src.x, src.y, src.width, src.height, + physDevSrc->dc_rect.left, physDevSrc->dc_rect.top, wine_dbgstr_rect( &src.visrect ) ); + if (src.x < 0 || src.y < 0 || src.width < 0 || src.height < 0 || src.width > physDevSrc->drawable_rect.right - physDevSrc->drawable_rect.left - src.x || src.height > physDevSrc->drawable_rect.bottom - physDevSrc->drawable_rect.top - src.y)

1 0