December 2009 - Wine-Commits

Nikolay Sivov : comctl32/tests: Some tests for buddy procedure subclassing.
by Alexandre Julliard Dec. 22, 2009

Dec. 22, 2009

Module: wine Branch: master Commit: 48d42d4a93194868b5f0a02587b4b95ca789b8ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=48d42d4a93194868b5f0a0258… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Dec 22 01:54:06 2009 +0300 comctl32/tests: Some tests for buddy procedure subclassing. --- dlls/comctl32/tests/updown.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index df3fbbf..c2a5a4a 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -61,6 +61,8 @@ static HWND parent_wnd, g_edit; +static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); + static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; static const struct message add_updown_with_edit_seq[] = { @@ -436,7 +438,9 @@ static void test_updown_pos32(void) static void test_updown_buddy(void) { - HWND updown, buddyReturn; + HWND updown, buddyReturn, buddy; + WNDPROC proc; + DWORD style; updown = create_updown_control(UDS_ALIGNRIGHT, g_edit); @@ -455,6 +459,35 @@ static void test_updown_buddy(void) ok_sequence(sequences, EDIT_SEQ_INDEX, add_updown_with_edit_seq, "test updown buddy_edit", FALSE); DestroyWindow(updown); + + buddy = create_edit_control(); + proc = (WNDPROC)GetWindowLongPtrA(buddy, GWLP_WNDPROC); + + updown= create_updown_control(UDS_ALIGNRIGHT, buddy); + ok(proc == (WNDPROC)GetWindowLongPtrA(buddy, GWLP_WNDPROC), "No subclassing expected\n"); + + style = GetWindowLongA(updown, GWL_STYLE); + SetWindowLongA(updown, GWL_STYLE, style | UDS_ARROWKEYS); + style = GetWindowLongA(updown, GWL_STYLE); + ok(style & UDS_ARROWKEYS, "Expected UDS_ARROWKEYS\n"); + /* no subclass if UDS_ARROWKEYS set after creation */ + ok(proc == (WNDPROC)GetWindowLongPtrA(buddy, GWLP_WNDPROC), "No subclassing expected\n"); + + DestroyWindow(updown); + + updown= create_updown_control(UDS_ALIGNRIGHT | UDS_ARROWKEYS, buddy); + ok(proc != (WNDPROC)GetWindowLongPtrA(buddy, GWLP_WNDPROC), "Subclassing expected\n"); + + if (pSetWindowSubclass) + { + /* updown uses subclass helpers for buddy on >5.8x systems */ + todo_wine + ok(GetPropA(buddy, "CC32SubclassInfo") != NULL, "Expected CC32SubclassInfo property\n"); + } + + DestroyWindow(updown); + + DestroyWindow(buddy); } static void test_updown_base(void) @@ -687,6 +720,10 @@ static void test_UDS_SETBUDDYINT(void) START_TEST(updown) { + HMODULE mod = GetModuleHandleA("comctl32.dll"); + + pSetWindowSubclass = (void*)GetProcAddress(mod, (LPSTR)410); + InitCommonControls(); init_msg_sequences(sequences, NUM_MSG_SEQUENCES);

1 0

Henri Verbeet : wined3d: Get rid of some redundant local variables.
by Alexandre Julliard Dec. 22, 2009

Dec. 22, 2009

Module: wine Branch: master Commit: ea0af93c19643044ebb5c80d20e45ab656203fa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea0af93c19643044ebb5c80d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 21 23:17:26 2009 +0100 wined3d: Get rid of some redundant local variables. E.g. "This" variables that are only used in traces. --- dlls/wined3d/basetexture.c | 6 +-- dlls/wined3d/clipper.c | 7 ++-- dlls/wined3d/cubetexture.c | 12 +++--- dlls/wined3d/device.c | 76 ++++++++++++++++++++++------------------- dlls/wined3d/directx.c | 43 ++++++++++------------- dlls/wined3d/drawprim.c | 6 +-- dlls/wined3d/query.c | 11 ++++-- dlls/wined3d/surface_base.c | 9 ++--- dlls/wined3d/swapchain_base.c | 3 +- dlls/wined3d/volumetexture.c | 21 ++++++----- 10 files changed, 96 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ea0af93c19643044ebb5c…

1 0

Henri Verbeet : wined3d: Volumes are resources in wined3d.
by Alexandre Julliard Dec. 22, 2009

Dec. 22, 2009

Module: wine Branch: master Commit: 3f77683174a739129925a4a7877802d578b47c65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f77683174a739129925a4a78… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 21 23:17:24 2009 +0100 wined3d: Volumes are resources in wined3d. --- dlls/wined3d/volume.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 7f65f2a..8e19ee9 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -97,18 +97,23 @@ void volume_add_dirty_box(IWineD3DVolume *iface, const WINED3DBOX *dirty_box) /* ******************************************* IWineD3DVolume IUnknown parts follow ******************************************* */ -static HRESULT WINAPI IWineD3DVolumeImpl_QueryInterface(IWineD3DVolume *iface, REFIID riid, LPVOID *ppobj) +static HRESULT WINAPI IWineD3DVolumeImpl_QueryInterface(IWineD3DVolume *iface, REFIID riid, void **object) { - IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; - TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IWineD3DBase) - || IsEqualGUID(riid, &IID_IWineD3DVolume)){ + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_IWineD3DVolume) + || IsEqualGUID(riid, &IID_IWineD3DResource) + || IsEqualGUID(riid, &IID_IWineD3DBase) + || IsEqualGUID(riid, &IID_IUnknown)) + { IUnknown_AddRef(iface); - *ppobj = This; + *object = iface; return S_OK; } - *ppobj = NULL; + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; return E_NOINTERFACE; }

