wine-commits May 2015

wine-commits@winehq.org

2 participants
428 discussions

Bruno Jesus : user32/tests: Add tests for GetRawInputDeviceList.
by Alexandre Julliard 26 May '15

26 May '15

Module: wine Branch: master Commit: 1bba9674d9e3902e20dc7d5f94352b1e0c556cc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bba9674d9e3902e20dc7d5f9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon May 25 16:11:56 2015 -0300 user32/tests: Add tests for GetRawInputDeviceList. --- dlls/user32/tests/input.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 4a67c74..7639b66 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -77,6 +77,7 @@ static struct { static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); static int (WINAPI *pGetMouseMovePointsEx) (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEPOINT, int, DWORD); +static UINT (WINAPI *pGetRawInputDeviceList) (PRAWINPUTDEVICELIST, PUINT, UINT); #define MAXKEYEVENTS 12 #define MAXKEYMESSAGES MAXKEYEVENTS /* assuming a key event generates one @@ -160,6 +161,7 @@ static void init_function_pointers(void) GET_PROC(SendInput) GET_PROC(GetMouseMovePointsEx) + GET_PROC(GetRawInputDeviceList) #undef GET_PROC } @@ -1486,6 +1488,51 @@ static void test_GetMouseMovePointsEx(void) #undef MYERROR } +static void test_GetRawInputDeviceList(void) +{ + RAWINPUTDEVICELIST devices[32]; + UINT ret, devcount, odevcount; + DWORD err; + + SetLastError(0xdeadbeef); + ret = pGetRawInputDeviceList(NULL, NULL, 0); + err = GetLastError(); + ok(ret == -1, "expected -1, got %d\n", ret); +todo_wine + ok(err == ERROR_INVALID_PARAMETER, "expected 87, got %d\n", err); + + SetLastError(0xdeadbeef); + ret = pGetRawInputDeviceList(NULL, NULL, sizeof(devices[0])); + err = GetLastError(); + ok(ret == -1, "expected -1, got %d\n", ret); +todo_wine + ok(err == ERROR_NOACCESS, "expected 998, got %d\n", err); + + devcount = 0; + ret = pGetRawInputDeviceList(NULL, &devcount, sizeof(devices[0])); + ok(ret == 0, "expected 0, got %d\n", ret); + ok(devcount > 0, "expected non-zero\n"); + + SetLastError(0xdeadbeef); + devcount = 0; + ret = pGetRawInputDeviceList(devices, &devcount, sizeof(devices[0])); + err = GetLastError(); + ok(ret == -1, "expected -1, got %d\n", ret); +todo_wine + ok(err == ERROR_INSUFFICIENT_BUFFER, "expected 122, got %d\n", err); + ok(devcount > 0, "expected non-zero\n"); + + /* devcount contain now the correct number of devices */ + ret = pGetRawInputDeviceList(devices, &devcount, sizeof(devices[0])); + ok(ret > 0, "expected non-zero\n"); + + /* check if variable changes from larger to smaller value */ + devcount = odevcount = sizeof(devices) / sizeof(devices[0]); + ret = pGetRawInputDeviceList(devices, &odevcount, sizeof(devices[0])); + ok(ret > 0, "expected non-zero\n"); + ok(devcount == odevcount, "expected %d, got %d\n", devcount, odevcount); +} + static void test_key_map(void) { HKL kl = GetKeyboardLayout(0); @@ -2353,4 +2400,9 @@ START_TEST(input) test_GetMouseMovePointsEx(); else win_skip("GetMouseMovePointsEx is not available\n"); + + if(pGetRawInputDeviceList) + test_GetRawInputDeviceList(); + else + win_skip("GetRawInputDeviceList is not available\n"); }

1 0

Piotr Caban : msvcr120: Add copysign export.
by Alexandre Julliard 26 May '15

26 May '15

Module: wine Branch: master Commit: e1de0eeae416f31203ec6a666614a2b0f8ab33b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1de0eeae416f31203ec6a666… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 25 19:11:11 2015 +0200 msvcr120: Add copysign export. --- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 811dcee..bf6159b 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2087,9 +2087,9 @@ @ stub conj @ stub conjf @ stub conjl -@ stub copysign -@ stub copysignf -@ stub copysignl +@ cdecl copysign(double double) MSVCRT__copysign +@ cdecl copysignf(float float) MSVCRT__copysignf +@ cdecl copysignl(double double) MSVCRT__copysign @ cdecl cos(double) MSVCRT_cos @ cdecl -arch=arm,x86_64 cosf(float) MSVCRT_cosf @ cdecl cosh(double) MSVCRT_cosh diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 2ac7ab9..903120b 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1756,9 +1756,9 @@ @ stub conj @ stub conjf @ stub conjl -@ stub copysign -@ stub copysignf -@ stub copysignl +@ cdecl copysign(double double) msvcr120.copysign +@ cdecl copysignf(float float) msvcr120.copysignf +@ cdecl copysignl(double double) msvcr120.copysignl @ cdecl cos(double) msvcr120.cos @ cdecl -arch=arm,x86_64 cosf(float) msvcr120.cosf @ cdecl cosh(double) msvcr120.cosh

