February 2011 - Wine-commits

Jerome Leclanche : winemenubuilder: Make sure extension-based mimetypes are always lowercase.
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: 44527f57b2c4722b3317b2a03ba6b1d2ac7fc538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44527f57b2c4722b3317b2a03… Author: Jerome Leclanche <adys.wh(a)gmail.com> Date: Sun Feb 20 18:05:44 2011 +0000 winemenubuilder: Make sure extension-based mimetypes are always lowercase. --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 070a8c2..e0c8e8f 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2321,7 +2321,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package char *progIdA = NULL; char *mimeProgId = NULL; - extensionA = wchars_to_utf8_chars(extensionW); + extensionA = wchars_to_utf8_chars(strlwrW(extensionW)); if (extensionA == NULL) { WINE_ERR("out of memory\n");

1 0

Alexandre Julliard : cabinet: Fix the remaining todo_wine tests in fdi.c.
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: 3dc669ffb5a2005f5cb47a1ddac66227ae63f678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dc669ffb5a2005f5cb47a1dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 19 12:50:09 2011 +0100 cabinet: Fix the remaining todo_wine tests in fdi.c. --- dlls/cabinet/fci.c | 2 +- dlls/cabinet/fdi.c | 35 ++++++----------------------------- dlls/cabinet/tests/fdi.c | 20 ++++++-------------- 3 files changed, 13 insertions(+), 44 deletions(-) diff --git a/dlls/cabinet/fci.c b/dlls/cabinet/fci.c index 997760a..9ec1bdd 100644 --- a/dlls/cabinet/fci.c +++ b/dlls/cabinet/fci.c @@ -672,7 +672,7 @@ static BOOL write_cabinet( FCI_Int *fci, PFNFCISTATUS status_callback ) cfheader->cFiles = fci_endian_uword( fci->cFiles ); cfheader->flags = fci_endian_uword( flags ); cfheader->setID = fci_endian_uword( fci->ccab.setID ); - cfheader->iCabinet = fci_endian_uword( fci->ccab.iCab - 1 ); + cfheader->iCabinet = fci_endian_uword( fci->ccab.iCab ); ptr = (char *)(cfheader + 1); if (flags & cfheadRESERVE_PRESENT) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index b5dc29d..27a969b 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -436,10 +436,8 @@ HFDI __cdecl FDICreate( if (!((fdi = pfnalloc(sizeof(FDI_Int))))) { perf->erfOper = FDIERROR_ALLOC_FAIL; - perf->erfType = ERROR_NOT_ENOUGH_MEMORY; + perf->erfType = 0; perf->fError = TRUE; - - SetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL; } @@ -603,21 +601,9 @@ static BOOL FDI_read_entries( /* get the number of folders */ num_folders = EndGetI16(buf+cfhead_NumFolders); - if (num_folders == 0) { - /* PONDERME: is this really invalid? */ - WARN("weird cabinet detect failure: no folders in cabinet\n"); - if (pmii) set_error( fdi, FDIERROR_NOT_A_CABINET, 0 ); - return FALSE; - } /* get the number of files */ num_files = EndGetI16(buf+cfhead_NumFiles); - if (num_files == 0) { - /* PONDERME: is this really invalid? */ - WARN("weird cabinet detect failure: no files in cabinet\n"); - if (pmii) set_error( fdi, FDIERROR_NOT_A_CABINET, 0 ); - return FALSE; - } /* setid */ setid = EndGetI16(buf+cfhead_SetID); @@ -2284,8 +2270,7 @@ static void free_decompression_temps(FDI_Int *fdi, const struct fdi_folder *fol, } } -static void free_decompression_mem(FDI_Int *fdi, - fdi_decomp_state *decomp_state, struct fdi_file *file) +static void free_decompression_mem(FDI_Int *fdi, fdi_decomp_state *decomp_state) { struct fdi_folder *fol; while (decomp_state) { @@ -2305,7 +2290,7 @@ static void free_decompression_mem(FDI_Int *fdi, fdi->free(fol); } while (CAB(firstfile)) { - file = CAB(firstfile); + struct fdi_file *file = CAB(firstfile); if (file->filename) fdi->free(file->filename); CAB(firstfile) = CAB(firstfile)->next; fdi->free(file); @@ -2531,7 +2516,6 @@ BOOL __cdecl FDICopy( idx = 0; if (pathlen) { for (i = 0; i < pathlen; i++) fullpath[idx++] = pszCabPath[i]; - if (fullpath[idx - 1] != '\\') fullpath[idx++] = '\\'; } if (filenamelen) for (i = 0; i < filenamelen; i++) fullpath[idx++] = pszCabinet[i]; fullpath[idx] = '\0'; @@ -2547,13 +2531,6 @@ BOOL __cdecl FDICopy( return FALSE; } - if (cabhf == 0) { - ERR("PFDI_OPEN returned zero for %s.\n", fullpath); - fdi->free(decomp_state); - set_error( fdi, FDIERROR_CABINET_NOT_FOUND, ERROR_FILE_NOT_FOUND ); - return FALSE; - } - /* check if it's really a cabfile. Note that this doesn't implement the bug */ if (!FDI_read_entries(fdi, cabhf, &fdici, &(CAB(mii)))) { ERR("FDIIsCabinet failed.\n"); @@ -2859,8 +2836,8 @@ BOOL __cdecl FDICopy( } } - free_decompression_temps(fdi, fol, decomp_state); - free_decompression_mem(fdi, decomp_state, file); + if (fol) free_decompression_temps(fdi, fol, decomp_state); + free_decompression_mem(fdi, decomp_state); return TRUE; @@ -2870,7 +2847,7 @@ BOOL __cdecl FDICopy( if (filehf) fdi->close(filehf); - free_decompression_mem(fdi, decomp_state, file); + free_decompression_mem(fdi, decomp_state); return FALSE; } diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index b3f70bf..4e1c9e0 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -239,12 +239,9 @@ static void test_FDICreate(void) ok(erf.erfOper == FDIERROR_ALLOC_FAIL, "Expected FDIERROR_ALLOC_FAIL, got %d\n", erf.erfOper); ok(erf.fError == TRUE, "Expected TRUE, got %d\n", erf.fError); - todo_wine - { - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(erf.erfType == 0, "Expected 0, got %d\n", erf.erfType); - } + ok(GetLastError() == 0xdeadbeef, + "Expected 0xdeadbeef, got %d\n", GetLastError()); + ok(erf.erfType == 0, "Expected 0, got %d\n", erf.erfType); } static void test_FDIDestroy(void) @@ -582,8 +579,7 @@ static void test_FDIIsCabinet(void) ok(cabinfo.cFolders == 1, "Expected 1, got %d\n", cabinfo.cFolders); ok(cabinfo.setID == 0xbeef, "Expected 0xbeef, got %d\n", cabinfo.setID); ok(cabinfo.cbCabinet == 182, "Expected 182, got %d\n", cabinfo.cbCabinet); - todo_wine - ok(cabinfo.iCabinet == 0, "Expected 0, got %d\n", cabinfo.iCabinet); + ok(cabinfo.iCabinet == 0, "Expected 0, got %d\n", cabinfo.iCabinet); fdi_close(fd); FDIDestroy(hfdi); @@ -629,11 +625,8 @@ static void test_FDICopy(void) SetLastError(0xdeadbeef); ret = FDICopy(hfdi, name, path, 0, CopyProgress, NULL, 0); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); - todo_wine - { - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - } + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); FDIDestroy(hfdi); } @@ -649,7 +642,6 @@ static void test_FDICopy(void) /* cabinet with no files or folders */ SetLastError(0xdeadbeef); ret = FDICopy(hfdi, name, path, 0, CopyProgress, NULL, 0); - todo_wine ok(ret == TRUE, "Expected TRUE, got %d\n", ret); ok(GetLastError() == 0, "Expected 0f, got %d\n", GetLastError());

1 0

Alexandre Julliard : Wine release 1.3.14
by Alexandre Julliard 18 Feb '11

18 Feb '11

Module: website Branch: master Commit: d736ff6fda3615b24007c2b4acb168be1e7e9df6 URL: http://source.winehq.org/git/website.git/?a=commit;h=d736ff6fda3615b24007c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 18 19:36:18 2011 +0100 Wine release 1.3.14 --- news/en/2011021801.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/en/2011021801.xml b/news/en/2011021801.xml new file mode 100644 index 0000000..5f61ddf --- /dev/null +++ b/news/en/2011021801.xml @@ -0,0 +1,15 @@ +<news> +<date>February 18, 2011</date> +<title>Wine 1.3.14 Released</title> +<body> + The Wine development release 1.3.14 is now available. + <a href="{$root}/announce/1.3.14">What's new</a> in this release: +<ul> + <li>Many cleanups to address Valgrind and Clang warnings.</li> + <li>Support for creating compressed cabinet files.</li> + <li>Translation updates.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.14.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.3.14.
by Alexandre Julliard 18 Feb '11

18 Feb '11

Module: wine Branch: master Commit: b799765fe6c0487fc8446b5e275cddb880787d00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b799765fe6c0487fc8446b5e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 18 19:28:55 2011 +0100 Release 1.3.14. --- ANNOUNCE | 922 +++++++++++++++++++++++++++++-------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 450 insertions(+), 492 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b799765fe6c0487fc8446…

1 0

Tag wine-1.3.14 : Alexandre Julliard : Release 1.3.14
by Alexandre Julliard 18 Feb '11

18 Feb '11

Module: wine Branch: refs/tags/wine-1.3.14 Tag: 8a41d41db5e53f809a0738fc0d047b21681050ed URL: http://source.winehq.org/git/wine.git/?a=tag;h=8a41d41db5e53f809a0738fc0d04… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 18 19:28:56 2011 +0100 Release 1.3.14

1 0

Austin English : wintrust/tests: Remove win9x hacks.
by Alexandre Julliard 18 Feb '11

18 Feb '11

Module: wine Branch: master Commit: d23b0888186ecf3865efbaf5e039744fafeaf18a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d23b0888186ecf3865efbaf5e… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 17 18:51:12 2011 -0800 wintrust/tests: Remove win9x hacks. --- dlls/wintrust/tests/asn.c | 4 ++-- dlls/wintrust/tests/crypt.c | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index 2fa45c6..a9955ac 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -150,7 +150,7 @@ static void test_encodeSPCLink(void) CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && (GetLastError() == CRYPT_E_INVALID_IA5_STRING || - GetLastError() == OSS_BAD_PTR /* Win9x */), + GetLastError() == OSS_BAD_PTR /* WinNT */), "Expected CRYPT_E_INVALID_IA5_STRING, got %08x\n", GetLastError()); /* Unlike the crypt32 string encoding routines, size is not set to the * index of the first invalid character. @@ -298,7 +298,7 @@ static void test_decodeSPCLink(void) NULL, &buf, &size); ok(!ret && (GetLastError() == CRYPT_E_BAD_ENCODE || - GetLastError() == OSS_DATA_ERROR /* Win9x */), + GetLastError() == OSS_DATA_ERROR /* WinNT */), "Expected CRYPT_E_BAD_ENCODE, got %08x\n", GetLastError()); } diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index bb561a2..0236486 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -893,8 +893,7 @@ static void test_cdf_parsing(void) catcdf = pCryptCATCDFOpen(cdffileW, cdf_callback); ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n"); todo_wine - ok(GetLastError() == ERROR_SHARING_VIOLATION || - broken(GetLastError() == ERROR_SUCCESS), /* win9x */ + ok(GetLastError() == ERROR_SHARING_VIOLATION, "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); DeleteFileA(cdffileA); @@ -909,8 +908,7 @@ static void test_cdf_parsing(void) catcdf = pCryptCATCDFOpen(cdffileW, cdf_callback); ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n"); todo_wine - ok(GetLastError() == ERROR_SHARING_VIOLATION || - broken(GetLastError() == ERROR_SUCCESS), /* win9x */ + ok(GetLastError() == ERROR_SHARING_VIOLATION, "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); DeleteFileA(cdffileA); ok(!DeleteFileA(catfileA), "Didn't expect a catalog file to be created\n"); @@ -925,8 +923,7 @@ static void test_cdf_parsing(void) catcdf = pCryptCATCDFOpen(cdffileW, cdf_callback); ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n"); todo_wine - ok(GetLastError() == ERROR_SHARING_VIOLATION || - broken(GetLastError() == ERROR_SUCCESS), /* win9x */ + ok(GetLastError() == ERROR_SHARING_VIOLATION, "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); DeleteFileA(cdffileA); ok(!DeleteFileA(catfileA), "Didn't expect a catalog file to be created\n");

