wine-commits March 2014

wine-commits@winehq.org

2 participants
530 discussions

Nikolay Sivov : user32/tests: Properly maintain clipboard viewers chain.
by Alexandre Julliard 07 Mar '14

07 Mar '14

Module: wine Branch: master Commit: 83367e874cc65d22fa5f30b2e3512c011818125f URL: http://source.winehq.org/git/wine.git/?a=commit;h=83367e874cc65d22fa5f30b2e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 7 14:30:56 2014 +0400 user32/tests: Properly maintain clipboard viewers chain. Without this CloseClipboard() will crash on Windows 8 if executed after test_messages(). --- dlls/user32/tests/clipboard.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index d9ebb23..40218be 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -270,6 +270,7 @@ static void test_synthesized(void) } static CRITICAL_SECTION clipboard_cs; +static HWND next_wnd; static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { switch(msg) { @@ -277,7 +278,14 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA EnterCriticalSection(&clipboard_cs); LeaveCriticalSection(&clipboard_cs); break; + case WM_CHANGECBCHAIN: + if (next_wnd == (HWND)wp) + next_wnd = (HWND)lp; + else if (next_wnd) + SendMessageA(next_wnd, msg, wp, lp); + break; case WM_USER: + ChangeClipboardChain(hwnd, next_wnd); PostQuitMessage(0); break; } @@ -292,7 +300,7 @@ static DWORD WINAPI clipboard_thread(void *param) EnterCriticalSection(&clipboard_cs); SetLastError(0xdeadbeef); - SetClipboardViewer(win); + next_wnd = SetClipboardViewer(win); ok(GetLastError() == 0xdeadbeef, "GetLastError = %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs);

1 0

Henri Verbeet : d3dx9: Use a 1x1x1 unit box in D3DXCreateBox().
by Alexandre Julliard 07 Mar '14

07 Mar '14

