- wine-devel - winehq.org

Re: d3d9/tests: Fix a trailing ok() '\n'.
by Marvin 29 May '16

29 May '16

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=23225 Your paranoid android. === w864 (64 bit device) === device.c:4351: Test failed: cw is 0xf60, expected 0x7f. device.c:4360: Test failed: Callback cw is 0xf60, expected 0x7f. === w1064 (64 bit device) === device.c:4351: Test failed: cw is 0xf60, expected 0x7f. device.c:4360: Test failed: Callback cw is 0xf60, expected 0x7f.

1 0

Re: setupapi: Add stub for setupapi.dll.CM_Get_DevNode_Status
by André Hentschel 28 May '16

28 May '16

Am 28.05.2016 um 15:55 schrieb Rob Walker: > Fixes https://bugs.winehq.org/show_bug.cgi?id=40691 The Ex function is wrong, have a look at msdn

1 0

AW: setupapi: Add stub for setupapi.dll.CM_Get_DevNode_Status
by siro＠das-labor.org 28 May '16

28 May '16

Sent from BlackBerry Z30mcfmrrmf Originalnachricht Von: Rob Walker ef Cm f fmrc Fmrrrfmcfmf J efmf‎ Gesendet: Samstag, 28. Mai 2016 15:56 An: wine-patches R‎ Antwort an: wine-devel(a)winehq.org Betreff: setupapi: Add stub for setupapi.dll.CM_Get_DevNode_Stmcv Fcmmcfvefgermfrrfcm rrfmr Fmatus Ff 4M fete c‎ Ec Fixes https://bugs.winehq.org/show_bug.cgi?id=40691 The application launches cleanly without a backtrace dialog generated by FabCheck.exe (which calls CM_Get_DevNode_Status). Tested on Gentoo Linux (wine - without staging patches). Signed-off-by: Rob Walker <bob.mt.wya(a)gmail.com> --- dlls/cfgmgr32/cfgmgr32.spec | 4 ++-- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index f442157..b6e73ac 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -60,8 +60,8 @@ @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr long long) setupapi.CM_Get_DevNode_Registry_PropertyW @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExA @ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExW -@ stub CM_Get_DevNode_Status -@ stub CM_Get_DevNode_Status_Ex +@ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status +@ stdcall CM_Get_DevNode_Status_Ex(ptr ptr long long) setupapi.CM_Get_DevNode_Status_Ex @ stdcall CM_Get_Device_IDA(ptr ptr long long) setupapi.CM_Get_Device_IDA @ stdcall CM_Get_Device_IDW(ptr ptr long long) setupapi.CM_Get_Device_IDW @ stdcall CM_Get_Device_ID_ExA(ptr ptr long long ptr) setupapi.CM_Get_Device_ID_ExA diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 9bfaadd..a336fc2 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -71,8 +71,8 @@ @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr long long) @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) @ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) -@ stub CM_Get_DevNode_Status -@ stub CM_Get_DevNode_Status_Ex +@ stdcall CM_Get_DevNode_Status(ptr ptr long long) +@ stdcall CM_Get_DevNode_Status_Ex(ptr ptr long long) @ stdcall CM_Get_Device_IDA(ptr ptr long long) @ stdcall CM_Get_Device_IDW(ptr ptr long long) @ stdcall CM_Get_Device_ID_ExA(ptr ptr long long ptr) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index ffc766b..e315ea9 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -419,6 +419,26 @@ CONFIGRET WINAPI CM_Get_DevNode_Registry_PropertyW(DEVINST dev, ULONG prop, PULO } /*********************************************************************** + * CM_Get_DevNode_Status (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Status(PULONG pulStatus, PULONG pulProblemNumber, DEVINST dnDevInst, + ULONG ulFlags) +{ + FIXME("%p %p 0x%08x 0x%08x: stub\n", pulStatus, pulProblemNumber, dnDevInst, ulFlags); + return CR_FAILURE; +} + +/*********************************************************************** + * CM_Get_DevNode_Status_Ex (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Status_Ex(PULONG pulStatus, PULONG pulProblemNumber, DEVINST dnDevInst, + ULONG ulFlags) +{ + FIXME("%p %p 0x%08x 0x%08x: stub\n", pulStatus, pulProblemNumber, dnDevInst, ulFlags); + return CR_FAILURE; +} + +/*********************************************************************** * CM_Enumerate_Classes (SETUPAPI.@) */ CONFIGRET WINAPI CM_Enumerate_Classes(ULONG index, LPGUID class, ULONG flags) -- 2.8.3

1 0

Re: [PATCH] comctl32: Use SetRect() instead of open coding it.
by Nikolay Sivov 28 May '16

28 May '16

if (dis->itemAction & ODA_FOCUS) { - rect.left = xbase + xioff - 1; - rect.right = rect.left + txtsize.cx + 2; - rect.top = dis->rcItem.top; - rect.bottom = dis->rcItem.bottom; + SetRect(&rect, xbase + xioff - 1, dis->rcItem.top, rect.left + txtsize.cx + 2, dis->rcItem.bottom); DrawFocusRect(dis->hDC, &rect); } This change is obviously wrong. I think it's better to leave this one as is.

1 0

Re: [PATCH 2/3] msctf: Added Push/Pop context tests.
by Marvin 27 May '16

27 May '16

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=23219 Your paranoid android. === w1064 (32 bit inputprocessor) === inputprocessor.c:834: Test failed: Deactivation came unexpectedly

2 1

Re: [PATCH 3/3] msctf: Fixed ref counts in tests.
by Marvin 27 May '16

27 May '16

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=23220 Your paranoid android. === w1064 (64 bit inputprocessor) === inputprocessor.c:834: Test failed: Deactivation came unexpectedly

1 0

Re: [v2 3/3] d3dx9: Add test for IsParameterUsed function.
by Matteo Bruni 26 May '16

26 May '16

