wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

Alexandre Julliard : Release 1.5.19.
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: 5f3f2173f9f584ec1f30799b23fdabd155b136c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f3f2173f9f584ec1f30799b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 7 20:17:32 2012 +0100 Release 1.5.19. --- ANNOUNCE | 809 +++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 417 insertions(+), 412 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f3f2173f9f584ec1f307…

1 0

André Hentschel : secur32/tests: Fix tests on win8.
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: 1eaa25696b1f7b487bfc246dd029a588b14b010e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eaa25696b1f7b487bfc246dd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 6 19:28:55 2012 +0100 secur32/tests: Fix tests on win8. --- dlls/secur32/tests/negotiate.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/tests/negotiate.c b/dlls/secur32/tests/negotiate.c index 9aca5b6..e70c1e8 100644 --- a/dlls/secur32/tests/negotiate.c +++ b/dlls/secur32/tests/negotiate.c @@ -329,7 +329,9 @@ static void test_authentication(void) { ok( pi->fCapabilities == NTLM_BASE_CAPS || pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_READONLY_WITH_CHECKSUM) || - pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS), + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS) || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS| + SECPKG_FLAG_APPCONTAINER_CHECKS), "got %08x\n", pi->fCapabilities ); ok( pi->wVersion == 1, "got %u\n", pi->wVersion ); ok( pi->wRPCID == RPC_C_AUTHN_WINNT, "got %u\n", pi->wRPCID ); @@ -372,7 +374,9 @@ START_TEST(negotiate) } ok( info->fCapabilities == NEGOTIATE_BASE_CAPS || info->fCapabilities == (NEGOTIATE_BASE_CAPS|SECPKG_FLAG_READONLY_WITH_CHECKSUM) || - info->fCapabilities == (NEGOTIATE_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS), + info->fCapabilities == (NEGOTIATE_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS) || + info->fCapabilities == (NEGOTIATE_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS| + SECPKG_FLAG_APPCONTAINER_CHECKS), "got %08x\n", info->fCapabilities ); ok( info->wVersion == 1, "got %u\n", info->wVersion ); ok( info->wRPCID == RPC_C_AUTHN_GSS_NEGOTIATE, "got %u\n", info->wRPCID );

1 0

André Hentschel : schannel/tests: Fix test on win8.
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: 30fd27e1173cc6ace459f2aa100fe6b84367dd98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30fd27e1173cc6ace459f2aa1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 6 19:28:08 2012 +0100 schannel/tests: Fix test on win8. --- dlls/schannel/tests/main.c | 18 +++++++++++++++--- include/sspi.h | 4 ++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index b576848..83c107a 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -45,6 +45,17 @@ ValidateTargetInfo) #define SECPKG_FUNCTION_TABLE_SIZE_6 sizeof(SECPKG_FUNCTION_TABLE) +#define LSA_BASE_CAPS ( \ + SECPKG_FLAG_INTEGRITY | \ + SECPKG_FLAG_PRIVACY | \ + SECPKG_FLAG_CONNECTION | \ + SECPKG_FLAG_MULTI_REQUIRED | \ + SECPKG_FLAG_EXTENDED_ERROR | \ + SECPKG_FLAG_IMPERSONATION | \ + SECPKG_FLAG_ACCEPT_WIN32_NAME | \ + SECPKG_FLAG_STREAM | \ + SECPKG_FLAG_MUTUAL_AUTH ) + static NTSTATUS (NTAPI *pSpLsaModeInitialize)(ULONG, PULONG, PSECPKG_FUNCTION_TABLE*, PULONG); static NTSTATUS (NTAPI *pSpUserModeInitialize)(ULONG, PULONG, @@ -179,8 +190,9 @@ static void testGetInfo(void) /* First package: Unified */ status = pTables->GetInfo(&PackageInfo); ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); - ok(PackageInfo.fCapabilities == 0x107b3, "fCapabilities: 0x%x\n", - PackageInfo.fCapabilities); + ok(PackageInfo.fCapabilities == LSA_BASE_CAPS || + PackageInfo.fCapabilities == (LSA_BASE_CAPS|SECPKG_FLAG_APPCONTAINER_PASSTHROUGH), + "fCapabilities: 0x%x\n", PackageInfo.fCapabilities); ok(PackageInfo.wVersion == 1, "wVersion: %d\n", PackageInfo.wVersion); ok(PackageInfo.wRPCID == 14, "wRPCID: %d\n", PackageInfo.wRPCID); ok(PackageInfo.cbMaxToken == 0x4000 || @@ -204,7 +216,7 @@ static void testGetInfo(void) if (status == STATUS_SUCCESS) { - ok(PackageInfo.fCapabilities == 0x107b3, "fCapabilities: 0x%x\n", + ok(PackageInfo.fCapabilities == LSA_BASE_CAPS, "fCapabilities: 0x%x\n", PackageInfo.fCapabilities); ok(PackageInfo.wVersion == 1, "wVersion: %d\n", PackageInfo.wVersion); ok(PackageInfo.wRPCID == 14, "wRPCID: %d\n", PackageInfo.wRPCID); diff --git a/include/sspi.h b/include/sspi.h index bd2241c..74bfd2f 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -131,6 +131,10 @@ typedef struct _SecPkgInfoW #define SECPKG_FLAG_DELEGATION 0x00020000 #define SECPKG_FLAG_READONLY_WITH_CHECKSUM 0x00040000 #define SECPKG_FLAG_RESTRICTED_TOKENS 0x00080000 +#define SECPKG_FLAG_NEGO_EXTENDER 0x00100000 +#define SECPKG_FLAG_NEGOTIABLE2 0x00200000 +#define SECPKG_FLAG_APPCONTAINER_PASSTHROUGH 0x00400000 +#define SECPKG_FLAG_APPCONTAINER_CHECKS 0x00800000 #define SECPKG_ID_NONE 0xffff