1 0

Jacek Caban : mshtml: Pass EventTarget to call_event_handlers.
by Alexandre Julliard 26 May '15

26 May '15

Module: wine Branch: master Commit: 9981890397550ed5e332f0fac4357f6c6598a7a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9981890397550ed5e332f0fac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 25 15:45:09 2015 +0200 mshtml: Pass EventTarget to call_event_handlers. --- dlls/mshtml/htmlevent.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 596c171..254b864 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -966,18 +966,15 @@ static BOOL is_cp_event(cp_static_data_t *data, DISPID dispid) return FALSE; } -static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, event_target_t *event_target, +static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, EventTarget *event_target, ConnectionPointContainer *cp_container, eventid_t eid, IDispatch *this_obj) { + event_target_t *data = get_event_target_data(event_target, FALSE); const BOOL cancelable = event_info[eid].flags & EVENT_CANCELABLE; - handler_vector_t *handler_vector = NULL; VARIANT v; HRESULT hres; - if(event_target) - handler_vector = event_target->event_table[eid]; - - if(handler_vector && handler_vector->handler_prop) { + if(data && data->event_table[eid] && data->event_table[eid]->handler_prop) { DISPID named_arg = DISPID_THIS; VARIANTARG arg; DISPPARAMS dp = {&arg, &named_arg, 1, 1}; @@ -987,7 +984,7 @@ static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, V_VT(&v) = VT_EMPTY; TRACE("%s >>>\n", debugstr_w(event_info[eid].name)); - hres = call_disp_func(handler_vector->handler_prop, &dp, &v); + hres = call_disp_func(data->event_table[eid]->handler_prop, &dp, &v); if(hres == S_OK) { TRACE("%s <<< %s\n", debugstr_w(event_info[eid].name), debugstr_variant(&v)); @@ -1005,7 +1002,7 @@ static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, } } - if(handler_vector && handler_vector->handler_cnt) { + if(data && data->event_table[eid] && data->event_table[eid]->handler_cnt) { VARIANTARG arg; DISPPARAMS dp = {&arg, NULL, 1, 0}; int i; @@ -1013,13 +1010,13 @@ static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, V_VT(&arg) = VT_DISPATCH; V_DISPATCH(&arg) = (IDispatch*)event_obj; - i = handler_vector->handler_cnt; + i = data->event_table[eid]->handler_cnt; while(i--) { - if(handler_vector->handlers[i]) { + if(data->event_table[eid]->handlers[i]) { V_VT(&v) = VT_EMPTY; TRACE("%s [%d] >>>\n", debugstr_w(event_info[eid].name), i); - hres = call_disp_func(handler_vector->handlers[i], &dp, &v); + hres = call_disp_func(data->event_table[eid]->handlers[i], &dp, &v); if(hres == S_OK) { TRACE("%s [%d] <<<\n", debugstr_w(event_info[eid].name), i); @@ -1121,8 +1118,8 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e do { hres = get_node(doc, nsnode, FALSE, &node); if(SUCCEEDED(hres) && node) { - call_event_handlers(doc, event_obj, get_event_target_data(&node->event_target, FALSE), - node->cp_container, eid, script_this ? script_this : (IDispatch*)&node->IHTMLDOMNode_iface); + call_event_handlers(doc, event_obj, &node->event_target, node->cp_container, eid, + script_this ? script_this : (IDispatch*)&node->IHTMLDOMNode_iface); node_release(node); } @@ -1150,8 +1147,8 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e if(NS_SUCCEEDED(nsres) && nsbody) { hres = get_node(doc, (nsIDOMNode*)nsbody, FALSE, &node); if(SUCCEEDED(hres) && node) { - call_event_handlers(doc, event_obj, get_event_target_data(&node->event_target, FALSE), - node->cp_container, eid, script_this ? script_this : (IDispatch*)&node->IHTMLDOMNode_iface); + call_event_handlers(doc, event_obj, &node->event_target, node->cp_container, eid, + script_this ? script_this : (IDispatch*)&node->IHTMLDOMNode_iface); node_release(node); } nsIDOMHTMLElement_Release(nsbody); @@ -1160,7 +1157,7 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e } } - call_event_handlers(doc, event_obj, doc->node.event_target.ptr, &doc->basedoc.cp_container, eid, + call_event_handlers(doc, event_obj, &doc->node.event_target, &doc->basedoc.cp_container, eid, script_this ? script_this : (IDispatch*)&doc->basedoc.IHTMLDocument2_iface); break;

1 0

Nikolay Sivov : setupapi/tests: Skip a test if user is not allowed to open logging.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 98b991fdcf3f2cdbdae7d61203367ce9728a5e6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=98b991fdcf3f2cdbdae7d6120… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 25 12:39:34 2015 +0300 setupapi/tests: Skip a test if user is not allowed to open logging. --- dlls/setupapi/tests/misc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index d5cfa01..09e0fb8 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -789,6 +789,11 @@ static void test_SetupLogError(void) SetLastError(0xdeadbeef); ret = SetupOpenLog(FALSE); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + win_skip("SetupOpenLog() failed on insufficient permissions\n"); + return; + } ok(ret, "SetupOpenLog failed, error %d\n", GetLastError()); SetLastError(0xdeadbeef);

1 0

Stefan Dösinger : wined3d: Allow specifying a different depth stencil location.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 90d8896826043bdf8c294018acc663c5d6684935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d8896826043bdf8c294018a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 22 10:11:22 2015 +0200 wined3d: Allow specifying a different depth stencil location. This is for drivers that do not support depth stencil textures, but happily support depth stencil renderbuffers. --- dlls/wined3d/context.c | 60 ++++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 38 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90d8896826043bdf8c294…

1 0

Stefan Dösinger : wined3d: Check resource types separately in check_fbo_compat.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: bd658a15b9c71ee67e8d4ca60370812cdd453b17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd658a15b9c71ee67e8d4ca60… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 22 10:11:21 2015 +0200 wined3d: Check resource types separately in check_fbo_compat. --- dlls/wined3d/utils.c | 491 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 307 insertions(+), 184 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd658a15b9c71ee67e8d4…

1 0

Nikolay Sivov : riched20/tests: Initial tests for font duplication behavior.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: c5a029f82e2b8ec45b867df59e4bb3c5f003ad79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5a029f82e2b8ec45b867df59… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 24 17:45:12 2015 +0300 riched20/tests: Initial tests for font duplication behavior. --- dlls/riched20/richole.c | 42 ++++++++-- dlls/riched20/tests/richole.c | 190 +++++++++++++++++++++++++++++++++--------- 2 files changed, 184 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5a029f82e2b8ec45b867…

1 0

Nikolay Sivov : riched20/tests: Basic test for Delete().
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 95074af8a87dd8acd817f7b37930f25d0ff22da7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95074af8a87dd8acd817f7b37… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 24 14:21:06 2015 +0300 riched20/tests: Basic test for Delete(). --- dlls/riched20/tests/richole.c | 47 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index f195810..ee4294f 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -1880,6 +1880,52 @@ static void test_ITextFont(void) ITextFont_Release(font); } +static void test_Delete(void) +{ + static const CHAR test_text1[] = "TestSomeText"; + IRichEditOle *reOle = NULL; + ITextDocument *doc = NULL; + ITextRange *range, *range2; + LONG value; + HRESULT hr; + HWND hwnd; + + create_interfaces(&hwnd, &reOle, &doc, NULL); + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); + + hr = ITextDocument_Range(doc, 0, 4, &range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextDocument_Range(doc, 1, 2, &range2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextRange_GetEnd(range, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 4, "got %d\n", value); + + hr = ITextRange_Delete(range2, tomCharacter, 0, NULL); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextRange_GetEnd(range, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(value == 3, "got %d\n", value); + + hr = ITextRange_GetStart(range2, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 1, "got %d\n", value); + + hr = ITextRange_GetEnd(range2, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(value == 1, "got %d\n", value); + + ITextRange_Release(range); + ITextRange_Release(range2); + release_interfaces(&hwnd, &reOle, &doc, NULL); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -1905,4 +1951,5 @@ START_TEST(richole) test_GetPara(); test_dispatch(); test_ITextFont(); + test_Delete(); }

1 0

Nikolay Sivov : riched20/tests: Some tests for GetText().
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: b43a0e1175d4bf83db250057460fb5cefc897dcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b43a0e1175d4bf83db2500574… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 24 14:19:20 2015 +0300 riched20/tests: Some tests for GetText(). --- dlls/riched20/richole.c | 8 ++- dlls/riched20/tests/richole.c | 164 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 148 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b43a0e1175d4bf83db250…

1 0

Nikolay Sivov : riched20: Implement Start/End properties for ranges.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: f4438f1ee54cf1a9b367616206b827d624a94665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4438f1ee54cf1a9b36761620… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 24 14:08:16 2015 +0300 riched20: Implement Start/End properties for ranges. --- dlls/riched20/richole.c | 120 +++++++++++++++++---------- dlls/riched20/tests/richole.c | 189 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 258 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4438f1ee54cf1a9b3676…

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
43
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 May 2015