2016-05-23 12:40 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/tests/effect.c | 537 ++++++++++++++++++++++++++----------------- > 1 file changed, 321 insertions(+), 216 deletions(-) You forgot the "/tests" part of the patch subject prefix. > +static void test_effect_isparameterused(IDirect3DDevice9 *device) > +{ > + ID3DXEffect *effect; > + HRESULT hr; > + D3DXHANDLE param, tech, param_child; > + unsigned int i; > + > + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), > + NULL, NULL, 0, NULL, &effect, NULL); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + > + tech = effect->lpVtbl->GetTechniqueByName(effect, "tech0"); > + ok(!!tech, "GetTechniqueByName failed.\n"); > + > + param = effect->lpVtbl->GetParameterByName(effect, NULL, "opvect3"); > + ok(!!param, "GetParameterByName failed.\n"); > + ok(effect->lpVtbl->IsParameterUsed(effect, param, tech), "IsParameterUsed should be TRUE for opvect3.\n"); Pretty minor but I would prefer something like ok(..., "Unexpected IsParameterUsed() result for opvect3.\n"); Same for the other IsParameterUsed() ok() calls. > + param = effect->lpVtbl->GetParameterByName(effect, NULL, "arr2"); > + ok(!!param, "GetParameterByName failed.\n"); > + ok(effect->lpVtbl->IsParameterUsed(effect, param, tech), "IsParameterUsed should be TRUE for arr2.\n"); > + for (i = 0; i < 2; ++i) > + { > + param_child = effect->lpVtbl->GetParameterElement(effect, param, i); > + ok(!!param_child, "GetParameterElement failed.\n"); > + ok(!effect->lpVtbl->IsParameterUsed(effect, param_child, tech), > + "IsParameterUsed should be FALSE for arr2[%u].\n", i); > + } You could make a small function from this and use it through. You would check that IsParameterUsed() for the parameter gives the expected result, then enumerate the parameter elements and members and check that they are all unused. BTW, is there any case where IsParameterUsed() for a child is TRUE?

2 1

Re: [v2 2/3] d3dx9: Implement IsParameterUsed function in effect.
by Matteo Bruni 26 May '16

26 May '16

