May 2014 - Wine-Commits - list.winehq.org

Piotr Caban : msvcrt: Don't crash on NULL struct _tm in asctime.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: c18d52d346898be56239976c1b73007a06d2f38d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c18d52d346898be56239976c1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 12 14:34:51 2014 +0200 msvcrt: Don't crash on NULL struct _tm in asctime. --- dlls/msvcrt/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index a6d4691..9c15bf4 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1263,7 +1263,7 @@ static char* asctime_buf(char *buf, const struct MSVCRT_tm *mstm) static const char month[12][4] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; - if (mstm->tm_sec<0 || mstm->tm_sec>59 + if (!mstm || mstm->tm_sec<0 || mstm->tm_sec>59 || mstm->tm_min<0 || mstm->tm_min>59 || mstm->tm_hour<0 || mstm->tm_hour>23 || mstm->tm_mon<0 || mstm->tm_mon>11

1 0

Stefan Dösinger : wined3d: Implement DDBLTFX_MIRRORUPDOWN for DXT2.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: 46df06aae7e4a0c32c622deae69b8c391ed94012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46df06aae7e4a0c32c622deae… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 12 15:12:41 2014 +0200 wined3d: Implement DDBLTFX_MIRRORUPDOWN for DXT2. --- dlls/wined3d/surface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4b40944..1111df2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5369,6 +5369,7 @@ static HRESULT surface_cpu_blt_compressed(const BYTE *src_data, BYTE *dst_data, } return WINED3D_OK; + case WINED3DFMT_DXT2: case WINED3DFMT_DXT3: for (y = 0; y < update_h; y += format->block_height) {

1 0

Alexandre Julliard : include: Add some more media type uuids.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: 9a64cf7705709a04c0aadace9ccabea23bdaccad URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a64cf7705709a04c0aadace9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 12 11:38:49 2014 +0200 include: Add some more media type uuids. --- include/Makefile.in | 1 + include/ksuuids.h | 81 ++++++++ include/uuids.h | 573 +++++++++++++++++++++++++++++++++------------------ 3 files changed, 449 insertions(+), 206 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a64cf7705709a04c0aad…

1 0

Frédéric Delanoy : user32/tests: Constify some arrays.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: b242d9cee36b8c8186c92d0bf86c067fc56b19c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b242d9cee36b8c8186c92d0bf… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat May 10 19:01:06 2014 +0200 user32/tests: Constify some arrays. --- dlls/user32/tests/cursoricon.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index a7c3ca4..9540f3d 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -955,14 +955,14 @@ static void test_CreateIcon(void) /* Shamelessly ripped from dlls/oleaut32/tests/olepicture.c */ /* 1x1 pixel gif */ -static unsigned char gifimage[35] = { +static const unsigned char gifimage[35] = { 0x47,0x49,0x46,0x38,0x37,0x61,0x01,0x00,0x01,0x00,0x80,0x00,0x00,0xff,0xff,0xff, 0xff,0xff,0xff,0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x02,0x02,0x44, 0x01,0x00,0x3b }; /* 1x1 pixel jpg */ -static unsigned char jpgimage[285] = { +static const unsigned char jpgimage[285] = { 0xff,0xd8,0xff,0xe0,0x00,0x10,0x4a,0x46,0x49,0x46,0x00,0x01,0x01,0x01,0x01,0x2c, 0x01,0x2c,0x00,0x00,0xff,0xdb,0x00,0x43,0x00,0x05,0x03,0x04,0x04,0x04,0x03,0x05, 0x04,0x04,0x04,0x05,0x05,0x05,0x06,0x07,0x0c,0x08,0x07,0x07,0x07,0x07,0x0f,0x0b, @@ -984,7 +984,7 @@ static unsigned char jpgimage[285] = { }; /* 1x1 pixel png */ -static unsigned char pngimage[285] = { +static const unsigned char pngimage[285] = { 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52, 0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x08,0x02,0x00,0x00,0x00,0x90,0x77,0x53, 0xde,0x00,0x00,0x00,0x09,0x70,0x48,0x59,0x73,0x00,0x00,0x0b,0x13,0x00,0x00,0x0b, @@ -1005,14 +1005,14 @@ static unsigned char bmpimage[70] = { }; /* 1x1 pixel bmp using BITMAPCOREHEADER */ -static unsigned char bmpcoreimage[38] = { +static const unsigned char bmpcoreimage[38] = { 0x42,0x4d,0x26,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x22,0x00,0x00,0x00,0x0c,0x00, 0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xff,0xff,0xff,0x00,0x55,0x55, 0x55,0x00,0x00,0x00,0x00,0x00 }; /* 2x2 pixel gif */ -static unsigned char gif4pixel[42] = { +static const unsigned char gif4pixel[42] = { 0x47,0x49,0x46,0x38,0x37,0x61,0x02,0x00,0x02,0x00,0xa1,0x00,0x00,0x00,0x00,0x00, 0x39,0x62,0xfc,0xff,0x1a,0xe5,0xff,0xff,0xff,0x2c,0x00,0x00,0x00,0x00,0x02,0x00, 0x02,0x00,0x00,0x02,0x03,0x14,0x16,0x05,0x00,0x3b @@ -1059,7 +1059,7 @@ static void test_LoadImageBitmap(const char * test_desc, HBITMAP hbm) ok(color_match(pixel, 0x00ffffff), "%s: Pixel is 0x%08x\n", test_desc, pixel); } -static void test_LoadImageFile(const char * test_desc, unsigned char * image_data, +static void test_LoadImageFile(const char * test_desc, const unsigned char * image_data, unsigned int image_size, const char * ext, BOOL expect_success) { HANDLE handle;

1 0

Alistair Leslie-Hughes : dxguid: Include dplobby8.h.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: 123c670f8e6201dcadaf6e6d4cafb5730c4c40c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=123c670f8e6201dcadaf6e6d4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat May 10 20:55:49 2014 +1000 dxguid: Include dplobby8.h. --- dlls/dxguid/dxguid.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dxguid/dxguid.c b/dlls/dxguid/dxguid.c index f923d9c..77d4194 100644 --- a/dlls/dxguid/dxguid.c +++ b/dlls/dxguid/dxguid.c @@ -40,6 +40,7 @@ #include "dplay.h" #include "dplay8.h" #include "dplobby.h" +#include "dplobby8.h" #include "dinput.h" #include "ddrawi.h" #include "dxdiag.h"

1 0

Jacek Caban : mshtml: Forward IHTMLScreen' s IDispatch methods to IDispatchEx.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: 75afeb474098309dba56a6f5d64cc4f188c6effe URL: http://source.winehq.org/git/wine.git/?a=commit;h=75afeb474098309dba56a6f5d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 12 10:23:33 2014 +0200 mshtml: Forward IHTMLScreen's IDispatch methods to IDispatchEx. --- dlls/mshtml/htmlscreen.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlscreen.c b/dlls/mshtml/htmlscreen.c index db63688..5e512999 100644 --- a/dlls/mshtml/htmlscreen.c +++ b/dlls/mshtml/htmlscreen.c @@ -93,24 +93,22 @@ static ULONG WINAPI HTMLScreen_Release(IHTMLScreen *iface) static HRESULT WINAPI HTMLScreen_GetTypeInfoCount(IHTMLScreen *iface, UINT *pctinfo) { HTMLScreen *This = impl_from_IHTMLScreen(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI HTMLScreen_GetTypeInfo(IHTMLScreen *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLScreen *This = impl_from_IHTMLScreen(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLScreen_GetIDsOfNames(IHTMLScreen *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { HTMLScreen *This = impl_from_IHTMLScreen(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); } static HRESULT WINAPI HTMLScreen_Invoke(IHTMLScreen *iface, DISPID dispIdMember, @@ -118,8 +116,8 @@ static HRESULT WINAPI HTMLScreen_Invoke(IHTMLScreen *iface, DISPID dispIdMember, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLScreen *This = impl_from_IHTMLScreen(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLScreen_get_colorDepth(IHTMLScreen *iface, LONG *p)

1 0

Henri Verbeet : d2d1: Add the ID2D1StrokeStyle interface.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: 3a6b53feacb8f0ca0047ef9121749ed14c73e092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a6b53feacb8f0ca0047ef912… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 12 09:34:01 2014 +0200 d2d1: Add the ID2D1StrokeStyle interface. --- include/d2d1.idl | 64 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 57 insertions(+), 7 deletions(-) diff --git a/include/d2d1.idl b/include/d2d1.idl index b5f136b..76cb47f 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -59,13 +59,6 @@ typedef enum D2D1_FIGURE_BEGIN D2D1_FIGURE_BEGIN_FORCE_DWORD = 0xffffffff } D2D1_FIGURE_BEGIN; -typedef struct D2D1_BEZIER_SEGMENT -{ - D2D1_POINT_2F point1; - D2D1_POINT_2F point2; - D2D1_POINT_2F point3; -} D2D1_BEZIER_SEGMENT; - typedef enum D2D1_FIGURE_END { D2D1_FIGURE_END_OPEN = 0, @@ -73,6 +66,42 @@ typedef enum D2D1_FIGURE_END D2D1_FIGURE_END_FORCE_DWORD = 0xffffffff } D2D1_FIGURE_END; +typedef enum D2D1_CAP_STYLE +{ + D2D1_CAP_STYLE_FLAT = 0, + D2D1_CAP_STYLE_SQUARE = 1, + D2D1_CAP_STYLE_ROUND = 2, + D2D1_CAP_STYLE_TRIANGLE = 3, + D2D1_CAP_STYLE_FORCE_DWORD = 0xffffffff, +} D2D1_CAP_STYLE; + +typedef enum D2D1_LINE_JOIN +{ + D2D1_LINE_JOIN_MITER = 0, + D2D1_LINE_JOIN_BEVEL = 1, + D2D1_LINE_JOIN_ROUND = 2, + D2D1_LINE_JOIN_MITER_OR_BEVEL = 3, + D2D1_LINE_JOIN_FORCE_DWORD = 0xffffffff, +} D2D1_LINE_JOIN; + +typedef enum D2D1_DASH_STYLE +{ + D2D1_DASH_STYLE_SOLID = 0, + D2D1_DASH_STYLE_DASH = 1, + D2D1_DASH_STYLE_DOT = 2, + D2D1_DASH_STYLE_DASH_DOT = 3, + D2D1_DASH_STYLE_DASH_DOT_DOT = 4, + D2D1_DASH_STYLE_CUSTOM = 5, + D2D1_DASH_STYLE_FORCE_DWORD = 0xffffffff, +} D2D1_DASH_STYLE; + +typedef struct D2D1_BEZIER_SEGMENT +{ + D2D1_POINT_2F point1; + D2D1_POINT_2F point2; + D2D1_POINT_2F point3; +} D2D1_BEZIER_SEGMENT; + typedef struct D2D1_FACTORY_OPTIONS { D2D1_DEBUG_LEVEL debugLevel; @@ -95,6 +124,27 @@ interface ID2D1Resource : IUnknown [ local, object, + uuid(2cd9069d-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1StrokeStyle : ID2D1Resource +{ + D2D1_CAP_STYLE GetStartCap(); + D2D1_CAP_STYLE GetEndCap(); + D2D1_CAP_STYLE GetDashCap(); + float GetMiterLimit(); + D2D1_LINE_JOIN GetLineJoin(); + float GetDashOffset(); + D2D1_DASH_STYLE GetDashStyle(); + UINT32 GetDashesCount(); + void GetDashes( + [out, size_is(count)] float *dashes, + [in] UINT32 count + ); +} + +[ + local, + object, uuid(2cd9069e-12e2-11dc-9fed-001143a055f9) ] interface ID2D1SimplifiedGeometrySink : IUnknown

1 0

Bruno Jesus : ws2_32: Avoid magic numbers in shutdown() function.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: 443edfa1da00f3ddc04699ce18ea9ba0ade9a292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=443edfa1da00f3ddc04699ce1… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon May 12 01:21:54 2014 -0300 ws2_32: Avoid magic numbers in shutdown() function. --- dlls/ws2_32/socket.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 519ce85..5499753 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5027,13 +5027,13 @@ int WINAPI WS_shutdown(SOCKET s, int how) switch( how ) { - case 0: /* drop receives */ + case SD_RECEIVE: /* drop receives */ clear_flags |= FD_READ; break; - case 1: /* drop sends */ + case SD_SEND: /* drop sends */ clear_flags |= FD_WRITE; break; - case 2: /* drop all */ + case SD_BOTH: /* drop all */ clear_flags |= FD_READ|FD_WRITE; /*fall through */ default: @@ -7375,7 +7375,7 @@ INT WINAPI WSARecvDisconnect( SOCKET s, LPWSABUF disconnectdata ) { TRACE( "(0x%04lx %p)\n", s, disconnectdata ); - return WS_shutdown( s, 0 ); + return WS_shutdown( s, SD_RECEIVE ); } /***********************************************************************

1 0

Piotr Caban : oleacc: Add Client_accLocation implementation.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: 7a0fd9cfe2a79d2fe4d79695029483c4732c4100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a0fd9cfe2a79d2fe4d796950… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 12 12:53:39 2014 +0200 oleacc: Add Client_accLocation implementation. --- dlls/oleacc/client.c | 26 ++++++++++++++++++++++++-- dlls/oleacc/tests/main.c | 26 +++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index b2c734a..8a48b36 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -326,9 +326,31 @@ static HRESULT WINAPI Client_accLocation(IAccessible *iface, LONG *pxLeft, LONG *pyTop, LONG *pcxWidth, LONG *pcyHeight, VARIANT varID) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%p %p %p %p %s)\n", This, pxLeft, pyTop, + RECT rect; + POINT pt; + + TRACE("(%p)->(%p %p %p %p %s)\n", This, pxLeft, pyTop, pcxWidth, pcyHeight, debugstr_variant(&varID)); - return E_NOTIMPL; + + *pxLeft = *pyTop = *pcxWidth = *pcyHeight = 0; + if(convert_child_id(&varID) != CHILDID_SELF) + return E_INVALIDARG; + + if(!GetClientRect(This->hwnd, &rect)) + return S_OK; + + pt.x = rect.left, + pt.y = rect.top; + MapWindowPoints(This->hwnd, NULL, &pt, 1); + *pxLeft = pt.x; + *pyTop = pt.y; + + pt.x = rect.right; + pt.y = rect.bottom; + MapWindowPoints(This->hwnd, NULL, &pt, 1); + *pcxWidth = pt.x - *pxLeft; + *pcyHeight = pt.y - *pyTop; + return S_OK; } static HRESULT WINAPI Client_accNavigate(IAccessible *iface, diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 3fb23da..4f9ea98 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -319,7 +319,8 @@ static void test_default_client_accessible_object(void) VARIANT vid, v; BSTR str; POINT pt; - LONG l; + RECT rect; + LONG l, left, top, width, height; hwnd = CreateWindowA("oleacc_test", "test &t &junk", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, NULL, NULL, NULL, NULL); @@ -435,6 +436,22 @@ static void test_default_client_accessible_object(void) ok(disp != NULL, "disp == NULL\n"); IDispatch_Release(disp); + ok(GetClientRect(hwnd, &rect), "GetClientRect failed\n"); + pt.x = rect.left; + pt.y = rect.top; + MapWindowPoints(hwnd, NULL, &pt, 1); + rect.left = pt.x; + rect.top = pt.y; + pt.x = rect.right; + pt.y = rect.bottom; + MapWindowPoints(hwnd, NULL, &pt, 1); + hr = IAccessible_accLocation(acc, &left, &top, &width, &height, vid); + ok(hr == S_OK, "got %x\n", hr); + ok(left == rect.left, "left = %d, expected %d\n", left, rect.left); + ok(top == rect.top, "top = %d, expected %d\n", top, rect.top); + ok(width == pt.x-rect.left, "width = %d, expected %d\n", width, pt.x-rect.left); + ok(height == pt.y-rect.top, "height = %d, expected %d\n", height, pt.y-rect.top); + DestroyWindow(hwnd); hr = IAccessible_get_accChildCount(acc, &l); @@ -467,6 +484,13 @@ static void test_default_client_accessible_object(void) ok(hr == E_FAIL, "got %x\n", hr); ok(disp == NULL, "disp = %p\n", disp); + hr = IAccessible_accLocation(acc, &left, &top, &width, &height, vid); + ok(hr == S_OK, "got %x\n", hr); + ok(left == 0, "left = %d\n", left); + ok(top == 0, "top = %d\n", top); + ok(width == 0, "width = %d\n", width); + ok(height == 0, "height = %d\n", height); + IAccessible_Release(acc); }

1 0

Nikolay Sivov : comctl32/treeview: Added a test for NM_RETURN.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: a709e3f98dc807c2423ce5ea1d39902777f07f33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a709e3f98dc807c2423ce5ea1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 12 13:18:36 2014 +0400 comctl32/treeview: Added a test for NM_RETURN. --- dlls/comctl32/tests/treeview.c | 31 +++++++++++++++++++++++++++++++ dlls/comctl32/treeview.c | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index cd619a9..3b70e6c 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -252,6 +252,13 @@ static const struct message parent_cd_seq[] = { { 0 } }; +static const struct message parent_vk_return_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, TVN_KEYDOWN }, + { WM_NOTIFY, sent|id, 0, 0, NM_RETURN }, + { WM_CHANGEUISTATE, sent|optional }, + { 0 } +}; + static HWND hMainWnd; static HTREEITEM hRoot, hChild; @@ -2126,6 +2133,29 @@ static void test_customdraw(void) DestroyWindow(hwnd); } +static void test_WM_KEYDOWN(void) +{ + static const char *rootA = "root"; + TVINSERTSTRUCTA ins; + HTREEITEM hRoot; + HWND hwnd; + + hwnd = create_treeview_control(0); + + ins.hParent = TVI_ROOT; + ins.hInsertAfter = TVI_ROOT; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = (char*)rootA; + hRoot = TreeView_InsertItemA(hwnd, &ins); + ok(hRoot != NULL, "got %p\n", hRoot); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SendMessageA(hwnd, WM_KEYDOWN, VK_RETURN, 0); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_vk_return_seq, "WM_KEYDOWN/VK_RETURN parent notification", TRUE); + + DestroyWindow(hwnd); +} + START_TEST(treeview) { HMODULE hComctl32; @@ -2200,6 +2230,7 @@ START_TEST(treeview) test_TVM_HITTEST(); test_WM_GETDLGCODE(); test_customdraw(); + test_WM_KEYDOWN(); if (!load_v6_module(&ctx_cookie, &hCtx)) { diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index bb42b21..6dd7e93 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5261,7 +5261,7 @@ TREEVIEW_KeyDown(TREEVIEW_INFO *infoPtr, WPARAM wParam) case VK_RETURN: TREEVIEW_SendSimpleNotify(infoPtr, NM_RETURN); - break; + break; case VK_HOME: newSelection = infoPtr->root->firstChild;

1 0

Akihiro Sagawa : taskmgr: Show whether the process is running under WOW64.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: 776849987d34a8c77fef97b07cbb79091c0d5e46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=776849987d34a8c77fef97b07… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun May 11 23:54:29 2014 +0900 taskmgr: Show whether the process is running under WOW64. --- programs/taskmgr/perfdata.c | 8 ++++++++ programs/taskmgr/perfdata.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index 110fe5a..aa19914 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -33,6 +33,7 @@ static PROCNTQSI pNtQuerySystemInformation = NULL; static PROCGGR pGetGuiResources = NULL; static PROCGPIC pGetProcessIoCounters = NULL; +static PROCISW64 pIsWow64Process = NULL; static CRITICAL_SECTION PerfDataCriticalSection; static PPERFDATA pPerfDataOld = NULL; /* Older perf data (saved to establish delta values) */ static PPERFDATA pPerfData = NULL; /* Most recent copy of perf data */ @@ -60,6 +61,7 @@ BOOL PerfDataInitialize(void) pNtQuerySystemInformation = (PROCNTQSI)GetProcAddress(GetModuleHandleW(wszNtdll), "NtQuerySystemInformation"); pGetGuiResources = (PROCGGR)GetProcAddress(GetModuleHandleW(wszUser32), "GetGuiResources"); pGetProcessIoCounters = (PROCGPIC)GetProcAddress(GetModuleHandleW(wszKernel32), "GetProcessIoCounters"); + pIsWow64Process = (PROCISW64)GetProcAddress(GetModuleHandleW(wszKernel32), "IsWow64Process"); InitializeCriticalSection(&PerfDataCriticalSection); @@ -296,6 +298,8 @@ void PerfDataRefresh(void) } if (pGetProcessIoCounters) pGetProcessIoCounters(hProcess, &pPerfData[Idx].IOCounters); + if (pIsWow64Process) + pIsWow64Process(hProcess, &pPerfData[Idx].Wow64Process); CloseHandle(hProcess); } pPerfData[Idx].UserTime.QuadPart = pSPI->UserTime.QuadPart; @@ -331,12 +335,16 @@ ULONG PerfDataGetProcessorSystemUsage(void) BOOL PerfDataGetImageName(ULONG Index, LPWSTR lpImageName, int nMaxCount) { + static const WCHAR proc32W[] = {' ','*','3','2',0}; BOOL bSuccessful; EnterCriticalSection(&PerfDataCriticalSection); if (Index < ProcessCount) { wcsncpy(lpImageName, pPerfData[Index].ImageName, nMaxCount); + if (pPerfData[Index].Wow64Process && + nMaxCount - lstrlenW(lpImageName) > 4 /* =lstrlenW(proc32W) */) + lstrcatW(lpImageName, proc32W); bSuccessful = TRUE; } else { bSuccessful = FALSE; diff --git a/programs/taskmgr/perfdata.h b/programs/taskmgr/perfdata.h index be6b819..d6a1602 100644 --- a/programs/taskmgr/perfdata.h +++ b/programs/taskmgr/perfdata.h @@ -47,6 +47,7 @@ typedef struct _PERFDATA TIME UserTime; TIME KernelTime; + BOOL Wow64Process; } PERFDATA, *PPERFDATA; /* SystemPageFileInformation (18) */ @@ -68,6 +69,7 @@ struct _SYSTEM_PAGEFILE_INFORMATION typedef LONG (WINAPI *PROCNTQSI)(UINT,PVOID,ULONG,PULONG); typedef DWORD (WINAPI *PROCGGR)(HANDLE,DWORD); typedef BOOL (WINAPI *PROCGPIC)(HANDLE,PIO_COUNTERS); +typedef BOOL (WINAPI *PROCISW64)(HANDLE,PBOOL); BOOL PerfDataInitialize(void); void PerfDataRefresh(void);

1 0

André Hentschel : Add WWN369
by Jeremy Newman May 9, 2014

May 9, 2014

Module: website Branch: master Commit: 5388934d8eaf5707ba9fa5f9ef5487cef9fe5a20 URL: http://source.winehq.org/git/website.git/?a=commit;h=5388934d8eaf5707ba9fa5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 9 21:28:40 2014 +0200 Add WWN369 --- news/de/2014050901.xml | 12 + news/en/2014050901.xml | 12 + wwn/en/wn20140509_369.xml | 701 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 725 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=5388934d8eaf5707ba…

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/ source/git/website
by Jeremy Newman May 9, 2014

May 9, 2014

Module: website Branch: master Commit: 1d47644aa6bbc8e0593cb50bfae7a1a9f80aa883 URL: http://source.winehq.org/git/website.git/?a=commit;h=1d47644aa6bbc8e0593cb5… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri May 9 14:33:02 2014 -0500 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

André Hentschel : Add WWN369
by Jeremy Newman May 9, 2014

May 9, 2014

Module: website Branch: master Commit: 0e82978b680e032346f6cdaa787dc5fd3ec28197 URL: http://source.winehq.org/git/website.git/?a=commit;h=0e82978b680e032346f6cd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 9 21:28:40 2014 +0200 Add WWN369 --- news/de/2014050901.xml | 12 + news/en/2014050901.xml | 12 + wwn/en/wn20140509_369.xml | 701 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 725 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=0e82978b680e032346…

1 0

Jacek Caban : mshtml: Use debugmsg_mshtml_guid in a few more places.
by Alexandre Julliard May 9, 2014

May 9, 2014

Module: wine Branch: master Commit: 018af15b9d7eddf545281ac7091ef01c287b8d81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=018af15b9d7eddf545281ac70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 9 13:08:48 2014 +0200 mshtml: Use debugmsg_mshtml_guid in a few more places. --- dlls/mshtml/conpoint.c | 44 ++++++++++++-------------------------------- dlls/mshtml/dispex.c | 4 ++-- dlls/mshtml/ifacewrap.c | 2 +- dlls/mshtml/ipwindow.c | 15 ++++++--------- dlls/mshtml/loadopts.c | 23 ++++++++++------------- dlls/mshtml/main.c | 11 +++++++++++ 6 files changed, 42 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=018af15b9d7eddf545281…

1 0

Piotr Caban : oleacc: Add Client_accHitTest implementation.
by Alexandre Julliard May 9, 2014

May 9, 2014

Module: wine Branch: master Commit: e99dc1acede2cbeb222f4b6458a07c14b64ab2e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e99dc1acede2cbeb222f4b645… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 9 13:59:51 2014 +0200 oleacc: Add Client_accHitTest implementation. --- dlls/oleacc/client.c | 22 ++++++++++++++++++-- dlls/oleacc/tests/main.c | 50 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 67 insertions(+), 5 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index e768657..d557de9 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -340,8 +340,26 @@ static HRESULT WINAPI Client_accHitTest(IAccessible *iface, LONG xLeft, LONG yTop, VARIANT *pvarID) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%d %d %p)\n", This, xLeft, yTop, pvarID); - return E_NOTIMPL; + HWND child; + POINT pt; + + TRACE("(%p)->(%d %d %p)\n", This, xLeft, yTop, pvarID); + + V_VT(pvarID) = VT_I4; + V_I4(pvarID) = 0; + + pt.x = xLeft; + pt.y = yTop; + if(!IsWindowVisible(This->hwnd) || !ScreenToClient(This->hwnd, &pt)) + return S_OK; + + child = ChildWindowFromPointEx(This->hwnd, pt, CWP_SKIPINVISIBLE); + if(!child || child==This->hwnd) + return S_OK; + + V_VT(pvarID) = VT_DISPATCH; + return AccessibleObjectFromWindow(child, OBJID_WINDOW, + &IID_IDispatch, (void**)&V_DISPATCH(pvarID)); } static HRESULT WINAPI Client_accDoDefaultAction(IAccessible *iface, VARIANT varID) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 186a71b..62fe3f8 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -315,13 +315,14 @@ static void test_default_client_accessible_object(void) HRESULT hr; VARIANT vid, v; BSTR str; + POINT pt; LONG l; hwnd = CreateWindowA("oleacc_test", "test &t &junk", WS_OVERLAPPEDWINDOW, - 0, 0, 0, 0, NULL, NULL, NULL, NULL); + 0, 0, 100, 100, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "CreateWindow failed\n"); - chld = CreateWindowA("static", "message", WS_CHILD, - 0, 0, 0, 0, hwnd, NULL, NULL, NULL); + chld = CreateWindowA("static", "message", WS_CHILD | WS_VISIBLE, + 0, 0, 50, 50, hwnd, NULL, NULL, NULL); ok(chld != NULL, "CreateWindow failed\n"); hr = CreateStdAccessibleObject(NULL, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); @@ -388,6 +389,44 @@ static void test_default_client_accessible_object(void) ok(hr == S_FALSE, "got %x\n", hr); ok(!str, "str != NULL\n"); + pt.x = pt.y = 60; + ok(ClientToScreen(hwnd, &pt), "ClientToScreen failed\n"); + hr = IAccessible_accHitTest(acc, pt.x, pt.y, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 0, "V_I4(&v) = %d\n", V_I4(&v)); + + pt.x = pt.y = 25; + ok(ClientToScreen(hwnd, &pt), "ClientToScreen failed\n"); + hr = IAccessible_accHitTest(acc, pt.x, pt.y, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 0, "V_I4(&v) = %d\n", V_I4(&v)); + + ShowWindow(hwnd, TRUE); + pt.x = pt.y = 60; + ok(ClientToScreen(hwnd, &pt), "ClientToScreen failed\n"); + hr = IAccessible_accHitTest(acc, pt.x, pt.y, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 0, "V_I4(&v) = %d\n", V_I4(&v)); + + pt.x = pt.y = 25; + ok(ClientToScreen(hwnd, &pt), "ClientToScreen failed\n"); + hr = IAccessible_accHitTest(acc, pt.x, pt.y, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(&v) = %p\n", V_DISPATCH(&v)); + VariantClear(&v); + + ShowWindow(chld, FALSE); + pt.x = pt.y = 25; + ok(ClientToScreen(hwnd, &pt), "ClientToScreen failed\n"); + hr = IAccessible_accHitTest(acc, pt.x, pt.y, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 0, "V_I4(&v) = %d\n", V_I4(&v)); + DestroyWindow(hwnd); hr = IAccessible_get_accChildCount(acc, &l); @@ -410,6 +449,11 @@ static void test_default_client_accessible_object(void) ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); ok(V_I4(&v) == STATE_SYSTEM_INVISIBLE, "V_I4(&v) = %x\n", V_I4(&v)); + hr = IAccessible_accHitTest(acc, 200, 200, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 0, "V_I4(&v) = %d\n", V_I4(&v)); + IAccessible_Release(acc); }

1 0

Piotr Caban : oleacc: Add default window accessible object stub.
by Alexandre Julliard May 9, 2014

May 9, 2014

Module: wine Branch: master Commit: 6474f8c1df922d277882ba342414c93078f2aa67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6474f8c1df922d277882ba342… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 9 13:59:47 2014 +0200 oleacc: Add default window accessible object stub. --- dlls/oleacc/Makefile.in | 3 +- dlls/oleacc/main.c | 2 + dlls/oleacc/oleacc_private.h | 1 + dlls/oleacc/window.c | 316 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 321 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6474f8c1df922d277882b…

1 0

Jacek Caban : mshtml: Fixed leaks in IHTMLStyleSheet:: Release and IHTMLStyleSheetsCollection::Release implementations.
by Alexandre Julliard May 9, 2014

May 9, 2014

Module: wine Branch: master Commit: 60989ea3328648ac7d04bc08ce292b55105aa5a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60989ea3328648ac7d04bc08c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 9 13:29:21 2014 +0200 mshtml: Fixed leaks in IHTMLStyleSheet::Release and IHTMLStyleSheetsCollection::Release implementations. --- dlls/mshtml/htmlstylesheet.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 2abd77f..4258f79 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -264,6 +264,7 @@ static ULONG WINAPI HTMLStyleSheetsCollection_Release(IHTMLStyleSheetsCollection TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + release_dispex(&This->dispex); if(This->nslist) nsIDOMStyleSheetList_Release(This->nslist); heap_free(This); @@ -455,8 +456,12 @@ static ULONG WINAPI HTMLStyleSheet_Release(IHTMLStyleSheet *iface) TRACE("(%p) ref=%d\n", This, ref); - if(!ref) + if(!ref) { + release_dispex(&This->dispex); + if(This->nsstylesheet) + nsIDOMCSSStyleSheet_Release(This->nsstylesheet); heap_free(This); + } return ref; }

1 0

Joachim Priesner : wined3d: Clear active lights when cleaning up a D3D stateblock.
by Alexandre Julliard May 9, 2014

May 9, 2014

Module: wine Branch: master Commit: 3cd86c9f62cfb800164068a2cb8a77b65ef6d9bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd86c9f62cfb800164068a2c… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Thu May 8 22:43:46 2014 +0200 wined3d: Clear active lights when cleaning up a D3D stateblock. This prevents dangling pointers as the light structures that the pointers in the state->lights array point to are freed below when cleaning the light maps. --- dlls/wined3d/stateblock.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index f991362..e98ee2a 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -539,6 +539,11 @@ void state_cleanup(struct wined3d_state *state) if (!(state->flags & WINED3D_STATE_NO_REF)) state_unbind_resources(state); + for (counter = 0; counter < MAX_ACTIVE_LIGHTS; ++counter) + { + state->lights[counter] = NULL; + } + for (counter = 0; counter < LIGHTMAP_SIZE; ++counter) { struct list *e1, *e2;

1 0

Jacek Caban : mshtml: Added IDispatchEx support to HTMLStyleSheetRulesCollection object.
by Alexandre Julliard May 9, 2014

May 9, 2014

Module: wine Branch: master Commit: 000b78e9436ddb26dc00ee120c1b98150d3776e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=000b78e9436ddb26dc00ee120… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 9 14:05:21 2014 +0200 mshtml: Added IDispatchEx support to HTMLStyleSheetRulesCollection object. --- dlls/mshtml/htmlstylesheet.c | 50 ++++++++++++++++++++++++------------------ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 2 ++ 3 files changed, 33 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index a1669c1..2abd77f 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -50,6 +50,7 @@ struct HTMLStyleSheetsCollection { }; struct HTMLStyleSheetRulesCollection { + DispatchEx dispex; IHTMLStyleSheetRulesCollection IHTMLStyleSheetRulesCollection_iface; LONG ref; @@ -73,15 +74,16 @@ static HRESULT WINAPI HTMLStyleSheetRulesCollection_QueryInterface(IHTMLStyleShe }else if(IsEqualGUID(&IID_IHTMLStyleSheetRulesCollection, riid)) { TRACE("(%p)->(IID_IHTMLStyleSheetRulesCollection %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheetRulesCollection_iface; + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; + }else { + *ppv = NULL; + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; } - if(*ppv) { - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI HTMLStyleSheetRulesCollection_AddRef(IHTMLStyleSheetRulesCollection *iface) @@ -102,6 +104,7 @@ static ULONG WINAPI HTMLStyleSheetRulesCollection_Release(IHTMLStyleSheetRulesCo TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + release_dispex(&This->dispex); if(This->nslist) nsIDOMCSSRuleList_Release(This->nslist); heap_free(This); @@ -114,25 +117,22 @@ static HRESULT WINAPI HTMLStyleSheetRulesCollection_GetTypeInfoCount( IHTMLStyleSheetRulesCollection *iface, UINT *pctinfo) { HTMLStyleSheetRulesCollection *This = impl_from_IHTMLStyleSheetRulesCollection(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI HTMLStyleSheetRulesCollection_GetTypeInfo(IHTMLStyleSheetRulesCollection *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLStyleSheetRulesCollection *This = impl_from_IHTMLStyleSheetRulesCollection(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLStyleSheetRulesCollection_GetIDsOfNames(IHTMLStyleSheetRulesCollection *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { HTMLStyleSheetRulesCollection *This = impl_from_IHTMLStyleSheetRulesCollection(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); } static HRESULT WINAPI HTMLStyleSheetRulesCollection_Invoke(IHTMLStyleSheetRulesCollection *iface, @@ -140,9 +140,8 @@ static HRESULT WINAPI HTMLStyleSheetRulesCollection_Invoke(IHTMLStyleSheetRulesC VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLStyleSheetRulesCollection *This = impl_from_IHTMLStyleSheetRulesCollection(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLStyleSheetRulesCollection_get_length(IHTMLStyleSheetRulesCollection *iface, @@ -185,6 +184,17 @@ static const IHTMLStyleSheetRulesCollectionVtbl HTMLStyleSheetRulesCollectionVtb HTMLStyleSheetRulesCollection_item }; +static const tid_t HTMLStyleSheetRulesCollection_iface_tids[] = { + IHTMLStyleSheetRulesCollection_tid, + 0 +}; +static dispex_static_data_t HTMLStyleSheetRulesCollection_dispex = { + NULL, + DispHTMLStyleSheetRulesCollection_tid, + NULL, + HTMLStyleSheetRulesCollection_iface_tids +}; + static IHTMLStyleSheetRulesCollection *HTMLStyleSheetRulesCollection_Create(nsIDOMCSSRuleList *nslist) { HTMLStyleSheetRulesCollection *ret; @@ -194,6 +204,8 @@ static IHTMLStyleSheetRulesCollection *HTMLStyleSheetRulesCollection_Create(nsID ret->ref = 1; ret->nslist = nslist; + init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLStyleSheetRulesCollection_iface, &HTMLStyleSheetRulesCollection_dispex); + if(nslist) nsIDOMCSSRuleList_AddRef(nslist); @@ -460,7 +472,6 @@ static HRESULT WINAPI HTMLStyleSheet_GetTypeInfo(IHTMLStyleSheet *iface, UINT iT LCID lcid, ITypeInfo **ppTInfo) { HTMLStyleSheet *This = impl_from_IHTMLStyleSheet(iface); - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); } @@ -469,7 +480,6 @@ static HRESULT WINAPI HTMLStyleSheet_GetIDsOfNames(IHTMLStyleSheet *iface, REFII LCID lcid, DISPID *rgDispId) { HTMLStyleSheet *This = impl_from_IHTMLStyleSheet(iface); - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, rgDispId); } @@ -478,8 +488,6 @@ static HRESULT WINAPI HTMLStyleSheet_Invoke(IHTMLStyleSheet *iface, DISPID dispI VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLStyleSheet *This = impl_from_IHTMLStyleSheet(iface); - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2b59c8a..ccfec4a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -107,6 +107,7 @@ typedef struct event_target_t event_target_t; XDIID(DispHTMLStyle) \ XDIID(DispHTMLStyleElement) \ XDIID(DispHTMLStyleSheet) \ + XDIID(DispHTMLStyleSheetRulesCollection) \ XDIID(DispHTMLStyleSheetsCollection) \ XDIID(DispHTMLTable) \ XDIID(DispHTMLTableCell) \ @@ -180,6 +181,7 @@ typedef struct event_target_t event_target_t; XIID(IHTMLStyle6) \ XIID(IHTMLStyleElement) \ XIID(IHTMLStyleSheet) \ + XIID(IHTMLStyleSheetRulesCollection) \ XIID(IHTMLStyleSheetsCollection) \ XIID(IHTMLTable) \ XIID(IHTMLTable2) \ diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4378ad3..08c6c29 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6241,6 +6241,8 @@ static void test_stylesheet(IDispatch *disp) hres = IHTMLStyleSheet_get_rules(stylesheet, &col); ok(hres == S_OK, "get_rules failed: %08x\n", hres); ok(col != NULL, "col == NULL\n"); + + test_disp2((IUnknown*)col, &DIID_DispHTMLStyleSheetRulesCollection, &IID_IHTMLStyleSheetRulesCollection, "[object]"); IHTMLStyleSheetRulesCollection_Release(col); href = (void*)0xdeadbeef;

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Client GetSPCaps.
by Alexandre Julliard May 9, 2014

May 9, 2014

Module: wine Branch: master Commit: b01fc1aa6e12b426b3f539c44196c92331bad874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b01fc1aa6e12b426b3f539c44… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 7 10:59:46 2014 +1000 dpnet: Implement IDirectPlay8Client GetSPCaps. --- dlls/dpnet/client.c | 20 +++++++++++++++++--- dlls/dpnet/dpnet_private.h | 2 ++ dlls/dpnet/tests/client.c | 25 ++++++++++++++++--------- 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index 43ffb59..abcc5f7 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -234,9 +234,21 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_SetSPCaps(IDirectPlay8Client *iface static HRESULT WINAPI IDirectPlay8ClientImpl_GetSPCaps(IDirectPlay8Client *iface, const GUID * const pguidSP, DPN_SP_CAPS * const pdpspCaps, const DWORD dwFlags) { - IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%x): Stub\n", This, dwFlags); - return DPN_OK; + IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); + + TRACE("(%p)->(%p,%p,%x)\n", This, pguidSP, pdpspCaps, dwFlags); + + if(!This->msghandler) + return DPNERR_UNINITIALIZED; + + if(pdpspCaps->dwSize != sizeof(DPN_SP_CAPS)) + { + return DPNERR_INVALIDPARAM; + } + + *pdpspCaps = This->spcaps; + + return DPN_OK; } static HRESULT WINAPI IDirectPlay8ClientImpl_GetConnectionInfo(IDirectPlay8Client *iface, @@ -301,6 +313,8 @@ HRESULT DPNET_CreateDirectPlay8Client(IClassFactory *iface, IUnknown *pUnkOuter, client->IDirectPlay8Client_iface.lpVtbl = &DirectPlay8Client_Vtbl; client->ref = 1; + init_dpn_sp_caps(&client->spcaps); + hr = IDirectPlay8ClientImpl_QueryInterface(&client->IDirectPlay8Client_iface, riid, ppv); IDirectPlay8ClientImpl_Release(&client->IDirectPlay8Client_iface); diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 46aa8d5..af81474 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -53,6 +53,8 @@ struct IDirectPlay8ClientImpl PFNDPNMESSAGEHANDLER msghandler; DWORD flags; void *usercontext; + + DPN_SP_CAPS spcaps; }; /* ------------------- */ diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 0df99dd..bf0d26f 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -36,6 +36,7 @@ static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, static BOOL test_init_dp(void) { HRESULT hr; + DPN_SP_CAPS caps; hr = CoInitialize(0); ok(hr == S_OK, "CoInitialize failed with %x\n", hr); @@ -43,6 +44,12 @@ static BOOL test_init_dp(void) hr = CoCreateInstance(&CLSID_DirectPlay8Client, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay8Client, (void **)&client); ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); + memset(&caps, 0, sizeof(DPN_SP_CAPS)); + caps.dwSize = sizeof(DPN_SP_CAPS); + + hr = IDirectPlay8Client_GetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPNERR_UNINITIALIZED, "GetSPCaps failed with %x\n", hr); + hr = IDirectPlay8Client_Initialize(client, NULL, NULL, 0); ok(hr == DPNERR_INVALIDPARAM, "got %x\n", hr); @@ -160,24 +167,24 @@ static void test_get_sp_caps(void) memset(&caps, 0, sizeof(DPN_SP_CAPS)); hr = IDirectPlay8Client_GetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); - todo_wine ok(hr == DPNERR_INVALIDPARAM, "GetSPCaps unexpectedly returned %x\n", hr); + ok(hr == DPNERR_INVALIDPARAM, "GetSPCaps unexpectedly returned %x\n", hr); caps.dwSize = sizeof(DPN_SP_CAPS); hr = IDirectPlay8Client_GetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); ok(hr == DPN_OK, "GetSPCaps failed with %x\n", hr); - todo_wine ok((caps.dwFlags & + ok((caps.dwFlags & (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS)) == (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS), "unexpected flags %x\n", caps.dwFlags); - todo_wine ok(caps.dwNumThreads >= 3, "got %d\n", caps.dwNumThreads); - todo_wine ok(caps.dwDefaultEnumCount == 5, "expected 5, got %d\n", caps.dwDefaultEnumCount); - todo_wine ok(caps.dwDefaultEnumRetryInterval == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumRetryInterval); - todo_wine ok(caps.dwDefaultEnumTimeout == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumTimeout); - todo_wine ok(caps.dwMaxEnumPayloadSize == 983, "expected 983, got %d\n", caps.dwMaxEnumPayloadSize); - todo_wine ok(caps.dwBuffersPerThread == 1, "expected 1, got %d\n", caps.dwBuffersPerThread); - todo_wine ok(caps.dwSystemBufferSize == 0x10000 || broken(caps.dwSystemBufferSize == 0x2000 /* before Win8 */), + ok(caps.dwNumThreads >= 3, "got %d\n", caps.dwNumThreads); + ok(caps.dwDefaultEnumCount == 5, "expected 5, got %d\n", caps.dwDefaultEnumCount); + ok(caps.dwDefaultEnumRetryInterval == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumRetryInterval); + ok(caps.dwDefaultEnumTimeout == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumTimeout); + ok(caps.dwMaxEnumPayloadSize == 983, "expected 983, got %d\n", caps.dwMaxEnumPayloadSize); + ok(caps.dwBuffersPerThread == 1, "expected 1, got %d\n", caps.dwBuffersPerThread); + ok(caps.dwSystemBufferSize == 0x10000 || broken(caps.dwSystemBufferSize == 0x2000 /* before Win8 */), "expected 0x10000, got 0x%x\n", caps.dwSystemBufferSize); }

1 0

Alistair Leslie-Hughes : dpnet: Store DPN_SP_CAPS as part of the object.
by Alexandre Julliard May 9, 2014

May 9, 2014

Module: wine Branch: master Commit: 329c70d9b8aef9e52313384e369471c612df9067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=329c70d9b8aef9e52313384e3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 14 15:37:23 2014 +1100 dpnet: Store DPN_SP_CAPS as part of the object. --- dlls/dpnet/dpnet_private.h | 2 ++ dlls/dpnet/peer.c | 34 ++++++++++++++++++++++++---------- dlls/dpnet/tests/peer.c | 7 +++++++ 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 34d2aee..46aa8d5 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -99,6 +99,8 @@ extern HRESULT DPNET_CreateDirectPlay8Address(LPCLASSFACTORY iface, LPUNKNOWN pu extern HRESULT DPNET_CreateDirectPlay8LobbiedApp(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; extern HRESULT DPNET_CreateDirectPlay8ThreadPool(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; +extern void init_dpn_sp_caps(DPN_SP_CAPS *dpnspcaps) DECLSPEC_HIDDEN; + /* used for generic dumping (copied from ddraw) */ typedef struct { DWORD val; diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 02b8d99..a07a59a 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -47,6 +47,8 @@ typedef struct IDirectPlay8PeerImpl PFNDPNMESSAGEHANDLER msghandler; DWORD flags; void *usercontext; + + DPN_SP_CAPS spcaps; } IDirectPlay8PeerImpl; static inline IDirectPlay8PeerImpl *impl_from_IDirectPlay8Peer(IDirectPlay8Peer *iface) @@ -416,22 +418,19 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_SetSPCaps(IDirectPlay8Peer *iface, co static HRESULT WINAPI IDirectPlay8PeerImpl_GetSPCaps(IDirectPlay8Peer *iface, const GUID * const pguidSP, DPN_SP_CAPS * const pdpspCaps, const DWORD dwFlags) { - TRACE("(%p)->(%p,%p,%x)\n", iface, pguidSP, pdpspCaps, dwFlags); + IDirectPlay8PeerImpl* This = impl_from_IDirectPlay8Peer(iface); + + TRACE("(%p)->(%p,%p,%x)\n", This, pguidSP, pdpspCaps, dwFlags); + + if(!This->msghandler) + return DPNERR_UNINITIALIZED; if(pdpspCaps->dwSize != sizeof(DPN_SP_CAPS)) { return DPNERR_INVALIDPARAM; } - pdpspCaps->dwFlags = DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | - DPNSPCAPS_SUPPORTSALLADAPTERS | DPNSPCAPS_SUPPORTSTHREADPOOL; - pdpspCaps->dwNumThreads = 3; - pdpspCaps->dwDefaultEnumCount = 5; - pdpspCaps->dwDefaultEnumRetryInterval = 1500; - pdpspCaps->dwDefaultEnumTimeout = 1500; - pdpspCaps->dwMaxEnumPayloadSize = 983; - pdpspCaps->dwBuffersPerThread = 1; - pdpspCaps->dwSystemBufferSize = 0x10000; + *pdpspCaps = This->spcaps; return DPN_OK; } @@ -501,6 +500,19 @@ static const IDirectPlay8PeerVtbl DirectPlay8Peer_Vtbl = IDirectPlay8PeerImpl_TerminateSession }; +void init_dpn_sp_caps(DPN_SP_CAPS *dpnspcaps) +{ + dpnspcaps->dwFlags = DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | + DPNSPCAPS_SUPPORTSALLADAPTERS | DPNSPCAPS_SUPPORTSTHREADPOOL; + dpnspcaps->dwNumThreads = 3; + dpnspcaps->dwDefaultEnumCount = 5; + dpnspcaps->dwDefaultEnumRetryInterval = 1500; + dpnspcaps->dwDefaultEnumTimeout = 1500; + dpnspcaps->dwMaxEnumPayloadSize = 983; + dpnspcaps->dwBuffersPerThread = 1; + dpnspcaps->dwSystemBufferSize = 0x10000; +}; + HRESULT DPNET_CreateDirectPlay8Peer(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, LPVOID *ppobj) { IDirectPlay8PeerImpl* Client; @@ -522,6 +534,8 @@ HRESULT DPNET_CreateDirectPlay8Peer(IClassFactory *iface, IUnknown *pUnkOuter, R Client->msghandler = NULL; Client->flags = 0; + init_dpn_sp_caps(&Client->spcaps); + ret = IDirectPlay8Peer_QueryInterface(&Client->IDirectPlay8Peer_iface, riid, ppobj); IDirectPlay8Peer_Release(&Client->IDirectPlay8Peer_iface); diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index d1f3504..670b843 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -34,6 +34,7 @@ static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, static void test_init_dp(void) { HRESULT hr; + DPN_SP_CAPS caps; hr = CoInitialize(0); ok(hr == S_OK, "CoInitialize failed with %x\n", hr); @@ -41,6 +42,12 @@ static void test_init_dp(void) hr = CoCreateInstance(&CLSID_DirectPlay8Peer, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay8Peer, (void **)&peer); ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); + memset(&caps, 0, sizeof(DPN_SP_CAPS)); + caps.dwSize = sizeof(DPN_SP_CAPS); + + hr = IDirectPlay8Peer_GetSPCaps(peer, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPNERR_UNINITIALIZED, "GetSPCaps failed with %x\n", hr); + hr = IDirectPlay8Peer_Initialize(peer, NULL, NULL, 0); ok(hr == DPNERR_INVALIDPARAM, "got %x\n", hr);

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard May 9, 2014

May 9, 2014

Module: wine Branch: master Commit: 22acc5cb304d946c7990fccf61ce4a0f77cb1a2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=22acc5cb304d946c7990fccf6… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 9 16:06:56 2014 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddraw7.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index b61172c..8c5f6ac 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -6688,19 +6688,19 @@ static void test_material(void) ok(!memcmp(&U(material).diffuse, &null_color, sizeof(null_color)), "Got unexpected diffuse color {%.8e, %.8e, %.8e, %.8e}.\n", U1(U(material).diffuse).r, U2(U(material).diffuse).g, - U3(U(material).diffuse).b, U3(U(material).diffuse).a); + U3(U(material).diffuse).b, U4(U(material).diffuse).a); ok(!memcmp(&U1(material).ambient, &null_color, sizeof(null_color)), "Got unexpected ambient color {%.8e, %.8e, %.8e, %.8e}.\n", U1(U1(material).ambient).r, U2(U1(material).ambient).g, - U3(U1(material).ambient).b, U3(U1(material).ambient).a); + U3(U1(material).ambient).b, U4(U1(material).ambient).a); ok(!memcmp(&U2(material).specular, &null_color, sizeof(null_color)), "Got unexpected specular color {%.8e, %.8e, %.8e, %.8e}.\n", U1(U2(material).specular).r, U2(U2(material).specular).g, - U3(U2(material).specular).b, U3(U2(material).specular).a); + U3(U2(material).specular).b, U4(U2(material).specular).a); ok(!memcmp(&U3(material).emissive, &null_color, sizeof(null_color)), "Got unexpected emissive color {%.8e, %.8e, %.8e, %.8e}.\n", U1(U3(material).emissive).r, U2(U3(material).emissive).g, - U3(U3(material).emissive).b, U3(U3(material).emissive).a); + U3(U3(material).emissive).b, U4(U3(material).emissive).a); ok(U4(material).power == 0.0f, "Got unexpected power %.8e.\n", U4(material).power); refcount = IDirect3DDevice7_Release(device);

1 0

Piotr Caban : oleacc: Add Client_get_accParent implementation.
by Alexandre Julliard May 9, 2014

May 9, 2014

Module: wine Branch: master Commit: 40bdbda82559062caa335b282883b50ce4f8a7fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=40bdbda82559062caa335b282… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 9 13:59:58 2014 +0200 oleacc: Add Client_get_accParent implementation. --- dlls/oleacc/client.c | 7 +++++-- dlls/oleacc/tests/main.c | 13 +++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index d557de9..b2c734a 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -113,8 +113,11 @@ static HRESULT WINAPI Client_Invoke(IAccessible *iface, DISPID dispIdMember, static HRESULT WINAPI Client_get_accParent(IAccessible *iface, IDispatch **ppdispParent) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%p)\n", This, ppdispParent); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppdispParent); + + return AccessibleObjectFromWindow(This->hwnd, OBJID_WINDOW, + &IID_IDispatch, (void**)ppdispParent); } static HRESULT WINAPI Client_get_accChildCount(IAccessible *iface, LONG *pcountChildren) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 62fe3f8..3fb23da 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -225,6 +225,8 @@ static LRESULT WINAPI test_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA return E_UNEXPECTED; if(lparam == (DWORD)OBJID_CLIENT) return LresultFromObject(&IID_IUnknown, wparam, &Object); + if(lparam == (DWORD)OBJID_WINDOW) + return 0; ok(0, "unexpected (%ld)\n", lparam); return 0; @@ -311,6 +313,7 @@ static void test_default_client_accessible_object(void) static const WCHAR shortcutW[] = {'A','l','t','+','t',0}; IAccessible *acc; + IDispatch *disp; HWND chld, hwnd; HRESULT hr; VARIANT vid, v; @@ -427,6 +430,11 @@ static void test_default_client_accessible_object(void) ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); ok(V_I4(&v) == 0, "V_I4(&v) = %d\n", V_I4(&v)); + hr = IAccessible_get_accParent(acc, &disp); + ok(hr == S_OK, "got %x\n", hr); + ok(disp != NULL, "disp == NULL\n"); + IDispatch_Release(disp); + DestroyWindow(hwnd); hr = IAccessible_get_accChildCount(acc, &l); @@ -454,6 +462,11 @@ static void test_default_client_accessible_object(void) ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); ok(V_I4(&v) == 0, "V_I4(&v) = %d\n", V_I4(&v)); + disp = (void*)0xdeadbeef; + hr = IAccessible_get_accParent(acc, &disp); + ok(hr == E_FAIL, "got %x\n", hr); + ok(disp == NULL, "disp = %p\n", disp); + IAccessible_Release(acc); }

1 0

Huw Davies : imagehlp/tests: Don' t assume the certificate chain is originally empty.
by Alexandre Julliard May 9, 2014

May 9, 2014

Module: wine Branch: master Commit: 38483f1efe5850131455754e3d08a9ccf06a0065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38483f1efe5850131455754e3… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 9 11:12:24 2014 +0100 imagehlp/tests: Don't assume the certificate chain is originally empty. --- dlls/imagehlp/tests/integrity.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/imagehlp/tests/integrity.c b/dlls/imagehlp/tests/integrity.c index eb1eb58..3fa359f 100644 --- a/dlls/imagehlp/tests/integrity.c +++ b/dlls/imagehlp/tests/integrity.c @@ -135,7 +135,7 @@ static DWORD get_file_size(void) return filesize; } -static void test_add_certificate(const char *cert_data, int len) +static DWORD test_add_certificate(const char *cert_data, int len) { HANDLE hFile; LPWIN_CERTIFICATE cert; @@ -148,7 +148,7 @@ static void test_add_certificate(const char *cert_data, int len) if (hFile == INVALID_HANDLE_VALUE) { skip("Unable to open %s, skipping test\n", test_dll_path); - return; + return ~0; } cert_len = sizeof(WIN_CERTIFICATE) + len; @@ -158,7 +158,7 @@ static void test_add_certificate(const char *cert_data, int len) { skip("Unable to allocate memory, skipping test\n"); CloseHandle(hFile); - return; + return ~0; } cert->dwLength = cert_len; @@ -168,9 +168,11 @@ static void test_add_certificate(const char *cert_data, int len) ret = pImageAddCertificate(hFile, cert, &index); ok(ret, "Unable to add certificate to image, error %x\n", GetLastError()); + trace("added cert index %d\n", index); HeapFree(GetProcessHeap(), 0, cert); CloseHandle(hFile); + return index; } static void test_get_certificate(const char *cert_data, int index) @@ -239,7 +241,7 @@ static void test_remove_certificate(int index) START_TEST(integrity) { - DWORD file_size, file_size_orig; + DWORD file_size, file_size_orig, first, second; hImageHlp = LoadLibraryA("imagehlp.dll"); @@ -272,25 +274,27 @@ START_TEST(integrity) pImageGetCertificateHeader = (void *) GetProcAddress(hImageHlp, "ImageGetCertificateHeader"); pImageRemoveCertificate = (void *) GetProcAddress(hImageHlp, "ImageRemoveCertificate"); - test_add_certificate(test_cert_data, sizeof(test_cert_data)); - test_get_certificate(test_cert_data, 0); - test_remove_certificate(0); + first = test_add_certificate(test_cert_data, sizeof(test_cert_data)); + test_get_certificate(test_cert_data, first); + test_remove_certificate(first); file_size = get_file_size(); ok(file_size == file_size_orig, "File size different after add and remove (old: %d; new: %d)\n", file_size_orig, file_size); /* Try adding multiple certificates */ - test_add_certificate(test_cert_data, sizeof(test_cert_data)); - test_add_certificate(test_cert_data_2, sizeof(test_cert_data_2)); + first = test_add_certificate(test_cert_data, sizeof(test_cert_data)); + second = test_add_certificate(test_cert_data_2, sizeof(test_cert_data_2)); + ok(second == first + 1, "got %d %d\n", first, second); - test_get_certificate(test_cert_data, 0); - test_get_certificate(test_cert_data_2, 1); + test_get_certificate(test_cert_data, first); + test_get_certificate(test_cert_data_2, second); /* Remove the first one and verify the second certificate is intact */ - test_remove_certificate(0); - test_get_certificate(test_cert_data_2, 0); + test_remove_certificate(first); + second--; + test_get_certificate(test_cert_data_2, second); - test_remove_certificate(0); + test_remove_certificate(second); file_size = get_file_size(); ok(file_size == file_size_orig, "File size different after add and remove (old: %d; new: %d)\n", file_size_orig, file_size);

1 0