July 2013 - Wine-commits - list.winehq.org

Rico Schüller : d3dx9: Improve shader constant table parsing.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: e6e09eb465e2752cd2d4daed132635a157b87c82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6e09eb465e2752cd2d4daed1… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 22 14:35:23 2013 +0200 d3dx9: Improve shader constant table parsing. --- dlls/d3dx9_36/shader.c | 89 ++++++++++++++++++++++++++++------------------- 1 files changed, 53 insertions(+), 36 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 1d6a677..8b089d2 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1554,58 +1554,63 @@ static HRESULT parse_ctab_constant_type(const char *ctab, DWORD typeoffset, stru } else { - WORD offsetdiff = 0; + WORD offsetdiff = type->Columns * type->Rows; + BOOL fail = FALSE; - switch (type->Class) + size = type->Columns * type->Rows; + + switch (regset) { - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - offsetdiff = 1; - size = 1; + case D3DXRS_BOOL: + fail = type->Class != D3DXPC_SCALAR && type->Class != D3DXPC_VECTOR + && type->Class != D3DXPC_MATRIX_ROWS && type->Class != D3DXPC_MATRIX_COLUMNS; break; - case D3DXPC_MATRIX_ROWS: - size = is_element ? type->Rows : max(type->Rows, type->Columns); - offsetdiff = type->Rows; - break; + case D3DXRS_FLOAT4: + case D3DXRS_INT4: + switch (type->Class) + { + case D3DXPC_VECTOR: + size = 1; + /* fall through */ + case D3DXPC_SCALAR: + offsetdiff = type->Rows * 4; + break; + + case D3DXPC_MATRIX_ROWS: + offsetdiff = type->Rows * 4; + size = is_element ? type->Rows : max(type->Rows, type->Columns); + break; - case D3DXPC_MATRIX_COLUMNS: - size = type->Columns; - offsetdiff = type->Columns; + case D3DXPC_MATRIX_COLUMNS: + offsetdiff = type->Columns * 4; + size = type->Columns; + break; + + default: + fail = TRUE; + break; + } break; - case D3DXPC_OBJECT: + case D3DXRS_SAMPLER: size = 1; + fail = type->Class != D3DXPC_OBJECT; break; default: - FIXME("Unhandled type class %s\n", debug_d3dxparameter_class(type->Class)); + fail = TRUE; break; } - /* offset in bytes => offsetdiff * components(4) * sizeof(DWORD) */ - if (offset) *offset += offsetdiff * 4 * 4; - - /* int and bool registerset have different sizes */ - if (regset == D3DXRS_INT4 || regset == D3DXRS_BOOL) + if (fail) { - switch (type->Class) - { - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - size = type->Columns; - break; - - case D3DXPC_MATRIX_ROWS: - case D3DXPC_MATRIX_COLUMNS: - size = 4 * type->Columns; - break; - - default: - FIXME("Unhandled type class %s\n", debug_d3dxparameter_class(type->Class)); - break; - } + FIXME("Unhandled register set %s, type class %s\n", debug_d3dxparameter_registerset(regset), + debug_d3dxparameter_class(type->Class)); } + + /* offset in bytes => offsetdiff * sizeof(DWORD) */ + if (offset) *offset += offsetdiff * 4; } constant->desc.RegisterCount = max(0, min(max - index, size)); @@ -1719,6 +1724,18 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(const DWORD *byte_code, DWORD flags, offset ? &offset : NULL, constant_info[i].Name, constant_info[i].RegisterSet); if (hr != D3D_OK) goto error; + + /* + * Set the register count, it may differ for D3DXRS_INT4, because somehow + * it makes the assumption that the register size is 1 instead of 4, so the + * count is 4 times bigger. This holds true only for toplevel shader + * constants. The count of elements and members is always based on a + * register size of 4. + */ + if (object->constants[i].desc.RegisterSet == D3DXRS_INT4) + { + object->constants[i].desc.RegisterCount = constant_info[i].RegisterCount; + } } *constant_table = &object->ID3DXConstantTable_iface;

1 0

