April 2017 - Wine-Devel - list.winehq.org

Re: [PATCH] winhttp/tests: Test when large amount of data is returned from a 410
by Hans Leidekker April 11, 2017

April 11, 2017

On Tue, 2017-04-11 at 02:08 +0000, Alistair Leslie-Hughes wrote: > diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c > index a5eff11..0761c2e 100644 > --- a/dlls/winhttp/tests/winhttp.c > +++ b/dlls/winhttp/tests/winhttp.c > @@ -2059,6 +2059,16 @@ static const char multiauth[] = > "Content-Type: text/plain\r\n" > "\r\n"; > > +static const char largeauth[] = > +"HTTP/1.1 401 Unauthorized\r\n" > +"Server: winetest\r\n" > +"WWW-Authenticate: Bearer\r\n" > +"WWW-Authenticate: Basic realm=\"placebo\"\r\n" > +"WWW-Authenticate: NTLM\r\n" > +"Content-Length: 10240\r\n" > +"Content-Type: text/plain\r\n" > +"\r\n"; Please try to be minimal. You're only using NTLM so the other two authenticate headers are not needed. > @@ -2172,6 +2182,20 @@ static DWORD CALLBACK server_thread(LPVOID param) > { > send(c, multiauth, sizeof multiauth - 1, 0); > } > + if(strstr(buffer, "GET /largeauth")) > + { > + if (strstr(buffer, "Authorization: NTLM")) > + send(c, okmsg, sizeof(okmsg) - 1, 0); > + else > + { > + void *data = malloc(10240); > + send(c, largeauth, sizeof largeauth - 1, 0); > + memset(data, 'A', 10240); > + send(c, data, 10240, 0); > + free(data); > + continue; You can avoid the allocation e.g. by sending 1 byte in a loop. > +static void test_large_data_authentication(int port) > +{ > + static const WCHAR largeauthW[] = {'/','l','a','r','g','e','a','u','t','h',0}; > + static const WCHAR getW[] = {'G','E','T',0}; > + static WCHAR userW[] = {'u','s','e','r',0}; > + static WCHAR passW[] = {'p','w','d',0}; > + HINTERNET ses, con, req; > + DWORD supported, first, target, status, size; > + BOOL ret; > + > + ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); > + ok(ses != NULL, "failed to open session %u\n", GetLastError()); > + > + con = WinHttpConnect(ses, localhostW, port, 0); > + ok(con != NULL, "failed to open a connection %u\n", GetLastError()); > + > + req = WinHttpOpenRequest(con, getW, largeauthW, NULL, NULL, NULL, 0); > + ok(req != NULL, "failed to open a request %u\n", GetLastError()); > + > + ret = WinHttpSendRequest(req, WINHTTP_NO_ADDITIONAL_HEADERS, 0, > + WINHTTP_NO_REQUEST_DATA,0, 0, 0 ); > + ok(ret, "expected success\n"); > + > + ret = WinHttpReceiveResponse(req, NULL); > + ok(ret, "expected success\n"); > + > + size = sizeof(status); > + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, > + &status, &size, NULL ); > + ok(ret, "expected success\n"); > + ok(status == HTTP_STATUS_DENIED, "got %d\n", status); > + > + supported = first = target = 0xdeadbeef; > + ret = WinHttpQueryAuthSchemes(req, &supported, &first, &target); > + ok(ret, "expected success\n"); > + ok(supported == (WINHTTP_AUTH_SCHEME_BASIC | WINHTTP_AUTH_SCHEME_NTLM), "got %x\n", supported); > + ok(target == WINHTTP_AUTH_TARGET_SERVER, "got %x\n", target); > + ok(first == WINHTTP_AUTH_SCHEME_BASIC, "got %x\n", first); This is also copied from another test and not strictly needed. You can hardcode scheme and target. WinHttpQueryAuthSchemes is already tested elsewhere.

1 0

Re: [v2 PATCH 2/2] odbccp32: Handle ODBC_CONFIG_DRIVER request in SQLConfigDriver/W
by Huw Davies April 11, 2017

April 11, 2017

