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

Joel Holdsworth : regedit: Fixed flaws in the icon.
by Alexandre Julliard 26 Apr '10

26 Apr '10

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

Joel Holdsworth : makefiles: Added a rule for building BMPs from SVGs.
by Alexandre Julliard 26 Apr '10

26 Apr '10

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

Joel Holdsworth : credui: Replaced banner with a tango compliant image.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 20beb068cc0847908d3465b508d54fcb6f9a897c URL: http://source.winehq.org/git/wine.git/?a=commit;h=20beb068cc0847908d3465b50… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sat Apr 24 14:06:15 2010 +0100 credui: Replaced banner with a tango compliant image. --- dlls/credui/Makefile.in | 3 + dlls/credui/banner.bmp | Bin 57654 -> 57654 bytes dlls/credui/banner.svg | 101 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=20beb068cc0847908d346…

1 0

Joel Holdsworth : comdlg32: Replaced pd32_portrait.ico and pd32_landscape. ico with Tango compliant icons.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 57b55f36601248b054c738906c0d750915ba3c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57b55f36601248b054c738906… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Thu Apr 22 23:20:52 2010 +0100 comdlg32: Replaced pd32_portrait.ico and pd32_landscape.ico with Tango compliant icons. --- dlls/comdlg32/Makefile.in | 4 +++- dlls/comdlg32/pd32_landscape.ico | Bin 766 -> 7278 bytes dlls/comdlg32/pd32_landscape.svg | 30 ++++++++++++++++++++++++++++++ dlls/comdlg32/pd32_portrait.ico | Bin 766 -> 7278 bytes dlls/comdlg32/pd32_portrait.svg | 30 ++++++++++++++++++++++++++++++ 5 files changed, 63 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=57b55f36601248b054c73…

1 0

Nikolay Sivov : user32/tests: Add some GetDlgItem() tests regarding children windows Z-order.
by Alexandre Julliard 26 Apr '10

26 Apr '10

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

Nikolay Sivov : comctl32/listview: Don' t change Z-order of edit window while resizing edit box.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 379cf468734363da9c5aa60dec23702ae478a4a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=379cf468734363da9c5aa60de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 23 22:39:55 2010 +0400 comctl32/listview: Don't change Z-order of edit window while resizing edit box. --- dlls/comctl32/listview.c | 14 ++++---------- dlls/comctl32/tests/listview.c | 26 +++++++++++++++++++------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 256d4c6..09c731a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11599,7 +11599,7 @@ static LRESULT LISTVIEW_Command(LISTVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lP /* Select font to get the right dimension of the string */ hFont = (HFONT)SendMessageW(infoPtr->hwndEdit, WM_GETFONT, 0, 0); - if(hFont != 0) + if (hFont) { hOldFont = SelectObject(hdc, hFont); } @@ -11612,16 +11612,10 @@ static LRESULT LISTVIEW_Command(LISTVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lP GetTextMetricsW(hdc, &textMetric); sz.cx += (textMetric.tmMaxCharWidth * 2); - SetWindowPos ( - infoPtr->hwndEdit, - HWND_TOP, - 0, - 0, - sz.cx, - rect.bottom - rect.top, - SWP_DRAWFRAME|SWP_NOMOVE); + SetWindowPos(infoPtr->hwndEdit, NULL, 0, 0, sz.cx, + rect.bottom - rect.top, SWP_DRAWFRAME | SWP_NOMOVE | SWP_NOZORDER); } - if(hFont != 0) + if (hFont) SelectObject(hdc, hOldFont); ReleaseDC(infoPtr->hwndEdit, hdc); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 4bf877a..176f323 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3422,12 +3422,12 @@ static void test_getitemrect(void) static void test_editbox(void) { - HWND hwnd, hwndedit, hwndedit2; + static CHAR testitemA[] = "testitem"; + static CHAR testitem1A[] = "testitem_quitelongname"; + static CHAR buffer[25]; + HWND hwnd, hwndedit, hwndedit2, header; LVITEMA item; DWORD r; - static CHAR testitemA[] = "testitem"; - static CHAR testitem1A[] = "testitem1"; - static CHAR buffer[10]; hwnd = create_listview_control(LVS_EDITLABELS | LVS_REPORT); ok(hwnd != NULL, "failed to create a listview window\n"); @@ -3447,16 +3447,28 @@ static void test_editbox(void) hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); ok(IsWindow(hwndedit), "Expected Edit window to be created\n"); + /* test children Z-order after Edit box created */ + header = (HWND)SendMessageA(hwnd, LVM_GETHEADER, 0, 0); + ok(IsWindow(header), "Expected header to be created\n"); + ok(GetTopWindow(hwnd) == header, "Expected header to be on top\n"); + ok(GetNextWindow(header, GW_HWNDNEXT) == hwndedit, "got %p\n", GetNextWindow(header, GW_HWNDNEXT)); + /* modify initial string */ r = SendMessage(hwndedit, WM_SETTEXT, 0, (LPARAM)testitem1A); expect(TRUE, r); + + /* edit window is resized and repositioned, + check again for Z-order - it should be preserved */ + ok(GetTopWindow(hwnd) == header, "Expected header to be on top\n"); + ok(GetNextWindow(header, GW_HWNDNEXT) == hwndedit, "got %p\n", GetNextWindow(header, GW_HWNDNEXT)); + /* return focus to listview */ SetFocus(hwnd); memset(&item, 0, sizeof(item)); item.mask = LVIF_TEXT; item.pszText = buffer; - item.cchTextMax = 10; + item.cchTextMax = sizeof(buffer); item.iItem = 0; item.iSubItem = 0; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); @@ -3496,7 +3508,7 @@ static void test_editbox(void) expect(0, r); memset(&item, 0, sizeof(item)); item.pszText = buffer; - item.cchTextMax = 10; + item.cchTextMax = sizeof(buffer); item.iItem = 0; item.iSubItem = 0; r = SendMessage(hwnd, LVM_GETITEMTEXTA, 0, (LPARAM)&item); @@ -3522,7 +3534,7 @@ static void test_editbox(void) memset(&item, 0, sizeof(item)); item.pszText = buffer; - item.cchTextMax = 10; + item.cchTextMax = sizeof(buffer); item.iItem = 0; item.iSubItem = 0; r = SendMessage(hwnd, LVM_GETITEMTEXTA, 0, (LPARAM)&item);