Rico Schüller : d3dx9: Merge get/is_valid_constant().
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: 918abfef6a7a7e0d14fec9000205146af804b9e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=918abfef6a7a7e0d14fec9000… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 22 14:35:34 2013 +0200 d3dx9: Merge get/is_valid_constant(). --- dlls/d3dx9_36/shader.c | 47 ++++++++++++++++------------------------------- 1 files changed, 16 insertions(+), 31 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 8b089d2..6ad5f92 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -610,11 +610,6 @@ static inline BOOL is_vertex_shader(DWORD version) return (version & 0xffff0000) == 0xfffe0000; } -static inline struct ctab_constant *constant_from_handle(D3DXHANDLE handle) -{ - return (struct ctab_constant *)handle; -} - static inline D3DXHANDLE handle_from_constant(struct ctab_constant *constant) { return (D3DXHANDLE)constant; @@ -708,54 +703,44 @@ static struct ctab_constant *get_constant_by_name(struct ID3DXConstantTableImpl return NULL; } -static struct ctab_constant *is_valid_sub_constant(struct ctab_constant *parent, struct ctab_constant *constant) +static struct ctab_constant *is_valid_sub_constant(struct ctab_constant *parent, D3DXHANDLE handle) { + struct ctab_constant *c; UINT i, count; - /* all variable have at least elements = 1, but no elements */ + /* all variable have at least elements = 1, but not always elements */ if (!parent->constants) return NULL; - if (parent->desc.Elements > 1) count = parent->desc.Elements; - else count = parent->desc.StructMembers; - + count = parent->desc.Elements > 1 ? parent->desc.Elements : parent->desc.StructMembers; for (i = 0; i < count; ++i) { - if (&parent->constants[i] == constant) - return constant; + if (handle_from_constant(&parent->constants[i]) == handle) + return &parent->constants[i]; - if (is_valid_sub_constant(&parent->constants[i], constant)) - return constant; + c = is_valid_sub_constant(&parent->constants[i], handle); + if (c) return c; } return NULL; } -static inline struct ctab_constant *is_valid_constant(struct ID3DXConstantTableImpl *table, D3DXHANDLE handle) +static inline struct ctab_constant *get_valid_constant(struct ID3DXConstantTableImpl *table, D3DXHANDLE handle) { - struct ctab_constant *c = constant_from_handle(handle); + struct ctab_constant *c; UINT i; - if (!c) return NULL; + if (!handle) return NULL; for (i = 0; i < table->desc.Constants; ++i) { - if (&table->constants[i] == c) - return c; + if (handle_from_constant(&table->constants[i]) == handle) + return &table->constants[i]; - if (is_valid_sub_constant(&table->constants[i], c)) - return c; + c = is_valid_sub_constant(&table->constants[i], handle); + if (c) return c; } - return NULL; -} - -static inline struct ctab_constant *get_valid_constant(struct ID3DXConstantTableImpl *table, D3DXHANDLE handle) -{ - struct ctab_constant *constant = is_valid_constant(table, handle); - - if (!constant) constant = get_constant_by_name(table, NULL, handle); - - return constant; + return get_constant_by_name(table, NULL, handle); } static inline void set_float_shader_constant(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device,

1 0

Rico Schüller : d3dx9: Improve ID3DXConstantTable:: Set*().
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: 8231c8ef50ca26f9e9208ffe3db4563f9a77dc6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8231c8ef50ca26f9e9208ffe3… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 22 14:35:41 2013 +0200 d3dx9: Improve ID3DXConstantTable::Set*(). --- dlls/d3dx9_36/shader.c | 665 ++++++++++++++++++++++++------------------ dlls/d3dx9_36/tests/shader.c | 2 +- 2 files changed, 383 insertions(+), 284 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8231c8ef50ca26f9e9208…

1 0

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable scalar test.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: 0a2085f50227d3793df50e293982dbc89b2655ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a2085f50227d3793df50e293… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 22 14:35:47 2013 +0200 d3dx9/tests: Add ID3DXConstantTable scalar test. --- dlls/d3dx9_36/tests/shader.c | 606 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 606 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a2085f50227d3793df50…

1 0

Aric Stewart : wineqtdecoder: Calculate AvgTimePerFrame for video tracks.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: deff27e23ee9dca1791501c3ba31a0e6cf042c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deff27e23ee9dca1791501c3b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 15 13:04:42 2013 -0500 wineqtdecoder: Calculate AvgTimePerFrame for video tracks. --- dlls/wineqtdecoder/qtsplitter.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 03cc8a9..9aa6314 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -884,6 +884,10 @@ static HRESULT QT_Process_Video_Track(QTSplitter* filter, Track trk) int t; DWORD outputWidth, outputHeight, outputDepth; Fixed trackWidth, trackHeight; + Media videoMedia; + long sampleCount; + TimeValue64 duration; + TimeScale timeScale; ZeroMemory(&amt, sizeof(amt)); amt.formattype = FORMAT_VideoInfo; @@ -952,6 +956,12 @@ static HRESULT QT_Process_Video_Track(QTSplitter* filter, Track trk) return E_FAIL; } + videoMedia = GetTrackMedia(trk); + sampleCount = GetMediaSampleCount(videoMedia); + timeScale = GetMediaTimeScale(videoMedia); + duration = GetMediaDisplayDuration(videoMedia); + pvi->AvgTimePerFrame = (100000.0 * sampleCount * timeScale) / duration; + piOutput.dir = PINDIR_OUTPUT; piOutput.pFilter = &filter->filter.IBaseFilter_iface; lstrcpyW(piOutput.achName,szwVideoOut);

1 0

Dmitry Timoshkov : kernel32: GetShortPathName for a non-existent short file name should fail.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: 4cc482bc0df758bec76ad1466abcba7f85e3cc5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cc482bc0df758bec76ad1466… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 19 14:02:38 2013 +0900 kernel32: GetShortPathName for a non-existent short file name should fail. --- dlls/kernel32/path.c | 30 ++++++++---------------------- dlls/kernel32/tests/path.c | 2 -- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 63d977b..5cd3c4b 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -441,8 +441,6 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl DWORD tmplen; WIN32_FIND_DATAW wfd; HANDLE goit; - UNICODE_STRING ustr; - WCHAR ustr_buf[8+1+3+1]; TRACE("%s\n", debugstr_w(longpath)); @@ -465,10 +463,6 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl sp = lp = 2; } - ustr.Buffer = ustr_buf; - ustr.Length = 0; - ustr.MaximumLength = sizeof(ustr_buf); - while (longpath[lp]) { /* check for path delimiters and reproduce them */ @@ -485,29 +479,21 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl continue; } - for (p = longpath + lp; *p && *p != '/' && *p != '\\'; p++); - tmplen = p - (longpath + lp); - lstrcpynW(tmpshortpath + sp, longpath + lp, tmplen + 1); - /* Check, if the current element is a valid dos name */ - if (tmplen <= 8+1+3) + p = longpath + lp; + if (lp == 0 && p[0] == '.' && (p[1] == '/' || p[1] == '\\')) { - BOOLEAN spaces; - memcpy(ustr_buf, longpath + lp, tmplen * sizeof(WCHAR)); - ustr_buf[tmplen] = '\0'; - ustr.Length = tmplen * sizeof(WCHAR); - if (RtlIsNameLegalDOS8Dot3(&ustr, NULL, &spaces) && !spaces) - { - sp += tmplen; - lp += tmplen; - continue; - } + tmpshortpath[sp++] = *p++; + tmpshortpath[sp++] = *p++; } + for (; *p && *p != '/' && *p != '\\'; p++); + tmplen = p - (longpath + lp); + lstrcpynW(tmpshortpath + sp, longpath + lp, tmplen + 1); /* Check if the file exists and use the existing short file name */ goit = FindFirstFileW(tmpshortpath, &wfd); if (goit == INVALID_HANDLE_VALUE) goto notfound; FindClose(goit); - strcpyW(tmpshortpath + sp, wfd.cAlternateFileName); + strcpyW(tmpshortpath + sp, wfd.cAlternateFileName[0] ? wfd.cAlternateFileName : wfd.cFileName); sp += strlenW(tmpshortpath + sp); lp += tmplen; } diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index d703aa9..c49a76f 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1281,9 +1281,7 @@ static void test_GetShortPathNameW(void) /* GetShortPathName for a non-existent short file name should fail */ SetLastError(0xdeadbeef); length = GetShortPathNameW( short_path, path, 0 ); -todo_wine ok(!length, "GetShortPathNameW should fail\n"); -todo_wine ok(GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); file = CreateFileW( short_path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL );

1 0

Marcus Meissner : msxml3/tests: Check ISAXContentHandler_endDocument ( Coverity).
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: f6a16d8e0428abf40064d6731c5710ff00e0c152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6a16d8e0428abf40064d6731… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Jul 22 09:01:31 2013 +0200 msxml3/tests: Check ISAXContentHandler_endDocument (Coverity). --- dlls/msxml3/tests/saxreader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index df0aa47..dec62bb 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3712,7 +3712,8 @@ static void test_mxwriter_startendelement(void) ok(!lstrcmpW(_bstr_("<abc>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); - ISAXContentHandler_endDocument(content); + hr = ISAXContentHandler_endDocument(content); + EXPECT_HR(hr, S_OK); IMXWriter_flush(writer); hr = ISAXContentHandler_endElement(content, _bstr_(""), 0, _bstr_(""), 0, _bstr_("abdcdef"), 3);

1 0

Jacek Caban : mshtml: Better res protocol URL parsing.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: edf4e61891214039af9add7c2b0d8df9c36d62f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edf4e61891214039af9add7c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 19 17:59:30 2013 +0200 mshtml: Better res protocol URL parsing. --- dlls/mshtml/protocol.c | 32 ++++++++++++++------------------ 1 files changed, 14 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 021ce55..c8f8d08 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -631,31 +631,27 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, } url_dll = url + sizeof(wszRes)/sizeof(wszRes[0]); - if(!(url_file = strrchrW(url_dll, '/'))) { + if(!(res_type = strchrW(url_dll, '/'))) { WARN("wrong url: %s\n", debugstr_w(url)); IInternetProtocolSink_ReportResult(pOIProtSink, MK_E_SYNTAX, 0, NULL); heap_free(url); return MK_E_SYNTAX; } - *url_file++ = 0; + *res_type++ = 0; + if ((url_file = strchrW(res_type, '/'))) { + *url_file++ = 0; + }else { + url_file = res_type; + res_type = MAKEINTRESOURCEW(RT_HTML); + } + hdll = LoadLibraryExW(url_dll, NULL, LOAD_LIBRARY_AS_DATAFILE); if(!hdll) { - if (!(res_type = strrchrW(url_dll, '/'))) { - WARN("Could not open dll: %s\n", debugstr_w(url_dll)); - IInternetProtocolSink_ReportResult(pOIProtSink, HRESULT_FROM_WIN32(GetLastError()), 0, NULL); - heap_free(url); - return HRESULT_FROM_WIN32(GetLastError()); - } - *res_type++ = 0; - - hdll = LoadLibraryExW(url_dll, NULL, LOAD_LIBRARY_AS_DATAFILE); - if(!hdll) { - WARN("Could not open dll: %s\n", debugstr_w(url_dll)); - IInternetProtocolSink_ReportResult(pOIProtSink, HRESULT_FROM_WIN32(GetLastError()), 0, NULL); - heap_free(url); - return HRESULT_FROM_WIN32(GetLastError()); - } + WARN("Could not open dll: %s\n", debugstr_w(url_dll)); + IInternetProtocolSink_ReportResult(pOIProtSink, HRESULT_FROM_WIN32(GetLastError()), 0, NULL); + heap_free(url); + return HRESULT_FROM_WIN32(GetLastError()); } TRACE("trying to find resource type %s, name %s\n", debugstr_w(res_type), debugstr_w(url_file)); @@ -665,7 +661,7 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, LPWSTR endpoint = NULL; DWORD file_id = strtolW(url_file, &endpoint, 10); if(endpoint == url_file+strlenW(url_file)) - src = FindResourceW(hdll, MAKEINTRESOURCEW(file_id), MAKEINTRESOURCEW(RT_HTML)); + src = FindResourceW(hdll, MAKEINTRESOURCEW(file_id), res_type); if(!src) { WARN("Could not find resource\n");

1 0

Jacek Caban : mshtml/tests: Added more res protocol tests.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: 2046d69b4e701bfa16c189452b1b019788272bc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2046d69b4e701bfa16c189452… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 19 17:59:40 2013 +0200 mshtml/tests: Added more res protocol tests. --- dlls/mshtml/tests/protocol.c | 39 ++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/rsrc.rc | 8 ++++++++ 2 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 7e66347..04c4714 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -27,6 +27,7 @@ #include "ole2.h" #include "urlmon.h" #include "shlwapi.h" +#include "wininet.h" #include "initguid.h" @@ -73,6 +74,9 @@ static const WCHAR about_test_url[] = {'a','b','o','u','t',':','t','e','s','t',0 static const WCHAR about_res_url[] = {'r','e','s',':','b','l','a','n','k',0}; static const WCHAR javascript_test_url[] = {'j','a','v','a','s','c','r','i','p','t',':','t','e','s','t','(',')',0}; +static WCHAR res_url_base[INTERNET_MAX_URL_LENGTH] = {'r','e','s',':','/','/'}; +static unsigned res_url_base_len; + static const char *debugstr_guid(REFIID riid) { static char buf[50]; @@ -248,7 +252,7 @@ static void test_protocol_fail(IInternetProtocol *protocol, LPCWSTR url, HRESULT CHECK_CALLED(ReportResult); } -static void protocol_start(IInternetProtocol *protocol, LPCWSTR url) +static void protocol_start(IInternetProtocol *protocol, const WCHAR *url) { HRESULT hres; @@ -268,6 +272,33 @@ static void protocol_start(IInternetProtocol *protocol, LPCWSTR url) CHECK_CALLED(ReportResult); } +static void test_res_url(const char *url_suffix) +{ + WCHAR url[INTERNET_MAX_URL_LENGTH]; + IInternetProtocol *protocol; + ULONG size, ref; + BYTE buf[100]; + HRESULT hres; + + memcpy(url, res_url_base, res_url_base_len*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, url_suffix, -1, url+res_url_base_len, sizeof(url)-res_url_base_len); + + hres = CoCreateInstance(&CLSID_ResProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void**)&protocol); + ok(hres == S_OK, "Could not create ResProtocol instance: %08x\n", hres); + + protocol_start(protocol, url); + + hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &size); + ok(hres == S_OK, "Read failed: %08x\n", hres); + + hres = IInternetProtocol_Terminate(protocol, 0); + ok(hres == S_OK, "Terminate failed: %08x\n", hres); + + + ref = IInternetProtocol_Release(protocol); + ok(!ref, "ref=%u\n", ref); +} + static void res_sec_url_cmp(LPCWSTR url, DWORD size, LPCWSTR file) { WCHAR buf[MAX_PATH]; @@ -578,6 +609,10 @@ static void test_res_protocol(void) } IUnknown_Release(unk); + + test_res_url("/jstest.html"); + test_res_url("/Test/res.html"); + test_res_url("/test/dir/dir2/res.html"); } static void do_test_about_protocol(IClassFactory *factory, DWORD bf) @@ -908,6 +943,8 @@ static void test_javascript_protocol(void) START_TEST(protocol) { + res_url_base_len = 6 + GetModuleFileNameW(NULL, res_url_base + 6 /* strlen("res://") */, sizeof(res_url_base)-6); + OleInitialize(NULL); test_res_protocol(); diff --git a/dlls/mshtml/tests/rsrc.rc b/dlls/mshtml/tests/rsrc.rc index 49aecdf..07d816d 100644 --- a/dlls/mshtml/tests/rsrc.rc +++ b/dlls/mshtml/tests/rsrc.rc @@ -33,3 +33,11 @@ externscr.js HTML "externscr.js" /* @makedep: test_tlb.tlb */ 1 TYPELIB test_tlb.tlb + +/* For res: protocol test: */ + +/* @makedep: jstest.html */ +res.html test "jstest.html" + +/* @makedep: jstest.html */ +dir/dir2/res.html test "jstest.html"

1 0

Bruno Jesus : ws2_32/tests: Add listen() tests for TCP sockets.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: 9ea1835b82ef26db3a1a273b8028060dc474d893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ea1835b82ef26db3a1a273b8… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jul 20 13:27:30 2013 -0300 ws2_32/tests: Add listen() tests for TCP sockets. --- dlls/ws2_32/tests/sock.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3e3167a..bcf7abc 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2357,6 +2357,85 @@ static void test_errors(void) ok ( (ret == 0), "closesocket failed unexpectedly: %d\n", WSAGetLastError()); } +static void test_listen(void) +{ + SOCKET fdA, fdB; + int ret; + struct sockaddr_in address; + + memset(&address, 0, sizeof(address)); + address.sin_addr.s_addr = inet_addr("127.0.0.1"); + address.sin_family = AF_INET; + address.sin_port = htons(SERVERPORT); + + /* invalid socket tests */ + SetLastError(0xdeadbeef); + ok ((listen(0, 0) == SOCKET_ERROR), "listen did not fail\n"); + ret = WSAGetLastError(); +todo_wine + ok (ret == WSAENOTSOCK, "expected 10038, received %d\n", ret); + + SetLastError(0xdeadbeef); + ok ((listen(0xdeadbeef, 0) == SOCKET_ERROR), "listen did not fail\n"); + ret = WSAGetLastError(); +todo_wine + ok (ret == WSAENOTSOCK, "expected 10038, received %d\n", ret); + + /* tcp tests */ + fdA = socket(AF_INET, SOCK_STREAM, 0); + ok ((fdA != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); + + fdB = socket(AF_INET, SOCK_STREAM, 0); + ok ((fdB != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); + +todo_wine { + SetLastError(0xdeadbeef); + ok ((listen(fdA, -2) == SOCKET_ERROR), "listen did not fail\n"); + ret = WSAGetLastError(); + ok (ret == WSAEINVAL, "expected 10022, received %d\n", ret); + + SetLastError(0xdeadbeef); + ok ((listen(fdA, 1) == SOCKET_ERROR), "listen did not fail\n"); + ret = WSAGetLastError(); + ok (ret == WSAEINVAL, "expected 10022, received %d\n", ret); + + SetLastError(0xdeadbeef); + ok ((listen(fdA, SOMAXCONN) == SOCKET_ERROR), "listen did not fail\n"); + ret = WSAGetLastError(); + ok (ret == WSAEINVAL, "expected 10022, received %d\n", ret); + + ok (!bind(fdA, (struct sockaddr*) &address, sizeof(address)), "bind failed\n"); + + SetLastError(0xdeadbeef); + ok (bind(fdB, (struct sockaddr*) &address, sizeof(address)), "bind should have failed\n"); + ok (ret == WSAEINVAL, "expected 10022, received %d\n", ret); +} + ok (!listen(fdA, 0), "listen failed\n"); + ok (!listen(fdA, SOMAXCONN), "double listen failed\n"); +todo_wine { + SetLastError(0xdeadbeef); + ok ((listen(fdB, SOMAXCONN) == SOCKET_ERROR), "listen did not fail\n"); + ret = WSAGetLastError(); + ok (ret == WSAEINVAL, "expected 10022, received %d\n", ret); +} + ret = closesocket(fdB); + ok (ret == 0, "closesocket failed unexpectedly: %d\n", ret); + + fdB = socket(AF_INET, SOCK_STREAM, 0); + ok ((fdB != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); + +todo_wine { + SetLastError(0xdeadbeef); + ok (bind(fdB, (struct sockaddr*) &address, sizeof(address)), "bind should have failed\n"); + ret = WSAGetLastError(); + ok (ret == WSAEADDRINUSE, "expected 10048, received %d\n", ret); +} + ret = closesocket(fdA); + ok (ret == 0, "closesocket failed unexpectedly: %d\n", ret); + ret = closesocket(fdB); + ok (ret == 0, "closesocket failed unexpectedly: %d\n", ret); +} + static void test_select(void) { SOCKET fdRead, fdWrite; @@ -6098,6 +6177,7 @@ START_TEST( sock ) test_WSAStringToAddressW(); test_errors(); + test_listen(); test_select(); test_accept(); test_getpeername();

1 0