July 2016 - Wine-Commits - list.winehq.org

Sebastian Lackner : wininet/tests: Add a test for recently introduced regression related to InternetCrackUrl.
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: master Commit: 93832ef88da8662f9991958413b0d46b07b3a80f URL: http://source.winehq.org/git/wine.git/?a=commit;h=93832ef88da8662f999195841… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 8 13:10:09 2016 +0200 wininet/tests: Add a test for recently introduced regression related to InternetCrackUrl. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/url.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 9be3839..7b1fd72 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -806,6 +806,19 @@ static void InternetCrackUrlW_test(void) ok( r, "InternetCrackUrlW failed unexpectedly\n"); ok( host[0] == 'x', "host should be x.org\n"); ok( urlpart[0] == 0, "urlpart should be empty\n"); + + urlpart[0] = 0; + host[0] = 0; + memset(&comp, 0, sizeof(comp)); + comp.dwStructSize = sizeof(comp); + comp.lpszHostName = host; + comp.dwHostNameLength = sizeof(host)/sizeof(host[0]); + comp.lpszUrlPath = urlpart; + comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]); + r = InternetCrackUrlW(url3, 0, ICU_DECODE, &comp); + todo_wine ok(r, "InternetCrackUrlW failed unexpectedly\n"); + todo_wine ok(!strcmp_wa(host, "x.org"), "host is %s, should be x.org\n", wine_dbgstr_w(host)); + ok(urlpart[0] == 0, "urlpart should be empty\n"); } static void fill_url_components(URL_COMPONENTSA *lpUrlComponents)

1 0