Module: wine Branch: master Commit: c91c8ca92d8e28fef9a644e65b2395ce2fae4ecb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c91c8ca92d8e28fef9a644e65… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 7 11:17:15 2014 +0100 d3dx9: Use a 1x1x1 unit box in D3DXCreateBox(). --- dlls/d3dx9_36/mesh.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index cc3576c..1a2b020 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -4542,12 +4542,12 @@ HRESULT WINAPI D3DXCreateBox(struct IDirect3DDevice9 *device, float width, float unsigned int i, face; static const D3DXVECTOR3 unit_box[] = { - {-1.0f, -1.0f, -1.0f}, {-1.0f, -1.0f, 1.0f}, {-1.0f, 1.0f, 1.0f}, {-1.0f, 1.0f, -1.0f}, - {-1.0f, 1.0f, -1.0f}, {-1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, -1.0f}, - { 1.0f, 1.0f, -1.0f}, { 1.0f, 1.0f, 1.0f}, { 1.0f, -1.0f, 1.0f}, { 1.0f, -1.0f, -1.0f}, - {-1.0f, -1.0f, 1.0f}, {-1.0f, -1.0f, -1.0f}, { 1.0f, -1.0f, -1.0f}, { 1.0f, -1.0f, 1.0f}, - {-1.0f, -1.0f, 1.0f}, { 1.0f, -1.0f, 1.0f}, { 1.0f, 1.0f, 1.0f}, {-1.0f, 1.0f, 1.0f}, - {-1.0f, -1.0f, -1.0f}, {-1.0f, 1.0f, -1.0f}, { 1.0f, 1.0f, -1.0f}, { 1.0f, -1.0f, -1.0f} + {-0.5f, -0.5f, -0.5f}, {-0.5f, -0.5f, 0.5f}, {-0.5f, 0.5f, 0.5f}, {-0.5f, 0.5f, -0.5f}, + {-0.5f, 0.5f, -0.5f}, {-0.5f, 0.5f, 0.5f}, { 0.5f, 0.5f, 0.5f}, { 0.5f, 0.5f, -0.5f}, + { 0.5f, 0.5f, -0.5f}, { 0.5f, 0.5f, 0.5f}, { 0.5f, -0.5f, 0.5f}, { 0.5f, -0.5f, -0.5f}, + {-0.5f, -0.5f, 0.5f}, {-0.5f, -0.5f, -0.5f}, { 0.5f, -0.5f, -0.5f}, { 0.5f, -0.5f, 0.5f}, + {-0.5f, -0.5f, 0.5f}, { 0.5f, -0.5f, 0.5f}, { 0.5f, 0.5f, 0.5f}, {-0.5f, 0.5f, 0.5f}, + {-0.5f, -0.5f, -0.5f}, {-0.5f, 0.5f, -0.5f}, { 0.5f, 0.5f, -0.5f}, { 0.5f, -0.5f, -0.5f} }; static const D3DXVECTOR3 normals[] = { @@ -4587,10 +4587,6 @@ HRESULT WINAPI D3DXCreateBox(struct IDirect3DDevice9 *device, float width, float return hr; } - width /= 2.0f; - height /= 2.0f; - depth /= 2.0f; - for (i = 0; i < 24; i++) { vertices[i].position.x = width * unit_box[i].x;

1 0

Henri Verbeet : d3d8/tests: Handle failure to create a device in the stateblock tests with skip().
by Alexandre Julliard 07 Mar '14

07 Mar '14

Module: wine Branch: master Commit: b0de8d88913d3002f95121272b57e6bcbd869cde URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0de8d88913d3002f95121272… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 7 11:17:14 2014 +0100 d3d8/tests: Handle failure to create a device in the stateblock tests with skip(). --- dlls/d3d8/tests/stateblock.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c index acb4e08..979cf4e 100644 --- a/dlls/d3d8/tests/stateblock.c +++ b/dlls/d3d8/tests/stateblock.c @@ -33,13 +33,12 @@ static HWND create_window(void) return CreateWindowA("d3d8_test_wc", "d3d8_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); } -static IDirect3DDevice8 *init_d3d8(D3DPRESENT_PARAMETERS *present_parameters) +static IDirect3DDevice8 *create_device(D3DPRESENT_PARAMETERS *present_parameters) { IDirect3DDevice8 *device; D3DDISPLAYMODE d3ddm; IDirect3D8 *d3d8; HWND window; - HRESULT hr; if (!(d3d8 = Direct3DCreate8(D3D_SDK_VERSION))) { @@ -55,11 +54,8 @@ static IDirect3DDevice8 *init_d3d8(D3DPRESENT_PARAMETERS *present_parameters) present_parameters->SwapEffect = D3DSWAPEFFECT_DISCARD; present_parameters->BackBufferFormat = d3ddm.Format; - hr = IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, - D3DCREATE_SOFTWARE_VERTEXPROCESSING, present_parameters, &device); - ok(SUCCEEDED(hr) || hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), - "IDirect3D8_CreateDevice failed, hr %#x.\n", hr); - if (SUCCEEDED(hr)) + if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, present_parameters, &device))) return device; return NULL; @@ -2050,8 +2046,11 @@ START_TEST(stateblock) IDirect3DDevice8 *device; ULONG refcount; - if (!(device = init_d3d8(&device_pparams))) + if (!(device = create_device(&device_pparams))) + { + skip("Failed to create a 3D device, skipping test.\n"); return; + } test_begin_end_state_block(device); test_state_management(device, &device_pparams);

1 0

Henri Verbeet : d3d9/tests: Handle failure to create a device in the stateblock tests with skip().
by Alexandre Julliard 07 Mar '14

07 Mar '14

Module: wine Branch: master Commit: ad86da8cd0d94d71623b34e30eafc96eb59b7420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad86da8cd0d94d71623b34e30… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 7 11:17:13 2014 +0100 d3d9/tests: Handle failure to create a device in the stateblock tests with skip(). --- dlls/d3d9/tests/stateblock.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index fea76cd..3b205ff 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -34,12 +34,11 @@ static HWND create_window(void) 0, 0, 0, 0, 0, 0, 0, 0); } -static IDirect3DDevice9 *init_d3d9(D3DPRESENT_PARAMETERS *present_parameters) +static IDirect3DDevice9 *create_device(D3DPRESENT_PARAMETERS *present_parameters) { IDirect3DDevice9 *device; IDirect3D9 *d3d9; HWND window; - HRESULT hr; if (!(d3d9 = Direct3DCreate9(D3D_SDK_VERSION))) { @@ -54,10 +53,8 @@ static IDirect3DDevice9 *init_d3d9(D3DPRESENT_PARAMETERS *present_parameters) present_parameters->hDeviceWindow = window; present_parameters->SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, - D3DCREATE_SOFTWARE_VERTEXPROCESSING, present_parameters, &device); - ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "Failed to create device, hr %#x.\n", hr); - if (SUCCEEDED(hr)) + if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, present_parameters, &device))) return device; return NULL; @@ -2438,8 +2435,11 @@ START_TEST(stateblock) IDirect3DDevice9 *device; ULONG refcount; - if (!(device = init_d3d9(&device_pparams))) + if (!(device = create_device(&device_pparams))) + { + skip("Failed to create a 3D device, skipping test.\n"); return; + } test_begin_end_state_block(device); test_state_management(device, &device_pparams);

