May 2016 - Wine-Devel - list.winehq.org

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

May 28, 2016

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 May 28, 2016

May 28, 2016

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 May 27, 2016

May 27, 2016

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 May 27, 2016

May 27, 2016

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 May 26, 2016

May 26, 2016

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 May 26, 2016

May 26, 2016

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 May 26, 2016

May 26, 2016

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 May 26, 2016

May 26, 2016

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 May 26, 2016

May 26, 2016

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 May 25, 2016

May 25, 2016

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 May 25, 2016

May 25, 2016

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 May 25, 2016

May 25, 2016

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 May 25, 2016

May 25, 2016

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 May 25, 2016

May 25, 2016

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 May 25, 2016

May 25, 2016

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 May 25, 2016

May 25, 2016

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 May 25, 2016

May 25, 2016

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 May 24, 2016

May 24, 2016

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 May 24, 2016

May 24, 2016

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 May 23, 2016

May 23, 2016

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 May 23, 2016

May 23, 2016

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 May 23, 2016

May 23, 2016

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 May 22, 2016

May 22, 2016

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] wined3d: Don't accept WINED3DFMT_NULL
by Stefan Dösinger May 22, 2016

May 22, 2016

-----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 12/12] wined3d: Use ARB_fragment_coord_conventions for vpos fixups when supported.
by Henri Verbeet May 22, 2016

May 22, 2016

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