June 2014 - Wine-Devel - list.winehq.org

Re: [1/7] server: Any of the 4 SE_*_DEFAULTED controls should not be stored on objects, their usage is transient. (try 3)
by Marvin June 26, 2014

June 26, 2014

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=7715 Your paranoid android. === build (build) === Could not copy the patch to the VM: the "nc -q0 '10.42.42.130' '4242'" command returned 1

2 1

Re: [PATCH 4/5] msvcrt: Use file->_flag to check if file buffering is enabled
by Alexandre Julliard June 26, 2014

June 26, 2014

Piotr Caban <piotr(a)codeweavers.com> writes: > --- > dlls/msvcrt/file.c | 64 > +++++++++++++++++++++++++++++------------------------- > 1 file changed, 35 insertions(+), 29 deletions(-) It breaks the tests: ../../../tools/runtest -q -P wine -T ../../.. -M mshtml.dll -p mshtml_test.exe.so dom && touch dom.ok wine: Unhandled page fault on write access to 0x00000000 at address 0x559c685b (thread 0045), starting debugger... Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x559c685b). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:559c685b ESP:0032ea30 EBP:0032ea58 EFLAGS:00210246( R- -- I Z- -P- ) EAX:00000000 EBX:55a2ba90 ECX:00000030 EDX:00000001 ESI:55a33cc0 EDI:003d2de3 Stack dump: 0x0032ea30: 0000001e 00000000 4d430003 00000000 0x0032ea40: 0032ea60 55a2ba90 0032ea98 559c6943 0x0032ea50: 55a2ba90 55a33cc0 0032ea98 559c6a7e 0x0032ea60: 00000030 55a33cc0 0032ed78 7bc3c409 0x0032ea70: 00000000 003d2d24 0000004b 00000000 0x0032ea80: 000001f4 003d2de3 0032eab8 003d2d98 Backtrace: =>0 0x559c685b MSVCRT__flsbuf+0x4b(c=<is not available>, file=<is not available>) [/home/julliard/wine/wine/dlls/msvcrt/file.c:3671] in msvcrt (0x0032ea58) 1 0x559c6a7e MSVCRT_fwrite+0x17d(ptr=<is not available>, size=<is not available>, nmemb=<is not available>, file=<is not available>) [/home/julliard/wine/wine/dlls/msvcrt/file.c:3738] in msvcrt (0x0032ea98) 2 0x00334cd0 in nspr4 (+0x4ccf) (0x0032eab8) 3 0x003354d3 in nspr4 (+0x54d2) (0x0032ed38) 4 0x6a65ce06 in xul (+0xa1ce05) (0x0032edd8) 5 0x69f4e2ef in xul (+0x30e2ee) (0x0032ef18) 0x559c685b MSVCRT__flsbuf+0x4b [/home/julliard/wine/wine/dlls/msvcrt/file.c:3671] in msvcrt: movb %cl,0x0(%eax) 3671 *file->_ptr++ = c; -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/5] msvcrt: Support NULL buffer in setvbuf
by Marvin June 26, 2014

June 26, 2014

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=7709 Your paranoid android. === build (build) === Patch failed to apply

3 2

Re: [PATCH 4/4] vbscript: Implemented Abs(try 2)
by Jacek Caban June 26, 2014

June 26, 2014