1 0

Jacek Caban : vbscript: Use simplified constant implementation for more constants.
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: d10d989feddd5dfc8ffac7d9e5cf8ff357c0a3b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d10d989feddd5dfc8ffac7d9e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 7 13:00:35 2012 +0100 vbscript: Use simplified constant implementation for more constants. --- dlls/vbscript/global.c | 56 ++++++------------------------------------------ 1 files changed, 7 insertions(+), 49 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 420a5a5..cba4edc 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1638,48 +1638,6 @@ static HRESULT Global_vbSystemModal(vbdisp_t *This, VARIANT *arg, unsigned args_ return E_NOTIMPL; } -static HRESULT Global_vbOK(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, IDOK); -} - -static HRESULT Global_vbCancel(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, IDCANCEL); -} - -static HRESULT Global_vbAbort(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, IDABORT); -} - -static HRESULT Global_vbRetry(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, IDRETRY); -} - -static HRESULT Global_vbIgnore(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, IDIGNORE); -} - -static HRESULT Global_vbYes(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, IDYES); -} - -static HRESULT Global_vbNo(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, IDNO); -} - static HRESULT Global_vbTrue(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { FIXME("\n"); @@ -1907,13 +1865,13 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBDEFAULTBUTTON4, Global_vbDefaultButton4, BP_GET}, {DISPID_GLOBAL_VBAPPLICATIONMODAL, Global_vbApplicationModal, BP_GET}, {DISPID_GLOBAL_VBSYSTEMMODAL, Global_vbSystemModal, BP_GET}, - {DISPID_GLOBAL_VBOK, Global_vbOK, BP_GET}, - {DISPID_GLOBAL_VBCANCEL, Global_vbCancel, BP_GET}, - {DISPID_GLOBAL_VBABORT, Global_vbAbort, BP_GET}, - {DISPID_GLOBAL_VBRETRY, Global_vbRetry, BP_GET}, - {DISPID_GLOBAL_VBIGNORE, Global_vbIgnore, BP_GET}, - {DISPID_GLOBAL_VBYES, Global_vbYes, BP_GET}, - {DISPID_GLOBAL_VBNO, Global_vbNo, BP_GET}, + {DISPID_GLOBAL_VBOK, NULL, BP_GET, IDOK}, + {DISPID_GLOBAL_VBCANCEL, NULL, BP_GET, IDCANCEL}, + {DISPID_GLOBAL_VBABORT, NULL, BP_GET, IDABORT}, + {DISPID_GLOBAL_VBRETRY, NULL, BP_GET, IDRETRY}, + {DISPID_GLOBAL_VBIGNORE, NULL, BP_GET, IDIGNORE}, + {DISPID_GLOBAL_VBYES, NULL, BP_GET, IDYES}, + {DISPID_GLOBAL_VBNO, NULL, BP_GET, IDNO}, {DISPID_GLOBAL_VBEMPTY, NULL, BP_GET, VT_EMPTY}, {DISPID_GLOBAL_VBNULL, NULL, BP_GET, VT_NULL}, {DISPID_GLOBAL_VBINTEGER, NULL, BP_GET, VT_I2},

1 0

Alexandre Julliard : gdi32: Keep track of the number of fonts on the unused list.
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: 06dced4eaae078ea701eb8bb593075801fff75ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=06dced4eaae078ea701eb8bb5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 7 14:36:22 2012 +0100 gdi32: Keep track of the number of fonts on the unused list. --- dlls/gdi32/freetype.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5cf34ca..ce8bbd9 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -375,6 +375,7 @@ struct enum_charset_list { static struct list gdi_font_list = LIST_INIT(gdi_font_list); static struct list unused_gdi_font_list = LIST_INIT(unused_gdi_font_list); +static unsigned int unused_font_count; #define UNUSED_CACHE_SIZE 10 static struct list system_links = LIST_INIT(system_links); @@ -4307,6 +4308,7 @@ static GdiFont *find_in_cache(HFONT hfont, const LOGFONTW *plf, const FMAT2 *pma hflist = HeapAlloc(GetProcessHeap(), 0, sizeof(*hflist)); hflist->hfont = hfont; list_add_head(&ret->hfontlist, &hflist->entry); + unused_font_count--; return ret; } return NULL; @@ -5021,7 +5023,6 @@ BOOL WineEngDestroyFontInstance(HFONT handle) GdiFont *gdiFont, *next; HFONTLIST *hflist, *hfnext; BOOL ret = FALSE; - int i = 0; GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); @@ -5044,17 +5045,16 @@ BOOL WineEngDestroyFontInstance(HFONT handle) TRACE("Moving to Unused list\n"); list_remove(&gdiFont->entry); list_add_head(&unused_gdi_font_list, &gdiFont->entry); + if (unused_font_count > UNUSED_CACHE_SIZE) + { + gdiFont = LIST_ENTRY( list_tail( &unused_gdi_font_list ), struct tagGdiFont, entry ); + TRACE("freeing %p\n", gdiFont); + list_remove(&gdiFont->entry); + free_font(gdiFont); + } + else unused_font_count++; } } - - - LIST_FOR_EACH_ENTRY_SAFE( gdiFont, next, &unused_gdi_font_list, struct tagGdiFont, entry ) - { - if (i++ < UNUSED_CACHE_SIZE) continue; - TRACE("freeing %p\n", gdiFont); - list_remove(&gdiFont->entry); - free_font(gdiFont); - } LeaveCriticalSection( &freetype_cs ); return ret; }

1 0

Alexandre Julliard : gdi32: Simplify list processing by using the LIST_FOR_EACH_ENTRY macro.
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: d3c128346b50c546d9e247a76cc0f87ad1a3a4e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c128346b50c546d9e247a76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 7 14:29:28 2012 +0100 gdi32: Simplify list processing by using the LIST_FOR_EACH_ENTRY macro. --- dlls/gdi32/freetype.c | 183 ++++++++++++++++++------------------------------ 1 files changed, 69 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d3c128346b50c546d9e24…

1 0

Francois Gouget : gdi32: Make make_rgb_colorref() static.
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: 166e7c7381b1c3848d328dd281ae57e02f4b6b5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=166e7c7381b1c3848d328dd28… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 7 12:31:16 2012 +0100 gdi32: Make make_rgb_colorref() static. --- dlls/gdi32/dibdrv/dibdrv.h | 1 - dlls/gdi32/dibdrv/objects.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index b780268..4152f2e 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -245,7 +245,6 @@ extern void free_dib_info(dib_info *dib) DECLSPEC_HIDDEN; extern void free_pattern_brush(dib_brush *brush) DECLSPEC_HIDDEN; extern void copy_dib_color_info(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN; extern BOOL convert_dib(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN; -extern COLORREF make_rgb_colorref( HDC hdc, const dib_info *dib, COLORREF color, BOOL *got_pixel, DWORD *pixel ) DECLSPEC_HIDDEN; extern DWORD get_pixel_color( HDC hdc, const dib_info *dib, COLORREF color, BOOL mono_fixup ) DECLSPEC_HIDDEN; extern int clip_rect_to_dib( const dib_info *dib, RECT *rc ) DECLSPEC_HIDDEN; extern int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct clipped_rects *clip_rects ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 96c0e7a..5ff9d1a 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -135,7 +135,7 @@ static inline BOOL rgbquad_equal(const RGBQUAD *a, const RGBQUAD *b) return FALSE; } -COLORREF make_rgb_colorref( HDC hdc, const dib_info *dib, COLORREF color, BOOL *got_pixel, DWORD *pixel ) +static COLORREF make_rgb_colorref( HDC hdc, const dib_info *dib, COLORREF color, BOOL *got_pixel, DWORD *pixel ) { *pixel = 0; *got_pixel = FALSE;

1 0

Jacek Caban : jscript: Added more useful debug traces.
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: e8766bb66f7f52993580b5a9f767ddf92a683621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8766bb66f7f52993580b5a9f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 7 11:57:42 2012 +0100 jscript: Added more useful debug traces. --- dlls/jscript/activex.c | 2 ++ dlls/jscript/engine.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/activex.c b/dlls/jscript/activex.c index c7b4e0a..58c2574 100644 --- a/dlls/jscript/activex.c +++ b/dlls/jscript/activex.c @@ -70,6 +70,8 @@ static IUnknown *create_activex_object(script_ctx_t *ctx, const WCHAR *progid) GUID guid; HRESULT hres; + TRACE("%s\n", debugstr_w(progid)); + hres = CLSIDFromProgID(progid, &guid); if(FAILED(hres)) return NULL; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 3fedea1..b62e5a6 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2458,7 +2458,7 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, bytecode_t *code, function_code op = code->instrs[exec_ctx->ip].op; hres = op_funcs[op](exec_ctx); if(FAILED(hres)) { - TRACE("EXCEPTION\n"); + TRACE("EXCEPTION %08x\n", hres); if(!exec_ctx->except_frame) break;

1 0

Jacek Caban : msxml3: Tests code clean up.
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: b93dbb49c09b59610a4d11aaea883bb837f769d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b93dbb49c09b59610a4d11aae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 7 11:53:56 2012 +0100 msxml3: Tests code clean up. --- dlls/msxml3/tests/httpreq.c | 31 +++++++++++-------------------- 1 files changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 654749b..e3a1a91 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -114,6 +114,9 @@ static int alloced_bstrs_count; static BSTR _bstr_(const char *str) { + if(!str) + return NULL; + assert(alloced_bstrs_count < sizeof(alloced_bstrs)/sizeof(alloced_bstrs[0])); alloced_bstrs[alloced_bstrs_count] = alloc_str_from_narrow(str); return alloced_bstrs[alloced_bstrs_count++]; @@ -1431,7 +1434,6 @@ static void test_XMLHTTP(void) BSTR bstrResponse, str, str1; VARIANT varbody, varbody_ref; VARIANT dummy; - VARIANT async; LONG state, status, bound; IDispatch *event; void *ptr; @@ -1443,9 +1445,6 @@ static void test_XMLHTTP(void) VariantInit(&dummy); V_VT(&dummy) = VT_ERROR; V_ERROR(&dummy) = DISP_E_MEMBERNOTFOUND; - VariantInit(&async); - V_VT(&async) = VT_BOOL; - V_BOOL(&async) = VARIANT_FALSE; hr = IXMLHttpRequest_put_onreadystatechange(xhr, NULL); EXPECT_HR(hr, S_OK); @@ -1484,14 +1483,9 @@ static void test_XMLHTTP(void) ok(hr == E_FAIL, "got 0x%08x\n", hr); /* invalid parameters */ - hr = IXMLHttpRequest_open(xhr, NULL, NULL, async, dummy, dummy); - EXPECT_HR(hr, E_INVALIDARG); - - hr = IXMLHttpRequest_open(xhr, _bstr_("POST"), NULL, async, dummy, dummy); - EXPECT_HR(hr, E_INVALIDARG); - - hr = IXMLHttpRequest_open(xhr, NULL, _bstr_(urlA), async, dummy, dummy); - EXPECT_HR(hr, E_INVALIDARG); + test_open(xhr, NULL, NULL, E_INVALIDARG); + test_open(xhr, "POST", NULL, E_INVALIDARG); + test_open(xhr, NULL, urlA, E_INVALIDARG); hr = IXMLHttpRequest_setRequestHeader(xhr, NULL, NULL); EXPECT_HR(hr, E_INVALIDARG); @@ -1522,8 +1516,7 @@ static void test_XMLHTTP(void) g_unexpectedcall = g_expectedcall = 0; - hr = IXMLHttpRequest_open(xhr, _bstr_("POST"), _bstr_(urlA), async, dummy, dummy); - EXPECT_HR(hr, S_OK); + test_open(xhr, "POST", urlA, S_OK); ok(g_unexpectedcall == 0, "unexpected disp event call\n"); ok(g_expectedcall == 1 || broken(g_expectedcall == 0) /* win2k */, "no expected disp event call\n"); @@ -1548,8 +1541,7 @@ static void test_XMLHTTP(void) ok(state == READYSTATE_UNINITIALIZED || broken(state == READYSTATE_LOADING) /* win2k */, "got %d, expected READYSTATE_UNINITIALIZED\n", state); - hr = IXMLHttpRequest_open(xhr, _bstr_("POST"), _bstr_(urlA), async, dummy, dummy); - EXPECT_HR(hr, S_OK); + test_open(xhr, "POST", urlA, S_OK); hr = IXMLHttpRequest_setRequestHeader(xhr, _bstr_("header1"), _bstr_("value1")); EXPECT_HR(hr, S_OK); @@ -1628,16 +1620,15 @@ static void test_XMLHTTP(void) } /* POST: VT_VARIANT|VT_BYREF body */ + test_open(xhr, "POST", urlA, S_OK); + V_VT(&varbody_ref) = VT_VARIANT|VT_BYREF; V_VARIANTREF(&varbody_ref) = &varbody; - hr = IXMLHttpRequest_open(xhr, _bstr_("POST"), _bstr_(urlA), async, dummy, dummy); - EXPECT_HR(hr, S_OK); hr = IXMLHttpRequest_send(xhr, varbody_ref); EXPECT_HR(hr, S_OK); /* GET request */ - hr = IXMLHttpRequest_open(xhr, _bstr_("GET"), _bstr_(xmltestA), async, dummy, dummy); - EXPECT_HR(hr, S_OK); + test_open(xhr, "GET", xmltestA, S_OK); V_VT(&varbody) = VT_EMPTY;

1 0

Jacek Caban : msxml3: Added URL validation tests.
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: e310a88402374e954e05eeedeebcf7c97c196561 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e310a88402374e954e05eeede… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 7 11:53:38 2012 +0100 msxml3: Added URL validation tests. --- dlls/msxml3/tests/httpreq.c | 178 ++++++++++++++++++++++++++++++++----------- 1 files changed, 134 insertions(+), 44 deletions(-) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 9e2f99b..654749b 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -127,6 +127,21 @@ static void free_bstrs(void) alloced_bstrs_count = 0; } +static BSTR a2bstr(const char *str) +{ + BSTR ret; + int len; + + if(!str) + return NULL; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = SysAllocStringLen(NULL, len); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + + return ret; +} + typedef struct { IServiceProvider IServiceProvider_iface; @@ -537,7 +552,7 @@ static HRESULT WINAPI htmldoc2_put_URL(IHTMLDocument2 *iface, BSTR v) static HRESULT WINAPI htmldoc2_get_URL(IHTMLDocument2 *iface, BSTR *p) { CHECK_EXPECT2(htmldoc2_get_url); - *p = SysAllocString(NULL); + *p = a2bstr("http://test.winehq.org/"); return S_OK; } @@ -1317,6 +1332,92 @@ static IDispatch* create_dispevent(void) return (IDispatch*)&event->IDispatch_iface; } +static IXMLHttpRequest *create_xhr(void) +{ + IXMLHttpRequest *ret; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_XMLHTTPRequest, NULL, CLSCTX_INPROC_SERVER, + &IID_IXMLHttpRequest, (void**)&ret); + + return SUCCEEDED(hr) ? ret : NULL; +} + +static void set_safety_opt(IUnknown *unk, DWORD mask, DWORD opts) +{ + IObjectSafety *obj_safety; + HRESULT hr; + + hr = IUnknown_QueryInterface(unk, &IID_IObjectSafety, (void**)&obj_safety); + ok(hr == S_OK, "Could not get IObjectSafety iface: %08x\n", hr); + + hr = IObjectSafety_SetInterfaceSafetyOptions(obj_safety, &IID_IDispatch, mask, mask&opts); + ok(hr == S_OK, "SetInterfaceSafetyOptions failed: %08x\n", hr); + + IObjectSafety_Release(obj_safety); +} + +static void set_xhr_site(IXMLHttpRequest *xhr) +{ + IObjectWithSite *obj_site; + HRESULT hr; + + hr = IXMLHttpRequest_QueryInterface(xhr, &IID_IObjectWithSite, (void**)&obj_site); + ok(hr == S_OK, "Could not get IObjectWithSite iface: %08x\n", hr); + + SET_EXPECT(site_qi_IServiceProvider); + SET_EXPECT(sp_queryservice_SID_SBindHost); + SET_EXPECT(sp_queryservice_SID_SContainerDispatch_htmldoc2); + SET_EXPECT(sp_queryservice_SID_secmgr_htmldoc2); + SET_EXPECT(sp_queryservice_SID_secmgr_xmldomdoc); + SET_EXPECT(sp_queryservice_SID_secmgr_secmgr); + + /* calls to IHTMLDocument2 */ + SET_EXPECT(htmldoc2_get_all); + SET_EXPECT(collection_get_length); + SET_EXPECT(htmldoc2_get_url); + + SET_EXPECT(site_qi_IXMLDOMDocument); + SET_EXPECT(site_qi_IOleClientSite); + + hr = IObjectWithSite_SetSite(obj_site, &testsite.IUnknown_iface); + EXPECT_HR(hr, S_OK); + + CHECK_CALLED(site_qi_IServiceProvider); +todo_wine + CHECK_CALLED(sp_queryservice_SID_SBindHost); + CHECK_CALLED(sp_queryservice_SID_SContainerDispatch_htmldoc2); +todo_wine { + CHECK_CALLED(sp_queryservice_SID_secmgr_htmldoc2); + CHECK_CALLED(sp_queryservice_SID_secmgr_xmldomdoc); + /* this one isn't very reliable + CHECK_CALLED(sp_queryservice_SID_secmgr_secmgr); */ + + CHECK_CALLED(htmldoc2_get_all); + CHECK_CALLED(collection_get_length); + CHECK_CALLED(htmldoc2_get_url); + + CHECK_CALLED(site_qi_IXMLDOMDocument); + CHECK_CALLED(site_qi_IOleClientSite); +} + + IObjectWithSite_Release(obj_site); +} + +#define test_open(a,b,c,d) _test_open(__LINE__,a,b,c,d) +static void _test_open(unsigned line, IXMLHttpRequest *xhr, const char *method, const char *url, HRESULT exhres) +{ + VARIANT empty, vfalse; + HRESULT hr; + + V_VT(&empty) = VT_EMPTY; + V_VT(&vfalse) = VT_BOOL; + V_BOOL(&vfalse) = VARIANT_FALSE; + + hr = IXMLHttpRequest_open(xhr, _bstr_(method), _bstr_(url), vfalse, empty, empty); + ok_(__FILE__,line)(hr == exhres, "open(%s %s) failed: %08x, expected %08x\n", method, url, hr, exhres); +} + static void test_XMLHTTP(void) { static const char bodyA[] = "mode=Test"; @@ -1337,13 +1438,7 @@ static void test_XMLHTTP(void) HRESULT hr; HGLOBAL g; - hr = CoCreateInstance(&CLSID_XMLHTTPRequest, NULL, CLSCTX_INPROC_SERVER, - &IID_IXMLHttpRequest, (void**)&xhr); - if (FAILED(hr)) - { - win_skip("IXMLHTTPRequest is not available (0x%08x)\n", hr); - return; - } + xhr = create_xhr(); VariantInit(&dummy); V_VT(&dummy) = VT_ERROR; @@ -1629,43 +1724,10 @@ todo_wine { EXPECT_REF(obj_site2, 1); ok(obj_site != obj_site2, "expected new instance\n"); } - SET_EXPECT(site_qi_IServiceProvider); - SET_EXPECT(sp_queryservice_SID_SBindHost); - SET_EXPECT(sp_queryservice_SID_SContainerDispatch_htmldoc2); - SET_EXPECT(sp_queryservice_SID_secmgr_htmldoc2); - SET_EXPECT(sp_queryservice_SID_secmgr_xmldomdoc); - SET_EXPECT(sp_queryservice_SID_secmgr_secmgr); - - /* calls to IHTMLDocument2 */ - SET_EXPECT(htmldoc2_get_all); - SET_EXPECT(collection_get_length); - SET_EXPECT(htmldoc2_get_url); - - SET_EXPECT(site_qi_IXMLDOMDocument); - SET_EXPECT(site_qi_IOleClientSite); - - hr = IObjectWithSite_SetSite(obj_site, &testsite.IUnknown_iface); - EXPECT_HR(hr, S_OK); - - CHECK_CALLED(site_qi_IServiceProvider); -todo_wine - CHECK_CALLED(sp_queryservice_SID_SBindHost); - CHECK_CALLED(sp_queryservice_SID_SContainerDispatch_htmldoc2); -todo_wine { - CHECK_CALLED(sp_queryservice_SID_secmgr_htmldoc2); - CHECK_CALLED(sp_queryservice_SID_secmgr_xmldomdoc); - /* this one isn't very reliable - CHECK_CALLED(sp_queryservice_SID_secmgr_secmgr); */ - - CHECK_CALLED(htmldoc2_get_all); - CHECK_CALLED(collection_get_length); - CHECK_CALLED(htmldoc2_get_url); - - CHECK_CALLED(site_qi_IXMLDOMDocument); - CHECK_CALLED(site_qi_IOleClientSite); -} IObjectWithSite_Release(obj_site); + set_xhr_site(xhr); + /* try to set site another time */ /* to be removed once IObjectWithSite is properly separated */ @@ -1691,11 +1753,39 @@ todo_wine { free_bstrs(); } +static void test_safe_httpreq(void) +{ + IXMLHttpRequest *xhr; + + xhr = create_xhr(); + + set_safety_opt((IUnknown*)xhr, INTERFACESAFE_FOR_UNTRUSTED_DATA, -1); + set_xhr_site(xhr); + + /* different scheme */ + test_open(xhr, "GET", "https://test.winehq.org/tests/hello.html", E_ACCESSDENIED); + + /* different host */ + test_open(xhr, "GET", "http://tests.winehq.org/tests/hello.html", E_ACCESSDENIED); + test_open(xhr, "GET", "http://www.test.winehq.org/tests/hello.html", E_ACCESSDENIED); + + IXMLHttpRequest_Release(xhr); +} + START_TEST(httpreq) { + IXMLHttpRequest *xhr; + CoInitialize(NULL); - test_XMLHTTP(); + if((xhr = create_xhr())) { + IXMLHttpRequest_Release(xhr); + + test_XMLHTTP(); + test_safe_httpreq(); + }else { + win_skip("IXMLHTTPRequest is not available\n"); + } CoUninitialize(); }

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
55
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 December 2012