1 0

Jacek Caban : mshtml: Added JavaScript tests architecture and simple tests.
by Alexandre Julliard Dec. 22, 2009

Dec. 22, 2009

Module: wine Branch: master Commit: 3bacd7603d2cdedf5c9ac2b2d085368d390e87ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bacd7603d2cdedf5c9ac2b2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 21 22:51:50 2009 +0100 mshtml: Added JavaScript tests architecture and simple tests. --- dlls/mshtml/tests/Makefile.in | 2 + dlls/mshtml/tests/jstest.html | 20 ++ dlls/mshtml/tests/rsrc.rc | 20 ++ dlls/mshtml/tests/script.c | 735 ++++++++++++++++++++++++++++++++++++++++- 4 files changed, 759 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3bacd7603d2cdedf5c9ac…

1 0

Henri Verbeet : d3d9/tests: A volume really isn't a resource, despite having all the methods.
by Alexandre Julliard Dec. 22, 2009

Dec. 22, 2009

Module: wine Branch: master Commit: f262cf7603b5b5362cef32e28c2f36934e5d835b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f262cf7603b5b5362cef32e28… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 21 23:17:23 2009 +0100 d3d9/tests: A volume really isn't a resource, despite having all the methods. --- dlls/d3d9/tests/volume.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/volume.c b/dlls/d3d9/tests/volume.c index 38ea501..b313713 100644 --- a/dlls/d3d9/tests/volume.c +++ b/dlls/d3d9/tests/volume.c @@ -121,6 +121,29 @@ cleanup: if (volume_ptr) IDirect3DVolume9_Release(volume_ptr); } +static void test_volume_resource(IDirect3DDevice9 *device) +{ + IDirect3DVolumeTexture9 *texture; + IDirect3DResource9 *resource; + IDirect3DVolume9 *volume; + HRESULT hr; + + hr = IDirect3DDevice9_CreateVolumeTexture(device, 128, 128, 128, 1, 0, + D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &texture, 0); + ok(SUCCEEDED(hr), "CreateVolumeTexture failed, hr %#x.\n", hr); + + hr = IDirect3DVolumeTexture9_GetVolumeLevel(texture, 0, &volume); + ok(SUCCEEDED(hr), "GetVolumeLevel failed, hr %#x.\n", hr); + + IDirect3DVolumeTexture9_Release(texture); + + hr = IDirect3DVolume9_QueryInterface(volume, &IID_IDirect3DResource9, (void **)&resource); + ok(hr == E_NOINTERFACE, "QueryInterface returned %#x, expected %#x.\n", hr, E_NOINTERFACE); + + IDirect3DVolume9_Release(volume); +} + + START_TEST(volume) { HMODULE d3d9_handle; @@ -146,6 +169,7 @@ START_TEST(volume) } test_volume_get_container(device_ptr); + test_volume_resource(device_ptr); refcount = IDirect3DDevice9_Release(device_ptr); ok(!refcount, "Device has %u references left\n", refcount);