1 0

Henri Verbeet : d3d8/tests: Use create_device() in more tests.
by Alexandre Julliard 07 Mar '14

07 Mar '14

Module: wine Branch: master Commit: 314a016e29d99f15703d8e6ed0ff37bf76f259ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=314a016e29d99f15703d8e6ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 7 11:17:12 2014 +0100 d3d8/tests: Use create_device() in more tests. --- dlls/d3d8/tests/device.c | 837 ++++++++++++++++++---------------------------- 1 file changed, 334 insertions(+), 503 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=314a016e29d99f15703d8…

1 0

Henri Verbeet : d3d9/tests: Use create_device() in more tests.
by Alexandre Julliard 07 Mar '14

07 Mar '14

Module: wine Branch: master Commit: 84faf3d8c21008b614a93c7d2e683c4efffca9b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84faf3d8c21008b614a93c7d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 7 11:17:11 2014 +0100 d3d9/tests: Use create_device() in more tests. --- dlls/d3d9/tests/device.c | 989 +++++++++++++++++++--------------------------- 1 file changed, 406 insertions(+), 583 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84faf3d8c21008b614a93…

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 07 Mar '14

07 Mar '14

Module: wine Branch: master Commit: 0eb4616b5ae4c6bfa1d34d4ee5fe70302f75351d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eb4616b5ae4c6bfa1d34d4ee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 7 13:03:18 2014 +0400 po: Update Russian translation. --- po/ru.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/ru.po b/po/ru.po index 5aa6368..370b28c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6591,10 +6591,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"

1 0

Nikolay Sivov : msxml3: Make propputref methods invocable with DISPATCH_PROPERTYPUT.
by Alexandre Julliard 07 Mar '14

07 Mar '14