On 06/17/14 08:00, Shuai Meng wrote: > diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c > index d21784d..e646a29 100644 > --- a/dlls/vbscript/global.c > +++ b/dlls/vbscript/global.c > @@ -1302,8 +1302,24 @@ static HRESULT Global_ChrW(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI > > static HRESULT Global_Abs(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) > { > - FIXME("\n"); > - return E_NOTIMPL; > + VARIANT v; > + HRESULT hres; > + > + TRACE("(%s)\n", debugstr_variant(arg)); > + > + assert(args_cnt == 1); > + > + V_VT(&v) = VT_EMPTY; > + hres = VariantChangeType(&v, arg, VARIANT_LOCALBOOL, VT_R8); > + if (FAILED(hres)) > + return S_OK; Please use to_double here. Also note weird indention here. Jacek

3 6

[PATCH] gdi32: XFORM matrix in PlgBlt() is calculated incorrectly
by Alexander Almaleh June 26, 2014

June 26, 2014

As suggested by Sebastian Lackner, I am submitting his much simpler version of the fix. Only one line is touched. The patch file is attached. The bugzilla link is http://bugs.winehq.org/show_bug.cgi?id=36504

2 2

Re: [PATCH 5/5] msvcrt: Don't touch _bufsiz value while initializing FILE structure
by Marvin June 26, 2014

June 26, 2014

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=7710 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [4/7] server: Setting a security descriptor should not replace an existing owner or group if only a DACL is being set.
by Michael Stefaniuc June 26, 2014

June 26, 2014

Hello Joris, On 06/26/2014 01:13 AM, Joris van der Wel wrote: > +#define CHECK_DACL_IS_NULL(o) \ > + do{ \ > + SECURITY_DESCRIPTOR *queriedSD = NULL; \ > + PACL queriedAcl = NULL; \ > + BOOL dacl_present; \ > + BOOL dacl_defaulted; \ > + SECURITY_DESCRIPTOR_CONTROL control; \ > + DWORD revision; \ > + queriedSD = test_get_security_descriptor( o, __LINE__ ); \ > + queriedAcl = (PACL)0xdeadbeef; \ > + res = GetSecurityDescriptorDacl(queriedSD, &dacl_present, &queriedAcl, &dacl_defaulted); \ > + ok(res, "GetSecurityDescriptorDacl failed with error %d\n", GetLastError()); \ > + res = GetSecurityDescriptorControl(queriedSD, &control, &revision); \ > + ok(res, "GetSecurityDescriptorControl failed with error %d\n", GetLastError()); \ > + ok(dacl_present, "DACL should be present (even though the DACL is NULL)\n"); \ > + ok(queriedAcl == NULL, "Setting a NULL DACL, should also return a NULL DACL\n"); \ > + ok(!dacl_defaulted, "Defaulted is true\n"); \ > + ok((control & SE_DACL_DEFAULTED) == 0, "SE_DACL_DEFAULTED is set\n"); \ > + HeapFree(GetProcessHeap(), 0, queriedSD); \ > + }while(0) > + please try to avoid monster macros and use separate functions instead. You can still use a macro to pass __LINE__ to the function and use ok(__FILE__, line)(...) inside that function. bye michael

1 0

Re: [PATCH 2/4] vbscript: Implemented VarType(try 2)
by Jacek Caban June 26, 2014

June 26, 2014

On 06/17/14 07:59, Shuai Meng wrote: > diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c > index 5357df8..c2b2edd 100644 > --- a/dlls/vbscript/global.c > +++ b/dlls/vbscript/global.c > @@ -602,8 +602,52 @@ static HRESULT Global_Oct(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA > > static HRESULT Global_VarType(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) > { > - FIXME("\n"); > - return E_NOTIMPL; > + TRACE("(%s)\n", debugstr_variant(arg)); > + > + assert(args_cnt == 1); > + > + if(res) { > + V_VT(res) = VT_I2; > + switch(V_VT(arg)) { > + case VT_EMPTY: > + V_I2(res) = VT_EMPTY; > + break; > + case VT_NULL: > + V_I2(res) = VT_NULL; > + break; > + case VT_I2: > + V_I2(res) = VT_I2; > + break; (...) This all could be just: V_I2(res) = V_VT(arg); To handle unsupported types, you could use something like: if(V_VT(arg) & ~VT_TYPEMASK) { FIXME("..."); return E_NOTIMPL; } if(res) { V_VT(res) = VT_I2; V_I2(res) = V_VT(arg); } Jacek

3 2

Re: wined3d: Use shader and fragment capabilities to select d3d level
by Henri Verbeet June 25, 2014

June 25, 2014

On 23 June 2014 21:10, Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> wrote: > +static UINT d3d_level_from_gl_info(const struct wined3d_gl_info *gl_info) > +{ > + struct shader_caps shader_caps; > + struct fragment_caps fragment_caps; > + const struct wined3d_shader_backend_ops *shader_backend; > + const struct fragment_pipeline *fragment_pipeline; > + > + shader_backend = select_shader_backend(gl_info); > + shader_backend->shader_get_caps(gl_info, &shader_caps); > + > + if (shader_caps.vs_version >= 4) > + return 10; > + //wine can not use SM 4 on mesa drivers as the necessary functionality is not exposed on compatibility contexts, but still set the pci id accordingly Please avoid C99 features like // comments. > + if (shader_caps.vs_version == 3 && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30)) > + return 10; > + if (shader_caps.vs_version >= 2) > + return 9; > + if (shader_caps.vs_version == 1) > + return 8; > + > + fragment_pipeline = select_fragment_implementation(gl_info, shader_backend); > + fragment_pipeline->get_caps(gl_info, &fragment_caps); > + > + if (fragment_caps.TextureOpCaps & WINED3DTEXOPCAPS_DOTPRODUCT3) > + return 7; > + if (gl_info->limits.textures > 1) > + return 6; That's "fragment_caps.MaxSimultaneousTextures". It probably makes sense to reorganize things a bit. For example, the gl_info parameter to the select_card() callbacks in struct gl_vendor_selection is really only used by select_card_nvidia_binary() and select_card_amd_binary() to call d3d_level_from_gl_info(), but I don't think anything of value would be lost if those used a plain table like e.g. select_card_amd_mesa(). (At which point you wouldn't need a callback there anymore either.) d3d_level_from_gl_info() should probably get the shader and fragment caps passed as parameters, and be renamed. It probably makes sense to make it return some kind of enum instead of a plain number, so you can e.g. distinguish between D3D9 SM2 and D3D9 SM3. That would also allow the fallback card selection code to use plain tables instead of callbacks.

2 2

Tahoma fonts and Greek language
by Petros F June 25, 2014

June 25, 2014

Hello, When you install wine in a PC with Greek language, or run a program that requires or uses Greek fonts, the fonts could not appear correctly because of the pre-installed tahoma font which it hasn't Greek letters for some reason. So the user has to change the font manually to another font or to paste a Greek tahoma font into /usr/share/fonts or /home/.fonts folder. I was wondering if it is possible to include these tahoma fonts (that have Greek letters) and the procedure of their installation in the wine installation? Petros

3 2