1 0

Jason Edmeades : comctl32/toolbar: Improve fixme message conditions.
by Alexandre Julliard Dec. 22, 2009

Dec. 22, 2009

Module: wine Branch: master Commit: 64bd51b1d3480c186db7d253cae8a39b68118105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64bd51b1d3480c186db7d253c… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Mon Dec 21 09:42:38 2009 +0000 comctl32/toolbar: Improve fixme message conditions. --- dlls/comctl32/toolbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index d5ca524..836b864 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3980,7 +3980,7 @@ TOOLBAR_ReplaceBitmap (TOOLBAR_INFO *infoPtr, const TBREPLACEBITMAP *lpReplace) FIXME("changing standard bitmaps not implemented\n"); return FALSE; } - else if (lpReplace->hInstOld != 0) + else if (lpReplace->hInstOld != 0 && lpReplace->hInstOld != lpReplace->hInstNew) FIXME("resources not in the current module not implemented\n"); TRACE("To be replaced hInstOld %p nIDOld %lx\n", lpReplace->hInstOld, lpReplace->nIDOld);

1 0

Alexandre Julliard : user32: Reimplement MapWindowPoints16 and move it to wnd16.c.
by Alexandre Julliard Dec. 22, 2009

Dec. 22, 2009

Module: wine Branch: master Commit: df3e5a87627d74daf0a3bef7060d1e6e44016f47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df3e5a87627d74daf0a3bef70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 12:45:54 2009 +0100 user32: Reimplement MapWindowPoints16 and move it to wnd16.c. --- dlls/user32/winpos.c | 18 ------------------ dlls/user32/wnd16.c | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 915cb59..65e9389 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -507,24 +507,6 @@ static void WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, POINT *offset ) /******************************************************************* - * MapWindowPoints (USER.258) - */ -void WINAPI MapWindowPoints16( HWND16 hwndFrom, HWND16 hwndTo, - LPPOINT16 lppt, UINT16 count ) -{ - POINT offset; - - WINPOS_GetWinOffset( WIN_Handle32(hwndFrom), WIN_Handle32(hwndTo), &offset ); - while (count--) - { - lppt->x += offset.x; - lppt->y += offset.y; - lppt++; - } -} - - -/******************************************************************* * MapWindowPoints (USER32.@) */ INT WINAPI MapWindowPoints( HWND hwndFrom, HWND hwndTo, LPPOINT lppt, UINT count ) diff --git a/dlls/user32/wnd16.c b/dlls/user32/wnd16.c index 6968683..dfcd71f 100644 --- a/dlls/user32/wnd16.c +++ b/dlls/user32/wnd16.c @@ -1260,6 +1260,30 @@ HWND16 WINAPI GetOpenClipboardWindow16(void) } +/******************************************************************* + * MapWindowPoints (USER.258) + */ +void WINAPI MapWindowPoints16( HWND16 hwndFrom, HWND16 hwndTo, LPPOINT16 lppt, UINT16 count ) +{ + POINT buffer[8], *ppt = buffer; + UINT i; + + if (count > 8) ppt = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*ppt) ); + for (i = 0; i < count; i++) + { + ppt[i].x = lppt[i].x; + ppt[i].y = lppt[i].y; + } + MapWindowPoints( WIN_Handle32(hwndFrom), WIN_Handle32(hwndTo), ppt, count ); + for (i = 0; i < count; i++) + { + lppt[i].x = ppt[i].x; + lppt[i].y = ppt[i].y; + } + if (ppt != buffer) HeapFree( GetProcessHeap(), 0, ppt ); +} + + /************************************************************************** * BeginDeferWindowPos (USER.259) */

