wine-commits June 2016

wine-commits@winehq.org

2 participants
592 discussions

Jacek Caban : wininet: Use INTERNET_SendCallback in ftp.c.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 86d14ad17ec702f9cbf67fb4ae802c02134c0f6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=86d14ad17ec702f9cbf67fb4a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 20 21:54:44 2016 +0200 wininet: Use INTERNET_SendCallback in ftp.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/ftp.c | 44 +++++++++++++++++++------------------- dlls/wininet/internet.h | 4 ---- dlls/wininet/utility.c | 57 ------------------------------------------------- 3 files changed, 22 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=86d14ad17ec702f9cbf67…

1 0

Jacek Caban : wininet: Ignore unknown attributes in get_cookie.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 0d9dcf5c8f97bf86790d9a49b2e65441622de2a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d9dcf5c8f97bf86790d9a49b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 20 21:32:48 2016 +0200 wininet: Ignore unknown attributes in get_cookie. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 5 ++++- dlls/wininet/tests/internet.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 5de2304..38f69e0 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -911,6 +911,7 @@ DWORD set_cookie(substr_t domain, substr_t path, substr_t name, substr_t data, D static const WCHAR szSecure[] = {'s','e','c','u','r','e'}; static const WCHAR szHttpOnly[] = {'h','t','t','p','o','n','l','y'}; static const WCHAR szVersion[] = {'v','e','r','s','i','o','n','='}; + static const WCHAR max_ageW[] = {'m','a','x','-','a','g','e','='}; /* Skip ';' */ if(data.len) @@ -976,9 +977,11 @@ DWORD set_cookie(substr_t domain, substr_t path, substr_t name, substr_t data, D substr_skip(&data, len); FIXME("version not handled (%s)\n",debugstr_wn(data.str, data.len)); + }else if(data.len >= (len = sizeof(max_ageW)/sizeof(WCHAR)) && !strncmpiW(data.str, max_ageW, len)) { + /* Native doesn't support Max-Age attribute. */ + WARN("Max-Age ignored\n"); }else if(data.len) { FIXME("Unknown additional option %s\n", debugstr_wn(data.str, data.len)); - break; } substr_skip(&data, end_ptr - data.str); diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index db662a2..9b0a2e7 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -388,7 +388,7 @@ static void test_complicated_cookie(void) /* Technically illegal! domain should require 2 dots, but native wininet accepts it */ ret = InternetSetCookieA("http://www.example.com",NULL,"E=F; domain=example.com"); ok(ret == TRUE,"InternetSetCookie failed\n"); - ret = InternetSetCookieA("http://www.example.com",NULL,"G=H; domain=.example.com; path=/foo"); + ret = InternetSetCookieA("http://www.example.com",NULL,"G=H; domain=.example.com; invalid=attr; path=/foo"); ok(ret == TRUE,"InternetSetCookie failed\n"); ret = InternetSetCookieA("http://www.example.com/bar.html",NULL,"I=J; domain=.example.com"); ok(ret == TRUE,"InternetSetCookie failed\n");

1 0

Jacek Caban : wininet: Fixed tests on win10.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 3a7bd03da0428ec4d005bff041d532182a077bbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7bd03da0428ec4d005bff04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 20 21:32:22 2016 +0200 wininet: Fixed tests on win10. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/internet.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index d762768..db662a2 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1067,7 +1067,8 @@ static void test_IsDomainLegalCookieDomainW(void) static void test_PrivacyGetSetZonePreferenceW(void) { - DWORD ret, zone, type, template, old_template; + DWORD ret, zone, type, template, old_template, pref_size = 0; + WCHAR pref[256]; zone = 3; type = 0; @@ -1078,6 +1079,14 @@ static void test_PrivacyGetSetZonePreferenceW(void) ret = pPrivacyGetZonePreferenceW(zone, type, &old_template, NULL, NULL); ok(ret == 0, "expected ret == 0, got %u\n", ret); + trace("template %u\n", old_template); + + if(old_template == PRIVACY_TEMPLATE_ADVANCED) { + pref_size = sizeof(pref)/sizeof(WCHAR); + ret = pPrivacyGetZonePreferenceW(zone, type, &old_template, pref, &pref_size); + ok(ret == 0, "expected ret == 0, got %u\n", ret); + } + template = 5; ret = pPrivacySetZonePreferenceW(zone, type, template, NULL); ok(ret == 0, "expected ret == 0, got %u\n", ret); @@ -1088,7 +1097,7 @@ static void test_PrivacyGetSetZonePreferenceW(void) ok(template == 5, "expected template == 5, got %u\n", template); template = 5; - ret = pPrivacySetZonePreferenceW(zone, type, old_template, NULL); + ret = pPrivacySetZonePreferenceW(zone, type, old_template, pref_size ? pref : NULL); ok(ret == 0, "expected ret == 0, got %u\n", ret); }

1 0

Jacek Caban : jscript: Properly handle arguments in Object constructor.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 68dddd8d8963bb7551abfbe8601d82138063feb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68dddd8d8963bb7551abfbe86… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 20 20:54:48 2016 +0200 jscript: Properly handle arguments in Object constructor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 6 +++--- dlls/jscript/tests/api.js | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 71bed7b..827040b 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -261,6 +261,9 @@ static HRESULT ObjectConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags switch(flags) { case DISPATCH_METHOD: + case DISPATCH_CONSTRUCT: { + jsdisp_t *obj; + if(argc) { if(!is_undefined(argv[0]) && !is_null(argv[0]) && (!is_object_instance(argv[0]) || get_object(argv[0]))) { IDispatch *disp; @@ -276,9 +279,6 @@ static HRESULT ObjectConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags return S_OK; } } - /* fall through */ - case DISPATCH_CONSTRUCT: { - jsdisp_t *obj; hres = create_object(ctx, NULL, &obj); if(FAILED(hres)) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index ca6131b..1ca974d 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -350,12 +350,27 @@ ok(Object(1) instanceof Number, "Object(1) is not instance of Number"); ok(Object("") instanceof String, "Object('') is not instance of String"); ok(Object(false) instanceof Boolean, "Object(false) is not instance of Boolean"); +ok(new Object(1) instanceof Number, "Object(1) is not instance of Number"); +ok(new Object("") instanceof String, "Object('') is not instance of String"); +ok(new Object(false) instanceof Boolean, "Object(false) is not instance of Boolean"); + obj = new Object(); ok(Object(obj) === obj, "Object(obj) !== obj"); ok(typeof(Object()) === "object", "typeof(Object()) !== 'object'"); ok(typeof(Object(undefined)) === "object", "typeof(Object(undefined)) !== 'object'"); ok(typeof(Object(null)) === "object", "typeof(Object(null)) !== 'object'"); +ok(typeof(Object(nullDisp)) === "object", "typeof(Object(nullDisp)) !== 'object'"); + +ok(Object(nullDisp) != nullDisp, "Object(nullDisp) == nullDisp"); +ok(new Object(nullDisp) != nullDisp, "new Object(nullDisp) == nullDisp"); + +ok(Object(testObj) === testObj, "Object(testObj) != testObj\n"); +ok(new Object(testObj) === testObj, "new Object(testObj) != testObj\n"); + +tmp = new Object(); +ok(Object(tmp) === tmp, "Object(tmp) != tmp"); +ok(new Object(tmp) === tmp, "new Object(tmp) != tmp"); var obj = new Object(); obj.toString = function (x) {

1 0

Michael Stefaniuc : comctl32/tests: Use EqualRect() instead of memcmp() to compare RECTs.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: cbca4b3f511b5fbc5380a61b433890b5af082327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbca4b3f511b5fbc5380a61b4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 20 13:42:15 2016 +0200 comctl32/tests: Use EqualRect() instead of memcmp() to compare RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 2 +- dlls/comctl32/tests/toolbar.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index ed5d9f9..1444a9f 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -908,7 +908,7 @@ static void test_images(void) r = SendMessageA(hwnd, LVM_GETITEMRECT, 0, (LPARAM) &r2); expect(1, r); - ok(!memcmp(&r1, &r2, sizeof r1), "rectangle should be the same\n"); + ok(EqualRect(&r1, &r2), "rectangle should be the same\n"); DestroyWindow(hwnd); } diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index d825e18..efad00a 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1232,7 +1232,7 @@ static DWORD tbsize_alt_numtests = 0; for (i=0; i<min(buttonCount, res->nButtons); i++) { \ ok(SendMessageA(hToolbar, TB_GETITEMRECT, i, (LPARAM)&rc) == 1, "TB_GETITEMRECT\n"); \ if (broken(tbsize_alt_numtests < sizeof(tbsize_alt_results)/sizeof(tbsize_alt_results[0]) && \ - memcmp(&rc, &tbsize_alt_results[tbsize_alt_numtests].rcButton, sizeof(RECT)) == 0)) { \ + EqualRect(&rc, &tbsize_alt_results[tbsize_alt_numtests].rcButton))) { \ win_skip("Alternate rect found\n"); \ tbsize_alt_numtests++; \ } else if (!(mask&1)) { \

1 0

Piotr Caban : ucrtbase: Add _set_thread_local_invalid_parameter_handler implementation.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: c35d07fcd146826d05203a5746f2918d5b3d0bc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c35d07fcd146826d05203a574… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 20 17:48:19 2016 +0200 ucrtbase: Add _set_thread_local_invalid_parameter_handler implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/errno.c | 25 ++++++++++-- dlls/msvcrt/msvcrt.h | 3 ++ dlls/ucrtbase/tests/misc.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 119 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 75e211e..641ca35 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -433,6 +433,16 @@ void CDECL _seterrormode(int mode) void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_wchar_t *func, const MSVCRT_wchar_t *file, unsigned int line, MSVCRT_uintptr_t arg) { +#if _MSVCR_VER >= 140 + thread_data_t *data = msvcrt_get_thread_data(); + + if (data->invalid_parameter_handler) + { + data->invalid_parameter_handler( expr, func, file, line, arg ); + return; + } +#endif + if (invalid_parameter_handler) invalid_parameter_handler( expr, func, file, line, arg ); else { @@ -474,13 +484,14 @@ MSVCRT_invalid_parameter_handler CDECL _set_invalid_parameter_handler( return old; } +#if _MSVCR_VER >= 140 /********************************************************************* * _get_thread_local_invalid_parameter_handler (UCRTBASE.@) */ MSVCRT_invalid_parameter_handler CDECL _get_thread_local_invalid_parameter_handler(void) { - FIXME(" stub\n"); - return NULL; + TRACE("\n"); + return msvcrt_get_thread_data()->invalid_parameter_handler; } /********************************************************************* @@ -489,6 +500,12 @@ MSVCRT_invalid_parameter_handler CDECL _get_thread_local_invalid_parameter_handl MSVCRT_invalid_parameter_handler CDECL _set_thread_local_invalid_parameter_handler( MSVCRT_invalid_parameter_handler handler) { - FIXME("(%p) stub\n", handler); - return NULL; + thread_data_t *data = msvcrt_get_thread_data(); + MSVCRT_invalid_parameter_handler old = data->invalid_parameter_handler; + + TRACE("(%p)\n", handler); + + data->invalid_parameter_handler = handler; + return old; } +#endif diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 2d3fc94..6c2ab42 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -266,6 +266,9 @@ struct __thread_data { DWORD cached_cp; char cached_locale[131]; void *unk10[100]; +#if _MSVCR_VER >= 140 + MSVCRT_invalid_parameter_handler invalid_parameter_handler; +#endif }; typedef struct __thread_data thread_data_t; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index d427bb5..0111d2b 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -27,6 +27,33 @@ #include <winbase.h> #include "wine/test.h" +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT(func) \ + do { \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +DEFINE_EXPECT(global_invalid_parameter_handler); +DEFINE_EXPECT(thread_invalid_parameter_handler); + typedef int (CDECL *MSVCRT__onexit_t)(void); typedef struct MSVCRT__onexit_table_t @@ -41,6 +68,11 @@ static int (CDECL *p_register_onexit_function)(MSVCRT__onexit_table_t *table, MS static int (CDECL *p_execute_onexit_table)(MSVCRT__onexit_table_t *table); static int (CDECL *p___fpe_flt_rounds)(void); static unsigned int (CDECL *p__controlfp)(unsigned int, unsigned int); +static _invalid_parameter_handler (CDECL *p__set_invalid_parameter_handler)(_invalid_parameter_handler); +static _invalid_parameter_handler (CDECL *p__get_invalid_parameter_handler)(void); +static _invalid_parameter_handler (CDECL *p__set_thread_local_invalid_parameter_handler)(_invalid_parameter_handler); +static _invalid_parameter_handler (CDECL *p__get_thread_local_invalid_parameter_handler)(void); +static int (CDECL *p__ltoa_s)(LONG, char*, size_t, int); static void test__initialize_onexit_table(void) { @@ -223,6 +255,63 @@ static void test___fpe_flt_rounds(void) ok(ret == 0, "__fpe_flt_rounds returned %d\n", ret); } +static void __cdecl global_invalid_parameter_handler( + const wchar_t *expression, const wchar_t *function, + const wchar_t *file, unsigned line, uintptr_t arg) +{ + CHECK_EXPECT(global_invalid_parameter_handler); +} + +static void __cdecl thread_invalid_parameter_handler( + const wchar_t *expression, const wchar_t *function, + const wchar_t *file, unsigned line, uintptr_t arg) +{ + CHECK_EXPECT(thread_invalid_parameter_handler); +} + +static void test_invalid_parameter_handler(void) +{ + _invalid_parameter_handler ret; + + ret = p__get_invalid_parameter_handler(); + ok(!ret, "ret != NULL\n"); + + ret = p__get_thread_local_invalid_parameter_handler(); + ok(!ret, "ret != NULL\n"); + + ret = p__set_thread_local_invalid_parameter_handler(thread_invalid_parameter_handler); + ok(!ret, "ret != NULL\n"); + + ret = p__get_thread_local_invalid_parameter_handler(); + ok(ret == thread_invalid_parameter_handler, "ret = %p\n", ret); + + ret = p__get_invalid_parameter_handler(); + ok(!ret, "ret != NULL\n"); + + ret = p__set_invalid_parameter_handler(global_invalid_parameter_handler); + ok(!ret, "ret != NULL\n"); + + ret = p__get_invalid_parameter_handler(); + ok(ret == global_invalid_parameter_handler, "ret = %p\n", ret); + + ret = p__get_thread_local_invalid_parameter_handler(); + ok(ret == thread_invalid_parameter_handler, "ret = %p\n", ret); + + SET_EXPECT(thread_invalid_parameter_handler); + p__ltoa_s(0, NULL, 0, 0); + CHECK_CALLED(thread_invalid_parameter_handler); + + ret = p__set_thread_local_invalid_parameter_handler(NULL); + ok(ret == thread_invalid_parameter_handler, "ret = %p\n", ret); + + SET_EXPECT(global_invalid_parameter_handler); + p__ltoa_s(0, NULL, 0, 0); + CHECK_CALLED(global_invalid_parameter_handler); + + ret = p__set_invalid_parameter_handler(NULL); + ok(ret == global_invalid_parameter_handler, "ret = %p\n", ret); +} + static BOOL init(void) { HMODULE module = LoadLibraryA("ucrtbase.dll"); @@ -237,6 +326,11 @@ static BOOL init(void) p_execute_onexit_table = (void*)GetProcAddress(module, "_execute_onexit_table"); p___fpe_flt_rounds = (void*)GetProcAddress(module, "__fpe_flt_rounds"); p__controlfp = (void*)GetProcAddress(module, "_controlfp"); + p__set_invalid_parameter_handler = (void*)GetProcAddress(module, "_set_invalid_parameter_handler"); + p__get_invalid_parameter_handler = (void*)GetProcAddress(module, "_get_invalid_parameter_handler"); + p__set_thread_local_invalid_parameter_handler = (void*)GetProcAddress(module, "_set_thread_local_invalid_parameter_handler"); + p__get_thread_local_invalid_parameter_handler = (void*)GetProcAddress(module, "_get_thread_local_invalid_parameter_handler"); + p__ltoa_s = (void*)GetProcAddress(module, "_ltoa_s"); return TRUE; } @@ -246,6 +340,7 @@ START_TEST(misc) if(!init()) return; + test_invalid_parameter_handler(); test__initialize_onexit_table(); test__register_onexit_function(); test__execute_onexit_table();

1 0

Iván Matellanes : msvcirt: Fix implementation of strstreambuf::underflow.
by Alexandre Julliard 20 Jun '16

20 Jun '16

Module: wine Branch: master Commit: 025c54344230ca8b32e80f08b9af13a16dfd2445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=025c54344230ca8b32e80f08b… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jun 20 13:32:09 2016 +0100 msvcirt: Fix implementation of strstreambuf::underflow. Spotted while testing for ostream printing. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 5 ++++- dlls/msvcirt/tests/msvcirt.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index fe5901a..e4fb3fb 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1469,8 +1469,11 @@ int __thiscall strstreambuf_underflow(strstreambuf *this) if (this->base.gptr < this->base.egptr) return *this->base.gptr; /* extend the get area to include the characters written */ - if (this->base.egptr < this->base.pptr) + if (this->base.egptr < this->base.pptr) { + this->base.gptr = this->base.base + (this->base.gptr - this->base.eback); + this->base.eback = this->base.base; this->base.egptr = this->base.pptr; + } return (this->base.gptr < this->base.egptr) ? *this->base.gptr : EOF; } diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index a6916c1..428ddf3 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -1745,8 +1745,36 @@ static void test_strstreambuf(void) ssb2.base.pbase = ssb2.base.pptr = ssb2.base.epptr = NULL; ret = (int) call_func1(p_strstreambuf_underflow, &ssb2); ok(ret == EOF, "expected EOF got %d\n", ret); + ssb2.base.pbase = ssb2.base.pptr = ssb2.base.base; + ret = (int) call_func1(p_strstreambuf_underflow, &ssb2); + ok(ret == EOF, "expected EOF got %d\n", ret); + ok(ssb2.base.eback == ssb2.base.base, "wrong get base, expected %p got %p\n", ssb2.base.base, ssb2.base.eback); + ok(ssb2.base.gptr == ssb2.base.base, "wrong get pointer, expected %p got %p\n", ssb2.base.base, ssb2.base.gptr); + ok(ssb2.base.egptr == ssb2.base.base, "wrong get end, expected %p got %p\n", ssb2.base.base, ssb2.base.egptr); + ssb2.base.pptr = ssb2.base.base + 3; + ret = (int) call_func1(p_strstreambuf_underflow, &ssb2); + ok(ret == 'C', "expected 'C' got %d\n", ret); + ok(ssb2.base.eback == ssb2.base.base, "wrong get base, expected %p got %p\n", ssb2.base.base, ssb2.base.eback); + ok(ssb2.base.gptr == ssb2.base.base, "wrong get pointer, expected %p got %p\n", ssb2.base.base, ssb2.base.gptr); + ok(ssb2.base.egptr == ssb2.base.base + 3, "wrong get end, expected %p got %p\n", ssb2.base.base + 3, ssb2.base.egptr); + ssb2.base.gptr = ssb2.base.base + 2; + ssb2.base.egptr = NULL; + ret = (int) call_func1(p_strstreambuf_underflow, &ssb2); + ok(ret == 'e', "expected 'e' got %d\n", ret); + ok(ssb2.base.eback == ssb2.base.base, "wrong get base, expected %p got %p\n", ssb2.base.base, ssb2.base.eback); + ok(ssb2.base.gptr == ssb2.base.base + 2, "wrong get pointer, expected %p got %p\n", ssb2.base.base, ssb2.base.gptr); + ok(ssb2.base.egptr == ssb2.base.base + 3, "wrong get end, expected %p got %p\n", ssb2.base.base + 3, ssb2.base.egptr); + ssb2.base.eback = ssb2.base.egptr = ssb2.base.base + 1; + ssb2.base.gptr = ssb2.base.base + 3; + ssb2.base.pptr = ssb2.base.base + 5; + ret = (int) call_func1(p_strstreambuf_underflow, &ssb2); + ok(ret == 'e', "expected 'e' got %d\n", ret); + ok(ssb2.base.eback == ssb2.base.base, "wrong get base, expected %p got %p\n", ssb2.base.base, ssb2.base.eback); + ok(ssb2.base.gptr == ssb2.base.base + 2, "wrong get pointer, expected %p got %p\n", ssb2.base.base, ssb2.base.gptr); + ok(ssb2.base.egptr == ssb2.base.base + 5, "wrong get end, expected %p got %p\n", ssb2.base.base + 5, ssb2.base.egptr); ssb2.base.eback = ssb2.base.base; ssb2.base.gptr = ssb2.base.egptr = ssb2.base.ebuf; + ssb2.base.pbase = ssb2.base.pptr = NULL; ret = (int) call_func1(p_strstreambuf_underflow, &ssb2); ok(ret == EOF, "expected EOF got %d\n", ret);

1 0

Alistair Leslie-Hughes : vcruntime140: Forward _set_se_translator.
by Alexandre Julliard 20 Jun '16

20 Jun '16

Module: wine Branch: master Commit: eeec1b1a64b81dc3c771bf7f83123109f290b616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeec1b1a64b81dc3c771bf7f8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 19 05:57:25 2016 +0000 vcruntime140: Forward _set_se_translator. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index c85a998..06ef550 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -1149,7 +1149,7 @@ @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) ucrtbase._seh_longjmp_unwind @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) ucrtbase._seh_longjmp_unwind4 @ cdecl _set_purecall_handler(ptr) ucrtbase._set_purecall_handler -@ stub _set_se_translator +@ cdecl _set_se_translator(ptr) ucrtbase._set_se_translator @ cdecl -arch=i386 -norelay _setjmp3(ptr long) ucrtbase._setjmp3 @ cdecl -arch=i386,x86_64,arm longjmp(ptr long) ucrtbase.longjmp @ cdecl memchr(ptr long long) ucrtbase.memchr diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 64f6276..da03fd1 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1892,7 +1892,7 @@ @ cdecl _set_new_mode(long) MSVCRT__set_new_mode @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output @ cdecl _set_purecall_handler(ptr) -@ stub _set_se_translator +@ cdecl _set_se_translator(ptr) MSVCRT__set_se_translator @ cdecl _set_thread_local_invalid_parameter_handler(ptr) @ cdecl _seterrormode(long) @ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3 diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index ea8c93b..a49e7b9 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -69,7 +69,7 @@ @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) ucrtbase._seh_longjmp_unwind4 @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) ucrtbase._seh_longjmp_unwind @ cdecl _set_purecall_handler(ptr) ucrtbase._set_purecall_handler -@ stub _set_se_translator +@ cdecl _set_se_translator(ptr) ucrtbase._set_se_translator @ cdecl -arch=i386 -norelay _setjmp3(ptr long) ucrtbase._setjmp3 @ cdecl -arch=i386,x86_64,arm longjmp(ptr long) ucrtbase.longjmp @ cdecl memchr(ptr long long) ucrtbase.memchr

