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

Vincent Povirk : user32/tests: Add a test for empty popup menus.
by Alexandre Julliard March 12, 2014

March 12, 2014

Module: wine Branch: master Commit: b8d80364c389bc5e125bca687f101da99e23d2bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8d80364c389bc5e125bca687… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Feb 17 14:32:20 2014 -0600 user32/tests: Add a test for empty popup menus. --- dlls/user32/tests/menu.c | 112 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 110 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 6f13fac..d735922 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -147,7 +147,10 @@ static SIZE MODsizes[MOD_NRMENUS]= { {MOD_SIZE, MOD_SIZE},{MOD_SIZE, MOD_SIZE}, static BOOL MOD_GotDrawItemMsg = FALSE; static int gflag_initmenupopup, gflag_entermenuloop, - gflag_initmenu; + gflag_initmenu, + gflag_enteridle; +static WPARAM selectitem_wp; +static LPARAM selectitem_lp; /* wndproc used by test_menu_ownerdraw() */ static LRESULT WINAPI menu_ownerdraw_wnd_proc(HWND hwnd, UINT msg, @@ -236,6 +239,7 @@ static LRESULT WINAPI menu_ownerdraw_wnd_proc(HWND hwnd, UINT msg, } case WM_ENTERIDLE: { + gflag_enteridle++; ok( lparam || broken(!lparam), /* win9x, nt4 */ "Menu window handle is NULL!\n"); if( lparam) { @@ -246,7 +250,10 @@ static LRESULT WINAPI menu_ownerdraw_wnd_proc(HWND hwnd, UINT msg, PostMessageA(hwnd, WM_CANCELMODE, 0, 0); return TRUE; } - + case WM_MENUSELECT: + selectitem_wp = wparam; + selectitem_lp = lparam; + break; } return DefWindowProcA(hwnd, msg, wparam, lparam); } @@ -3517,6 +3524,106 @@ static void test_menualign(void) DestroyWindow( hwnd); } +static LRESULT WINAPI menu_fill_in_init(HWND hwnd, UINT msg, + WPARAM wparam, LPARAM lparam) +{ + HMENU hmenupopup; + BOOL ret; + switch (msg) + { + case WM_INITMENUPOPUP: + gflag_initmenupopup++; + hmenupopup = (HMENU) wparam; + ret = AppendMenuA(hmenupopup, MF_STRING , 100, "item 1"); + ok(ret, "AppendMenu failed.\n"); + ret = AppendMenuA(hmenupopup, MF_STRING , 101, "item 2"); + ok(ret, "AppendMenu failed.\n"); + break; + case WM_ENTERMENULOOP: + gflag_entermenuloop++; + break; + case WM_INITMENU: + gflag_initmenu++; + break; + case WM_ENTERIDLE: + gflag_enteridle++; + PostMessageA(hwnd, WM_CANCELMODE, 0, 0); + return TRUE; + case WM_MENUSELECT: + selectitem_wp = wparam; + selectitem_lp = lparam; + break; + } + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + +static void test_emptypopup(void) +{ + BOOL ret; + HMENU hmenu; + + HWND hwnd = CreateWindowExA(0, (LPCSTR)MAKEINTATOM(atomMenuCheckClass), NULL, + WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 200, 200, + NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindowEx failed with error %d\n", GetLastError()); + SetWindowLongPtrA( hwnd, GWLP_WNDPROC, (LONG_PTR)menu_ownerdraw_wnd_proc); + + hmenu = CreatePopupMenu(); + ok(hmenu != NULL, "CreateMenu failed with error %d\n", GetLastError()); + + gflag_initmenupopup = gflag_entermenuloop = gflag_initmenu = gflag_enteridle = 0; + selectitem_wp = 0xdeadbeef; + selectitem_lp = 0xdeadbeef; + + ret = TrackPopupMenu( hmenu, TPM_RETURNCMD, 100,100, 0, hwnd, NULL); + ok(ret == 0, "got %i\n", ret); + + ok(gflag_initmenupopup == 1, "got %i\n", gflag_initmenupopup); + ok(gflag_entermenuloop == 1, "got %i\n", gflag_entermenuloop); + ok(gflag_initmenu == 1, "got %i\n", gflag_initmenu); + todo_wine ok(gflag_enteridle == 0, "got %i\n", gflag_initmenu); + + todo_wine ok(selectitem_wp == 0xdeadbeef, "got %lx\n", selectitem_wp); + todo_wine ok(selectitem_lp == 0xdeadbeef, "got %lx\n", selectitem_lp); + + gflag_initmenupopup = gflag_entermenuloop = gflag_initmenu = gflag_enteridle = 0; + selectitem_wp = 0xdeadbeef; + selectitem_lp = 0xdeadbeef; + + ret = TrackPopupMenu( hmenu, 0, 100,100, 0, hwnd, NULL); + todo_wine ok(ret == 0, "got %i\n", ret); + + ok(gflag_initmenupopup == 1, "got %i\n", gflag_initmenupopup); + ok(gflag_entermenuloop == 1, "got %i\n", gflag_entermenuloop); + ok(gflag_initmenu == 1, "got %i\n", gflag_initmenu); + todo_wine ok(gflag_enteridle == 0, "got %i\n", gflag_initmenu); + + todo_wine ok(selectitem_wp == 0xdeadbeef, "got %lx\n", selectitem_wp); + todo_wine ok(selectitem_lp == 0xdeadbeef, "got %lx\n", selectitem_lp); + + SetWindowLongPtrA( hwnd, GWLP_WNDPROC, (LONG_PTR)menu_fill_in_init); + + gflag_initmenupopup = gflag_entermenuloop = gflag_initmenu = gflag_enteridle = 0; + selectitem_wp = 0xdeadbeef; + selectitem_lp = 0xdeadbeef; + + ret = TrackPopupMenu( hmenu, 0, 100,100, 0, hwnd, NULL); + ok(ret == 1, "got %i\n", ret); + + ok(gflag_initmenupopup == 1, "got %i\n", gflag_initmenupopup); + ok(gflag_entermenuloop == 1, "got %i\n", gflag_entermenuloop); + ok(gflag_initmenu == 1, "got %i\n", gflag_initmenu); + ok(gflag_enteridle == 1, "got %i\n", gflag_initmenu); + + ok(selectitem_wp == 0xffff0000, "got %lx\n", selectitem_wp); + ok(selectitem_lp == 0, "got %lx\n", selectitem_lp); + + DestroyWindow(hwnd); + + ret = DestroyMenu(hmenu); + ok(ret, "DestroyMenu failed with error %d\n", GetLastError()); +} + START_TEST(menu) { init_function_pointers(); @@ -3553,4 +3660,5 @@ START_TEST(menu) test_menu_cancelmode(); test_menu_maxdepth(); test_menu_circref(); + test_emptypopup(); }

1 0

Stefan Dösinger : d3d8/tests: Test GetPrivateData size behavior.
by Alexandre Julliard March 12, 2014

March 12, 2014

Module: wine Branch: master Commit: a3e5676c9a06a00c45dbd1a02105ab83a19e3c4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3e5676c9a06a00c45dbd1a02… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 12 14:08:27 2014 +0100 d3d8/tests: Test GetPrivateData size behavior. --- dlls/d3d8/tests/device.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index d729de0..a15770b 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3896,6 +3896,13 @@ static void test_private_data(void) 0x4edf, {0xa3,0x7f,0x9b,0x1d,0xf4,0x88,0xc5,0xfc} }; + static const GUID d3d8_private_data_test_guid2 = + { + 0x2e5afac2, + 0x87b5, + 0x4c10, + {0x9b,0x4b,0x89,0xd7,0xd1,0x12,0xe7,0x2b} + }; window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); @@ -3961,18 +3968,46 @@ static void test_private_data(void) hr = IDirect3DSurface8_SetPrivateData(surface, &d3d8_private_data_test_guid, device, sizeof(IUnknown *), D3DSPD_IUNKNOWN); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - size = sizeof(ptr); + size = 2 * sizeof(ptr); hr = IDirect3DSurface8_GetPrivateData(surface, &d3d8_private_data_test_guid, &ptr, &size); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(device), "Got unexpected size %u.\n", size); expected_refcount = refcount + 2; refcount = get_refcount((IUnknown *)device); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); ok(ptr == (IUnknown *)device, "Got unexpected ptr %p, expected %p.\n", ptr, device); IUnknown_Release(ptr); + expected_refcount--; + + ptr = (IUnknown *)0xdeadbeef; + size = 1; + hr = IDirect3DSurface8_GetPrivateData(surface, &d3d8_private_data_test_guid, NULL, &size); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(device), "Got unexpected size %u.\n", size); + size = 2 * sizeof(ptr); + hr = IDirect3DSurface8_GetPrivateData(surface, &d3d8_private_data_test_guid, NULL, &size); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(device), "Got unexpected size %u.\n", size); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + size = 1; + hr = IDirect3DSurface8_GetPrivateData(surface, &d3d8_private_data_test_guid, &ptr, &size); + ok(hr == D3DERR_MOREDATA, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(device), "Got unexpected size %u.\n", size); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + hr = IDirect3DSurface8_GetPrivateData(surface, &d3d8_private_data_test_guid2, NULL, NULL); + ok(hr == D3DERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + size = 0xdeadbabe; + hr = IDirect3DSurface8_GetPrivateData(surface, &d3d8_private_data_test_guid2, &ptr, &size); + ok(hr == D3DERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + ok(size == 0xdeadbabe, "Got unexpected size %u.\n", size); + /* GetPrivateData with size = NULL causes an access violation on Windows if the + * requested data exists. */ /* Destroying the surface frees the held reference. */ IDirect3DSurface8_Release(surface); - expected_refcount = refcount - 3; + expected_refcount = refcount - 2; refcount = get_refcount((IUnknown *)device); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);

1 0

Jactry Zeng : include: Fix a typo in ITextServices method named TxGetCurTarget.
by Alexandre Julliard March 12, 2014

March 12, 2014

Module: wine Branch: master Commit: 0f23b967a4cda24438d767606ec38e9e3b48fcaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f23b967a4cda24438d767606… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Wed Mar 12 21:43:35 2014 +0800 include: Fix a typo in ITextServices method named TxGetCurTarget. --- dlls/riched20/tests/txtsrv.c | 2 +- dlls/riched20/txtsrv.c | 6 +++--- include/textserv.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index efda32c..3401f8b 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -65,7 +65,7 @@ static ITextServicesVtbl itextServicesStdcallVtbl; #define ITextServices_OnTxUIDeactivate(This) TXTSERV_VTABLE(This)->OnTxUIDeactivate(This) #define ITextServices_TxGetText(This,a) TXTSERV_VTABLE(This)->TxGetText(This,a) #define ITextServices_TxSetText(This,a) TXTSERV_VTABLE(This)->TxSetText(This,a) -#define ITextServices_TxGetCurrentTargetX(This,a) TXTSERV_VTABLE(This)->TxGetCurrentTargetX(This,a) +#define ITextServices_TxGetCurTargetX(This,a) TXTSERV_VTABLE(This)->TxGetCurTargetX(This,a) #define ITextServices_TxGetBaseLinePos(This,a) TXTSERV_VTABLE(This)->TxGetBaseLinePos(This,a) #define ITextServices_TxGetNaturalSize(This,a,b,c,d,e,f,g,h) TXTSERV_VTABLE(This)->TxGetNaturalSize(This,a,b,c,d,e,f,g,h) #define ITextServices_TxGetDropTarget(This,a) TXTSERV_VTABLE(This)->TxGetDropTarget(This,a) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 0e78c53..1f78405 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -292,7 +292,7 @@ DECLSPEC_HIDDEN HRESULT WINAPI fnTextSrv_TxSetText(ITextServices *iface, LPCWSTR return S_OK; } -DECLSPEC_HIDDEN HRESULT WINAPI fnTextSrv_TxGetCurrentTargetX(ITextServices *iface, LONG *x) +DECLSPEC_HIDDEN HRESULT WINAPI fnTextSrv_TxGetCurTargetX(ITextServices *iface, LONG *x) { ITextServicesImpl *This = impl_from_ITextServices(iface); @@ -354,7 +354,7 @@ DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxUIActivate,4) DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxUIDeactivate,4) DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetText,8) DEFINE_THISCALL_WRAPPER(fnTextSrv_TxSetText,8) -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetCurrentTargetX,8) +DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetCurTargetX,8) DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetBaseLinePos,8) DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetNaturalSize,36) DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetDropTarget,8) @@ -378,7 +378,7 @@ static const ITextServicesVtbl textservices_vtbl = THISCALL(fnTextSrv_OnTxUIDeactivate), THISCALL(fnTextSrv_TxGetText), THISCALL(fnTextSrv_TxSetText), - THISCALL(fnTextSrv_TxGetCurrentTargetX), + THISCALL(fnTextSrv_TxGetCurTargetX), THISCALL(fnTextSrv_TxGetBaseLinePos), THISCALL(fnTextSrv_TxGetNaturalSize), THISCALL(fnTextSrv_TxGetDropTarget), diff --git a/include/textserv.h b/include/textserv.h index 3efb879..de3bb2d 100644 --- a/include/textserv.h +++ b/include/textserv.h @@ -112,7 +112,7 @@ DECLARE_INTERFACE_(ITextServices,IUnknown) STDMETHOD(TxSetText)( THIS_ LPCWSTR pszText) PURE; - STDMETHOD(TxGetCurrentTargetX)( THIS_ + STDMETHOD(TxGetCurTargetX)( THIS_ LONG* x) PURE; STDMETHOD(TxGetBaseLinePos)( THIS_

1 0

Vincent Povirk : user32/tests: Put some menu items in the test_menu_trackagain menu.
by Alexandre Julliard March 12, 2014

March 12, 2014

Module: wine Branch: master Commit: 0dc1886634413503a2f842ba0214fe6385f95dc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dc1886634413503a2f842ba0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Feb 17 15:45:43 2014 -0600 user32/tests: Put some menu items in the test_menu_trackagain menu. --- dlls/user32/tests/menu.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index d735922..7cab0a0 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -3251,8 +3251,13 @@ static void test_menu_trackagain(void) g_hmenu = CreatePopupMenu(); ok(g_hmenu != NULL, "CreateMenu failed with error %d\n", GetLastError()); + ret = AppendMenuA(g_hmenu, MF_STRING , 100, "item 1"); + ok(ret, "AppendMenu failed.\n"); + ret = AppendMenuA(g_hmenu, MF_STRING , 101, "item 2"); + ok(ret, "AppendMenu failed.\n"); + ret = TrackPopupMenu( g_hmenu, 0, 100, 100, 0, hwnd, NULL); - todo_wine ok(ret == FALSE, "got %d\n", ret); + ok(ret == TRUE, "got %d\n", ret); DestroyMenu(g_hmenu); DestroyWindow(hwnd);

1 0

Zhenbo Li : mshtml: Added IHTMLTableRow::align property implementation.
by Alexandre Julliard March 12, 2014

March 12, 2014

Module: wine Branch: master Commit: 7442abde9257022fcf9f178be8284826d445986a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7442abde9257022fcf9f178be… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Wed Mar 12 13:11:32 2014 +0800 mshtml: Added IHTMLTableRow::align property implementation. --- dlls/mshtml/htmltablerow.c | 27 +++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 13 +++++++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index 7274ded..ef01763 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -102,15 +102,34 @@ static HRESULT WINAPI HTMLTableRow_Invoke(IHTMLTableRow *iface, DISPID dispIdMem static HRESULT WINAPI HTMLTableRow_put_align(IHTMLTableRow *iface, BSTR v) { HTMLTableRow *This = impl_from_IHTMLTableRow(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString val; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&val, v); + + nsres = nsIDOMHTMLTableRowElement_SetAlign(This->nsrow, &val); + nsAString_Finish(&val); + if (NS_FAILED(nsres)){ + ERR("Set Align(%s) failed!\n", debugstr_w(v)); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLTableRow_get_align(IHTMLTableRow *iface, BSTR *p) { HTMLTableRow *This = impl_from_IHTMLTableRow(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString val; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&val, NULL); + nsres = nsIDOMHTMLTableRowElement_GetAlign(This->nsrow, &val); + + return return_nsstr(nsres, &val, p); } static HRESULT WINAPI HTMLTableRow_put_vAlign(IHTMLTableRow *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index cf78450..b485203 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5576,6 +5576,7 @@ static void test_tr_elem(IHTMLElement *elem) IHTMLElementCollection *col; IHTMLTableRow *row; HRESULT hres; + BSTR bstr; static const elem_type_t cell_types[] = {ET_TD,ET_TD}; @@ -5592,6 +5593,18 @@ static void test_tr_elem(IHTMLElement *elem) test_elem_collection((IUnknown*)col, cell_types, sizeof(cell_types)/sizeof(*cell_types)); IHTMLElementCollection_Release(col); + bstr = a2bstr("left"); + hres = IHTMLTableRow_put_align(row, bstr); + ok(hres == S_OK, "set_align failed: %08x\n", hres); + SysFreeString(bstr); + + bstr = NULL; + hres = IHTMLTableRow_get_align(row, &bstr); + ok(hres == S_OK, "get_align failed: %08x\n", hres); + ok(bstr != NULL, "get_align returned NULL\n"); + ok(!strcmp_wa(bstr, "left"), "get_align returned %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + IHTMLTableRow_Release(row); }

1 0

Stefan Dösinger : d3d8/tests: Use a custom GUID for the private data tests.
by Alexandre Julliard March 12, 2014

March 12, 2014

Module: wine Branch: master Commit: 120ca8e7226ee9b6c6bbaa4e395ae9a764323e23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=120ca8e7226ee9b6c6bbaa4e3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 12 14:08:26 2014 +0100 d3d8/tests: Use a custom GUID for the private data tests. --- dlls/d3d8/tests/device.c | 47 ++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 2bac6fd..d729de0 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3889,6 +3889,13 @@ static void test_private_data(void) HRESULT hr; DWORD size; DWORD data[4] = {1, 2, 3, 4}; + static const GUID d3d8_private_data_test_guid = + { + 0xfdb37466, + 0x428f, + 0x4edf, + {0xa3,0x7f,0x9b,0x1d,0xf4,0x88,0xc5,0xfc} + }; window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); @@ -3905,57 +3912,57 @@ static void test_private_data(void) hr = IDirect3DDevice8_CreateImageSurface(device, 4, 4, D3DFMT_A8R8G8B8, &surface); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); - hr = IDirect3DSurface8_SetPrivateData(surface, &IID_IDirect3DSurface8 /* Abuse this tag */, + hr = IDirect3DSurface8_SetPrivateData(surface, &d3d8_private_data_test_guid, device, 0, D3DSPD_IUNKNOWN); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DSurface8_SetPrivateData(surface, &IID_IDirect3DSurface8 /* Abuse this tag */, + hr = IDirect3DSurface8_SetPrivateData(surface, &d3d8_private_data_test_guid, device, 5, D3DSPD_IUNKNOWN); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DSurface8_SetPrivateData(surface, &IID_IDirect3DSurface8 /* Abuse this tag */, + hr = IDirect3DSurface8_SetPrivateData(surface, &d3d8_private_data_test_guid, device, sizeof(IUnknown *) * 2, D3DSPD_IUNKNOWN); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* A failing SetPrivateData call does not clear the old data with the same tag. */ - hr = IDirect3DSurface8_SetPrivateData(surface, &IID_IDirect3DVertexBuffer8, device, + hr = IDirect3DSurface8_SetPrivateData(surface, &d3d8_private_data_test_guid, device, sizeof(device), D3DSPD_IUNKNOWN); ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); - hr = IDirect3DSurface8_SetPrivateData(surface, &IID_IDirect3DVertexBuffer8, device, + hr = IDirect3DSurface8_SetPrivateData(surface, &d3d8_private_data_test_guid, device, sizeof(device) * 2, D3DSPD_IUNKNOWN); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); size = sizeof(ptr); - hr = IDirect3DSurface8_GetPrivateData(surface, &IID_IDirect3DVertexBuffer8, &ptr, &size); + hr = IDirect3DSurface8_GetPrivateData(surface, &d3d8_private_data_test_guid, &ptr, &size); ok(SUCCEEDED(hr), "Failed to get private data, hr %#x.\n", hr); IUnknown_Release(ptr); - hr = IDirect3DSurface8_FreePrivateData(surface, &IID_IDirect3DVertexBuffer8); + hr = IDirect3DSurface8_FreePrivateData(surface, &d3d8_private_data_test_guid); ok(SUCCEEDED(hr), "Failed to free private data, hr %#x.\n", hr); refcount = get_refcount((IUnknown *)device); - hr = IDirect3DSurface8_SetPrivateData(surface, &IID_IDirect3DSurface8 /* Abuse this tag */, + hr = IDirect3DSurface8_SetPrivateData(surface, &d3d8_private_data_test_guid, device, sizeof(IUnknown *), D3DSPD_IUNKNOWN); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); expected_refcount = refcount + 1; refcount = get_refcount((IUnknown *)device); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); - hr = IDirect3DSurface8_FreePrivateData(surface, &IID_IDirect3DSurface8); + hr = IDirect3DSurface8_FreePrivateData(surface, &d3d8_private_data_test_guid); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); expected_refcount = refcount - 1; refcount = get_refcount((IUnknown *)device); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); - hr = IDirect3DSurface8_SetPrivateData(surface, &IID_IDirect3DSurface8, + hr = IDirect3DSurface8_SetPrivateData(surface, &d3d8_private_data_test_guid, device, sizeof(IUnknown *), D3DSPD_IUNKNOWN); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DSurface8_SetPrivateData(surface, &IID_IDirect3DSurface8, + hr = IDirect3DSurface8_SetPrivateData(surface, &d3d8_private_data_test_guid, surface, sizeof(IUnknown *), D3DSPD_IUNKNOWN); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); refcount = get_refcount((IUnknown *)device); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); - hr = IDirect3DSurface8_SetPrivateData(surface, &IID_IDirect3DSurface8, + hr = IDirect3DSurface8_SetPrivateData(surface, &d3d8_private_data_test_guid, device, sizeof(IUnknown *), D3DSPD_IUNKNOWN); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); size = sizeof(ptr); - hr = IDirect3DSurface8_GetPrivateData(surface, &IID_IDirect3DSurface8, &ptr, &size); + hr = IDirect3DSurface8_GetPrivateData(surface, &d3d8_private_data_test_guid, &ptr, &size); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); expected_refcount = refcount + 2; refcount = get_refcount((IUnknown *)device); @@ -3976,26 +3983,26 @@ static void test_private_data(void) hr = IDirect3DTexture8_GetSurfaceLevel(texture, 1, &surface2); ok(SUCCEEDED(hr), "Failed to get texture level 1, hr %#x.\n", hr); - hr = IDirect3DTexture8_SetPrivateData(texture, &IID_IDirect3DVertexBuffer8, data, sizeof(data), 0); + hr = IDirect3DTexture8_SetPrivateData(texture, &d3d8_private_data_test_guid, data, sizeof(data), 0); ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); memset(data, 0, sizeof(data)); size = sizeof(data); - hr = IDirect3DSurface8_GetPrivateData(surface, &IID_IDirect3DVertexBuffer8, data, &size); + hr = IDirect3DSurface8_GetPrivateData(surface, &d3d8_private_data_test_guid, data, &size); ok(hr == D3DERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DTexture8_GetPrivateData(texture, &IID_IDirect3DVertexBuffer8, data, &size); + hr = IDirect3DTexture8_GetPrivateData(texture, &d3d8_private_data_test_guid, data, &size); ok(SUCCEEDED(hr), "Failed to get private data, hr %#x.\n", hr); ok(data[0] == 1 && data[1] == 2 && data[2] == 3 && data[3] == 4, "Got unexpected private data: %u, %u, %u, %u.\n", data[0], data[1], data[2], data[3]); - hr = IDirect3DTexture8_FreePrivateData(texture, &IID_IDirect3DVertexBuffer8); + hr = IDirect3DTexture8_FreePrivateData(texture, &d3d8_private_data_test_guid); ok(SUCCEEDED(hr), "Failed to free private data, hr %#x.\n", hr); - hr = IDirect3DSurface8_SetPrivateData(surface, &IID_IDirect3DVertexBuffer8, data, sizeof(data), 0); + hr = IDirect3DSurface8_SetPrivateData(surface, &d3d8_private_data_test_guid, data, sizeof(data), 0); ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); - hr = IDirect3DSurface8_GetPrivateData(surface2, &IID_IDirect3DVertexBuffer8, data, &size); + hr = IDirect3DSurface8_GetPrivateData(surface2, &d3d8_private_data_test_guid, data, &size); ok(hr == D3DERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DSurface8_FreePrivateData(surface, &IID_IDirect3DVertexBuffer8); + hr = IDirect3DSurface8_FreePrivateData(surface, &d3d8_private_data_test_guid); ok(SUCCEEDED(hr), "Failed to free private data, hr %#x.\n", hr); IDirect3DSurface8_Release(surface2);

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard March 12, 2014

March 12, 2014

Module: wine Branch: master Commit: 05863c0776a6abf43eba717ad0851eea024a0279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05863c0776a6abf43eba717ad… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Mar 11 16:06:50 2014 +0200 po: Update Ukrainian translation. --- po/uk.po | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/po/uk.po b/po/uk.po index ffdb5ec..0caec06 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-01-17 12:58+0300\n" +"PO-Revision-Date: 2014-03-11 16:05+0300\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: none\n" "Language: Ukrainian\n" @@ -2204,8 +2204,6 @@ msgstr "" "списку анульованих сертифікатів, чи списку довірених сертифікатів:" #: cryptui.rc:299 -#, fuzzy -#| msgid "CMS/PKCS #7 Messages (*.p7b)" msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" msgstr "Повідомлення CMS/PKCS #7 (*.p7b)" @@ -2356,15 +2354,13 @@ msgstr "Виберіть формат, який ви хочете викорис #: cryptui.rc:408 msgid "&DER-encoded X.509 (*.cer)" -msgstr "" +msgstr "X.509 в кодуванні &DER (*.cer)" #: cryptui.rc:410 msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "" +msgstr "X.509 в кодуванні Ba&se64 (*.cer):" #: cryptui.rc:412 -#, fuzzy -#| msgid "CMS/PKCS #7 Messages (*.p7b)" msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" msgstr "Повідомлення CMS/PKCS #7 (*.p7b)" @@ -4865,7 +4861,7 @@ msgstr "Елемент не знайдено.\n" #: winerror.mc:1571 msgid "No match found.\n" -msgstr "Немає співпадіння.\n" +msgstr "Відповідностей не знайдено.\n" #: winerror.mc:1576 msgid "Property set not found.\n" @@ -6588,10 +6584,8 @@ msgid "The username could not be found.\n" msgstr "Ім'я користувача не знайдено.\n" #: winerror.mc:3741 -#, fuzzy -#| msgid "The site does not exist.\n" msgid "This network connection does not exist.\n" -msgstr "Сайт не існує.\n" +msgstr "Цього мережевого з'єднання не існує.\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port" @@ -6824,7 +6818,7 @@ msgstr "" #: msi.rc:60 msgid "enter which folder contains %s" -msgstr "вкажіть папку, що містить %s" +msgstr "вкажіть теку, що містить %s" #: msi.rc:61 msgid "install source for feature missing" @@ -6840,7 +6834,7 @@ msgstr "можливість з:" #: msi.rc:64 msgid "choose which folder contains %s" -msgstr "виберіть папку, що містить %s" +msgstr "виберіть теку, що містить %s" #: msrle32.rc:31 msgid "Wine MS-RLE video codec"

1 0

Nikolay Sivov : msi: Update feature selection bitmaps.
by Alexandre Julliard March 12, 2014

March 12, 2014

Module: wine Branch: master Commit: 29eaebaa34219c6aac70789cb42cebf630ecba8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=29eaebaa34219c6aac70789cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 11 22:15:00 2014 +0400 msi: Update feature selection bitmaps. --- dlls/msi/instabsent.bmp | Bin 374 -> 374 bytes dlls/msi/instadvert.bmp | Bin 374 -> 374 bytes dlls/msi/instlocal.bmp | Bin 374 -> 374 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/dlls/msi/instabsent.bmp b/dlls/msi/instabsent.bmp index 9347961..187ef79 100644 Binary files a/dlls/msi/instabsent.bmp and b/dlls/msi/instabsent.bmp differ diff --git a/dlls/msi/instadvert.bmp b/dlls/msi/instadvert.bmp index 77b530932..95d6754 100644 Binary files a/dlls/msi/instadvert.bmp and b/dlls/msi/instadvert.bmp differ diff --git a/dlls/msi/instlocal.bmp b/dlls/msi/instlocal.bmp index c9591ad..a402f6b 100644 Binary files a/dlls/msi/instlocal.bmp and b/dlls/msi/instlocal.bmp differ

1 0

Stefan Dösinger : wined3d: Correctly handle the size parameter in get_private_data.
by Alexandre Julliard March 12, 2014

March 12, 2014

Module: wine Branch: master Commit: 3754cdd7931ebd078caeba64714a3312dd66b59c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3754cdd7931ebd078caeba647… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 12 14:08:23 2014 +0100 wined3d: Correctly handle the size parameter in get_private_data. --- dlls/wined3d/resource.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 04c3af4..8813af7 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -250,18 +250,21 @@ HRESULT CDECL wined3d_resource_get_private_data(const struct wined3d_resource *r void *data, DWORD *data_size) { const struct private_data *d; + DWORD size_in; TRACE("resource %p, guid %s, data %p, data_size %p.\n", resource, debugstr_guid(guid), data, data_size); d = resource_find_private_data(resource, guid); - if (!d) return WINED3DERR_NOTFOUND; - - if (*data_size < d->size) - { - *data_size = d->size; + if (!d) + return WINED3DERR_NOTFOUND; + + size_in = *data_size; + *data_size = d->size; + if (!data) + return WINED3D_OK; + if (size_in < d->size) return WINED3DERR_MOREDATA; - } if (d->flags & WINED3DSPD_IUNKNOWN) {

1 0

Stefan Dösinger : d3d9/tests: Test GetPrivateData size behavior.
by Alexandre Julliard March 12, 2014

March 12, 2014

Module: wine Branch: master Commit: 2a95fa6831a300569c7a6b6522e21f0db7aa0a5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a95fa6831a300569c7a6b652… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 12 14:08:25 2014 +0100 d3d9/tests: Test GetPrivateData size behavior. --- dlls/d3d9/tests/device.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 393c14a..af5f4d4 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5089,6 +5089,13 @@ static void test_private_data(void) 0x4edf, {0xa3,0x7f,0x9b,0x1d,0xf4,0x88,0xc5,0xfc} }; + static const GUID d3d9_private_data_test_guid2 = + { + 0x2e5afac2, + 0x87b5, + 0x4c10, + {0x9b,0x4b,0x89,0xd7,0xd1,0x12,0xe7,0x2b} + }; window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); @@ -5155,18 +5162,46 @@ static void test_private_data(void) hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, device, sizeof(IUnknown *), D3DSPD_IUNKNOWN); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - size = sizeof(ptr); + size = 2 * sizeof(ptr); hr = IDirect3DSurface9_GetPrivateData(surface, &d3d9_private_data_test_guid, &ptr, &size); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(device), "Got unexpected size %u.\n", size); expected_refcount = refcount + 2; refcount = get_refcount((IUnknown *)device); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); ok(ptr == (IUnknown *)device, "Got unexpected ptr %p, expected %p.\n", ptr, device); IUnknown_Release(ptr); + expected_refcount--; + + ptr = (IUnknown *)0xdeadbeef; + size = 1; + hr = IDirect3DSurface9_GetPrivateData(surface, &d3d9_private_data_test_guid, NULL, &size); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(device), "Got unexpected size %u.\n", size); + size = 2 * sizeof(ptr); + hr = IDirect3DSurface9_GetPrivateData(surface, &d3d9_private_data_test_guid, NULL, &size); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(device), "Got unexpected size %u.\n", size); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + size = 1; + hr = IDirect3DSurface9_GetPrivateData(surface, &d3d9_private_data_test_guid, &ptr, &size); + ok(hr == D3DERR_MOREDATA, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(device), "Got unexpected size %u.\n", size); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + hr = IDirect3DSurface9_GetPrivateData(surface, &d3d9_private_data_test_guid2, NULL, NULL); + ok(hr == D3DERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + size = 0xdeadbabe; + hr = IDirect3DSurface9_GetPrivateData(surface, &d3d9_private_data_test_guid2, &ptr, &size); + ok(hr == D3DERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + ok(size == 0xdeadbabe, "Got unexpected size %u.\n", size); + /* GetPrivateData with size = NULL causes an access violation on Windows if the + * requested data exists. */ /* Destroying the surface frees the held reference. */ IDirect3DSurface9_Release(surface); - expected_refcount = refcount - 3; + expected_refcount = refcount - 2; refcount = get_refcount((IUnknown *)device); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);

1 0