1 0

Austin English : mshtml/tests: Update disabled test comment.
by Alexandre Julliard 18 Feb '11

18 Feb '11

Module: wine Branch: master Commit: d1442ace4302ff5b4ab22edf37a20ebbbb9a270f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1442ace4302ff5b4ab22edf3… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 17 19:07:19 2011 -0800 mshtml/tests: Update disabled test comment. --- dlls/mshtml/tests/protocol.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 599f43e..7504927 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -387,7 +387,7 @@ static void test_res_protocol(void) if (0) { - /* Crashes on win9x */ + /* Crashes on windows */ size = 0xdeadbeef; buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, NULL, PARSE_DOMAIN, 0, buf, @@ -688,7 +688,7 @@ static void test_about_protocol(void) if (0) { - /* Crashes on win9x */ + /* Crashes on windows */ size = 0xdeadbeef; buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, NULL, PARSE_DOMAIN, 0, buf,

1 0

Alistair Leslie-Hughes : msxml3: Add IObjectWithSite support to IXMLHttpRequest.
by Alexandre Julliard 18 Feb '11

18 Feb '11

Module: wine Branch: master Commit: 27bb5a0f520841c6839522ecabf84a5ceadd04ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=27bb5a0f520841c6839522eca… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 17 20:26:15 2011 +1100 msxml3: Add IObjectWithSite support to IXMLHttpRequest. --- dlls/msxml3/httprequest.c | 76 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/domdoc.c | 5 +++ 2 files changed, 81 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 0be4fbb..12eaa08 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -61,6 +61,7 @@ struct reqheader typedef struct { IXMLHTTPRequest IXMLHTTPRequest_iface; + IObjectWithSite IObjectWithSite_iface; LONG ref; READYSTATE state; @@ -81,6 +82,9 @@ typedef struct /* bind callback */ BindStatusCallback *bsc; LONG status; + + /* IObjectWithSite*/ + IUnknown *site; } httprequest; static inline httprequest *impl_from_IXMLHTTPRequest( IXMLHTTPRequest *iface ) @@ -88,6 +92,11 @@ static inline httprequest *impl_from_IXMLHTTPRequest( IXMLHTTPRequest *iface ) return CONTAINING_RECORD(iface, httprequest, IXMLHTTPRequest_iface); } +static inline httprequest *impl_from_IObjectWithSite(IObjectWithSite *iface) +{ + return CONTAINING_RECORD(iface, httprequest, IObjectWithSite_iface); +} + static void httprequest_setreadystate(httprequest *This, READYSTATE state) { READYSTATE last = This->state; @@ -503,6 +512,10 @@ static HRESULT WINAPI httprequest_QueryInterface(IXMLHTTPRequest *iface, REFIID { *ppvObject = iface; } + else if (IsEqualGUID(&IID_IObjectWithSite, riid)) + { + *ppvObject = &This->IObjectWithSite_iface; + } else { TRACE("Unsupported interface %s\n", debugstr_guid(riid)); @@ -534,6 +547,9 @@ static ULONG WINAPI httprequest_Release(IXMLHTTPRequest *iface) { struct reqheader *header, *header2; + if (This->site) + IUnknown_Release( This->site ); + SysFreeString(This->url); SysFreeString(This->user); SysFreeString(This->password); @@ -992,6 +1008,64 @@ static const struct IXMLHTTPRequestVtbl dimimpl_vtbl = httprequest_put_onreadystatechange }; +/* IObjectWithSite */ +static HRESULT WINAPI +httprequest_ObjectWithSite_QueryInterface( IObjectWithSite* iface, REFIID riid, void** ppvObject ) +{ + httprequest *This = impl_from_IObjectWithSite(iface); + return IXMLHTTPRequest_QueryInterface( (IXMLHTTPRequest *)This, riid, ppvObject ); +} + +static ULONG WINAPI httprequest_ObjectWithSite_AddRef( IObjectWithSite* iface ) +{ + httprequest *This = impl_from_IObjectWithSite(iface); + return IXMLHTTPRequest_AddRef((IXMLHTTPRequest *)This); +} + +static ULONG WINAPI httprequest_ObjectWithSite_Release( IObjectWithSite* iface ) +{ + httprequest *This = impl_from_IObjectWithSite(iface); + return IXMLHTTPRequest_Release((IXMLHTTPRequest *)This); +} + +static HRESULT WINAPI httprequest_ObjectWithSite_GetSite( IObjectWithSite *iface, REFIID iid, void **ppvSite ) +{ + httprequest *This = impl_from_IObjectWithSite(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid( iid ), ppvSite ); + + if ( !This->site ) + return E_FAIL; + + return IUnknown_QueryInterface( This->site, iid, ppvSite ); +} + +static HRESULT WINAPI httprequest_ObjectWithSite_SetSite( IObjectWithSite *iface, IUnknown *punk ) +{ + httprequest *This = impl_from_IObjectWithSite(iface); + + TRACE("(%p)->(%p)\n", iface, punk); + + if (punk) + IUnknown_AddRef( punk ); + + if(This->site) + IUnknown_Release( This->site ); + + This->site = punk; + + return S_OK; +} + +static const IObjectWithSiteVtbl httprequestObjectSite = +{ + httprequest_ObjectWithSite_QueryInterface, + httprequest_ObjectWithSite_AddRef, + httprequest_ObjectWithSite_Release, + httprequest_ObjectWithSite_SetSite, + httprequest_ObjectWithSite_GetSite +}; + HRESULT XMLHTTPRequest_create(IUnknown *pUnkOuter, void **ppObj) { httprequest *req; @@ -1004,6 +1078,7 @@ HRESULT XMLHTTPRequest_create(IUnknown *pUnkOuter, void **ppObj) return E_OUTOFMEMORY; req->IXMLHTTPRequest_iface.lpVtbl = &dimimpl_vtbl; + req->IObjectWithSite_iface.lpVtbl = &httprequestObjectSite; req->ref = 1; req->async = FALSE; @@ -1017,6 +1092,7 @@ HRESULT XMLHTTPRequest_create(IUnknown *pUnkOuter, void **ppObj) req->status = 0; req->reqheader_size = 0; list_init(&req->reqheaders); + req->site = NULL; *ppObj = &req->IXMLHTTPRequest_iface; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d34168e..e38d3b5 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3216,6 +3216,7 @@ static void test_XMLHTTP(void) static const CHAR xmltestbodyA[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<a>TEST</a>\n"; IXMLHttpRequest *pXMLHttpRequest; + IObjectWithSite *pSite; BSTR bstrResponse, method, url; VARIANT dummy; VARIANT async; @@ -3232,6 +3233,10 @@ static void test_XMLHTTP(void) return; } + hr = IXMLHttpRequest_QueryInterface(pXMLHttpRequest, &IID_IObjectWithSite, (void**)&pSite); + ok(hr == S_OK, "got 0x%08x\n", hr); + if(hr == S_OK) IObjectWithSite_Release(pSite); + VariantInit(&dummy); V_VT(&dummy) = VT_ERROR; V_ERROR(&dummy) = DISP_E_MEMBERNOTFOUND;

1 0

Peter Urbanec : jscript: Implement character escaping as described by ECMA-262 B.2.1.
by Alexandre Julliard 18 Feb '11

18 Feb '11

Module: wine Branch: master Commit: 36391faf45677cc867085384a97e6f4f4adba271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36391faf45677cc867085384a… Author: Peter Urbanec <winehq.org(a)urbanec.net> Date: Fri Feb 18 21:05:46 2011 +1100 jscript: Implement character escaping as described by ECMA-262 B.2.1. --- dlls/jscript/global.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 24698ac..ebfc55c 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -99,6 +99,13 @@ static inline BOOL is_uri_unescaped(WCHAR c) return c < 128 && uri_char_table[c] == 2; } +/* Check that the character is one of the 69 nonblank characters as defined by ECMA-262 B.2.1 */ +static inline BOOL is_ecma_nonblank(const WCHAR c) +{ + return ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || + c == '@' || c == '*' || c == '_' || c == '+' || c == '-' || c == '.' || c == '/'); +} + static WCHAR int_to_char(int i) { if(i < 10) @@ -290,8 +297,7 @@ static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, D for(ptr=str; *ptr; ptr++) { if(*ptr > 0xff) len += 6; - else if(isalnum((unsigned char)*ptr) || *ptr=='*' || *ptr=='@' || *ptr=='-' - || *ptr=='_' || *ptr=='+' || *ptr=='.' || *ptr=='/') + else if(is_ecma_nonblank(*ptr)) len++; else len += 3; @@ -313,8 +319,7 @@ static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, D ret[len++] = int_to_char((*ptr >> 4) & 0xf); ret[len++] = int_to_char(*ptr & 0xf); } - else if(isalnum((char)*ptr) || *ptr=='*' || *ptr=='@' || *ptr=='-' - || *ptr=='_' || *ptr=='+' || *ptr=='.' || *ptr=='/') + else if(is_ecma_nonblank(*ptr)) ret[len++] = *ptr; else { ret[len++] = '%';

1 0

Rico Schüller : d3dcompiler/tests: Add GetResourceBindingDesc() test.
by Alexandre Julliard 18 Feb '11

18 Feb '11

Module: wine Branch: master Commit: 9cc0cd39a191e54029db5b27ee392a47ea6993bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cc0cd39a191e54029db5b27e… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Feb 17 21:47:29 2011 +0100 d3dcompiler/tests: Add GetResourceBindingDesc() test. --- dlls/d3dcompiler_43/tests/reflection.c | 161 ++++++++++++++++++++++++++++++++ 1 files changed, 161 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 65748f8..fdfbf1b 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -710,9 +710,170 @@ static void test_reflection_desc_ps(void) ok(count == 0, "Release failed %u\n", count); } +/* + * fxc.exe /E PS /Tps_4_0 /Fx + */ +#if 0 +Texture2D tex1; +SamplerState sam +{ + Filter = MIN_MAG_MIP_LINEAR; + AddressU = Wrap; + AddressV = Wrap; +}; +cbuffer c1 +{ + float x; + float y[2]; + int z; +}; +cbuffer c2 +{ + float t; +}; + +float4 PS(float2 uv : TEXCOORD0) : sv_target +{ + float4 q = tex1.Sample(sam, uv); + q.x = q.x + x; + q.w = q.w + y[0] + y[1] + t; + return q; +} +#endif +static DWORD test_reflection_bound_resources_blob[] = { +0x43425844, 0xe4af0279, 0x690268fc, 0x76bf6a72, 0xe5aff43b, 0x00000001, 0x000003f4, 0x00000005, +0x00000034, 0x000001e8, 0x0000021c, 0x00000250, 0x00000378, 0x46454452, 0x000001ac, 0x00000002, +0x000000ac, 0x00000004, 0x0000001c, 0xffff0400, 0x00000100, 0x0000017a, 0x0000009c, 0x00000003, +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x000000a0, 0x00000002, +0x00000005, 0x00000004, 0xffffffff, 0x00000000, 0x00000001, 0x0000000c, 0x000000a5, 0x00000000, +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x000000a8, 0x00000000, +0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x006d6173, 0x31786574, +0x00316300, 0xab003263, 0x000000a5, 0x00000003, 0x000000dc, 0x00000030, 0x00000000, 0x00000000, +0x000000a8, 0x00000001, 0x00000160, 0x00000010, 0x00000000, 0x00000000, 0x00000124, 0x00000000, +0x00000004, 0x00000002, 0x00000128, 0x00000000, 0x00000138, 0x00000010, 0x00000014, 0x00000002, +0x0000013c, 0x00000000, 0x0000014c, 0x00000024, 0x00000004, 0x00000000, 0x00000150, 0x00000000, +0xabab0078, 0x00030000, 0x00010001, 0x00000000, 0x00000000, 0xabab0079, 0x00030000, 0x00010001, +0x00000002, 0x00000000, 0xabab007a, 0x00020000, 0x00010001, 0x00000000, 0x00000000, 0x00000178, +0x00000000, 0x00000004, 0x00000002, 0x00000128, 0x00000000, 0x694d0074, 0x736f7263, 0x2074666f, +0x20295228, 0x4c534c48, 0x61685320, 0x20726564, 0x706d6f43, 0x72656c69, 0x322e3920, 0x35392e39, +0x31332e32, 0xab003131, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, +0x00000000, 0x00000003, 0x00000000, 0x00000303, 0x43584554, 0x44524f4f, 0xababab00, 0x4e47534f, +0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, +0x0000000f, 0x745f7673, 0x65677261, 0xabab0074, 0x52444853, 0x00000120, 0x00000040, 0x00000048, +0x04000059, 0x00208e46, 0x00000000, 0x00000003, 0x04000059, 0x00208e46, 0x00000001, 0x00000001, +0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x03001062, +0x00101032, 0x00000000, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x09000045, +0x001000f2, 0x00000000, 0x00101046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, +0x08000000, 0x00100082, 0x00000000, 0x0010003a, 0x00000000, 0x0020800a, 0x00000000, 0x00000001, +0x08000000, 0x00100082, 0x00000000, 0x0010003a, 0x00000000, 0x0020800a, 0x00000000, 0x00000002, +0x08000000, 0x00102082, 0x00000000, 0x0010003a, 0x00000000, 0x0020800a, 0x00000001, 0x00000000, +0x08000000, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, +0x05000036, 0x00102062, 0x00000000, 0x00100656, 0x00000000, 0x0100003e, 0x54415453, 0x00000074, +0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000004, 0x00000000, 0x00000000, 0x00000001, +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, +0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +}; + +static const D3D11_SHADER_INPUT_BIND_DESC test_reflection_bound_resources_result[] = +{ + {"sam", D3D_SIT_SAMPLER, 0, 1, 0, 0, D3D_SRV_DIMENSION_UNKNOWN, 0}, + {"tex1", D3D_SIT_TEXTURE, 0, 1, 12, D3D_RETURN_TYPE_FLOAT, D3D_SRV_DIMENSION_TEXTURE2D, 0xffffffff}, + {"c1", D3D_SIT_CBUFFER, 0, 1, 0, 0, D3D_SRV_DIMENSION_UNKNOWN, 0}, + {"c2", D3D_SIT_CBUFFER, 1, 1, 0, 0, D3D_SRV_DIMENSION_UNKNOWN, 0}, +}; + +static void test_reflection_bound_resources(void) +{ + HRESULT hr; + ULONG count; + ID3D11ShaderReflection *ref11; + D3D11_SHADER_INPUT_BIND_DESC desc; + const D3D11_SHADER_INPUT_BIND_DESC *pdesc; + unsigned int i; + + hr = D3DReflect(test_reflection_bound_resources_blob, test_reflection_bound_resources_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); + ok(hr == S_OK, "D3DReflect failed %x\n", hr); + + /* check invalid cases */ + hr = ref11->lpVtbl->GetResourceBindingDesc(ref11, 0, NULL); + ok(hr == E_INVALIDARG, "GetResourceBindingDesc failed %x\n", hr); + + hr = ref11->lpVtbl->GetResourceBindingDesc(ref11, 0xffffffff, &desc); + ok(hr == E_INVALIDARG, "GetResourceBindingDesc failed %x\n", hr); + + hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, NULL, &desc); + ok(hr == E_INVALIDARG, "GetResourceBindingDescByName failed %x\n", hr); + + hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, "sam", NULL); + ok(hr == E_INVALIDARG, "GetResourceBindingDescByName failed %x\n", hr); + + hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, "invalid", NULL); + ok(hr == E_INVALIDARG, "GetResourceBindingDescByName failed %x\n", hr); + + hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, "invalid", &desc); + ok(hr == E_INVALIDARG, "GetResourceBindingDescByName failed %x\n", hr); + + /* GetResourceBindingDesc */ + for (i = 0; i < sizeof(test_reflection_bound_resources_result)/sizeof(*test_reflection_bound_resources_result); ++i) + { + pdesc = &test_reflection_bound_resources_result[i]; + + hr = ref11->lpVtbl->GetResourceBindingDesc(ref11, i, &desc); + ok(hr == S_OK, "GetResourceBindingDesc(%u) failed, got %x, expected %x\n", i, hr, S_OK); + + ok(!strcmp(desc.Name, pdesc->Name), "GetResourceBindingDesc(%u) Name failed, got \"%s\", expected \"%s\"\n", + i, desc.Name, pdesc->Name); + ok(desc.Type == pdesc->Type, "GetResourceBindingDesc(%u) Type failed, got %x, expected %x\n", + i, desc.Type, pdesc->Type); + ok(desc.BindPoint == pdesc->BindPoint, "GetResourceBindingDesc(%u) BindPoint failed, got %u, expected %u\n", + i, desc.BindPoint, pdesc->BindPoint); + ok(desc.BindCount == pdesc->BindCount, "GetResourceBindingDesc(%u) BindCount failed, got %u, expected %u\n", + i, desc.BindCount, pdesc->BindCount); + ok(desc.uFlags == pdesc->uFlags, "GetResourceBindingDesc(%u) uFlags failed, got %u, expected %u\n", + i, desc.uFlags, pdesc->uFlags); + ok(desc.ReturnType == pdesc->ReturnType, "GetResourceBindingDesc(%u) ReturnType failed, got %x, expected %x\n", + i, desc.ReturnType, pdesc->ReturnType); + ok(desc.Dimension == pdesc->Dimension, "GetResourceBindingDesc(%u) Dimension failed, got %x, expected %x\n", + i, desc.Dimension, pdesc->Dimension); + ok(desc.NumSamples == pdesc->NumSamples, "GetResourceBindingDesc(%u) NumSamples failed, got %u, expected %u\n", + i, desc.NumSamples, pdesc->NumSamples); + } + + /* GetResourceBindingDescByName */ + for (i = 0; i < sizeof(test_reflection_bound_resources_result)/sizeof(*test_reflection_bound_resources_result); ++i) + { + pdesc = &test_reflection_bound_resources_result[i]; + + hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, pdesc->Name, &desc); + ok(hr == S_OK, "GetResourceBindingDescByName(%u) failed, got %x, expected %x\n", i, hr, S_OK); + + ok(!strcmp(desc.Name, pdesc->Name), "GetResourceBindingDescByName(%u) Name failed, got \"%s\", expected \"%s\"\n", + i, desc.Name, pdesc->Name); + ok(desc.Type == pdesc->Type, "GetResourceBindingDescByName(%u) Type failed, got %x, expected %x\n", + i, desc.Type, pdesc->Type); + ok(desc.BindPoint == pdesc->BindPoint, "GetResourceBindingDescByName(%u) BindPoint failed, got %u, expected %u\n", + i, desc.BindPoint, pdesc->BindPoint); + ok(desc.BindCount == pdesc->BindCount, "GetResourceBindingDescByName(%u) BindCount failed, got %u, expected %u\n", + i, desc.BindCount, pdesc->BindCount); + ok(desc.uFlags == pdesc->uFlags, "GetResourceBindingDescByName(%u) uFlags failed, got %u, expected %u\n", + i, desc.uFlags, pdesc->uFlags); + ok(desc.ReturnType == pdesc->ReturnType, "GetResourceBindingDescByName(%u) ReturnType failed, got %x, expected %x\n", + i, desc.ReturnType, pdesc->ReturnType); + ok(desc.Dimension == pdesc->Dimension, "GetResourceBindingDescByName(%u) Dimension failed, got %x, expected %x\n", + i, desc.Dimension, pdesc->Dimension); + ok(desc.NumSamples == pdesc->NumSamples, "GetResourceBindingDescByName(%u) NumSamples failed, got %u, expected %u\n", + i, desc.NumSamples, pdesc->NumSamples); + } + + count = ref11->lpVtbl->Release(ref11); + ok(count == 0, "Release failed %u\n", count); +} + START_TEST(reflection) { test_reflection_references(); test_reflection_desc_vs(); test_reflection_desc_ps(); + test_reflection_bound_resources(); }

1 0