1 0

Nikolay Sivov : msscript: Implement GetActivationPolicy().
by Alexandre Julliard 20 Jun '16

20 Jun '16

Module: wine Branch: master Commit: d62974a508d7427d3189cf2c3fba4ae41d4c1d4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62974a508d7427d3189cf2c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 20 14:00:31 2016 +0300 msscript: Implement GetActivationPolicy(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 8 ++++++-- dlls/msscript.ocx/tests/msscript.c | 9 +++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index db4d901..66018d3 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -1078,9 +1078,13 @@ static HRESULT WINAPI PointerInactive_GetActivationPolicy(IPointerInactive *ifac { ScriptControl *This = impl_from_IPointerInactive(iface); - FIXME("(%p)->(%p)\n", This, policy); + TRACE("(%p)->(%p)\n", This, policy); - return E_NOTIMPL; + if (!policy) + return E_POINTER; + + *policy = 0; + return S_OK; } static HRESULT WINAPI PointerInactive_OnInactiveMouseMove(IPointerInactive *iface, const RECT *bounds, diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 287daf9..9043361 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -847,6 +847,7 @@ static void test_pointerinactive(void) { IPointerInactive *pi; IScriptControl *sc; + DWORD policy; HRESULT hr; hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -856,6 +857,14 @@ static void test_pointerinactive(void) hr = IScriptControl_QueryInterface(sc, &IID_IPointerInactive, (void**)&pi); ok(hr == S_OK, "got 0x%08x\n", hr); + if (0) /* crashes w2k3 */ + hr = IPointerInactive_GetActivationPolicy(pi, NULL); + + policy = 123; + hr = IPointerInactive_GetActivationPolicy(pi, &policy); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(policy == 0, "got %#x\n", policy); + IPointerInactive_Release(pi); IScriptControl_Release(sc); }

1 0

Nikolay Sivov : msscript: Added IPointerInactive stub.
by Alexandre Julliard 20 Jun '16

20 Jun '16

Module: wine Branch: master Commit: e7802289476d5549ecabc0aa010a8f141510aee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7802289476d5549ecabc0aa0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 20 14:00:30 2016 +0300 msscript: Added IPointerInactive stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 66 ++++++++++++++++++++++++++++++++++++++ dlls/msscript.ocx/tests/msscript.c | 18 +++++++++++ 2 files changed, 84 insertions(+) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index c0e2520..db4d901 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -46,6 +46,7 @@ struct ScriptControl { IOleControl IOleControl_iface; IQuickActivate IQuickActivate_iface; IViewObject IViewObject_iface; + IPointerInactive IPointerInactive_iface; IConnectionPointContainer IConnectionPointContainer_iface; LONG ref; IOleClientSite *site; @@ -168,6 +169,11 @@ static inline ScriptControl *impl_from_IViewObject(IViewObject *iface) return CONTAINING_RECORD(iface, ScriptControl, IViewObject_iface); } +static inline ScriptControl *impl_from_IPointerInactive(IPointerInactive *iface) +{ + return CONTAINING_RECORD(iface, ScriptControl, IPointerInactive_iface); +} + static inline ScriptControl *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface) { return CONTAINING_RECORD(iface, ScriptControl, IConnectionPointContainer_iface); @@ -209,6 +215,9 @@ static HRESULT WINAPI ScriptControl_QueryInterface(IScriptControl *iface, REFIID }else if(IsEqualGUID(&IID_IViewObject, riid)) { TRACE("(%p)->(IID_IViewObject %p)\n", This, ppv); *ppv = &This->IViewObject_iface; + }else if(IsEqualGUID(&IID_IPointerInactive, riid)) { + TRACE("(%p)->(IID_IPointerInactive %p)\n", This, ppv); + *ppv = &This->IPointerInactive_iface; }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv); *ppv = &This->IConnectionPointContainer_iface; @@ -1047,6 +1056,62 @@ static const IViewObjectVtbl ViewObjectVtbl = { ViewObject_GetAdvise }; +static HRESULT WINAPI PointerInactive_QueryInterface(IPointerInactive *iface, REFIID riid, void **obj) +{ + ScriptControl *This = impl_from_IPointerInactive(iface); + return IScriptControl_QueryInterface(&This->IScriptControl_iface, riid, obj); +} + +static ULONG WINAPI PointerInactive_AddRef(IPointerInactive *iface) +{ + ScriptControl *This = impl_from_IPointerInactive(iface); + return IScriptControl_AddRef(&This->IScriptControl_iface); +} + +static ULONG WINAPI PointerInactive_Release(IPointerInactive *iface) +{ + ScriptControl *This = impl_from_IPointerInactive(iface); + return IScriptControl_Release(&This->IScriptControl_iface); +} + +static HRESULT WINAPI PointerInactive_GetActivationPolicy(IPointerInactive *iface, DWORD *policy) +{ + ScriptControl *This = impl_from_IPointerInactive(iface); + + FIXME("(%p)->(%p)\n", This, policy); + + return E_NOTIMPL; +} + +static HRESULT WINAPI PointerInactive_OnInactiveMouseMove(IPointerInactive *iface, const RECT *bounds, + LONG x, LONG y, DWORD key_state) +{ + ScriptControl *This = impl_from_IPointerInactive(iface); + + FIXME("(%p)->(%s %d %d %#x)\n", This, wine_dbgstr_rect(bounds), x, y, key_state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI PointerInactive_OnInactiveSetCursor(IPointerInactive *iface, const RECT *bounds, + LONG x, LONG y, DWORD msg, BOOL set_always) +{ + ScriptControl *This = impl_from_IPointerInactive(iface); + + FIXME("(%p)->(%s %d %d %#x %d)\n", This, wine_dbgstr_rect(bounds), x, y, msg, set_always); + + return E_NOTIMPL; +} + +static const IPointerInactiveVtbl PointerInactiveVtbl = { + PointerInactive_QueryInterface, + PointerInactive_AddRef, + PointerInactive_Release, + PointerInactive_GetActivationPolicy, + PointerInactive_OnInactiveMouseMove, + PointerInactive_OnInactiveSetCursor +}; + static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointContainer *iface, REFIID riid, void **obj) { ScriptControl *This = impl_from_IConnectionPointContainer(iface); @@ -1227,6 +1292,7 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->IOleControl_iface.lpVtbl = &OleControlVtbl; script_control->IQuickActivate_iface.lpVtbl = &QuickActivateVtbl; script_control->IViewObject_iface.lpVtbl = &ViewObjectVtbl; + script_control->IPointerInactive_iface.lpVtbl = &PointerInactiveVtbl; script_control->IConnectionPointContainer_iface.lpVtbl = &ConnectionPointContainerVtbl; script_control->ref = 1; script_control->site = NULL; diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 6e1f64d..287daf9 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -843,6 +843,23 @@ static void test_viewobject(void) IScriptControl_Release(sc); } +static void test_pointerinactive(void) +{ + IPointerInactive *pi; + IScriptControl *sc; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_QueryInterface(sc, &IID_IPointerInactive, (void**)&pi); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IPointerInactive_Release(pi); + IScriptControl_Release(sc); +} + START_TEST(msscript) { IUnknown *unk; @@ -865,6 +882,7 @@ START_TEST(msscript) test_connectionpoints(); test_quickactivate(); test_viewobject(); + test_pointerinactive(); CoUninitialize(); }

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
60
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 June 2016