Module: wine Branch: master Commit: d7aee26d7fd012d9bbf810f8e85e7995a668cb67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7aee26d7fd012d9bbf810f8e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 7 12:07:27 2014 +0400 msxml3: Make propputref methods invocable with DISPATCH_PROPERTYPUT. --- dlls/msxml3/dispex.c | 27 ++++++++++++++ dlls/msxml3/tests/saxreader.c | 82 +++++++++++++++++++++++++++++------------ 2 files changed, 86 insertions(+), 23 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 78d4c0c..a080a8b 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -32,6 +32,7 @@ #include "winnls.h" #include "ole2.h" #include "msxml6.h" +#include "msxml6did.h" #include "wininet.h" #include "urlmon.h" #include "winreg.h" @@ -519,6 +520,30 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW return DISP_E_UNKNOWNNAME; } +static BOOL is_propputref_id(DISPID id) +{ + switch (id) + { + case DISPID_DOM_DOCUMENT_DOCUMENTELEMENT: + case DISPID_XMLDOM_DOCUMENT2_SCHEMAS: + case DISPID_XMLDOM_SELECTION_CONTEXT: + case DISPID_XMLDOM_TEMPLATE_STYLESHEET: + case DISPID_SAX_CONTENTHANDLER_DOCUMENTLOCATOR: + case DISPID_SAX_XMLFILTER_PARENT: + case DISPID_SAX_XMLREADER_ENTITYRESOLVER: + case DISPID_SAX_XMLREADER_CONTENTHANDLER: + case DISPID_SAX_XMLREADER_DTDHANDLER: + case DISPID_SAX_XMLREADER_ERRORHANDLER: + case DISPID_MXXML_FILTER_ENTITYRESOLVER: + case DISPID_MXXML_FILTER_CONTENTHANDLER: + case DISPID_MXXML_FILTER_DTDHANDLER: + case DISPID_MXXML_FILTER_ERRORHANDLER: + return TRUE; + default: + return FALSE; + } +} + static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { @@ -601,6 +626,8 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return E_FAIL; } + if (is_propputref_id(id) && wFlags == DISPATCH_PROPERTYPUT) + wFlags = DISPATCH_PROPERTYPUTREF; hres = ITypeInfo_Invoke(ti, unk, id, wFlags, pdp, pvarRes, pei, &argerr); ITypeInfo_Release(ti); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 5891b55..42e4ec0 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -4432,31 +4432,67 @@ static void test_obj_dispex(IUnknown *obj) IDispatchEx_Release(dispex); } -static void test_dispex(void) +static void test_saxreader_dispex(void) { - IVBSAXXMLReader *vbreader; - ISAXXMLReader *reader; - IUnknown *unk; - HRESULT hr; + IVBSAXXMLReader *vbreader; + ISAXXMLReader *reader; + DISPPARAMS dispparams; + DISPID dispid; + IUnknown *unk; + VARIANT arg; + HRESULT hr; - hr = CoCreateInstance(&CLSID_SAXXMLReader, NULL, CLSCTX_INPROC_SERVER, + hr = CoCreateInstance(&CLSID_SAXXMLReader, NULL, CLSCTX_INPROC_SERVER, &IID_ISAXXMLReader, (void**)&reader); - EXPECT_HR(hr, S_OK); - - hr = ISAXXMLReader_QueryInterface(reader, &IID_IUnknown, (void**)&unk); - EXPECT_HR(hr, S_OK); - test_obj_dispex(unk); - IUnknown_Release(unk); - - hr = ISAXXMLReader_QueryInterface(reader, &IID_IVBSAXXMLReader, (void**)&vbreader); - EXPECT_HR(hr, S_OK); - hr = IVBSAXXMLReader_QueryInterface(vbreader, &IID_IUnknown, (void**)&unk); - EXPECT_HR(hr, S_OK); - test_obj_dispex(unk); - IUnknown_Release(unk); - IVBSAXXMLReader_Release(vbreader); - - ISAXXMLReader_Release(reader); + EXPECT_HR(hr, S_OK); + + hr = ISAXXMLReader_QueryInterface(reader, &IID_IUnknown, (void**)&unk); + EXPECT_HR(hr, S_OK); + test_obj_dispex(unk); + IUnknown_Release(unk); + + hr = ISAXXMLReader_QueryInterface(reader, &IID_IVBSAXXMLReader, (void**)&vbreader); + EXPECT_HR(hr, S_OK); + hr = IVBSAXXMLReader_QueryInterface(vbreader, &IID_IUnknown, (void**)&unk); + EXPECT_HR(hr, S_OK); + test_obj_dispex(unk); + IUnknown_Release(unk); + + dispid = DISPID_PROPERTYPUT; + dispparams.cArgs = 1; + dispparams.cNamedArgs = 1; + dispparams.rgdispidNamedArgs = &dispid; + dispparams.rgvarg = &arg; + + V_VT(&arg) = VT_DISPATCH; + V_DISPATCH(&arg) = NULL; + + /* propputref is callable as PROPERTYPUT and PROPERTYPUTREF */ + hr = IVBSAXXMLReader_Invoke(vbreader, + DISPID_SAX_XMLREADER_CONTENTHANDLER, + &IID_NULL, + 0, + DISPATCH_PROPERTYPUT, + &dispparams, + NULL, + NULL, + NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IVBSAXXMLReader_Invoke(vbreader, + DISPID_SAX_XMLREADER_CONTENTHANDLER, + &IID_NULL, + 0, + DISPATCH_PROPERTYPUTREF, + &dispparams, + NULL, + NULL, + NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IVBSAXXMLReader_Release(vbreader); + + ISAXXMLReader_Release(reader); } static void test_mxwriter_dispex(void) @@ -5518,7 +5554,7 @@ START_TEST(saxreader) test_saxreader_properties(); test_saxreader_features(); test_saxreader_encoding(); - test_dispex(); + test_saxreader_dispex(); /* MXXMLWriter tests */ get_class_support_data(mxwriter_support_data, &IID_IMXWriter);