Michael Müller : wininet: Correctly set lpszUrlPath in InternetCrackUrlW for urls without path component.
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: master Commit: cacad1df98aceee3b2bf4f9a9c6978287b897be6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cacad1df98aceee3b2bf4f9a9… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Jul 8 12:07:43 2016 +0200 wininet: Correctly set lpszUrlPath in InternetCrackUrlW for urls without path component. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 4 +--- dlls/wininet/tests/url.c | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 19cf470..4e1f3b9 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1917,9 +1917,7 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF } else { - if (lpUC->lpszUrlPath && (lpUC->dwUrlPathLength > 0)) - lpUC->lpszUrlPath[0] = 0; - lpUC->dwUrlPathLength = 0; + set_url_component(&lpUC->lpszUrlPath, &lpUC->dwUrlPathLength, lpszcp, 0); } TRACE("%s: scheme(%s) host(%s) path(%s) extra(%s)\n", debugstr_wn(lpszUrl,dwUrlLength), diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 00a457a..0af1d77 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -130,6 +130,9 @@ static const crack_url_test_t crack_url_tests[] = { {"HtTp://www.winehq.org/scheme", 0, 4, INTERNET_SCHEME_HTTP, 7, 14, 23, 80, -1, 0, -1, 0, 21, 7, -1, 0, "HtTp", "www.winehq.org", "", "", "/scheme", ""}, + {"http://www.winehq.org", + 0, 4, INTERNET_SCHEME_HTTP, 7, 14, 23, 80, -1, 0, -1, 0, 21, 0, -1, 0, + "http", "www.winehq.org", "", "", "", ""}, {"file:///C:/Program%20Files/Atmel/AVR%20Tools/STK500/STK500.xml", 0, 4, INTERNET_SCHEME_FILE, -1, 0, -1, 0, -1, 0, -1, 0, 7, 55, -1, 0, "file", "", "", "", "C:\\Program Files\\Atmel\\AVR Tools\\STK500\\STK500.xml", ""},

1 0

Tag wine-1.9.14 : Alexandre Julliard : Release 1.9.14
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: refs/tags/wine-1.9.14 Tag: df8b70b2adbbbaab4610a600fe59b71e51c23f2d URL: http://source.winehq.org/git/wine.git/?a=tag;h=df8b70b2adbbbaab4610a600fe59… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 8 23:59:59 2016 +0900 Release 1.9.14

1 0

Alexandre Julliard : Release 1.9.14.
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: master Commit: abb221fa81b60f53c14f6864bbfb9453455aeeeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=abb221fa81b60f53c14f6864b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 8 23:59:59 2016 +0900 Release 1.9.14. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 778 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 382 insertions(+), 419 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=abb221fa81b60f53c14f6…

1 0

Nikolay Sivov : xmllite/writer: Support trivial case of WriteAttributeString().
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: master Commit: 895ad74fb0eaf4125c7f42d2c87b8efac632cad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=895ad74fb0eaf4125c7f42d2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 8 15:03:03 2016 +0300 xmllite/writer: Support trivial case of WriteAttributeString(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 104 +++++++++++++++++++++++++++++++++++++++++--- dlls/xmllite/writer.c | 26 ++++++++--- 2 files changed, 116 insertions(+), 14 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 9318bda..5e6769c 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -31,7 +31,7 @@ #include "initguid.h" DEFINE_GUID(IID_IXmlWriterOutput, 0xc1131708, 0x0f59, 0x477f, 0x93, 0x59, 0x7d, 0x33, 0x24, 0x51, 0xbc, 0x1a); -static void check_output(IStream *stream, const char *expected, int line) +static void check_output(IStream *stream, const char *expected, BOOL todo, int line) { HGLOBAL hglobal; int len = strlen(expected), size; @@ -43,16 +43,20 @@ static void check_output(IStream *stream, const char *expected, int line) size = GlobalSize(hglobal); ptr = GlobalLock(hglobal); - if (size != len) + todo_wine_if(todo) { - ok_(__FILE__, line)(0, "data size mismatch, expected %u, got %u\n", len, size); - ok_(__FILE__, line)(0, "got %s, expected %s\n", ptr, expected); + if (size != len) + { + ok_(__FILE__, line)(0, "data size mismatch, expected %u, got %u\n", len, size); + ok_(__FILE__, line)(0, "got %s, expected %s\n", ptr, expected); + } + else + ok_(__FILE__, line)(!strncmp(ptr, expected, len), "got %s, expected %s\n", ptr, expected); } - else - ok_(__FILE__, line)(!strncmp(ptr, expected, len), "got %s, expected %s\n", ptr, expected); GlobalUnlock(hglobal); } -#define CHECK_OUTPUT(stream, expected) check_output(stream, expected, __LINE__) +#define CHECK_OUTPUT(stream, expected) check_output(stream, expected, FALSE, __LINE__) +#define CHECK_OUTPUT_TODO(stream, expected) check_output(stream, expected, TRUE, __LINE__) /* used to test all Write* methods for consistent error state */ static void check_writer_state(IXmlWriter *writer, HRESULT exp_hr) @@ -1054,6 +1058,91 @@ static void test_indentation(void) IStream_Release(stream); } +static void test_WriteAttributeString(void) +{ + static const WCHAR prefixW[] = {'p','r','e','f','i','x',0}; + static const WCHAR localW[] = {'l','o','c','a','l',0}; + static const WCHAR uriW[] = {'u','r','i',0}; + static const WCHAR uri2W[] = {'u','r','i','2',0}; + static const WCHAR xmlnsW[] = {'x','m','l','n','s',0}; + static const WCHAR aW[] = {'a',0}; + static const WCHAR bW[] = {'b',0}; + IXmlWriter *writer; + IStream *stream; + HRESULT hr; + + hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + stream = writer_set_output(writer); + + hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, bW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + CHECK_OUTPUT(stream, + "<a a=\"b\" />"); + IStream_Release(stream); + + /* with namespaces */ + stream = writer_set_output(writer); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteAttributeString(writer, aW, NULL, NULL, bW); +todo_wine + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteAttributeString(writer, prefixW, localW, uriW, bW); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, bW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteAttributeString(writer, NULL, xmlnsW, uri2W, NULL); +todo_wine + ok(hr == WR_E_XMLNSPREFIXDECLARATION, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteAttributeString(writer, NULL, xmlnsW, NULL, uri2W); +todo_wine + ok(hr == WR_E_NSPREFIXDECLARED, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteAttributeString(writer, prefixW, localW, NULL, bW); +todo_wine + ok(hr == WR_E_DUPLICATEATTRIBUTE, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + CHECK_OUTPUT_TODO(stream, + "<a prefix:local=\"b\" a=\"b\" xmlns:prefix=\"uri\" />"); + + IXmlWriter_Release(writer); + IStream_Release(stream); +} + START_TEST(writer) { test_writer_create(); @@ -1070,4 +1159,5 @@ START_TEST(writer) test_WriteCData(); test_WriteRaw(); test_indentation(); + test_WriteAttributeString(); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 49e65cc..be5f0e1 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -44,6 +44,7 @@ static const WCHAR closepiW[] = {'?','>'}; static const WCHAR ltW[] = {'<'}; static const WCHAR gtW[] = {'>'}; static const WCHAR spaceW[] = {' '}; +static const WCHAR quoteW[] = {'"'}; struct output_buffer { @@ -284,7 +285,6 @@ static HRESULT write_output_buffer(xmlwriteroutput *output, const WCHAR *data, i static HRESULT write_output_buffer_quoted(xmlwriteroutput *output, const WCHAR *data, int len) { - static const WCHAR quoteW[] = {'"'}; write_output_buffer(output, quoteW, ARRAY_SIZE(quoteW)); write_output_buffer(output, data, len); write_output_buffer(output, quoteW, ARRAY_SIZE(quoteW)); @@ -609,14 +609,14 @@ static HRESULT WINAPI xmlwriter_WriteAttributes(IXmlWriter *iface, IXmlReader *p return E_NOTIMPL; } -static HRESULT WINAPI xmlwriter_WriteAttributeString(IXmlWriter *iface, LPCWSTR pwszPrefix, - LPCWSTR pwszLocalName, LPCWSTR pwszNamespaceUri, - LPCWSTR pwszValue) +static HRESULT WINAPI xmlwriter_WriteAttributeString(IXmlWriter *iface, LPCWSTR ns_prefix, + LPCWSTR local_name, LPCWSTR ns_uri, LPCWSTR value) { + static const WCHAR eqW[] = {'=','"'}; xmlwriter *This = impl_from_IXmlWriter(iface); - FIXME("%p %s %s %s %s\n", This, wine_dbgstr_w(pwszPrefix), wine_dbgstr_w(pwszLocalName), - wine_dbgstr_w(pwszNamespaceUri), wine_dbgstr_w(pwszValue)); + TRACE("%p %s %s %s %s\n", This, debugstr_w(ns_prefix), debugstr_w(local_name), + debugstr_w(ns_uri), debugstr_w(value)); switch (This->state) { @@ -630,7 +630,19 @@ static HRESULT WINAPI xmlwriter_WriteAttributeString(IXmlWriter *iface, LPCWSTR ; } - return E_NOTIMPL; + if (ns_prefix || ns_uri) + { + FIXME("namespaces are not supported.\n"); + return E_NOTIMPL; + } + + write_output_buffer(This->output, spaceW, ARRAY_SIZE(spaceW)); + write_output_buffer(This->output, local_name, -1); + write_output_buffer(This->output, eqW, ARRAY_SIZE(eqW)); + write_output_buffer(This->output, value, -1); + write_output_buffer(This->output, quoteW, ARRAY_SIZE(quoteW)); + + return S_OK; } static void write_cdata_section(xmlwriteroutput *output, const WCHAR *data, int len)

1 0

Huw Davies : gdi32: Add get_any_obj_ptr() to retrieve the ptr and type of a GDI handle.
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: master Commit: fc2d3109494d294af7cd9e2a018b69551a8bea0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc2d3109494d294af7cd9e2a0… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 8 12:57:14 2016 +0100 gdi32: Add get_any_obj_ptr() to retrieve the ptr and type of a GDI handle. This enables get_dc_obj() to check the type without calling GetObjectType() and thus it saves additional calls to Enter/LeaveCriticalSection(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 5 +++-- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdiobj.c | 29 ++++++++++++++++++++++++----- dlls/gdi32/pen.c | 10 ++++++---- 4 files changed, 34 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 5146f5b..2e54671 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -52,10 +52,11 @@ static const struct gdi_obj_funcs dc_funcs = static inline DC *get_dc_obj( HDC hdc ) { - DC *dc = GDI_GetObjPtr( hdc, 0 ); + WORD type; + DC *dc = get_any_obj_ptr( hdc, &type ); if (!dc) return NULL; - switch (GetObjectType( hdc )) + switch (type) { case OBJ_DC: case OBJ_MEMDC: diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 9c58747..79a7a74 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -299,6 +299,7 @@ extern HGDIOBJ alloc_gdi_handle( void *obj, WORD type, const struct gdi_obj_func extern void *free_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern HGDIOBJ get_full_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern void *GDI_GetObjPtr( HGDIOBJ, WORD ) DECLSPEC_HIDDEN; +extern void *get_any_obj_ptr( HGDIOBJ, WORD * ) DECLSPEC_HIDDEN; extern void GDI_ReleaseObj( HGDIOBJ ) DECLSPEC_HIDDEN; extern void GDI_CheckNotLock(void) DECLSPEC_HIDDEN; extern UINT GDI_get_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 237544d..46b2241 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -829,13 +829,13 @@ HGDIOBJ get_full_gdi_handle( HGDIOBJ handle ) } /*********************************************************************** - * GDI_GetObjPtr + * get_any_obj_ptr * - * Return a pointer to the GDI object associated to the handle. - * Return NULL if the object has the wrong magic number. + * Return a pointer to, and the type of, the GDI object + * associated with the handle. * The object must be released with GDI_ReleaseObj. */ -void *GDI_GetObjPtr( HGDIOBJ handle, WORD type ) +void *get_any_obj_ptr( HGDIOBJ handle, WORD *type ) { void *ptr = NULL; struct gdi_handle_entry *entry; @@ -844,13 +844,32 @@ void *GDI_GetObjPtr( HGDIOBJ handle, WORD type ) if ((entry = handle_entry( handle ))) { - if (!type || entry->type == type) ptr = entry->obj; + ptr = entry->obj; + *type = entry->type; } if (!ptr) LeaveCriticalSection( &gdi_section ); return ptr; } +/*********************************************************************** + * GDI_GetObjPtr + * + * Return a pointer to the GDI object associated with the handle. + * Return NULL if the object has the wrong type. + * The object must be released with GDI_ReleaseObj. + */ +void *GDI_GetObjPtr( HGDIOBJ handle, WORD type ) +{ + WORD ret_type; + void *ptr = get_any_obj_ptr( handle, &ret_type ); + if (ptr && ret_type != type) + { + GDI_ReleaseObj( handle ); + ptr = NULL; + } + return ptr; +} /*********************************************************************** * GDI_ReleaseObj diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index cf4b080..d6c1dc4 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -223,6 +223,7 @@ static HGDIOBJ PEN_SelectObject( HGDIOBJ handle, HDC hdc ) PENOBJ *pen; HGDIOBJ ret = 0; DC *dc = get_dc_ptr( hdc ); + WORD type; if (!dc) { @@ -230,12 +231,12 @@ static HGDIOBJ PEN_SelectObject( HGDIOBJ handle, HDC hdc ) return 0; } - if ((pen = GDI_GetObjPtr( handle, 0 ))) + if ((pen = get_any_obj_ptr( handle, &type ))) { struct brush_pattern *pattern; PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSelectPen ); - switch (GetObjectType( handle )) + switch (type) { case OBJ_PEN: pattern = NULL; @@ -287,12 +288,13 @@ static BOOL PEN_DeleteObject( HGDIOBJ handle ) */ static INT PEN_GetObject( HGDIOBJ handle, INT count, LPVOID buffer ) { - PENOBJ *pen = GDI_GetObjPtr( handle, 0 ); + WORD type; + PENOBJ *pen = get_any_obj_ptr( handle, &type ); INT ret = 0; if (!pen) return 0; - switch (GetObjectType( handle )) + switch (type) { case OBJ_PEN: {

1 0

Jacek Caban : wscript: Added WScript.Quit tests.
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: master Commit: b0664560d412dc8db6e7b54fbc77b0c7586caf07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0664560d412dc8db6e7b54fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 8 12:43:58 2016 +0200 wscript: Added WScript.Quit tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wscript/tests/run.c | 73 +++++++++++++++++++++++++++++--------------- 1 file changed, 49 insertions(+), 24 deletions(-) diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index e0a6932..eb840cc 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -339,11 +339,12 @@ static const IClassFactoryVtbl ClassFactoryVtbl = { static IClassFactory testobj_cf = { &ClassFactoryVtbl }; -static void run_test(const char *file_name) +static void run_script_file(const char *file_name, DWORD expected_exit_code) { char command[MAX_PATH]; STARTUPINFOA si = {sizeof(si)}; PROCESS_INFORMATION pi; + DWORD exit_code; BOOL bres; script_name = file_name; @@ -360,37 +361,29 @@ static void run_test(const char *file_name) wscript_process = pi.hProcess; WaitForSingleObject(pi.hProcess, INFINITE); + + bres = GetExitCodeProcess(pi.hProcess, &exit_code); + ok(bres, "GetExitCodeProcess failed: %u\n", GetLastError()); + ok(exit_code == expected_exit_code, "exit_code = %u, expected %u\n", exit_code, expected_exit_code); + CloseHandle(pi.hThread); CloseHandle(pi.hProcess); CHECK_CALLED(reportSuccess); } -static BOOL WINAPI test_enum_proc(HMODULE module, LPCSTR type, LPSTR name, LONG_PTR param) +static void run_script(const char *name, const char *script_data, size_t script_size, DWORD expected_exit_code) { - const char *script_data, *ext; - DWORD script_size, size; char file_name[MAX_PATH]; + const char *ext; HANDLE file; - HRSRC src; + DWORD size; BOOL res; - trace("running %s test...\n", name); - - src = FindResourceA(NULL, name, type); - ok(src != NULL, "Could not find resource %s: %u\n", name, GetLastError()); - if(!src) - return TRUE; - - script_data = LoadResource(NULL, src); - script_size = SizeofResource(NULL, src); - while(script_size && !script_data[script_size-1]) - script_size--; - ext = strrchr(name, '.'); ok(ext != NULL, "no script extension\n"); if(!ext) - return TRUE; + return; sprintf(file_name, "test%s", ext); @@ -398,17 +391,43 @@ static BOOL WINAPI test_enum_proc(HMODULE module, LPCSTR type, LPSTR name, LONG_ FILE_ATTRIBUTE_NORMAL, NULL); ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); if(file == INVALID_HANDLE_VALUE) - return TRUE; + return; res = WriteFile(file, script_data, script_size, &size, NULL); CloseHandle(file); ok(res, "Could not write to file: %u\n", GetLastError()); if(!res) - return TRUE; + return; - run_test(file_name); + run_script_file(file_name, expected_exit_code); DeleteFileA(file_name); +} + +static void run_simple_script(const char *script, DWORD expected_exit_code) +{ + run_script("simple.js", script, strlen(script), expected_exit_code); +} + +static BOOL WINAPI test_enum_proc(HMODULE module, LPCSTR type, LPSTR name, LONG_PTR param) +{ + const char *script_data; + DWORD script_size; + HRSRC src; + + trace("running %s test...\n", name); + + src = FindResourceA(NULL, name, type); + ok(src != NULL, "Could not find resource %s: %u\n", name, GetLastError()); + if(!src) + return TRUE; + + script_data = LoadResource(NULL, src); + script_size = SizeofResource(NULL, src); + while(script_size && !script_data[script_size-1]) + script_size--; + + run_script(name, script_data, script_size, 0); return TRUE; } @@ -468,11 +487,17 @@ START_TEST(run) } argc = winetest_get_mainargs(&argv); - if(argc > 2) - run_test(argv[2]); - else + if(argc > 2) { + run_script_file(argv[2], 0); + }else { EnumResourceNamesA(NULL, "TESTSCRIPT", test_enum_proc, 0); + run_simple_script("var winetest = new ActiveXObject('Wine.Test');\n" + "winetest.reportSuccess();\n" + "WScript.Quit(3);\n" + "winetest.ok(false, 'not quit?');\n", 3); +} + init_registry(FALSE); CoUninitialize(); }

1 0

Thiago Barbato : wscript: Added WScript.Quit semi-stub implementation.
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: master Commit: 341bb46fc693273b357842bdbe3260c017aa0318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=341bb46fc693273b357842bdb… Author: Thiago Barbato <thiagocbbt(a)gmail.com> Date: Fri Jul 8 12:43:39 2016 +0200 wscript: Added WScript.Quit semi-stub implementation. Signed-off-by: Thiago Barbato <thiagocbbt(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wscript/host.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index 893d006..3c30c3c 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -224,8 +224,10 @@ static HRESULT WINAPI Host_put_Interactive(IHost *iface, VARIANT_BOOL v) static HRESULT WINAPI Host_Quit(IHost *iface, int ExitCode) { - WINE_FIXME("(%d)\n", ExitCode); - return E_NOTIMPL; + FIXME("(%d) semi-stub: no script engine clean up\n", ExitCode); + + ExitProcess(ExitCode); + return S_OK; } static HRESULT WINAPI Host_get_ScriptName(IHost *iface, BSTR *out_ScriptName)

1 0

Józef Kucia : d3d11/tests: Add test for immediate constant buffer.
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: master Commit: 7dc5d5ebfe7c61d042fe211d183a7d06f8d71bde URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dc5d5ebfe7c61d042fe211d1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 8 12:12:33 2016 +0200 d3d11/tests: Add test for immediate constant buffer. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 149 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 147 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 38dd9fb..69cf5cd 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -763,6 +763,49 @@ static void check_texture_float_(unsigned int line, ID3D11Texture2D *texture, check_texture_sub_resource_float_(line, texture, sub_resource_idx, expected_value, max_diff); } +#define check_texture_sub_resource_vec4(a, b, c, d) check_texture_sub_resource_vec4_(__LINE__, a, b, c, d) +static void check_texture_sub_resource_vec4_(unsigned int line, ID3D11Texture2D *texture, + unsigned int sub_resource_idx, const struct vec4 *expected_value, BYTE max_diff) +{ + struct texture_readback rb; + unsigned int x = 0, y = 0; + struct vec4 value = {0}; + BOOL all_match = TRUE; + + get_texture_readback(texture, sub_resource_idx, &rb); + for (y = 0; y < rb.height; ++y) + { + for (x = 0; x < rb.width; ++x) + { + value = *get_readback_vec4(&rb, x, y); + if (!compare_vec4(&value, expected_value, max_diff)) + { + all_match = FALSE; + break; + } + } + if (!all_match) + break; + } + release_texture_readback(&rb); + ok_(__FILE__, line)(all_match, + "Got unexpected value {%.8e, %.8e, %.8e, %.8e} at (%u, %u), sub-resource %u.\n", + value.x, value.y, value.z, value.w, x, y, sub_resource_idx); +} + +#define check_texture_vec4(a, b, c) check_texture_vec4_(__LINE__, a, b, c) +static void check_texture_vec4_(unsigned int line, ID3D11Texture2D *texture, + const struct vec4 *expected_value, BYTE max_diff) +{ + unsigned int sub_resource_idx, sub_resource_count; + D3D11_TEXTURE2D_DESC texture_desc; + + ID3D11Texture2D_GetDesc(texture, &texture_desc); + sub_resource_count = texture_desc.ArraySize * texture_desc.MipLevels; + for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx) + check_texture_sub_resource_vec4_(line, texture, sub_resource_idx, expected_value, max_diff); +} + static ID3D11Device *create_device(const struct device_desc *desc) { static const D3D_FEATURE_LEVEL default_feature_level[] = @@ -5734,7 +5777,7 @@ static void test_multiple_render_targets(void) static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = { - {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, }; static const DWORD vs_code[] = { @@ -7748,7 +7791,7 @@ static void test_cb_relative_addressing(void) static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = { - {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, }; static const DWORD vs_code[] = { @@ -9118,6 +9161,107 @@ static void test_create_unordered_access_view(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_immediate_constant_buffer(void) +{ + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11DeviceContext *context; + ID3D11RenderTargetView *rtv; + unsigned int index[4] = {0}; + ID3D11Texture2D *texture; + ID3D11PixelShader *ps; + ID3D11Device *device; + ID3D11Buffer *cb; + unsigned int i; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + uint index; + + static const int int_array[6] = + { + 310, 111, 212, -513, -318, 0, + }; + + static const uint uint_array[6] = + { + 2, 7, 0x7f800000, 0xff800000, 0x7fc00000, 0 + }; + + static const float float_array[6] = + { + 76, 83.5f, 0.5f, 0.75f, -0.5f, 0.0f, + }; + + float4 main() : SV_Target + { + return float4(int_array[index], uint_array[index], float_array[index], 1.0f); + } +#endif + 0x43425844, 0xbad068da, 0xd631ea3c, 0x41648374, 0x3ccd0120, 0x00000001, 0x00000184, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x0000010c, 0x00000040, 0x00000043, + 0x00001835, 0x0000001a, 0x00000136, 0x00000002, 0x42980000, 0x00000000, 0x0000006f, 0x00000007, + 0x42a70000, 0x00000000, 0x000000d4, 0x7f800000, 0x3f000000, 0x00000000, 0xfffffdff, 0xff800000, + 0x3f400000, 0x00000000, 0xfffffec2, 0x7fc00000, 0xbf000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000, + 0x06000036, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x06000056, 0x00102022, + 0x00000000, 0x0090901a, 0x0010000a, 0x00000000, 0x0600002b, 0x00102012, 0x00000000, 0x0090900a, + 0x0010000a, 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0090902a, 0x0010000a, 0x00000000, + 0x0100003e, + }; + static struct vec4 expected_result[] = + { + { 310.0f, 2.0f, 76.00f, 1.0f}, + { 111.0f, 7.0f, 83.50f, 1.0f}, + { 212.0f, 2139095040.0f, 0.50f, 1.0f}, + {-513.0f, 4286578688.0f, 0.75f, 1.0f}, + {-318.0f, 2143289344.0f, -0.50f, 1.0f}, + { 0.0f, 0.0f, 0.0f, 1.0f}, + }; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(index), NULL); + ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); + + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + + for (i = 0; i < sizeof(expected_result) / sizeof(*expected_result); ++i) + { + *index = i; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, index, 0, 0); + + draw_quad(&test_context); + check_texture_vec4(texture, &expected_result[i], 0); + } + + ID3D11Buffer_Release(cb); + ID3D11PixelShader_Release(ps); + ID3D11Texture2D_Release(texture); + ID3D11RenderTargetView_Release(rtv); + release_test_context(&test_context); +} + START_TEST(d3d11) { test_create_device(); @@ -9167,4 +9311,5 @@ START_TEST(d3d11) test_null_sampler(); test_check_feature_support(); test_create_unordered_access_view(); + test_immediate_constant_buffer(); }

1 0

Józef Kucia : wined3d: Implement immediate constant buffer in GLSL backend.
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: master Commit: 9fb41539ea6bd48bfb4d49cb584772b31c945f77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fb41539ea6bd48bfb4d49cb5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 8 12:12:32 2016 +0200 wined3d: Implement immediate constant buffer in GLSL backend. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 30 +++++++++++++++++++++++++++++- dlls/wined3d/shader.c | 2 +- dlls/wined3d/shader_sm4.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7ad5acd..2c04260 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -559,6 +559,26 @@ static void shader_glsl_load_samplers(const struct wined3d_gl_info *gl_info, string_buffer_release(&priv->string_buffers, sampler_name); } +static void shader_glsl_load_icb(const struct wined3d_gl_info *gl_info, struct shader_glsl_priv *priv, + GLuint program_id, const struct wined3d_shader_reg_maps *reg_maps) +{ + const struct wined3d_shader_immediate_constant_buffer *icb = reg_maps->icb; + + if (icb) + { + struct wined3d_string_buffer *icb_name = string_buffer_get(&priv->string_buffers); + const char *prefix = shader_glsl_get_prefix(reg_maps->shader_version.type); + GLint icb_location; + + string_buffer_sprintf(icb_name, "%s_icb", prefix); + icb_location = GL_EXTCALL(glGetUniformLocation(program_id, icb_name->buffer)); + GL_EXTCALL(glUniform4fv(icb_location, icb->vec4_count, (const GLfloat *)icb->data)); + checkGLcall("Load immediate constant buffer"); + + string_buffer_release(&priv->string_buffers, icb_name); + } +} + /* Context activation is done by the caller. */ static inline void walk_constant_heap(const struct wined3d_gl_info *gl_info, const struct wined3d_vec4 *constants, const GLint *constant_locations, const struct constant_heap *heap, unsigned char *stack, DWORD version) @@ -1892,6 +1912,11 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont if (shader->limits->constant_bool > 0 && reg_maps->boolean_constants) shader_addline(buffer, "uniform bool %s_b[%u];\n", prefix, shader->limits->constant_bool); + /* Declare immediate constant buffer */ + if (reg_maps->icb) + shader_addline(buffer, "uniform vec4 %s_icb[%u];\n", prefix, reg_maps->icb->vec4_count); + + /* Declare constant buffers */ for (i = 0; i < WINED3D_MAX_CBS; ++i) { if (reg_maps->cb_sizes[i]) @@ -7863,6 +7888,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const entry->constant_update_mask |= WINED3D_SHADER_CONST_POS_FIXUP; shader_glsl_init_uniform_block_bindings(gl_info, priv, program_id, &vshader->reg_maps); + shader_glsl_load_icb(gl_info, priv, program_id, &vshader->reg_maps); } else { @@ -7903,6 +7929,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const { entry->constant_update_mask |= WINED3D_SHADER_CONST_POS_FIXUP; shader_glsl_init_uniform_block_bindings(gl_info, priv, program_id, &gshader->reg_maps); + shader_glsl_load_icb(gl_info, priv, program_id, &gshader->reg_maps); } if (ps_id) @@ -7918,6 +7945,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const entry->constant_update_mask |= WINED3D_SHADER_CONST_PS_Y_CORR; shader_glsl_init_uniform_block_bindings(gl_info, priv, program_id, &pshader->reg_maps); + shader_glsl_load_icb(gl_info, priv, program_id, &pshader->reg_maps); } else { @@ -8611,7 +8639,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_GLOBAL_FLAGS */ shader_glsl_nop, /* WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT */ NULL, /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ NULL, - /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ NULL, + /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ shader_glsl_nop, /* WINED3DSIH_DCL_INDEXABLE_TEMP */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 9a9eafb..08cee35 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2235,7 +2235,7 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe else if (ins.handler_idx == WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER) { shader_addline(&buffer, "%s {\n", shader_opcode_names[ins.handler_idx]); - for (i = 0; i < ins.declaration.icb->element_count / 4; ++i) + for (i = 0; i < ins.declaration.icb->vec4_count; ++i) { shader_addline(&buffer, " {0x%08x, 0x%08x, 0x%08x, 0x%08x},\n", ins.declaration.icb->data[4 * i + 0], diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 72cd5fc..c8fdb32 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -447,7 +447,7 @@ static void shader_sm4_read_shader_data(struct wined3d_shader_instruction *ins, return; } - priv->icb.element_count = icb_size; + priv->icb.vec4_count = icb_size / 4; memcpy(priv->icb.data, tokens, sizeof(*tokens) * icb_size); ins->declaration.icb = &priv->icb; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3de14e8..41c127b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -790,7 +790,7 @@ struct wined3d_shader_sampler_map struct wined3d_shader_immediate_constant_buffer { - UINT element_count; + unsigned int vec4_count; DWORD data[MAX_IMMEDIATE_CONSTANT_BUFFER_SIZE]; };

1 0