1 0

Alexandre Julliard : winex11: Add some tracing to AlphaBlend.
by Alexandre Julliard 26 Apr '10

26 Apr '10

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

Alexandre Julliard : winex11: Use a format with 8 bits of alpha for the AlphaBlend mask.
by Alexandre Julliard 26 Apr '10

26 Apr '10

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

Henri Verbeet : wined3d: Store texture sub-resources in IWineD3DBaseTextureClass.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 958b5237077086454a7cbc19ec9942d42f00a238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=958b5237077086454a7cbc19e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 22 18:55:57 2010 +0200 wined3d: Store texture sub-resources in IWineD3DBaseTextureClass. --- dlls/wined3d/basetexture.c | 52 +++++--- dlls/wined3d/cubetexture.c | 266 +++++++++++++++++++++++----------------- dlls/wined3d/state.c | 10 +- dlls/wined3d/texture.c | 110 ++++++++++------- dlls/wined3d/utils.c | 4 +- dlls/wined3d/volumetexture.c | 141 +++++++++++++--------- dlls/wined3d/wined3d_private.h | 18 +-- 7 files changed, 347 insertions(+), 254 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=958b5237077086454a7cb…

1 0

Henri Verbeet : wined3d: Make sure all texture levels are allocated in surface_prepare_texture().
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 9308c5499fa1f13ca5fff58f22a95ba60aa54726 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9308c5499fa1f13ca5fff58f2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 22 18:55:58 2010 +0200 wined3d: Make sure all texture levels are allocated in surface_prepare_texture(). This fixes a regression introduced by commit af7dfcd378739127c50aa95ce40b13eb3d1950cf. --- dlls/wined3d/surface.c | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0818ce9..7d6d175 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1563,7 +1563,8 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) } /* Context activation is done by the caller. */ -void surface_prepare_texture(IWineD3DSurfaceImpl *surface, const struct wined3d_gl_info *gl_info, BOOL srgb) +static void surface_prepare_texture_internal(IWineD3DSurfaceImpl *surface, + const struct wined3d_gl_info *gl_info, BOOL srgb) { DWORD alloc_flag = srgb ? SFLAG_SRGBALLOCATED : SFLAG_ALLOCATED; CONVERT_TYPES convert; @@ -1580,6 +1581,31 @@ void surface_prepare_texture(IWineD3DSurfaceImpl *surface, const struct wined3d_ surface->Flags |= alloc_flag; } +/* Context activation is done by the caller. */ +void surface_prepare_texture(IWineD3DSurfaceImpl *surface, const struct wined3d_gl_info *gl_info, BOOL srgb) +{ + IWineD3DBaseTextureImpl *texture; + + if (SUCCEEDED(IWineD3DSurface_GetContainer((IWineD3DSurface *)surface, + &IID_IWineD3DBaseTexture, (void **)&texture))) + { + UINT sub_count = texture->baseTexture.level_count * texture->baseTexture.layer_count; + UINT i; + + TRACE("surface %p is a subresource of texture %p.\n", surface, texture); + + for (i = 0; i < sub_count; ++i) + { + IWineD3DSurfaceImpl *s = (IWineD3DSurfaceImpl *)texture->baseTexture.sub_resources[i]; + surface_prepare_texture_internal(s, gl_info, srgb); + } + + IWineD3DBaseTexture_Release((IWineD3DBaseTexture *)texture); + } + + surface_prepare_texture_internal(surface, gl_info, srgb); +} + static void surface_prepare_system_memory(IWineD3DSurfaceImpl *This) { IWineD3DDeviceImpl *device = This->resource.device;

1 0