On Mon, Apr 10, 2017 at 04:30:48AM +0000, Alistair Leslie-Hughes wrote: > diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c > index f28d464..2f415c7 100644 > --- a/dlls/odbccp32/odbccp32.c > +++ b/dlls/odbccp32/odbccp32.c > @@ -303,6 +303,41 @@ static HMODULE load_config_driver(const WCHAR *driver) > return hmod; > } > > +static BOOL write_timeout_value(const WCHAR *driver, const WCHAR *args) > +{ > + static WCHAR cptimeout[] = {'C','P','T','i','m','e','o','u','t',0}; > + long ret; > + HKEY hkey; > + WCHAR *position; > + > + if ( !(position = strstrW(args, cptimeout))) > + return FALSE; > + > + if ((ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, odbcini, &hkey)) == ERROR_SUCCESS) > + { > + HKEY hkeydriver; > + > + if ((ret = RegOpenKeyW(hkey, driver, &hkeydriver)) == ERROR_SUCCESS) > + { > + const WCHAR *value = &args[sizeof(cptimeout) / sizeof(WCHAR)]; > + > + TRACE("CPTimeout value %s\n", debugstr_w(value)); > + if(RegSetValueExW(hkeydriver, cptimeout, 0, REG_SZ, (BYTE*)value, > + strlenW(value) * sizeof(WCHAR)) != ERROR_SUCCESS) > + ERR("Failed to write registry installed key\n"); > + What are the possible formats of the arg string here? You initially strstr to find "CPTimeout" (which is fine). Later on, when you assign value, you're assuming that "CPTimeout" is at the beginning of the string (and this is a pretty ugly way of doing it). You're then writting anything that follows to the registry. Could there be more than one arg, if so how are they separated? Huw.

1 0

Re: [PATCH] winhttp/tests: Test when large amount of data is returned from a 410
by Marvin April 11, 2017

April 11, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=30105 Your paranoid android. === w864 (64 bit winhttp) === winhttp.c:3831: Test failed: got 80090321

1 0

Re: [PATCH 4/5] wined3d: Fix specular lighting calculation.
by Alexandre Julliard April 10, 2017

April 10, 2017

Matteo Bruni <mbruni(a)codeweavers.com> writes: > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > --- > For bug 41827. > > I don't really like the shader_glsl_ffp_vertex_lighting_footer name but I > couldn't think of anything nicer... > > dlls/d3d8/tests/visual.c | 59 +++++++++++++++++++++++++++++++++------------- > dlls/d3d9/tests/visual.c | 59 +++++++++++++++++++++++++++++++++------------- > dlls/ddraw/tests/ddraw2.c | 49 +++++++++++++++++++++++++++++--------- > dlls/ddraw/tests/ddraw4.c | 51 +++++++++++++++++++++++++++++---------- > dlls/ddraw/tests/ddraw7.c | 59 +++++++++++++++++++++++++++++++++------------- > dlls/wined3d/glsl_shader.c | 50 +++++++++++++++------------------------ > 6 files changed, 225 insertions(+), 102 deletions(-) The tests fail here: ../../../tools/runtest -q -P wine -T ../../.. -M d3d8.dll -p d3d8_test.exe.so visual && touch visual.ok visual.c:793: Test failed: Expected color 0x00000000 at location (160, 120), got 0x00ffffff, case 7. visual.c:793: Test failed: Expected color 0x00000000 at location (320, 120), got 0x00ffffff, case 7. visual.c:793: Test failed: Expected color 0x00000000 at location (480, 120), got 0x00ffffff, case 7. visual.c:793: Test failed: Expected color 0x00000000 at location (160, 240), got 0x00ffffff, case 7. visual.c:793: Test failed: Expected color 0x00000000 at location (320, 240), got 0x00ffffff, case 7. visual.c:793: Test failed: Expected color 0x00000000 at location (480, 240), got 0x00ffffff, case 7. visual.c:793: Test failed: Expected color 0x00000000 at location (160, 360), got 0x00ffffff, case 7. visual.c:793: Test failed: Expected color 0x00000000 at location (320, 360), got 0x00ffffff, case 7. visual.c:793: Test failed: Expected color 0x00000000 at location (480, 360), got 0x00ffffff, case 7. visual.c:2790: Tests skipped: D3DFMT_P8 textures not supported. visual.c:4294: Tests skipped: No RESZ support, skipping RESZ test. visual.c:4971: Tests skipped: Volume DXT5 textures are not supported, skipping test. visual.c:6632: Tests skipped: Volume ATI2N textures are not supported, skipping some tests. Makefile:246: recipe for target 'visual.ok' failed make: *** [visual.ok] Error 9 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/2] regedit/tests: Add tests for importing DWORD values
by Alexandre Julliard April 10, 2017

April 10, 2017

Hugh McMaster <hugh.mcmaster(a)outlook.com> writes: > Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> > --- > programs/regedit/tests/regedit.c | 56 ++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 56 insertions(+) It fails here: ../../../tools/runtest -q -P wine -T ../../.. -M regedit.exe -p regedit.exe_test.exe.so regedit && touch regedit.ok regedit.c:803: Test failed: RegQueryValueEx failed: got 2 regedit.c:804: Test failed: RegQueryValueEx failed: got 2 Makefile:174: recipe for target 'regedit.ok' failed make[1]: *** [regedit.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v2 1/2] d3dx9: Support relative addressing in preshader.
by Matteo Bruni April 10, 2017

April 10, 2017

2017-03-24 23:12 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > @@ -697,13 +739,13 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u > for (i = 0; i < pres->ins_count; ++i) > { > for (j = 0; j < pres_op_info[pres->ins[i].op].input_count; ++j) > - update_table_size(pres->regs.table_sizes, pres->ins[i].inputs[j].table, > - get_reg_offset(pres->ins[i].inputs[j].table, > - pres->ins[i].inputs[j].offset + pres->ins[i].component_count - 1)); > + update_table_size(pres->regs.table_sizes, pres->ins[i].inputs[j].reg.table, > + get_reg_offset(pres->ins[i].inputs[j].reg.table, > + pres->ins[i].inputs[j].reg.offset + pres->ins[i].component_count - 1)); > > - update_table_size(pres->regs.table_sizes, pres->ins[i].output.table, > - get_reg_offset(pres->ins[i].output.table, > - pres->ins[i].output.offset + pres->ins[i].component_count - 1)); > + update_table_size(pres->regs.table_sizes, pres->ins[i].output.reg.table, > + get_reg_offset(pres->ins[i].output.reg.table, > + pres->ins[i].output.reg.offset + pres->ins[i].component_count - 1)); Do these update_table_size() always do the right thing with relative addressing? If I'm not mistaken, they should be fine because we only accept relative addressing for CONST and IMMED and the former is taken care by update_table_sizes_consts() just below while the latter's size is set statically just above this chunk. I think that means though that we don't need to call update_table_size() on the input arguments. If that sounds right to you, you could drop that "for(j)" altogether or, probably better, replace the update_table_size() with a check that the argument is not out of bounds (probably returning failure if the check doesn't pass). That should be a separate patch. > @@ -1088,18 +1130,65 @@ static HRESULT init_set_constants(struct d3dx_const_tab *const_tab, ID3DXConstan > return ret; > } > > +static double exec_get_reg_value(struct d3dx_regstore *rs, enum pres_reg_tables table, unsigned int offset) > +{ > + if (!regstore_is_val_set_reg(rs, table, offset / table_info[table].reg_component_count)) > + WARN("Using uninitialized input, table %u, offset %u.\n", table, offset); > + > + return regstore_get_double(rs, table, offset); > +} > + > static double exec_get_arg(struct d3dx_regstore *rs, const struct d3dx_pres_operand *opr, unsigned int comp) > { > - if (!regstore_is_val_set_reg(rs, opr->table, (opr->offset + comp) / table_info[opr->table].reg_component_count)) > - WARN("Using uninitialized input, table %u, offset %u.\n", opr->table, opr->offset + comp); > + unsigned int offset, base_index, reg_index, table; > + > + table = opr->reg.table; > + > + if (opr->index_reg.table == PRES_REGTAB_COUNT) > + base_index = 0; > + else > + base_index = lrint(exec_get_reg_value(rs, opr->index_reg.table, opr->index_reg.offset)); > + > + /* '4' is used instead of reg_component_count, as immediate constants (which have > + * reg_component_count of 1) are still indexed as 4 values according to the tests. > + */ > + offset = base_index * 4 + opr->reg.offset + comp; Actually, is there any reason why reg_component_count for PRES_REGTAB_IMMED isn't 4? Maybe change it to 4 and in parse_preshader() check that const_count is a multiple of 4 (which is something we're depending on anyway). That would be a separate patch too. Clue me if I'm missing anything. > + reg_index = offset / table_info[table].reg_component_count; > + > + if (reg_index >= rs->table_sizes[table]) > + { > + unsigned int wrap_size; > + > + if (table == PRES_REGTAB_CONST) > + { > + /* As it can be guessed from tests (by iterating base register value and > + * observing the period of result values repeat), offset into floating > + * constant table are wrapped to the nearest power of 2 and not to the > + * actual table size. > + */ > + for (wrap_size = 1; wrap_size < rs->table_sizes[table]; wrap_size <<= 1) > + ; Please close the comment on the last text line (i.e. "*/" shouldn't be on its own line) and maybe remove the part in parentheses which is pretty obvious. I like the comment otherwise. Another thing on this, maybe add a WARN() on wrapped accesses to show what offset (or value) is returned in that case? Ignore it if you don't think that's useful.