1 0

Paul Vriens : ole32/tests: Fix a test failure on several platforms.
by Alexandre Julliard Dec. 22, 2009

Dec. 22, 2009

Module: wine Branch: master Commit: 25d15c68dc91ebf91478513d226567dc2ce92211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d15c68dc91ebf91478513d2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Dec 21 18:51:18 2009 +0100 ole32/tests: Fix a test failure on several platforms. --- dlls/ole32/tests/storage32.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 07ac810..2011375 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -999,7 +999,9 @@ static void test_streamenum(void) /* the storage is left open until the enumerator is freed */ r = StgOpenStorage( filename, NULL, STGM_SHARE_EXCLUSIVE | STGM_READWRITE |STGM_TRANSACTED, NULL, 0, &stg); - ok(r==STG_E_SHAREVIOLATION, "StgCreateDocfile failed, res=%x\n", r); + ok(r==STG_E_SHAREVIOLATION || + r==STG_E_LOCKVIOLATION, /* XP-SP2/W2K3-SP1 and below */ + "StgCreateDocfile failed, res=%x\n", r); r = IEnumSTATSTG_Release(ee); ok (r == 0, "enum not released\n");

1 0

Vladimir Pankratov : mapi32: Add Russian translation.
by Alexandre Julliard Dec. 22, 2009

Dec. 22, 2009

Module: wine Branch: master Commit: 9e394d86b409aa71685fafe1874aea89e8a02f9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e394d86b409aa71685fafe18… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Mon Dec 21 22:52:30 2009 +0500 mapi32: Add Russian translation. --- dlls/mapi32/Makefile.in | 1 + dlls/mapi32/Ru.rc | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index eecd69c..2ce3313 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -18,6 +18,7 @@ RC_SRCS = \ En.rc \ Fr.rc \ Lt.rc \ + Ru.rc \ version.rc @MAKE_DLL_RULES@ diff --git a/dlls/mapi32/Ru.rc b/dlls/mapi32/Ru.rc new file mode 100644 index 0000000..66626da --- /dev/null +++ b/dlls/mapi32/Ru.rc @@ -0,0 +1,33 @@ +/* +* MAPI32 Russian resources +* +* Copyright 2009 Vladimir Pankratov +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +* +*/ + +#include "res.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_NO_MAPI_CLIENT, "Невозможно отправить почту: не установлен почтовый клиент MAPI." + IDS_SEND_MAIL, "Отправка почты" +}

1 0

Roderick Colenbrander : winex11: Fix a null pointer crash when XRender isn' t around.
by Alexandre Julliard Dec. 22, 2009

Dec. 22, 2009

Module: wine Branch: master Commit: 48db6abae1108c81144180ebc8902921bada015b URL: http://source.winehq.org/git/wine.git/?a=commit;h=48db6abae1108c81144180ebc… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Dec 21 16:45:13 2009 +0100 winex11: Fix a null pointer crash when XRender isn't around. --- dlls/winex11.drv/xrender.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 1f5e512..214be7b 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2093,7 +2093,8 @@ void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, physDev->brush.pixmap = XCreatePixmap(gdi_display, root_window, width, height, depth); /* Use XCopyArea when the physBitmap and brush.pixmap have the same format. */ - if(physBitmap->pixmap_depth == 1 || src_format->format == dst_format->format) + if( (physBitmap->pixmap_depth == 1) || (!X11DRV_XRender_Installed && physDev->depth == physBitmap->pixmap_depth) || + (src_format->format == dst_format->format) ) { XCopyArea( gdi_display, physBitmap->pixmap, physDev->brush.pixmap, get_bitmap_gc(physBitmap->pixmap_depth), 0, 0, width, height, 0, 0 );

1 0