1 0

Piotr Caban : dinput8: Create a window that will receive events generated by input tests.
by Alexandre Julliard 07 Mar '14

07 Mar '14

Module: wine Branch: master Commit: 8d5b1dd5021ab726155319060014beee223b0ba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d5b1dd5021ab726155319060… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 7 01:49:58 2014 +0100 dinput8: Create a window that will receive events generated by input tests. --- dlls/dinput8/tests/device.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index c66c43c..6495559 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -60,6 +60,21 @@ static DIACTIONA actionMapping[]= { 4, DIMOUSE_YAXIS, 0, { "Y Axis" } } }; +static void flush_events(void) +{ + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects(0, NULL, FALSE, min_timeout, QS_ALLINPUT) == WAIT_TIMEOUT) + break; + diff = time - GetTickCount(); + min_timeout = 50; + } +} + static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWORD event, DWORD expected) { HRESULT hr; @@ -76,12 +91,14 @@ static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWO if (event_type == INPUT_MOUSE) mouse_event( event, 0, 0, 0, 0); + flush_events(); IDirectInputDevice8_Poll(lpdid); hr = IDirectInputDevice8_GetDeviceData(lpdid, sizeof(obj_data), &obj_data, &data_size, 0); if (data_size != 1) { win_skip("We're not able to inject input into Windows dinput8 with events\n"); + IDirectInputDevice_Unacquire(lpdid); return; } @@ -100,6 +117,7 @@ static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWO mouse_event(MOUSEEVENTF_LEFTUP, 1, 1, 0, 0); } + flush_events(); IDirectInputDevice8_Poll(lpdid); data_size = 1; @@ -108,6 +126,8 @@ static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWO data_size = 1; hr = IDirectInputDevice8_GetDeviceData(lpdid, sizeof(obj_data), &obj_data, &data_size, 0); ok(hr == DI_OK && data_size == 1, "GetDeviceData() failed: %08x cnt:%d\n", hr, data_size); + + IDirectInputDevice_Unacquire(lpdid); } static void test_build_action_map(IDirectInputDevice8A *lpdid, DIACTIONFORMATA *lpdiaf, @@ -256,6 +276,7 @@ static void test_action_mapping(void) IDirectInput8A *pDI = NULL; DIACTIONFORMATA af; struct enum_data data = {pDI, &af, NULL, NULL, NULL, 0}; + HWND hwnd; hr = CoCreateInstance(&CLSID_DirectInput8, 0, CLSCTX_INPROC_SERVER, &IID_IDirectInput8A, (LPVOID*)&pDI); if (hr == DIERR_OLDDIRECTINPUTVERSION || @@ -296,6 +317,11 @@ static void test_action_mapping(void) hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &af, enumeration_callback, &data, DIEDBSFL_ATTACHEDONLY); ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n", hr); + hwnd = CreateWindowExA(WS_EX_TOPMOST, "static", "dinput", + WS_POPUP | WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "failed to create window\n"); + SetCursorPos(50, 50); + if (data.keyboard != NULL) { /* Test keyboard BuildActionMap */ @@ -326,6 +352,8 @@ static void test_action_mapping(void) test_device_input(data.mouse, INPUT_MOUSE, MOUSEEVENTF_LEFTDOWN, 3); } + + DestroyWindow(hwnd); } static void test_save_settings(void)

1 0

Vincent Povirk : kernel32: Cache locale info from the registry.
by Alexandre Julliard 06 Mar '14

06 Mar '14

Module: wine Branch: master Commit: 49f3b4282d29890fe3c213d096571af4de2c45cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f3b4282d29890fe3c213d09… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 27 16:10:58 2014 -0600 kernel32: Cache locale info from the registry. --- dlls/kernel32/locale.c | 338 ++++++++++++++++++++++++++++-------------------- 1 file changed, 200 insertions(+), 138 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49f3b4282d29890fe3c21…

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
53
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2014