2 9

Re: [3/3] [resend] wsdapi/tests: Add initial tests for WSDCreateDiscoveryPublisher
by Alexandre Julliard April 10, 2017

April 10, 2017

Owen Rudge <orudge(a)codeweavers.com> writes: > +START_TEST(discovery) > +{ > + HMODULE dllHandle; > + > + CoInitialize(NULL); > + > + dllHandle = LoadLibraryA("wsdapi.dll"); > + > + if (dllHandle) > + { > + BOOL ret; > + > + ret = FreeLibrary(dllHandle); > + ok(ret, "FreeLibrary(1) returned %d\n", GetLastError()); > + } This test doesn't seem very useful. Also there shouldn't be any reason to load the library dynamically, you could simply link to it. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/13] msidb: Add stub tool for manipulating MSI databases.
by Hans Leidekker April 10, 2017

April 10, 2017

On Sun, 2017-04-09 at 13:12 -0600, Erich E. Hoover wrote: > The "Windows SDK Components for Windows Installer Developers" has a > command line tool called msidb that is incredibly useful for creating, > editing, and exporting MSI installer databases, think of it as > winemsibuilder on steroids. This patch series implements much of the > functionality of the msidb tool, maintains compatible CLI flags, and > the underlying MSI functionality necessary to support these features. > With this patch series all the existing winemsibuilder functionality > is available, plus the ability to drop streams, export the > _SummaryInformation table, export binary streams (Binary/Icon tables), > and some miscellaneous bug fixes. A big feature of the implementation > is that it allows you to edit existing installer databases, rather > than just creating new ones. I can see how the extra functionality is useful for package builders but at the same time it's not essential to build Wine. That doesn't mean we can't maintain it in Wine, but I can also see it being part of a separate SDK tools project. Have you considered that?

2 1

Re: [PATCH] regedit: Do not import DWORD values beginning with "0x" (v2)
by Marvin April 10, 2017

April 10, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=30089 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH] xmllite/writer: Fix IID argument handling in CreateXmlWriter()
by Jacek Caban April 10, 2017

April 10, 2017

Hi Nikolay, On 4/10/17 6:37 AM, Nikolay Sivov wrote: > + hr = CreateXmlWriter(&IID_IStream, (void **)&unk, NULL); > + ok(hr == E_NOINTERFACE, "got %08x\n", hr); > + > + hr = CreateXmlWriter(&IID_IUnknown, (void **)&unk, NULL); > + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); > + hr = IUnknown_QueryInterface(unk, &IID_IUnknown, (void **)&writer); > + I think you meant IID_IXmlWriter here. Jacek

2 1