September 2014 - Wine-commits

Piotr Caban : user32/tests: Add cross-process mouse click test.
by Alexandre Julliard 29 Sep '14

29 Sep '14

Module: wine Branch: master Commit: 0b273d279beaa8dd5df387b2c79adfa0d43deed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b273d279beaa8dd5df387b2c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 29 18:03:07 2014 +0200 user32/tests: Add cross-process mouse click test. --- dlls/user32/tests/win.c | 71 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 57 insertions(+), 14 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 1392c9b..ad983df 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7216,12 +7216,45 @@ todo_wine ok(ret, "UnregisterClass(my_window) failed\n"); } +static void simulate_click(int x, int y) +{ + INPUT input[2]; + UINT events_no; + + SetCursorPos(x, y); + memset(input, 0, sizeof(input)); + input[0].type = INPUT_MOUSE; + U(input[0]).mi.dx = x; + U(input[0]).mi.dy = y; + U(input[0]).mi.dwFlags = MOUSEEVENTF_LEFTDOWN; + input[1].type = INPUT_MOUSE; + U(input[1]).mi.dx = x; + U(input[1]).mi.dy = y; + U(input[1]).mi.dwFlags = MOUSEEVENTF_LEFTUP; + events_no = SendInput(2, input, sizeof(input[0])); + ok(events_no == 2, "SendInput returned %d\n", events_no); +} + +static WNDPROC def_static_proc; +static BOOL got_hittest; +static LRESULT WINAPI static_hook_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + if(msg == WM_NCHITTEST) + got_hittest = TRUE; + if(msg == WM_LBUTTONDOWN) + ok(0, "unexpected call\n"); + + return def_static_proc(hwnd, msg, wp, lp); +} + static void window_from_point_proc(HWND parent) { HANDLE start_event, end_event; HANDLE win, child_static, child_button; + BOOL got_click; DWORD ret; POINT pt; + MSG msg; start_event = OpenEventA(EVENT_ALL_ACCESS, FALSE, "test_wfp_start"); ok(start_event != 0, "OpenEvent failed\n"); @@ -7242,8 +7275,28 @@ static void window_from_point_proc(HWND parent) win = WindowFromPoint(pt); ok(win == child_button, "WindowFromPoint returned %p, expected %p\n", win, child_button); + /* without this window simulate click test keeps sending WM_NCHITTEST + * message to child_static in an infinite loop */ + win = CreateWindowExA(0, "button", "button", WS_CHILD | WS_VISIBLE, + 0, 0, 100, 100, parent, 0, NULL, NULL); + ok(win != 0, "CreateWindowEx failed\n"); + def_static_proc = (void*)SetWindowLongPtrA(child_static, + GWLP_WNDPROC, (LONG_PTR)static_hook_proc); + flush_events(TRUE); SetEvent(start_event); + got_hittest = FALSE; + got_click = FALSE; + while(!got_click && wait_for_message(&msg)) { + if(msg.message == WM_LBUTTONUP) { + ok(msg.hwnd == win, "msg.hwnd = %p, expected %p\n", msg.hwnd, win); + got_click = TRUE; + } + DispatchMessageA(&msg); + } + ok(got_hittest, "transparent window didn't get WM_NCHITTEST message\n"); + todo_wine ok(got_click, "button under static window didn't get WM_LBUTTONUP\n"); + ret = WaitForSingleObject(end_event, 5000); ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", ret); @@ -7306,6 +7359,9 @@ static void test_window_from_point(const char *argv0) win = WindowFromPoint(pt); ok(win == child, "WindowFromPoint returned %p, expected %p\n", win, child); + simulate_click(150, 150); + flush_events(TRUE); + child = GetWindow(child, GW_HWNDNEXT); pt.x = 250; win = WindowFromPoint(pt); @@ -7838,20 +7894,7 @@ START_TEST(win) if(!SetForegroundWindow(hwndMain)) { /* workaround for foreground lock timeout */ - INPUT input[2]; - UINT events_no; - - memset(input, 0, sizeof(input)); - input[0].type = INPUT_MOUSE; - U(input[0]).mi.dx = 101; - U(input[0]).mi.dy = 101; - U(input[0]).mi.dwFlags = MOUSEEVENTF_LEFTDOWN; - input[0].type = INPUT_MOUSE; - U(input[0]).mi.dx = 101; - U(input[0]).mi.dy = 101; - U(input[0]).mi.dwFlags = MOUSEEVENTF_LEFTUP; - events_no = SendInput(2, input, sizeof(input[0])); - ok(events_no == 2, "SendInput returned %d\n", events_no); + simulate_click(101, 101); ok(SetForegroundWindow(hwndMain), "SetForegroundWindow failed\n"); }

1 0

Qian Hong : winmm: Also initialize sound device thread in mixerGetControlDetails.
by Alexandre Julliard 29 Sep '14

29 Sep '14

Module: wine Branch: master Commit: b3ebdd904c53231a4f721cf25821da49cf4fbb9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3ebdd904c53231a4f721cf25… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Sep 30 00:25:36 2014 +0800 winmm: Also initialize sound device thread in mixerGetControlDetails. Fixed volume control in EveryonePiano. --- dlls/winmm/waveform.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 6b259ff..8d7f8ad 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -3850,12 +3850,10 @@ UINT WINAPI mixerGetControlDetailsW(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdW DWORD fdwDetails) { WINMM_ControlDetails details; - HRESULT hr; TRACE("(%p, %p, %x)\n", hmix, lpmcdW, fdwDetails); - hr = WINMM_InitMMDevices(); - if(FAILED(hr)) + if(!WINMM_StartDevicesThread()) return MMSYSERR_NODRIVER; if(!lpmcdW || !lpmcdW->paDetails)

1 0

Alistair Leslie-Hughes : dpvoice: Add IDirectPlayVoiceTest stub interface.
by Alexandre Julliard 26 Sep '14

26 Sep '14

Module: wine Branch: master Commit: a192e7f11b6ac34e2173f5677674b4572c9fe0ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=a192e7f11b6ac34e2173f5677… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 26 09:01:15 2014 +1000 dpvoice: Add IDirectPlayVoiceTest stub interface. --- dlls/dpvoice/client.c | 86 +++++++++++++++++++++++++++++++++++++++++++ dlls/dpvoice/dvoice_private.h | 1 + dlls/dpvoice/main.c | 1 + dlls/dpvoice/tests/voice.c | 25 ++++++++++++- 4 files changed, 112 insertions(+), 1 deletion(-) diff --git a/dlls/dpvoice/client.c b/dlls/dpvoice/client.c index 68d631c..0fab0c5 100644 --- a/dlls/dpvoice/client.c +++ b/dlls/dpvoice/client.c @@ -41,11 +41,22 @@ typedef struct IDirectPlayVoiceClientImpl LONG ref; } IDirectPlayVoiceClientImpl; +typedef struct IDirectPlayVoiceTestImpl +{ + IDirectPlayVoiceTest IDirectPlayVoiceTest_iface; + LONG ref; +} IDirectPlayVoiceTestImpl; + static inline IDirectPlayVoiceClientImpl *impl_from_IDirectPlayVoiceClient(IDirectPlayVoiceClient *iface) { return CONTAINING_RECORD(iface, IDirectPlayVoiceClientImpl, IDirectPlayVoiceClient_iface); } +static inline IDirectPlayVoiceTestImpl *impl_from_IDirectPlayVoiceTest(IDirectPlayVoiceTest *iface) +{ + return CONTAINING_RECORD(iface, IDirectPlayVoiceTestImpl, IDirectPlayVoiceTest_iface); +} + static HRESULT WINAPI dpvclient_QueryInterface(IDirectPlayVoiceClient *iface, REFIID riid, void **ppv) { if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectPlayVoiceClient)) @@ -232,3 +243,78 @@ HRESULT DPVOICE_CreateDirectPlayVoiceClient(IClassFactory *iface, IUnknown *pUnk return ret; } + +static HRESULT WINAPI dpvtest_QueryInterface(IDirectPlayVoiceTest *iface, REFIID riid, void **ppv) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectPlayVoiceTest)) + { + IUnknown_AddRef(iface); + *ppv = iface; + return S_OK; + } + + WARN("(%p)->(%s,%p),not found\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI dpvtest_AddRef(IDirectPlayVoiceTest *iface) +{ + IDirectPlayVoiceTestImpl *This = impl_from_IDirectPlayVoiceTest(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI dpvtest_Release(IDirectPlayVoiceTest *iface) +{ + IDirectPlayVoiceTestImpl *This = impl_from_IDirectPlayVoiceTest(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + return ref; +} + +static HRESULT WINAPI dpvtest_CheckAudioSetup(IDirectPlayVoiceTest *iface, const GUID *pguidPlaybackDevice, const GUID *pguidCaptureDevice, + HWND hwndParent, DWORD dwFlags) +{ + IDirectPlayVoiceTestImpl *This = impl_from_IDirectPlayVoiceTest(iface); + FIXME("%p %p %p %p %d\n", This, pguidPlaybackDevice, pguidCaptureDevice, hwndParent, dwFlags); + return E_NOTIMPL; +} + +static const IDirectPlayVoiceTestVtbl DirectPlayVoiceTest_Vtbl = +{ + dpvtest_QueryInterface, + dpvtest_AddRef, + dpvtest_Release, + dpvtest_CheckAudioSetup +}; + +HRESULT DPVOICE_CreateDirectPlayVoiceTest(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) +{ + IDirectPlayVoiceTestImpl* test; + HRESULT ret; + + TRACE("(%p, %s, %p)\n", pUnkOuter, debugstr_guid(riid), ppobj); + + *ppobj = NULL; + + test = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlayVoiceTestImpl)); + if (!test) + return E_OUTOFMEMORY; + + test->IDirectPlayVoiceTest_iface.lpVtbl = &DirectPlayVoiceTest_Vtbl; + test->ref = 1; + + ret = IDirectPlayVoiceTest_QueryInterface(&test->IDirectPlayVoiceTest_iface, riid, ppobj); + IDirectPlayVoiceTest_Release(&test->IDirectPlayVoiceTest_iface); + + return ret; +} diff --git a/dlls/dpvoice/dvoice_private.h b/dlls/dpvoice/dvoice_private.h index 0ee2658..5b0e57d 100644 --- a/dlls/dpvoice/dvoice_private.h +++ b/dlls/dpvoice/dvoice_private.h @@ -22,5 +22,6 @@ extern HRESULT DPVOICE_CreateDirectPlayVoiceClient(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) DECLSPEC_HIDDEN; extern HRESULT DPVOICE_CreateDirectPlayVoiceServer(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) DECLSPEC_HIDDEN; +extern HRESULT DPVOICE_CreateDirectPlayVoiceTest(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) DECLSPEC_HIDDEN; #endif diff --git a/dlls/dpvoice/main.c b/dlls/dpvoice/main.c index 608d1cd..aab0859 100644 --- a/dlls/dpvoice/main.c +++ b/dlls/dpvoice/main.c @@ -96,6 +96,7 @@ static IClassFactoryImpl DPVOICE_CFS[] = { { { &DICF_Vtbl }, 1, &CLSID_DirectPlayVoiceClient, DPVOICE_CreateDirectPlayVoiceClient }, { { &DICF_Vtbl }, 1, &CLSID_DirectPlayVoiceServer, DPVOICE_CreateDirectPlayVoiceServer }, + { { &DICF_Vtbl }, 1, &CLSID_DirectPlayVoiceTest, DPVOICE_CreateDirectPlayVoiceTest }, { { NULL }, 0, NULL, NULL } }; diff --git a/dlls/dpvoice/tests/voice.c b/dlls/dpvoice/tests/voice.c index 4d950bd..883c684 100644 --- a/dlls/dpvoice/tests/voice.c +++ b/dlls/dpvoice/tests/voice.c @@ -239,7 +239,7 @@ static BOOL test_init_dpvoice_client(void) /* See if we can get the default values from the registry and try again. */ hr = CoCreateInstance(&CLSID_DirectPlayVoiceTest, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlayVoiceTest, (void **)&voicetest); - todo_wine ok(hr == S_OK, "CoCreateInstance failed with 0x%08x\n", hr); + ok(hr == S_OK, "CoCreateInstance failed with 0x%08x\n", hr); if(hr == S_OK) { hr = IDirectPlayVoiceTest_CheckAudioSetup(voicetest, &DSDEVID_DefaultVoicePlayback, &DSDEVID_DefaultVoiceCapture, @@ -322,6 +322,27 @@ static void test_cleanup_dpvoice(void) } } +static void create_voicetest(void) +{ + HRESULT hr; + IDirectPlayVoiceTest *voicetest; + + hr = CoCreateInstance(&CLSID_DirectPlayVoiceTest, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlayVoiceTest, (void **)&voicetest); + if(hr == S_OK) + { + hr = IDirectPlayVoiceTest_CheckAudioSetup(voicetest, &DSDEVID_DefaultVoicePlayback, &DSDEVID_DefaultVoiceCapture, + NULL, DVFLAGS_QUERYONLY); + todo_wine ok(hr == S_OK || hr == DVERR_RUNSETUP, "CheckAudioSetup failed with 0x%08x\n", hr); + + IDirectPlayVoiceTest_Release(voicetest); + } + else + { + /* Everything after Windows XP doesnt have dpvoice installed. */ + win_skip("IDirectPlayVoiceClient not supported on thie platform\n"); + } +} + START_TEST(voice) { HRESULT hr; @@ -331,6 +352,8 @@ START_TEST(voice) if(hr != S_OK) return; + create_voicetest(); + if(test_init_dpvoice_server() && test_init_dpvoice_client()) { /* TODO */

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Address AddComponent.
by Alexandre Julliard 26 Sep '14

26 Sep '14

Module: wine Branch: master Commit: 9a5a5a365e589434241ad17e200397bea5deff96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a5a5a365e589434241ad17e2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 11 09:02:56 2014 +1000 dpnet: Implement IDirectPlay8Address AddComponent. --- dlls/dpnet/address.c | 165 ++++++++++++++++++++++++++++++++++++++------- dlls/dpnet/dpnet_private.h | 30 +++++++-- dlls/dpnet/tests/address.c | 105 +++++++++++++++++++++++++++++ 3 files changed, 269 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a5a5a365e589434241ad…

1 0

Alistair Leslie-Hughes : dpnet: Show SetSP adds a component.
by Alexandre Julliard 26 Sep '14

26 Sep '14

Module: wine Branch: master Commit: f23b46464e074665af54cf4cee98427f2900fde6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f23b46464e074665af54cf4ce… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 26 13:28:53 2014 +1000 dpnet: Show SetSP adds a component. --- dlls/dpnet/address.c | 3 +++ dlls/dpnet/tests/address.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 6add842..2cea1ea 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -259,6 +259,9 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_SetSP(IDirectPlay8Address *iface, This->init = TRUE; This->SP_guid = *pguidSP; + + IDirectPlay8Address_AddComponent(iface, DPNA_KEY_PROVIDER, &This->SP_guid, sizeof(GUID), DPNA_DATATYPE_GUID); + return DPN_OK; } diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index 2d38d8c..4d825bb 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -171,6 +171,49 @@ static void address_addcomponents(void) } } +static void address_setsp(void) +{ + HRESULT hr; + IDirectPlay8Address *localaddr = NULL; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&localaddr); + ok(hr == S_OK, "Failed to create IDirectPlay8Address object\n"); + if(SUCCEEDED(hr)) + { + DWORD components; + WCHAR *name; + GUID guid = IID_Random; + DWORD type; + DWORD namelen = 0; + DWORD bufflen = 0; + + hr = IDirectPlay8Address_GetNumComponents(localaddr, &components); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(components == 0, "components=%d", components); + + hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetNumComponents(localaddr, &components); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(components == 1, "components=%d", components); + + hr = IDirectPlay8Address_GetComponentByIndex(localaddr, 0, NULL, &namelen, NULL, &bufflen, &type); + todo_wine ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + + name = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, namelen * sizeof(WCHAR)); + + hr = IDirectPlay8Address_GetComponentByIndex(localaddr, 0, name, &namelen, (void*)&guid, &bufflen, &type); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(type == DPNA_DATATYPE_GUID, "wrong datatype: %d\n", type); + todo_wine ok(IsEqualGUID(&guid, &CLSID_DP8SP_TCPIP), "wrong guid\n"); + + HeapFree(GetProcessHeap(), 0, name); + + IDirectPlay8Address_Release(localaddr); + } +} + START_TEST(address) { HRESULT hr; @@ -182,6 +225,7 @@ START_TEST(address) create_directplay_address(); address_addcomponents(); + address_setsp(); CoUninitialize(); }

1 0

Johannes Brandstätter : d3d10core: Add support for map_type flags D3D10_MAP_READ, D3D10_MAP_WRITE_NO_OVERWRITE and D3D10_MAP_DISCARD.
by Alexandre Julliard 26 Sep '14

26 Sep '14

Module: wine Branch: master Commit: db2e44a9bc428f82391629e7084816e43784f8cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=db2e44a9bc428f82391629e70… Author: Johannes Brandstätter <jbrandst(a)2ds.eu> Date: Thu Sep 25 17:18:40 2014 +0200 d3d10core: Add support for map_type flags D3D10_MAP_READ, D3D10_MAP_WRITE_NO_OVERWRITE and D3D10_MAP_DISCARD. --- dlls/d3d10core/buffer.c | 5 ++--- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/texture.c | 8 ++------ dlls/d3d10core/utils.c | 22 ++++++++++++++++++++++ 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c index b9ac6e1..c5d851e 100644 --- a/dlls/d3d10core/buffer.c +++ b/dlls/d3d10core/buffer.c @@ -154,12 +154,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_Map(ID3D10Buffer *iface, D3D10_MAP TRACE("iface %p, map_type %u, map_flags %#x, data %p.\n", iface, map_type, map_flags, data); - if (map_type != D3D10_MAP_READ_WRITE) - FIXME("Ignoring map_type %#x.\n", map_type); if (map_flags) FIXME("Ignoring map_flags %#x.\n", map_flags); - return wined3d_buffer_map(buffer->wined3d_buffer, 0, 0, (BYTE **)data, 0); + return wined3d_buffer_map(buffer->wined3d_buffer, 0, 0, (BYTE **)data, + wined3d_map_flags_from_d3d10_map_type(map_type)); } static void STDMETHODCALLTYPE d3d10_buffer_Unmap(ID3D10Buffer *iface) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 71c4dc0..30ae928 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -63,6 +63,7 @@ DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSP enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; DWORD wined3d_usage_from_d3d10core(UINT bind_flags, enum D3D10_USAGE usage) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_resource_from_resource(ID3D10Resource *resource) DECLSPEC_HIDDEN; +DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) DECLSPEC_HIDDEN; static inline void read_dword(const char **ptr, DWORD *d) { diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index b488f91..5e112dd 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -176,15 +176,13 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture2d_Map(ID3D10Texture2D *iface, UIN TRACE("iface %p, sub_resource_idx %u, map_type %u, map_flags %#x, mapped_texture %p.\n", iface, sub_resource_idx, map_type, map_flags, mapped_texture); - if (map_type != D3D10_MAP_READ_WRITE) - FIXME("Ignoring map_type %#x.\n", map_type); if (map_flags) FIXME("Ignoring map_flags %#x.\n", map_flags); if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx))) hr = E_INVALIDARG; else if (SUCCEEDED(hr = wined3d_surface_map(wined3d_surface_from_resource(sub_resource), - &wined3d_map_desc, NULL, 0))) + &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d10_map_type(map_type)))) { mapped_texture->pData = wined3d_map_desc.data; mapped_texture->RowPitch = wined3d_map_desc.row_pitch; @@ -451,15 +449,13 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UIN TRACE("iface %p, sub_resource_idx %u, map_type %u, map_flags %#x, mapped_texture %p.\n", iface, sub_resource_idx, map_type, map_flags, mapped_texture); - if (map_type != D3D10_MAP_READ_WRITE) - FIXME("Ignoring map_type %#x.\n", map_type); if (map_flags) FIXME("Ignoring map_flags %#x.\n", map_flags); if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx))) hr = E_INVALIDARG; else if (SUCCEEDED(hr = wined3d_volume_map(wined3d_volume_from_resource(sub_resource), - &wined3d_map_desc, NULL, 0))) + &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d10_map_type(map_type)))) { mapped_texture->pData = wined3d_map_desc.data; mapped_texture->RowPitch = wined3d_map_desc.row_pitch; diff --git a/dlls/d3d10core/utils.c b/dlls/d3d10core/utils.c index d955fbb..91eda6d 100644 --- a/dlls/d3d10core/utils.c +++ b/dlls/d3d10core/utils.c @@ -389,6 +389,28 @@ struct wined3d_resource *wined3d_resource_from_resource(ID3D10Resource *resource } } +DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) +{ + switch (map_type) + { + case D3D10_MAP_READ_WRITE: + return 0; + + case D3D10_MAP_READ: + return WINED3D_MAP_READONLY; + + case D3D10_MAP_WRITE_DISCARD: + return WINED3D_MAP_DISCARD; + + case D3D10_MAP_WRITE_NO_OVERWRITE: + return WINED3D_MAP_NOOVERWRITE; + + default: + FIXME("Unhandled map_type %#x.\n", map_type); + return 0; + } +} + void skip_dword_unknown(const char **ptr, unsigned int count) { unsigned int i;

1 0

Nikolay Sivov : dwrite: Implement GetScriptProperties().
by Alexandre Julliard 26 Sep '14

26 Sep '14

Module: wine Branch: master Commit: 59bdda006bc06cb6f3bc707eaec31a4b46f7e3a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59bdda006bc06cb6f3bc707ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 26 10:21:27 2014 +0400 dwrite: Implement GetScriptProperties(). --- dlls/dwrite/analyzer.c | 151 +++++++++++++++++++++++++++++++++++++++++-- dlls/dwrite/scripts.h | 3 +- dlls/dwrite/tests/analyzer.c | 33 ++++++++++ tools/make_unicode | 12 ++-- 4 files changed, 186 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59bdda006bc06cb6f3bc7…

1 0

Nikolay Sivov : dwrite: Implement GetTextComplexity().
by Alexandre Julliard 26 Sep '14

26 Sep '14

Module: wine Branch: master Commit: 7eac1f71568855f1d627410a27dd5a96804a04ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eac1f71568855f1d627410a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 26 12:54:02 2014 +0400 dwrite: Implement GetTextComplexity(). --- dlls/dwrite/analyzer.c | 54 +++++++++++++++++++- dlls/dwrite/tests/analyzer.c | 114 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 165 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index f9e3c11..46e3769 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -830,11 +830,61 @@ static HRESULT WINAPI dwritetextanalyzer1_GetScriptProperties(IDWriteTextAnalyze return S_OK; } +static inline BOOL is_char_from_simple_script(WCHAR c) +{ + if (IS_HIGH_SURROGATE(c) || IS_LOW_SURROGATE(c)) + return FALSE; + else { + UINT16 script = get_char_script(c); + return !dwritescripts_properties[script].is_complex; + } +} + static HRESULT WINAPI dwritetextanalyzer1_GetTextComplexity(IDWriteTextAnalyzer2 *iface, const WCHAR *text, UINT32 len, IDWriteFontFace *face, BOOL *is_simple, UINT32 *len_read, UINT16 *indices) { - FIXME("(%s:%u %p %p %p %p): stub\n", debugstr_wn(text, len), len, face, is_simple, len_read, indices); - return E_NOTIMPL; + HRESULT hr = S_OK; + int i; + + TRACE("(%s:%u %p %p %p %p)\n", debugstr_wn(text, len), len, face, is_simple, len_read, indices); + + *is_simple = FALSE; + *len_read = 0; + + if (!face) + return E_INVALIDARG; + + if (len == 0) { + *is_simple = TRUE; + return S_OK; + } + + *is_simple = text[0] && is_char_from_simple_script(text[0]); + for (i = 1; i < len && text[i]; i++) { + if (is_char_from_simple_script(text[i])) { + if (!*is_simple) + break; + } + else + *is_simple = FALSE; + } + + *len_read = i; + + /* fetch indices */ + if (*is_simple && indices) { + UINT32 *codepoints = heap_alloc(*len_read*sizeof(UINT32)); + if (!codepoints) + return E_OUTOFMEMORY; + + for (i = 0; i < *len_read; i++) + codepoints[i] = text[i]; + + hr = IDWriteFontFace_GetGlyphIndices(face, codepoints, *len_read, indices); + heap_free(codepoints); + } + + return hr; } static HRESULT WINAPI dwritetextanalyzer1_GetJustificationOpportunities(IDWriteTextAnalyzer2 *iface, diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 490165f..45e2e07 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -922,7 +922,7 @@ static void test_GetScriptProperties(void) hr = IDWriteTextAnalyzer_QueryInterface(analyzer, &IID_IDWriteTextAnalyzer1, (void**)&analyzer1); IDWriteTextAnalyzer_Release(analyzer); if (hr != S_OK) { - win_skip("IDWriteTextAnalyzer1 is not supported.\n"); + win_skip("GetScriptProperties() is not supported.\n"); return; } @@ -940,6 +940,117 @@ if (0) /* crashes on native */ IDWriteTextAnalyzer1_Release(analyzer1); } +struct textcomplexity_test { + const WCHAR text[5]; + UINT32 length; + BOOL simple; + UINT32 len_read; +}; + +static const struct textcomplexity_test textcomplexity_tests[] = { + { {0}, 1, FALSE, 1 }, + { {0}, 0, TRUE, 0 }, + { {0x610,0}, 0, TRUE, 0 }, + { {'A','B','C','D',0}, 3, TRUE, 3 }, + { {'A','B','C','D',0}, 5, TRUE, 4 }, + { {'A','B','C','D',0}, 10, TRUE, 4 }, + { {'A',0x610,'C','D',0}, 1, TRUE, 1 }, + { {'A',0x610,'C','D',0}, 2, FALSE, 2 }, + { {0x610,'A','C','D',0}, 1, FALSE, 1 }, + { {0x610,'A','C','D',0}, 2, FALSE, 1 }, + { {0x610,0x610,'C','D',0}, 2, FALSE, 2 }, + { {0xd800,'A','B',0}, 1, FALSE, 1 }, + { {0xd800,'A','B',0}, 2, FALSE, 1 }, + { {0xdc00,'A','B',0}, 2, FALSE, 1 } +}; + +static void test_GetTextComplexity(void) +{ + static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; + static const WCHAR textW[] = {'A','B','C',0}; + IDWriteTextAnalyzer1 *analyzer1; + IDWriteTextAnalyzer *analyzer; + IDWriteGdiInterop *interop; + IDWriteFontFace *fontface; + UINT16 indices[10]; + IDWriteFont *font; + LOGFONTW logfont; + BOOL simple; + HRESULT hr; + UINT32 len; + int i; + + hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextAnalyzer_QueryInterface(analyzer, &IID_IDWriteTextAnalyzer1, (void**)&analyzer1); + IDWriteTextAnalyzer_Release(analyzer); + if (hr != S_OK) { + win_skip("GetTextComplexity() is not supported.\n"); + return; + } + +if (0) { /* crashes on native */ + hr = IDWriteTextAnalyzer1_GetTextComplexity(analyzer1, NULL, 0, NULL, NULL, NULL, NULL); + hr = IDWriteTextAnalyzer1_GetTextComplexity(analyzer1, NULL, 0, NULL, NULL, &len, NULL); + hr = IDWriteTextAnalyzer1_GetTextComplexity(analyzer1, textW, 3, NULL, NULL, NULL, NULL); + hr = IDWriteTextAnalyzer1_GetTextComplexity(analyzer1, textW, 3, NULL, NULL, &len, NULL); + hr = IDWriteTextAnalyzer1_GetTextComplexity(analyzer1, textW, 3, NULL, &simple, NULL, NULL); +} + + len = 1; + simple = TRUE; + hr = IDWriteTextAnalyzer1_GetTextComplexity(analyzer1, NULL, 0, NULL, &simple, &len, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(len == 0, "got %d\n", len); + ok(simple == FALSE, "got %d\n", simple); + + len = 1; + simple = TRUE; + indices[0] = 1; + hr = IDWriteTextAnalyzer1_GetTextComplexity(analyzer1, textW, 3, NULL, &simple, &len, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(len == 0, "got %d\n", len); + ok(simple == FALSE, "got %d\n", simple); + ok(indices[0] == 1, "got %d\n", indices[0]); + + /* so font face is required, create one */ + hr = IDWriteFactory_GetGdiInterop(factory, &interop); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfWeight = FW_NORMAL; + logfont.lfItalic = 1; + lstrcpyW(logfont.lfFaceName, tahomaW); + + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + for (i = 0; i < sizeof(textcomplexity_tests)/sizeof(struct textcomplexity_test); i++) { + const struct textcomplexity_test *ptr = &textcomplexity_tests[i]; + len = 1; + simple = !ptr->simple; + indices[0] = 0; + hr = IDWriteTextAnalyzer1_GetTextComplexity(analyzer1, ptr->text, ptr->length, fontface, &simple, &len, indices); + ok(hr == S_OK, "%d: got 0x%08x\n", i, hr); + ok(len == ptr->len_read, "%d: read length: got %d, expected %d\n", i, len, ptr->len_read); + ok(simple == ptr->simple, "%d: simple: got %d, expected %d\n", i, simple, ptr->simple); + if (simple && ptr->length) + ok(indices[0] > 0, "%d: got %d\n", i, indices[0]); + else + ok(indices[0] == 0, "%d: got %d\n", i, indices[0]); + } + + IDWriteFontFace_Release(fontface); + IDWriteGdiInterop_Release(interop); + IDWriteTextAnalyzer1_Release(analyzer1); +} + START_TEST(analyzer) { HRESULT hr; @@ -958,6 +1069,7 @@ START_TEST(analyzer) test_AnalyzeScript(); test_AnalyzeLineBreakpoints(); test_GetScriptProperties(); + test_GetTextComplexity(); IDWriteFactory_Release(factory); }

1 0

Hao Peng : mshtml: Add IHTMLAnchorElement::search propertyimplementation.
by Alexandre Julliard 26 Sep '14

26 Sep '14

Module: wine Branch: master Commit: 268b22e5e8b801ddefe3d1fae9e175fa166099c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=268b22e5e8b801ddefe3d1fae… Author: Hao Peng <penghao(a)linuxdeepin.com> Date: Thu Sep 25 15:51:39 2014 +0800 mshtml: Add IHTMLAnchorElement::search propertyimplementation. --- dlls/mshtml/htmlanchor.c | 24 +++++++++++++++++++---- dlls/mshtml/tests/dom.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 3057f35..84f4098 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -479,15 +479,31 @@ static HRESULT WINAPI HTMLAnchorElement_get_protocol(IHTMLAnchorElement *iface, static HRESULT WINAPI HTMLAnchorElement_put_search(IHTMLAnchorElement *iface, BSTR v) { HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLAnchorElement_SetSearch(This->nsanchor, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) + return E_FAIL; + + return S_OK; } static HRESULT WINAPI HTMLAnchorElement_get_search(IHTMLAnchorElement *iface, BSTR *p) { HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString search_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&search_str, NULL); + nsres = nsIDOMHTMLAnchorElement_GetSearch(This->nsanchor, &search_str); + return return_nsstr(nsres, &search_str, p); } static HRESULT WINAPI HTMLAnchorElement_put_hash(IHTMLAnchorElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4dc89e0..4f69e7a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1479,6 +1479,37 @@ static void _test_anchor_hostname(unsigned line, IUnknown *unk, const char *host SysFreeString(str); } +#define test_anchor_search(a,h,n) _test_anchor_search(__LINE__,a,h,n) +static void _test_anchor_search(unsigned line, IUnknown *elem, const char *search, BOOL allowbroken) +{ + IHTMLAnchorElement *anchor = _get_anchor_iface(line, elem); + BSTR str; + HRESULT hres; + + hres = IHTMLAnchorElement_get_search(anchor, &str); + ok_(__FILE__,line)(hres == S_OK, "get_search failed: %08x\n", hres); + if ( ! str && allowbroken) + win_skip("skip ie6 incorrect behavior\n"); + else if(search) + ok_(__FILE__,line)(!strcmp_wa(str, search), "search = %s, expected %s\n", wine_dbgstr_w(str), search); + else + ok_(__FILE__,line)(!str, "search = %s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + +#define test_anchor_put_search(a,h) _test_anchor_put_search(__LINE__,a,h) +static void _test_anchor_put_search(unsigned line, IUnknown *unk, const char *search) +{ + IHTMLAnchorElement *anchor = _get_anchor_iface(line, unk); + BSTR str; + HRESULT hres; + + str = search ? a2bstr(search) : NULL; + hres = IHTMLAnchorElement_put_search(anchor, str); + ok_(__FILE__,line)(hres == S_OK, "put_search failed: %08x\n", hres); + SysFreeString(str); +} + #define test_anchor_hash(a,h) _test_anchor_hash(__LINE__,a,h) static void _test_anchor_hash(unsigned line, IHTMLElement *elem, const char *exhash) { @@ -7331,8 +7362,25 @@ static void test_elems(IHTMLDocument2 *doc) test_anchor_put_name((IUnknown*)elem, NULL); test_anchor_put_name((IUnknown*)elem, "x"); - test_anchor_put_href((IUnknown*)elem, "http://test/#hash"); + test_anchor_put_href((IUnknown*)elem, "http://test/?how#hash"); test_anchor_hash(elem, "#hash"); + test_anchor_search((IUnknown*)elem, "?how", FALSE); + + test_anchor_put_search((IUnknown*)elem, "?word=press"); + test_anchor_search((IUnknown*)elem, "?word=press", FALSE); + test_anchor_put_search((IUnknown*)elem, "?????word???press"); + test_anchor_search((IUnknown*)elem, "?????word???press", FALSE); + + test_anchor_put_search((IUnknown*)elem, "?q=\%E4\%BD\%A0\%E5\%A5\%BD"); /* encoded cjk characters */ + test_anchor_search((IUnknown*)elem, "?q=\%E4\%BD\%A0\%E5\%A5\%BD", FALSE); + + test_anchor_put_search((IUnknown*)elem, "?how?old=are"); + test_anchor_search((IUnknown*)elem, "?how?old=are", FALSE); + + /* due to incorrect behavior of ie6, search string without leading "?" is interpreted + as part of the pathname, and can not be accessed by get_search. */ + test_anchor_put_search((IUnknown*)elem, "word=abc"); + test_anchor_search((IUnknown*)elem, "?word=abc", TRUE); IHTMLElement_Release(elem); }

1 0

Jacek Caban : mshtml: Don't share nsimg reference with nsnode.
by Alexandre Julliard 26 Sep '14

26 Sep '14

Module: wine Branch: master Commit: 23fc0dc8e854cbebc9e1b77eebf90974eb82739d URL: http://source.winehq.org/git/wine.git/?a=commit;h=23fc0dc8e854cbebc9e1b77ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 26 15:11:28 2014 +0200 mshtml: Don't share nsimg reference with nsnode. --- dlls/mshtml/htmlimg.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 8c1d324..57eaa7e 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -686,6 +686,26 @@ static HRESULT HTMLImgElement_get_readystate(HTMLDOMNode *iface, BSTR *p) return IHTMLImgElement_get_readyState(&This->IHTMLImgElement_iface, p); } +static void HTMLImgElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLImgElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsimg) + note_cc_edge((nsISupports*)This->nsimg, "This->nsimg", cb); +} + +static void HTMLImgElement_unlink(HTMLDOMNode *iface) +{ + HTMLImgElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsimg) { + nsIDOMHTMLImageElement *nsimg = This->nsimg; + + This->nsimg = NULL; + nsIDOMHTMLImageElement_Release(nsimg); + } +} + static const NodeImplVtbl HTMLImgElementImplVtbl = { HTMLImgElement_QI, HTMLElement_destructor, @@ -698,7 +718,12 @@ static const NodeImplVtbl HTMLImgElementImplVtbl = { NULL, NULL, NULL, - HTMLImgElement_get_readystate + HTMLImgElement_get_readystate, + NULL, + NULL, + NULL, + HTMLImgElement_traverse, + HTMLImgElement_unlink }; static const tid_t HTMLImgElement_iface_tids[] = { @@ -728,10 +753,7 @@ HRESULT HTMLImgElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLElement_Init(&ret->element, doc, nselem, &HTMLImgElement_dispex); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLImageElement, (void**)&ret->nsimg); - - /* Share nsimg reference with nsnode */ - assert(nsres == NS_OK && (nsIDOMNode*)ret->nsimg == ret->element.node.nsnode); - nsIDOMNode_Release(ret->element.node.nsnode); + assert(nsres == NS_OK); *elem = &ret->element; return S_OK;

1 0