2016-05-23 12:40 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> It looks generally good, I only have minor "complaints" (and sorry for the delay in reviewing...). > --- > dlls/d3dx9_36/effect.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 110 insertions(+), 3 deletions(-) > > diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c > index 31aa2d6..cdfc494 100644 > --- a/dlls/d3dx9_36/effect.c > +++ b/dlls/d3dx9_36/effect.c > @@ -3545,15 +3545,122 @@ static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect* iface, > return E_NOTIMPL; > } > > +typedef BOOL (*walk_parameter_dep_func)(void *data, struct d3dx_parameter *param); > +static BOOL walk_state_dep(struct d3dx_state *state, walk_parameter_dep_func param_func, > + void *data); > +static BOOL walk_param_eval_dep(struct d3dx_param_eval *param_eval, walk_parameter_dep_func param_func, > + void *data); I guess you intend to reuse all these functions down the line for some other API, what are your plans? > +static BOOL compare_param_ptr(void *param_comp, struct d3dx_parameter *param) > +{ > + return param_comp == (void *)param; I think the cast is unnecessary here. > +} > + > static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDLE parameter, D3DXHANDLE technique) > { > struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); > + unsigned int i, j; > struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); > + struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique); > + struct d3dx_pass *pass; > > - FIXME("iface %p, parameter %p, technique %p stub.\n", iface, parameter, technique); > - TRACE("param %p (%s).\n", param, param ? debugstr_a(param->name) : ""); > + TRACE("iface %p, parameter %p, technique %p.\n", iface, parameter, technique); > + TRACE("param %p, name %s, tech %p.\n", param, param ? debugstr_a(param->name) : "", tech); > + if (!tech || !param) > + return FALSE; > > - return TRUE; > + for (i = 0; i < tech->pass_count; ++i) > + { > + pass = &tech->passes[i]; > + for (j = 0; j < pass->state_count; ++j) > + { > + if (walk_state_dep(&pass->states[j], compare_param_ptr, param)) > + { > + TRACE("technique %p, parameter %s, TRUE.\n", tech, param ? debugstr_a(param->name) : ""); I don't think you need to trace technique and parameter again, they are in the immediately preceding ID3DXEffectImpl_IsParameterUsed() TRACE anyway. Maybe the message could simply be "Returning TRUE.\n" or similar. > + return TRUE; > + } > + } > + } > + TRACE("technique %p, parameter %s, FALSE.\n", tech, param ? debugstr_a(param->name) : ""); Same here. > + return FALSE; > } > > static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DWORD flags) > -- > 2.5.5

2 1

How to finish implementing serial port read interval timeouts?
by Alex Henrie 26 May '16

26 May '16

Alexandre, A problem with serial port read interval timeouts was brought up in bug 40540.[1] The code that you wrote [2] works great for some applications, but it does not help others. The problem is that the read interval timer needs to be started immediately if ReadFile is able to read any data from the serial port buffer, rather than waiting for more data to arrive before starting the timer. It seems to me that NtReadFile [3] needs to tell serial_queue_async [4] if it read anything from the serial port before it sent the asynchronous read request to the Wineserver. If anything was read, serial_queue_async needs to start the read interval timer. Otherwise, serial_reselect_async should be the one to start the timer like it is now. I could hack something in to achieve the desired behavior, but before I submit anything, I wanted to ask your opinion on how it should be done. -Alex [1] https://bugs.winehq.org/show_bug.cgi?id=40540 [2] https://source.winehq.org/git/wine.git/commitdiff/bc0bf9e505922b81df1c317d6… [3] https://source.winehq.org/git/wine.git/blob/698d4114677205c3e5a0df659d230fe… [4] https://source.winehq.org/git/wine.git/blob/698d4114677205c3e5a0df659d230fe…

2 1

Re: [PATCH 2/2] secur32/tests: Add AcquireCredentialsHandleW tests
by Hans Leidekker 26 May '16

26 May '16

On Thu, 2016-05-26 at 08:07 +0000, Alistair Leslie-Hughes wrote: > + /* Test using the ASCI Structure. */ > + idA.User = (unsigned char*) test_user; > + idA.UserLength = strlen((char *) id.User); > + idA.Domain = (unsigned char *) workgroup; > + idA.DomainLength = strlen((char *) id.Domain); > + idA.Password = (unsigned char*) test_pass; > + idA.PasswordLength = strlen((char *) id.Password); > + idA.Flags = SEC_WINNT_AUTH_IDENTITY_ANSI; id.User, id.Domain and id.Password are Unicode strings.

1 0

Re: [PATCH 1/2] secur32: Fix handling of ANSI NTLM credentials
by Hans Leidekker 26 May '16

26 May '16

On Thu, 2016-05-26 at 08:07 +0000, Alistair Leslie-Hughes wrote: > --- a/dlls/secur32/ntlm.c > +++ b/dlls/secur32/ntlm.c > @@ -174,27 +174,74 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( > if(pAuthData != NULL) > { > PSEC_WINNT_AUTH_IDENTITY_W auth_data = pAuthData; > + LPWSTR domain = NULL, user = NULL, password = NULL; > + int domain_len = 0, user_len = 0, password_len = 0; > > - TRACE("Username is %s\n", debugstr_wn(auth_data->User, auth_data->UserLength)); > - TRACE("Domain name is %s\n", debugstr_wn(auth_data->Domain, auth_data->DomainLength)); > + if (auth_data->Flags & SEC_WINNT_AUTH_IDENTITY_ANSI) > + { > + if (auth_data->DomainLength) > + { > + domain_len = MultiByteToWideChar(CP_ACP, 0, (char *)auth_data->Domain, > + auth_data->DomainLength, NULL, 0); > + domain = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * domain_len); > + MultiByteToWideChar(CP_ACP, 0, (char *)auth_data->Domain, auth_data->DomainLength, > + domain, domain_len); Please check the result of HeapAlloc calls.

1 0

Re: [PATCH 7/8] d3d11/tests: Add test for SM4 breakc instruction.
by Henri Verbeet 25 May '16

25 May '16

On 25 May 2016 at 10:51, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + static const DWORD ps_breakc_nz_code[] = > + { > +#if 0 > + uint bits; > + > + float4 main() : SV_TARGET > + { > + uint counter = 0; > + > + for (uint i = 0; i < 255; ++i) > + ++counter; > + > + if (counter == 255) > + return float4(0.0f, 1.0f, 0.0f, 1.0f); > + else > + return float4(1.0f, 0.0f, 0.0f, 1.0f); > + } > +#endif It's pretty minor, but "bits" is unused. I'll also note that a sufficiently smart compiler could optimise the shader down to "return float4(0.0f, 1.0f, 0.0f, 1.0f);", although clearly the current version hasn't.

1 0

Re: [PATCH 2/2] d3d10core/test: Added DXGI_FORMAT_R16_TYPELESS D3D11_BIND_DEPTH_STENCIL test
by Henri Verbeet 25 May '16

25 May '16

On 25 May 2016 at 08:06, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/d3d10core/tests/device.c | 1 + > 1 file changed, 1 insertion(+) > The subject line certainly has room for improvement, but otherwise this is fine.

1 0

Re: [PATCH 5/5] jscript: Added non-zero timezone offset tests.
by Marvin 25 May '16

25 May '16

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=23195 Your paranoid android. === wxppro (32 bit) === Found no trace of the test summary line or of a crash === w2003std (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (32 bit) === Found no trace of the test summary line or of a crash === w2008s64 (32 bit) === Found no trace of the test summary line or of a crash === w7u (32 bit) === Found no trace of the test summary line or of a crash === w7pro64 (32 bit) === Found no trace of the test summary line or of a crash === w8 (32 bit) === Found no trace of the test summary line or of a crash === w864 (32 bit) === Found no trace of the test summary line or of a crash === w1064 (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (64 bit) === Found no trace of the test summary line or of a crash === w2008s64 (64 bit) === Found no trace of the test summary line or of a crash === w7pro64 (64 bit) === Found no trace of the test summary line or of a crash === w864 (64 bit) === Found no trace of the test summary line or of a crash === w1064 (64 bit) === Found no trace of the test summary line or of a crash

1 0

Re: [PATCH 4/5] jscript: Removed obsolete FIXME comments in tests and add relevant tests.
by Marvin 25 May '16

25 May '16

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=23194 Your paranoid android. === wxppro (32 bit) === Found no trace of the test summary line or of a crash === w2003std (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (32 bit) === Found no trace of the test summary line or of a crash === w2008s64 (32 bit) === Found no trace of the test summary line or of a crash === w7u (32 bit) === Found no trace of the test summary line or of a crash === w7pro64 (32 bit) === Found no trace of the test summary line or of a crash === w8 (32 bit) === Found no trace of the test summary line or of a crash === w864 (32 bit) === Found no trace of the test summary line or of a crash === w1064 (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (64 bit) === Found no trace of the test summary line or of a crash === w2008s64 (64 bit) === Found no trace of the test summary line or of a crash === w7pro64 (64 bit) === Found no trace of the test summary line or of a crash === w864 (64 bit) === Found no trace of the test summary line or of a crash === w1064 (64 bit) === Found no trace of the test summary line or of a crash

1 0

Re: [PATCH 3/5] jscript: Added RegExp.global getter implementation.
by Marvin 25 May '16

25 May '16

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=23193 Your paranoid android. === wxppro (32 bit) === Found no trace of the test summary line or of a crash === w2003std (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (32 bit) === Found no trace of the test summary line or of a crash === w2008s64 (32 bit) === Found no trace of the test summary line or of a crash === w7u (32 bit) === Found no trace of the test summary line or of a crash === w7pro64 (32 bit) === Found no trace of the test summary line or of a crash === w8 (32 bit) === Found no trace of the test summary line or of a crash === w864 (32 bit) === Found no trace of the test summary line or of a crash === w1064 (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (64 bit) === Found no trace of the test summary line or of a crash === w2008s64 (64 bit) === Found no trace of the test summary line or of a crash === w7pro64 (64 bit) === Found no trace of the test summary line or of a crash === w864 (64 bit) === Found no trace of the test summary line or of a crash === w1064 (64 bit) === Found no trace of the test summary line or of a crash

1 0

Re: [PATCH 2/5] jscript: Added RegExp.multiline getter implementation.
by Marvin 25 May '16

25 May '16

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=23192 Your paranoid android. === wxppro (32 bit) === Found no trace of the test summary line or of a crash === w2003std (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (32 bit) === Found no trace of the test summary line or of a crash === w2008s64 (32 bit) === Found no trace of the test summary line or of a crash === w7u (32 bit) === Found no trace of the test summary line or of a crash === w7pro64 (32 bit) === Found no trace of the test summary line or of a crash === w8 (32 bit) === Found no trace of the test summary line or of a crash === w864 (32 bit) === Found no trace of the test summary line or of a crash === w1064 (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (64 bit) === Found no trace of the test summary line or of a crash === w2008s64 (64 bit) === Found no trace of the test summary line or of a crash === w7pro64 (64 bit) === Found no trace of the test summary line or of a crash === w864 (64 bit) === Found no trace of the test summary line or of a crash === w1064 (64 bit) === Found no trace of the test summary line or of a crash

1 0

Re: [PATCH 1/5] jscript: Added RegExp.ignoreCase getter implementation.
by Marvin 25 May '16

25 May '16

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=23191 Your paranoid android. === wxppro (32 bit) === Found no trace of the test summary line or of a crash === w2003std (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (32 bit) === Found no trace of the test summary line or of a crash === w2008s64 (32 bit) === Found no trace of the test summary line or of a crash === w7u (32 bit) === Found no trace of the test summary line or of a crash === w7pro64 (32 bit) === Found no trace of the test summary line or of a crash === w8 (32 bit) === Found no trace of the test summary line or of a crash === w864 (32 bit) === Found no trace of the test summary line or of a crash === w1064 (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (64 bit) === Found no trace of the test summary line or of a crash === w2008s64 (64 bit) === Found no trace of the test summary line or of a crash === w7pro64 (64 bit) === Found no trace of the test summary line or of a crash === w864 (64 bit) === Found no trace of the test summary line or of a crash === w1064 (64 bit) === Found no trace of the test summary line or of a crash

1 0

Re: [PATCH 5/5] reg: Simplify syntax and help logic
by Alexandre Julliard 25 May '16

25 May '16

Hugh McMaster <hugh.mcmaster(a)outlook.com> writes: > @@ -907,19 +915,16 @@ int wmain(int argc, WCHAR *argvW[]) > return 0; > } > > + option_help = (!lstrcmpW(argvW[2], slashHelpW) || !lstrcmpiW(argvW[2], slashHW)); You should check argc first. > - if (argc < 3) > - { > - output_message(STRING_INVALID_SYNTAX); > - output_message(STRING_FUNC_HELP, struprW(argvW[1])); > - return 1; > - } > - else if (argc == 3 && (!lstrcmpW(argvW[2], slashHelpW) || > - !lstrcmpiW(argvW[2], slashHW))) > + if (argc < 3 || (argc > 3 && option_help)) > + return invalid_syntax(argvW[1]); > + else if (option_help) > { This doesn't feel like much of an improvement. You could probably come up with more useful helper functions. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH] jscript: Date.parse: make "UTC"/"GMT" optional before the timezone offset
by Jacek Caban 24 May '16

24 May '16

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>

1 0

Re: [PATCH 1/5] d3d9/tests: Add some tests for draw methods.
by Marvin 24 May '16

24 May '16

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=23169 Your paranoid android. === w864 (64 bit device) === device.c:4351: Test failed: cw is 0xf60, expected 0x7f. device.c:4360: Test failed: Callback cw is 0xf60, expected 0x7f. === w1064 (64 bit device) === device.c:4351: Test failed: cw is 0xf60, expected 0x7f. device.c:4360: Test failed: Callback cw is 0xf60, expected 0x7f.

1 0

Re: ddraw/tests: Fix a typo in ok() messages
by Marvin 23 May '16

23 May '16

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=23163 Your paranoid android. === w1064 (32 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw1) === ddraw1.c:2209: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw1) === ddraw1.c:2209: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH 1/1] libwine: Use WINEUSER as user_name, if set
by Bruno Jesus 23 May '16

23 May '16

On Mon, May 9, 2016 at 1:01 AM, Lucian Poston <lucian.poston(a)gmail.com> wrote: > Signed-off-by: Lucian Poston <lucian.poston(a)gmail.com> > --- > libs/wine/config.c | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) Hi, can you describe some useful scenarios and programs where this could be useful?

3 2

Re: [PATCH] msacm32: Added converter for ADPCM to PCM 8 bit mono.
by Andrew Eikum 23 May '16

23 May '16

Thanks for working on this. Some comments below. On Fri, May 20, 2016 at 02:54:01AM +0200, Fabian Maurer wrote: > +/*********************************************************************** > + * R8 > + * > + * Read a 8 bit sample > + */ > +static inline short R8(const unsigned char* src) > +{ > + return *src; > +} > + R8 is never used. > + nsamp_blk--; /* remove the sample in block header */ > + for (; nblock > 0; nblock--) > + { > + const unsigned char* in_src = src; > + > + /* handle header first */ > + sample = R16(src); > + stepIndex = (unsigned)*(src + 2); > + clamp_step_index(&stepIndex); > + src += 4; > + W8(dst, sample); dst += 1; > + > + for (nsamp = nsamp_blk; nsamp > 0; nsamp -= 2) > + { > + process_nibble(*src, &stepIndex, &sample); > + W8(dst, sample); dst += 1; > + process_nibble(*src++ >> 4, &stepIndex, &sample); > + W8(dst, sample); dst += 1; > + } The indentation here and elsewhere is a mess. I suggest just using 4-space indents, no hard tabs. > + /* we have now to realign the source pointer on block */ > + src = in_src + adsi->pwfxSrc->nBlockAlign; > + } > +} > + The only difference between cvtMMima8K and cvtMMima16K is a couple of multiplications by 2 and the use of W8 instead of W16, right? I think you can have just one function and use adsi->pwfxDst->wBitsPerSample to determine sample size, to avoid so much code duplication. > - /* adpcm decoding... */ > - if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 2) > - aad->convert = cvtSSima16K; > - if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 1) > - aad->convert = cvtMMima16K; > + /* adpcm decoding... */ > + if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 2) > + aad->convert = cvtSSima16K; > + if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 1) > + aad->convert = cvtMMima16K; > + if (adsi->pwfxDst->wBitsPerSample == 8 && adsi->pwfxDst->nChannels == 1) > + aad->convert = cvtMMima8K; > + /* FIXME: Stereo support for 8bit samples*/ > + if (adsi->pwfxDst->wBitsPerSample == 8 && adsi->pwfxDst->nChannels == 2) > + goto theEnd; More bad indentation. Andrew

2 1

Re: shell32: Initialize all of wszDstPath in ISFHelper_fnCopyItems. ISFHelper_fnCopyItems.
by Alexandre Julliard 23 May '16

23 May '16

Gerald Pfeifer <gerald(a)pfeifer.com> writes: > wszDstPath is an array of WCHAR, which are wider than one byte, > so this should have been (MAXPATH+1)*sizeof(WCHAR) -- or the more > robust approach I here propose. Actually there's no reason to initialize the entire buffer. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH 12/12] wined3d: Use ARB_fragment_coord_conventions for vpos fixups when supported.
by Henri Verbeet 22 May '16

22 May '16

On 20 May 2016 at 19:56, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > if (reg_maps->vpos) > { > - if (shader->device->wined3d->flags & WINED3D_PIXEL_CENTER_INTEGER) > + if (gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) > + shader_addline(buffer, "vpos = gl_FragCoord;\n"); > + else if (shader->device->wined3d->flags & WINED3D_PIXEL_CENTER_INTEGER) Isn't it harder than that? You're dropping the y-flip completely now. I think we can actually do that regardless of ARB_fragment_coord_conventions if we have always_offscreen, but not in general. It does look like the benefits of ARB_fragment_coord_conventions are somewhat limited. I probably mixed it up with ARB_clip_control when I initially suggested it. I think that would allow us to get rid of the position fixup, but we'd have to make it a requirement for shader model 4 if we wanted to avoid patch 6/12.

2 1

Re: include: Fix a typo in IDirect3D9Ex method
by Henri Verbeet 22 May '16

22 May '16

On 22 May 2016 at 14:30, Andrey Gusev <andrey.goosev(a)gmail.com> wrote: > - STDMETHOD(GetAdapterLUID)(THIS_ UINT Adatper, LUID *pLUID) PURE; > + STDMETHOD(GetAdapterLUID)(THIS_ UINT Adapter, LUID *pLUID) PURE; If you're touching it anyway, "Adapter" => "adapter" and "pLUID" => "luid".

1 0

Re: [PATCH v2 09/12] d3d10core/tests: Add a geometry shader test.
by Henri Verbeet 22 May '16

22 May '16

On 20 May 2016 at 19:56, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > +#if 0 > +struct gs_data > +{ > + float4 pos : SV_POSITION; > + float4 color : COLOR; > +}; > + > +[maxvertexcount(4)] > +void main(point struct gs_data vin[1], inout TriangleStream<gs_data> vout) > +{ > + float offset = 0.2 * vin[0].pos.w; > + gs_data v; > + > + v.color = vin[0].color; > + > + v.pos = float4(vin[0].pos.x - offset, vin[0].pos.y - offset, vin[0].pos.z, 1.0); > + vout.Append(v); > + v.pos = float4(vin[0].pos.x - offset, vin[0].pos.y + offset, vin[0].pos.z, 1.0); > + vout.Append(v); > + v.pos = float4(vin[0].pos.x + offset, vin[0].pos.y - offset, vin[0].pos.z, 1.0); > + vout.Append(v); > + v.pos = float4(vin[0].pos.x + offset, vin[0].pos.y + offset, vin[0].pos.z, 1.0); > + vout.Append(v); > +} > +#endif > + static const DWORD gs_code[] = > + { > + 0x43425844, 0x5c14d638, 0x1089a334, 0x4103d097, 0x218e3173, 0x00000001, 0x00000428, 0x00000005, > + 0x00000034, 0x0000008c, 0x000000e0, 0x00000134, 0x000003ac, 0x46454452, 0x00000050, 0x00000000, > + 0x00000000, 0x00000000, 0x0000001c, 0x47530400, 0x00000100, 0x0000001c, 0x7263694d, 0x666f736f, > + 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x31207265, 0x2e302e30, > + 0x31303031, 0x36312e31, 0x00343833, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, > + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000, > + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, > + 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, > + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, > + 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x00000270, 0x00020040, > + 0x0000009c, 0x05000061, 0x002010f2, 0x00000001, 0x00000000, 0x00000001, 0x0400005f, 0x002010f2, > + 0x00000001, 0x00000001, 0x02000068, 0x00000001, 0x0100085d, 0x0100285c, 0x04000067, 0x001020f2, > + 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x0200005e, 0x00000004, 0x0f000032, > + 0x00100032, 0x00000000, 0x80201ff6, 0x00000041, 0x00000000, 0x00000000, 0x00004002, 0x3e4ccccd, > + 0x3e4ccccd, 0x00000000, 0x00000000, 0x00201046, 0x00000000, 0x00000000, 0x05000036, 0x00102032, > + 0x00000000, 0x00100046, 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0020102a, 0x00000000, > + 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000, 0x06000036, 0x001020f2, > + 0x00000001, 0x00201e46, 0x00000000, 0x00000001, 0x01000013, 0x05000036, 0x00102012, 0x00000000, > + 0x0010000a, 0x00000000, 0x0e000032, 0x00100052, 0x00000000, 0x00201ff6, 0x00000000, 0x00000000, > + 0x00004002, 0x3e4ccccd, 0x00000000, 0x3e4ccccd, 0x00000000, 0x00201106, 0x00000000, 0x00000000, > + 0x05000036, 0x00102022, 0x00000000, 0x0010002a, 0x00000000, 0x06000036, 0x00102042, 0x00000000, > + 0x0020102a, 0x00000000, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000, > + 0x06000036, 0x001020f2, 0x00000001, 0x00201e46, 0x00000000, 0x00000001, 0x01000013, 0x05000036, > + 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x05000036, 0x00102022, 0x00000000, 0x0010001a, > + 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0020102a, 0x00000000, 0x00000000, 0x05000036, > + 0x00102082, 0x00000000, 0x00004001, 0x3f800000, 0x06000036, 0x001020f2, 0x00000001, 0x00201e46, > + 0x00000000, 0x00000001, 0x01000013, 0x05000036, 0x00102032, 0x00000000, 0x00100086, 0x00000000, > + 0x06000036, 0x00102042, 0x00000000, 0x0020102a, 0x00000000, 0x00000000, 0x05000036, 0x00102082, > + 0x00000000, 0x00004001, 0x3f800000, 0x06000036, 0x001020f2, 0x00000001, 0x00201e46, 0x00000000, > + 0x00000001, 0x01000013, 0x0100003e, 0x54415453, 0x00000074, 0x00000019, 0x00000001, 0x00000000, > + 0x00000004, 0x00000002, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, > + 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000005, 0x00000004, 0x00000000, > + 0x00000000, 0x00000000, > + }; That looks like it still contains debug info.

1 0

Re: [PATCH v3 01/12] wined3d: Alpha test emulation for core profile contexts.
by Henri Verbeet 22 May '16

22 May '16

On 20 May 2016 at 19:55, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > +static void shader_glsl_generate_alpha_test(struct wined3d_string_buffer *buffer, > + const struct wined3d_gl_info *gl_info, enum wined3d_cmp_func alpha_func) > +{ > + /* alpha_func is the PASS condition, not the DISCARD condition. Instead of > + * flipping all the operators here, just negate the comparison below. */ > + static const char * const comparison_operator[] = > + { > + "", /* WINED3D_CMP_NEVER */ > + "<", /* WINED3D_CMP_LESS */ > + "==", /* WINED3D_CMP_EQUAL */ > + "<=", /* WINED3D_CMP_LESSEQUAL */ > + ">", /* WINED3D_CMP_GREATER */ > + "!=", /* WINED3D_CMP_NOTEQUAL */ > + ">=", /* WINED3D_CMP_GREATEREQUAL */ > + "" /* WINED3D_CMP_ALWAYS */ > + }; > + > + if (alpha_func == WINED3D_CMP_ALWAYS) > + return; > + > + if (alpha_func != WINED3D_CMP_NEVER) > + shader_addline(buffer, "if (!(%s[0].a %s alpha_test_ref))\n", > + get_fragment_output(gl_info), comparison_operator[alpha_func - WINED3D_CMP_NEVER]); > + shader_addline(buffer, " discard;\n"); > +} I'm calling this good enough for a start. In case of WINED3D_CMP_EQUAL and WINED3D_CMP_NOTEQUAL in particular there may come a point where we'll have to do a range check like for color keys though.

1 0

Re: [PATCH] d3d11: Honor render state FrontCounterClockwise.
by Józef Kucia 22 May '16

22 May '16

On Sun, May 22, 2016 at 1:32 PM, Johannes Brandstätter <jbrandst(a)2ds.eu> wrote: > This fixes geometry flickering in Unigine's Valley and Heaven bechmarks. > The user interface would at least show some parts, but using this patch > it completly vanishes as well as the credits image upon closing. > > Signed-off-by: Johannes Brandstätter <jbrandst(a)2ds.eu> > --- > dlls/d3d11/device.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c > index 7fb28ac..d54f81f 100644 > --- a/dlls/d3d11/device.c > +++ b/dlls/d3d11/device.c > @@ -808,10 +808,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon > > desc = &device->rasterizer_state->desc; > wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, desc->FillMode); > - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, desc->CullMode); > /* glFrontFace() */ > if (desc->FrontCounterClockwise) > - FIXME("Ignoring FrontCounterClockwise %#x.\n", desc->FrontCounterClockwise); > + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, WINED3D_CULL_CCW); > + else > + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, desc->CullMode); > /* OpenGL style depth bias. */ > if (desc->DepthBias || desc->SlopeScaledDepthBias) > FIXME("Ignoring depth bias.\n"); > -- > 2.8.1 > > > This patch doesn't make sense. The FrontCounterClockwise field needs to be mapped to glFrontFace(). The best what you can get using the current wined3d API is to invert the cull mode when FrontCounterClockwise is true. if (desc->FrontCounterClockwise) { switch (desc->CullMode) { default: case D3D11_CULL_NONE: cullmode = WINED3D_CULL_NONE; break; case D3D11_CULL_FRONT: cullmode = WINED3D_CULL_CCW; break; case D3D11_CULL_BACK: cullmode = WINED3D_CULL_CW; break; } This still is not a proper solution because the front face property can be read in shaders, see the SV_IsFrontFace system-value semantic. The proper solution is to introduce a rasterizer state object in wined3d API. You could probably start with a rasterizer state object containing a single property for FrontCounterClockwise.

1 0

Re: [PATCH] wined3d: Don't accept WINED3DFMT_NULL
by Stefan Dösinger 22 May '16

22 May '16

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, Thanks for catching this bug. You'll have to submit your patch with your real name, and as Aaryaman stated, a signed off line. Am 2016-05-21 um 10:46 schrieb contrib(a)maxqia.com: > - if (!surface) > + if (!surface || surface->container->resource.format->id == WINED3DFMT_NULL) > { > key->objects[idx].object = 0; > key->objects[idx].target = 0; My sense is that a D3DFMT_NULL texture should hever have a GL texture allocated, so going through the final else path should be ok - surface_get_texture_name returns 0, and context_attach_surface_fbo ignores the other fields if object is 0. Can you check if object is != 0 in the case where it fails, and see where the value comes from? I can imagine that the game manually calls PreLoad on a NULL texture as a possible cause. In our draw and clear code we're skipping the GL texture allocation for NULL resources. If the GL texture is not 0 I expect that you get a GL error before context_set_fbo_key_for_surface is run. If it is indeed 0 and something goes wrong at a later point then my reasoning above must be wrong in some way. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXQG4IAAoJEN0/YqbEcdMwQOQP/20p3/P+Ej25ABqMh83F9l1/ OlhCUM3BdjYxYaZacopDInmudVALgTLaQe28dlKMw181XSqQ1op9acwHXSvXkNKM ZyvNIsqtLxenX37ZWu0I22xqV+DFU07D4TbzrQMAlgMd9XUK2713PhNVKRuYSLpS LazcTMldRoiHOxrJF7spbAr0Nn2JPGwHV/4NA0baQdIycnVQqztFQHPmdRVSP/eO 9zOacv0AKDaPt3GXgJV0+S7QuDW9EEsXI6nkytDJpazBnfSrJRCVQIGhPiokf9ik dlFkwYKuZe/fSTgSfyxyB0IhQoaOsfM4LTSJymQpneADRLhbmPORORMdzFMW/GrN qKPgK28U2oES3u3YF6u5/2YgfrSUvJvvqPe8077Tyl60uG5W7lBWeMQ4HUDaDHgW vWcDbvX1vYh+BG5zIvvVzGvmRKoKYnnEj65iqGqpi/vcJMz2f4ff/vmAiT1y23Hl 0Y50ZUxTWXpUVi4uzoQlKgpmXbny2je0P2K12zbA13J3kJ/LxoHqefm1RW9VJ1w4 VxYD94lbk4zchO0AQwbLK83b7f8QoTZH2quqyzbgyFoAynXv0RDhQ2ZjtRN66Jh+ HmFOprGcCEmOnFs9c0JS8c9MSBVc8g1i6XmnnnccO3wyaw7vrNQbNmnqPRhkpPEV ELMYspnFGK8apZ7633Dq =QeKV -----END PGP SIGNATURE-----

3 3

Re: [PATCH resend] wined3d: Don't accept WINED3DFMT_NULL
by Aaryaman Vasishta 21 May '16

21 May '16

Hi, Thanks for the contribution! I noticed that you're missing something: On Sat, May 21, 2016 at 4:14 PM, Maxqia <contrib(a)maxqia.com> wrote: > This fixes https://bugs.winehq.org/show_bug.cgi?id=40624 > --- > dlls/wined3d/context.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > You need to sign-off on this patch. FWIW, Use git commit --amend -s to add a signed-off by field to your patch and resend it. Cheers, Aaryaman

1 0

Re: [PATCH] jscript: Date.parse: make "UTC"/"GMT" optional before the timezone offset
by Marvin 21 May '16

21 May '16

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=23146 Your paranoid android. === wxppro (32 bit) === Found no trace of the test summary line or of a crash === w2003std (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (32 bit) === Found no trace of the test summary line or of a crash === w2008s64 (32 bit) === Found no trace of the test summary line or of a crash === w7u (32 bit) === Found no trace of the test summary line or of a crash === w7pro64 (32 bit) === Found no trace of the test summary line or of a crash === w8 (32 bit) === Found no trace of the test summary line or of a crash === w864 (32 bit) === Found no trace of the test summary line or of a crash === w1064 (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (64 bit) === Found no trace of the test summary line or of a crash === w2008s64 (64 bit) === Found no trace of the test summary line or of a crash === w7pro64 (64 bit) === Found no trace of the test summary line or of a crash === w864 (64 bit) === Found no trace of the test summary line or of a crash === w1064 (64 bit) === Found no trace of the test summary line or of a crash

1 0

Re: [PATCH 1/6] wined3d: Add wined3d creation flag for selecting unbound resource color.
by Henri Verbeet 20 May '16

20 May '16

On 20 May 2016 at 11:47, Józef Kucia <jkucia(a)codeweavers.com> wrote: > diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h > index 8429bea..79ac440 100644 > --- a/include/wine/wined3d.h > +++ b/include/wine/wined3d.h > @@ -1237,6 +1237,7 @@ enum wined3d_display_rotation > #define WINED3D_PIXEL_CENTER_INTEGER 0x00000080 > #define WINED3D_LEGACY_FFP_LIGHTING 0x00000100 > #define WINED3D_SRGB_READ_WRITE_CONTROL 0x00000200 > +#define WINED3D_UNBOUND_RESOURCE_COLOR_ZERO 0x00000400 > We generally try to make the "reasonable" behaviours the defaults, and only have flags for extra functionality or more quirky behaviours. In this case it's perhaps arguable what the default should be, but all zeroes seems like the more reasonable default to me.

1 0

Re: dnsapi: add DnsGetCacheDataTable stub
by Sebastian Lackner 20 May '16

20 May '16

On 20.05.2016 06:27, Austin English wrote: > +/****************************************************************************** > + * DnsGetCacheDataTable [DNSAPI.@] > + * > + */ > +DNS_GET_CACHE_DATA_TABLE WINAPI DnsGetCacheDataTable( DNSCACHEENTRY *cache ) I'm pretty sure it should not return a function pointer here. Also, you might want to move the struct to header file so that it can be used in tests later.

1 0

Re: ntdll: add WinSqmEndSession/WinSqmStartSession stubs
by Michael Müller 20 May '16

20 May '16

Am 20.05.2016 um 06:15 schrieb Austin English: > +NTSTATUS WINAPI WinSqmStartSession(GUID *sessionguid, DWORD sessionid, DWORD unknown1) > +{ Your usage example indicates that the function returns a HANDLE and not a NTSTATUS value. Returning INVALID_HANDLE_VALUE would therefore be the most suitable value for a stub. The linked code also handles this case. > +@ stdcall WinSqmEndSession(ptr) The parameter is a handle, so you should mark it as long instead of ptr. Btw, the remaining functions seems to be sorted alphabetically, so you also might want to correctly insert this function.

1 0

Re: [PATCH] mshtml/tests: Use todo_wine_if() in tests.
by Jacek Caban 20 May '16

20 May '16

Hi Hadrien, Please resend with your sign off. Other than that, the patch looks good. Thanks, Jacek

1 0

Re: [PATCH 3/7] d3drm: Implement IDirect3DRMTexture{2-3}_InitFromImage. (v6 resend)
by Henri Verbeet 20 May '16

20 May '16

On 19 May 2016 at 12:55, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index 583dbec..1f57058 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -1705,6 +1705,11 @@ static void test_Texture(void) > TRUE, 2 * sizeof(DWORD), NULL, NULL, > 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000, 0, NULL > }, *d3drm_img = NULL; > + D3DRMIMAGE testimg = { Formatting. (Yeah, the existing test is like that as well.) > + 0, 0, 0, 0, 0, > + TRUE, 0, (void *)0xcafebabe, NULL, > + 0x000000ff, 0x0000ff00, 0x00ff0000, 0, 0, NULL > + }; > DWORD pixel[4] = { 20000, 30000, 10000, 0 }; > DWORD size; > CHAR cname[64] = {0}; > @@ -1853,22 +1858,95 @@ static void test_Texture(void) > ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4); > > /* InitFromImage tests */ > - d3drm_img = NULL; > + > + /* Tests for validation of D3DRMIMAGE struct */ > + hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2, (void **)&texture2); Line length. > + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %x).\n", hr); It's not a huge issue, but %#x, please.

1 0

Re: [PATCH 2/7] d3drm: Introduce d3drm_texture_destroy helper (v4 resend).
by Henri Verbeet 20 May '16

20 May '16

On 19 May 2016 at 12:55, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > @@ -44,6 +44,14 @@ static inline struct d3drm_texture *impl_from_IDirect3DRMTexture3(IDirect3DRMTex > return CONTAINING_RECORD(iface, struct d3drm_texture, IDirect3DRMTexture3_iface); > } > > +static void d3drm_texture_destroy(struct d3drm_texture *texture) > +{ > + TRACE("texture %p is being destroyed.\n", texture); > +···· Trailing whitespace.

1 0

Re: [PATCH 1/7] d3drm: Use CreateObject in IDirect3DRM*::LoadTexture. (v3)
by Henri Verbeet 20 May '16

20 May '16

On 19 May 2016 at 13:00, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > static HRESULT WINAPI d3drm1_LoadTexture(IDirect3DRM *iface, > const char *filename, IDirect3DRMTexture **texture) > { > - struct d3drm_texture *object; > HRESULT hr; > > FIXME("iface %p, filename %s, texture %p stub!\n", iface, debugstr_a(filename), texture); > > - if (FAILED(hr = d3drm_texture_create(&object))) > + if (FAILED(hr = IDirect3DRM_CreateObject(iface, &CLSID_CDirect3DRMTexture, NULL, > + &IID_IDirect3DRMTexture, (void **)texture))) > return hr; > > - *texture = &object->IDirect3DRMTexture_iface; > - > return D3DRM_OK; > } Actually, after thinking it through for a bit, I don't think you need to use CreateObject() here at all. You can just add an extra parameter to d3drm_texture_create() in patch 3/7 and avoid going through all the COM stuff. (Of course at that point you'll also notice load_mesh_data() is broken...) > @@ -857,17 +855,19 @@ static HRESULT WINAPI d3drm2_CreateUserVisual(IDirect3DRM2 *iface, > static HRESULT WINAPI d3drm2_LoadTexture(IDirect3DRM2 *iface, > const char *filename, IDirect3DRMTexture2 **texture) > { > - struct d3drm_texture *object; > + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); > + IDirect3DRMTexture3 *texture3; > HRESULT hr; > > FIXME("iface %p, filename %s, texture %p stub!\n", iface, debugstr_a(filename), texture); > > - if (FAILED(hr = d3drm_texture_create(&object))) > + if (FAILED(hr = IDirect3DRM3_LoadTexture(&d3drm->IDirect3DRM3_iface, filename, &texture3))) > return hr; This change isn't necessarily wrong, but it's something different from what the rest of the patch does. Note that if things were ordered so that the newest version of the interface came first, you could call d3drm3_LoadTexture() here directly. The file is the way it is of course, but perhaps we should consider fixing that at some point.

1 0

Re: [PATCH] dwrite: Resolve BNs and embedding and override formatting characters to preceding level
by Marvin 20 May '16

20 May '16

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=23120 Your paranoid android. === wvistau64 (32 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w2008s64 (32 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w7u (32 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w7pro64 (32 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w8 (32 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w864 (32 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w1064 (32 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === wvistau64 (64 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w2008s64 (64 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w7pro64 (64 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w864 (64 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w1064 (64 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057

1 0

Re: dnsapi: add DnsGetCacheDataTable stub
by Hans Leidekker 20 May '16

20 May '16

On Thu, 2016-05-19 at 23:27 -0500, Austin English wrote: > +typedef int (*DNS_GET_CACHE_DATA_TABLE)(PDNSCACHEENTRY); You don't need this. > +DNS_GET_CACHE_DATA_TABLE WINAPI DnsGetCacheDataTable( DNSCACHEENTRY *cache ) > +{ > + FIXME( "(%p) stub\n", cache); > + return ERROR_SUCCESS; > +} It should probably return DNS_STATUS and the parameter might actually be DNSCACHEENTRY **. Some tests would be helpful here.

1 0

Re: user32: Also change rcUpdate when scrolling by more than the window size.
by Marvin 19 May '16

19 May '16

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=23115 Your paranoid android. === wvistau64 (32 bit win) === win.c:8207: Test failed: WindowFromPoint returned 00040170, expected 000201FC win.c:8214: Test failed: WindowFromPoint returned 000601BA, expected 000301FA

1 0

[PATCH] local debugging help
by Fabian Maurer 19 May '16

19 May '16

Please ignore my patch 122481 dubbed "local debugging help", I sent that by mistake.

1 0

Re: [PATCH 07/11] wininet: Removed maximum URL length assumption from get_proxy_autoconfig_url.
by Sebastian Lackner 19 May '16

19 May '16

On 17.05.2016 19:16, Jacek Caban wrote: > Also use correct encoding. > > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> > --- > dlls/wininet/internet.c | 33 +++++++++++++++++++-------------- > 1 file changed, 19 insertions(+), 14 deletions(-) > > > > 0007-wininet-Removed-maximum-URL-length-assumption-from-ge.diff > > > diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c > index 371c3d0..78bea7c 100644 > --- a/dlls/wininet/internet.c > +++ b/dlls/wininet/internet.c > @@ -2307,13 +2307,14 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer, > return res == ERROR_SUCCESS; > } > > -static BOOL get_proxy_autoconfig_url( char *buf, DWORD buflen ) > +static WCHAR *get_proxy_autoconfig_url(void) > { > #if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 > > CFDictionaryRef settings = CFNetworkCopySystemProxySettings(); > + WCHAR *ret = NULL; > + SIZE_T len; > const void *ref; > - BOOL ret = FALSE; > > if (!settings) return FALSE; > > @@ -2322,16 +2323,20 @@ static BOOL get_proxy_autoconfig_url( char *buf, DWORD buflen ) > CFRelease( settings ); > return FALSE; You forgot to replace FALSE -> NULL at a couple of places in this patch.

2 1

Re: [PATCH 1/7] d3drm: Use CreateObject in IDirect3DRM*::LoadTexture. (v2)
by Aaryaman Vasishta 19 May '16

19 May '16

On Thu, May 19, 2016 at 4:25 PM, Aaryaman Vasishta < jem456.vasishta(a)gmail.com> wrote: > v2: Thunk 2->3 for LoadTexture. > > Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> > --- > dlls/d3drm/d3drm.c | 21 +++++++++------------ > 1 file changed, 9 insertions(+), 12 deletions(-) > > diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c > index edb46df..bc16b6f 100644 > --- a/dlls/d3drm/d3drm.c > +++ b/dlls/d3drm/d3drm.c > @@ -413,16 +413,13 @@ static HRESULT WINAPI > d3drm1_CreateUserVisual(IDirect3DRM *iface, > static HRESULT WINAPI d3drm1_LoadTexture(IDirect3DRM *iface, > const char *filename, IDirect3DRMTexture **texture) > { > - struct d3drm_texture *object; > HRESULT hr; > > FIXME("iface %p, filename %s, texture %p stub!\n", iface, > debugstr_a(filename), texture); > > - if (FAILED(hr = d3drm_texture_create(&object))) > + if (FAILED(hr = IDirect3DRM_CreateObject(iface, > &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture, (void > **)texture))) > return hr; > This line is too long, I'm resending v3 of this patch. Cheers, Aaryaman

1 0

Re: [v2 PATCH] user32/scroll: Move GetDCEx to stop DC leak
by Alexandre Julliard 19 May '16

19 May '16

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/user32/scroll.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Since it can't happen there's no leak to fix. You could replace the return by an assert(0) if you want to make it clearer. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v3 PATCH] wined3d: Add missing WINED3DUSAGE flags to debug_d3dusage
by Henri Verbeet 19 May '16

19 May '16

On 18 May 2016 at 12:33, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > const char *debug_d3dusage(DWORD usage) > { > - char buf[333]; > + char buf[512]; 512 is insufficient, how did you arrive at that number?

1 0

Re: configure: Fix a typo in comments
by Nikolay Sivov 19 May '16

19 May '16

On 19.05.2016 12:13, Andrey Gusev wrote: > > --- a/configure > +++ b/configure > @@ -371,7 +371,7 @@ as_fn_executable_p () > # ---------------------- > # Append the text in VALUE to the end of the definition contained in VAR. Take > # advantage of any shell optimizations that allow amortized linear growth over > -# repeated appends, instead of the typical quadratic growth present in naive > +# repeated appends, instead of the typical quadratic growth present in native > # implementations. This is a generated part, if it had a typo it should be fixed in tools, not in Wine. For this patch, comment looks correct to me as it is.

1 0

Re: [PATCH 4/4] d3d9: Allow to pass NULL pointers to IDirect3DDevice9_GetRenderTargetData().
by Marvin 19 May '16

19 May '16

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=23103 Your paranoid android. === w864 (64 bit device) === device.c:4317: Test failed: cw is 0xf60, expected 0x7f. device.c:4326: Test failed: Callback cw is 0xf60, expected 0x7f. === w1064 (64 bit device) === device.c:4317: Test failed: cw is 0xf60, expected 0x7f. device.c:4326: Test failed: Callback cw is 0xf60, expected 0x7f.

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel