- wine-devel - winehq.org

Re: [9/9] wined3d: pass the capabilities directly to d3d_level_from_gl_info and rename it to d3d_level_from_caps
by Henri Verbeet 07 Jul '14

07 Jul '14

On 4 July 2014 00:40, Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> wrote: > - if (fragment_caps.TextureOpCaps & WINED3DTEXOPCAPS_DOTPRODUCT3) > + if (fragment_caps->TextureOpCaps & WINED3DTEXOPCAPS_DOTPRODUCT3) > return D3D7; > if (fragment_caps.MaxSimultaneousTextures > 1) > return D3D6; This doesn't compile: directx.c: In function ‘d3d_level_from_caps’: directx.c:1692:22: error: request for member ‘MaxSimultaneousTextures’ in something not a structure or union

1 0

Re: [7/9] wined3d: replace vendor specific callbacks with generic code that uses vendor specific arrays
by Henri Verbeet 07 Jul '14

07 Jul '14

On 4 July 2014 00:40, Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> wrote: > +enum wined3d_pci_device > +card_fallback_nvidia[] = static const enum wined3d_pci_device card_fallback_nvidia[] =

1 0

Re: [6/9] wined3d: Use capabilities from the shader backend or the fragment pipeline to determine the D3D level
by Henri Verbeet 07 Jul '14

07 Jul '14

On 4 July 2014 00:40, Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> wrote: > + /* wine can not use SM 4 on mesa drivers as the necessary functionality is not exposed on compatibility contexts */ Line length. (And caps, punctuation, but I don't care that much.)

1 0

Re: [5/9] wined3d: Make d3d_level_from_gl_info return an enum instead of a plain int
by Stefan Dösinger 07 Jul '14

07 Jul '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-07-04 00:40, schrieb Andrei Slăvoiu: > +enum wined3d_d3d_level > +{ > + D3D5, > + D3D6, > + D3D7, > + D3D8, > + D3D9_SM2, > + D3D9_SM3, > + D3D10, > + D3D11, > +}; I'd prefer enum values like D3D_LEVEL_5 etc. I think D3Dx is too short and generic. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTt9weAAoJEN0/YqbEcdMwZ7QP/RPzNly/5CRWpcwKFI2VAh6O IquSkL2PeTlsDRJPwiywF4lXc1IqDHnrqFRHpTfI1u+eQMijtQ2iaTMBHcClLeaY VQGg4Td2UBenMMPjVtqLsP5FAdOZEeI8cWo6dQoA/ZMakgWqz2ZJDuLq/YhSAKFU 1msCqEyGIukOyzYp5ThbQXobVwHkJYO34ORMciHpbWRu1X97fHReAZLL21zEIwVi RRQTPBF/O4KvCLzJMpLVG0F35Ki8vIeJJPS/QU0pN2H88n//SWQBPHE9Epm3KCE0 qczqa8P9SjW7eCJ/xD59mbc89tRUjwegcNnP7ItjiRDgAnwk98jbgyZbrQfTKyLU b7K8xezH6kmgC6+SotPcIVtvU9Ucw6kNLhJKtlhdiEHprhQcBXTp27+uMfWCS9Nx tsjGw8VpKJ4D6jssD7nY/b/reNZ6M3qMCQYyWiGOe1hi0gerq+ouOLBDCyTbJD2n XcifP/jj+3BuuCO8gXJwmYECutq6Ao23ziOjgKPuqKY3XLgoMwdpUo5bylmY/m4N tIzy1JnSZubbJVIxoeCp7nC4Eeq3YRaIMP3+cqmT8ogu9KDBQuwpNLSk/gW65OIO 9Og69K7gIvkrudCo5j/Vd8ir+JxcbhA9Hw+gJdcySZwLItiTmpX/yi31/1+6TLr+ cokSG4OFKv1ZB2izKi46 =y2DP -----END PGP SIGNATURE-----

2 1

Re: [4/9] wined3d: replace vendor specific callbacks with generic code that uses vendor specific renderer string tables
by Henri Verbeet 07 Jul '14

07 Jul '14

On 4 July 2014 00:40, Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> wrote: > +/* See http://developer.amd.com/drivers/pc_vendor_id/Pages/default.aspx > + *· Trailing space. > +cards_vmware[]= { Space between ']' and '=', '{' placement. > static const struct gl_vendor_selection > { > enum wined3d_gl_vendor gl_vendor; > const char *description; /* Description of the card selector i.e. Apple OS/X Intel */ > - enum wined3d_pci_device (*select_card)(const char *gl_renderer); > + const struct > + { > + const char *renderer; > + enum wined3d_pci_device id; > + } *cards; /* To be used as cards[], pointer to the first member in an array */ This doesn't work: directx.c:2124:5: warning: initialization from incompatible pointer type [enabled by default] directx.c:2124:5: warning: (near initialization for ‘amd_gl_vendor_table[0].cards’) [enabled by default] etc. > + size_t nr_cards; /* Number of entries in the array above */ We'd generally name that "card_count", or perhaps "cards_size". > + {GL_VENDOR_APPLE, "Apple OSX AMD/ATI binary driver", cards_amd_binary, sizeof(cards_amd_binary) / sizeof(*cards_amd_binary)}, > + {GL_VENDOR_FGLRX, "AMD/ATI binary driver", cards_amd_binary, sizeof(cards_amd_binary) / sizeof(*cards_amd_binary)}, > + {GL_VENDOR_MESA, "Mesa AMD/ATI driver", cards_amd_mesa, sizeof(cards_amd_mesa) / sizeof(*cards_amd_mesa)}, Those lines are a bit long. Generally speaking, in wined3d, 100 characters is safe, 120 is the limit. Note that as a potential follow-up patch it wouldn't be very hard to merge these tables with card_vendor_table[]. > + for (j = 0; j < table[i].nr_cards; ++j) > + { > + if (strstr(gl_renderer, table[i].cards[j].renderer)) > + return table[i].cards[j].id; > + } Four space indentation, please.

1 0

Re: [2/9] wined3d: Make the card selection for binary drivers use arrays only
by Stefan Dösinger 07 Jul '14

07 Jul '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-07-04 00:40, schrieb Andrei Slăvoiu: > + /* Radeon R5xx */ > + {"X1950", CARD_AMD_RADEON_X1600}, > + {"X1900", CARD_AMD_RADEON_X1600}, > + {"X1800", CARD_AMD_RADEON_X1600}, > + {"X1650", CARD_AMD_RADEON_X1600}, > + {"X1600", CARD_AMD_RADEON_X1600}, > + /* Radeon R4xx + X1300/X1400/X1450/X1550/X2300/X2500/HD2300 (lowend R5xx) > + * Note X2300/X2500/HD2300 are R5xx GPUs with a 2xxx naming but they are still DX9-only */ > + {"HD 2300", CARD_AMD_RADEON_X700}, > + {"X2500", CARD_AMD_RADEON_X700}, > + {"X2300", CARD_AMD_RADEON_X700}, > + {"X1550", CARD_AMD_RADEON_X700}, > + {"X1450", CARD_AMD_RADEON_X700}, > + {"X1400", CARD_AMD_RADEON_X700}, > + {"X1300", CARD_AMD_RADEON_X700}, > + {"X850", CARD_AMD_RADEON_X700}, > + {"X800", CARD_AMD_RADEON_X700}, > + {"X700", CARD_AMD_RADEON_X700}, > + /* Radeon Xpress Series - onboard, DX9b, Shader 2.0, 300-400 MHz */ > + {"Radeon Xpress", CARD_AMD_RADEON_XPRESS_200M}, The last version of the binary driver that supports those cards is more than 5 years old. Unlike the Nvidia counterpart it has never been updated for newer kernels or X servers. I think it is safe to remove these cards from the binary driver handler. I guess its also safe to keep them in there though in case we have one or two users left who use ancient distros. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTt8d3AAoJEN0/YqbEcdMwQxAP/A0itG/ma629yvacZntEzfiR GjxZnCDWcxOB/q0i32QaM7iClpJq8imVUv9ZZbu7niK7JFwDvxNR8NLLHvheKY5G VaQQvH5Ueg3dUx29J4Ri+JZCgTJQGPBkYFEi2/Ba4TwxPr4ZDjMSXqH0JLcuxA0D r79RS8nFqD/8hcxfEGiv9YMoE9iJgZOjL4v67ErBL/ob0Q2S+qWf0Y9+NIhQB+3z F3JhPyuG6szBn4iVN42wCGl9eg+4/iC+OuDvmLFe4Nsu+Ggb6CyxntOZcDPDpGIa PA99942HIoiEtr3MboV7xMuMlPo6aPm5IcbKOWQMi2djqf8RnbM+rAqsK30tRwFi zqnW9vrctY+JubADF4uRcxMt5insjv6mURH8FmHEo2snmbRv93HSzSeG28Ylp4ND /2ltZHdxnAo2IoGjZX0QjBHS6giBF9DQ6WLxZcJUVbCj2oBh5+iXiSnnrsYxGv92 CRkHtySd8iSCibseyi9EwpnMzK5BIbWVz1L7fs8eM0ITGFOfatS5guWvirxT0g15 B/hf8py1gQiC/tmZQW828n/nGAmtqzwNl4PBPX1TRZz1jwxR6mg3hHIuGL13vwZB +8GEJFgRZLMRz4l2YkiuFeEohaCNq6wQ5Tlc+n3Fs/GkWoaDASd/+OZ9pc55/Mof pbXvrhc7BUFxMWoPjHH/ =1c47 -----END PGP SIGNATURE-----

2 1

Re: [1/9] wined3d: Make the card selection for binary drivers depend only on gl_renderer like it already is for the mesa drivers and remove the gl_info parameter from the select_card callback.
by Henri Verbeet 07 Jul '14

07 Jul '14

On 4 July 2014 00:40, Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> wrote: > + /*Direct 3D 9 SM3*/ This is pretty minor, but could you please make that "/* Direct3D 9 SM3 */", etc.? > + {"HD 6770M",CARD_AMD_RADEON_HD6600M}, > + {"HD 6750M",CARD_AMD_RADEON_HD6600M}, Since you're touching the entire table anyway, please add some extra space here, preferably enough to make the "Radeon Xpress" entry from the next patch fit as well. > +···· > + /* Radeon R5xx */ Trailing whitespace. You missed select_card_nvidia_mesa(): directx.c:2270:5: warning: initialization from incompatible pointer type [enabled by default] directx.c:2270:5: warning: (near initialization for ‘nvidia_gl_vendor_table[1].select_card’) [enabled by default]

1 0

Re: [0/9] wined3d: Rework card pci id selection mechanism
by Henri Verbeet 07 Jul '14

07 Jul '14

> Question: is it intended to return an AMD card as fall-back for VMware? > Sort of. You could probably make an argument for always returning e.g. CARD_VMWARE_SVGA3D as fallback for VMware, but returning an AMD card is probably as good as any other.

1 0

Re: [4/9] wined3d: replace vendor specific callbacks with generic code that uses vendor specific renderer string tables
by Stefan Dösinger 06 Jul '14

06 Jul '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-07-04 00:40, schrieb Andrei Slăvoiu: > +/* See http://developer.amd.com/drivers/pc_vendor_id/Pages/default.aspx > + * > + * Beware: renderer string do not match exact card model, > + * eg HD 4800 is returned for multiple cards, even for RV790 based ones. */ This link is dead. I recommend to remove it. > static const struct gl_vendor_selection > { > enum wined3d_gl_vendor gl_vendor; > const char *description; /* Description of the card selector i.e. Apple OS/X Intel */ > - enum wined3d_pci_device (*select_card)(const char *gl_renderer); > + const struct > + { > + const char *renderer; > + enum wined3d_pci_device id; > + } *cards; /* To be used as cards[], pointer to the first member in an array */ > + size_t nr_cards; /* Number of entries in the array above */ I think it would be nicer to give the structure a name instead of declaring it twice. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTt8jBAAoJEN0/YqbEcdMwhskQAIV3GnqWmcBsxdq8rIGHUw/r lIP7nIxp65wxXSykylXJsPZDgyDGkQzb62u8StS1TBm+yjNy0sLR/A4vqHiZyUeN Kv6AAp/3xtSfykYLNw7dJKmSjhaMdXDo6tx8pB3r1KT1bygNu3tGEMmSjAnRDk94 wJPCsl1Gkl1VIPo6aNnEfaKSVAbLxCtGK1SxCZc9SznGSJLNDhNdPiqC2+s/8JUZ 2/+uSPpilHEQVyBf+pi1fnq+RXwZ23S2+Qc7IkYPegX4z75M/BP0IKo+8eXYmOP5 KLL0C6TyVOp06Q6cNUCqOVpoSu+7Mnm4aS423QUb5hlfcDTV67mgyrVYkQTwkn9h L9lxMldW/DzGMsY3GceVOZ7tm3VgTziT06FQjKcXuMknfhgPiXab2iHZYHgz7YJF hCbGA9WSeYd9UuNKu8AmeGGFuAg+IuFLfnbVSG1idF1yFT/wlaiyLnA8Vc7//cI/ PRrn8UuiUS94cNLp5lSyl8cS8kzk3hW3Nf5mkRCqSJQXvJb2mLq38Hr9VR98rCQr 9L3aIOG5HIn1Uzwng4KywtGvyNbySsgiUPJgQqQMwS3HgwAGprPt7lF0b6fTMQym v7l9/gx73pQQEpBAjBpIJPt9CAaUrhziPdciMojT/cBRhmBBDoDZJTtxe0LZorNL Yz7Iw8f+i5Pag4QlZrxF =Xnv/ -----END PGP SIGNATURE-----

2 2

Re: wininet: Call WSAStartup/WSACleanup to mime the Windows behavior
by Thomas Faber 06 Jul '14

06 Jul '14

Hey Bruno, > +static void init_ws2_32(void) > +{ > + static int once; > + if (once++) return; > + hws2_32 = GetModuleHandleA("ws2_32.dll"); > + pWSAStartup = (void *)GetProcAddress(hws2_32, "WSAStartup"); > + pWSACleanup = (void *)GetProcAddress(hws2_32, "WSACleanup"); > +} > + > +static void free_ws2_32(void) > +{ > + FreeLibrary(hws2_32); > +} GetModuleHandle doesn't increase the reference count so you probably shouldn't call FreeLibrary. > + /* initialize winsock DLL here as expected by some broken applications */ > + if (!winsock_init++) > + { > + char buffer[128]; > + init_ws2_32(); > + pWSAStartup(MAKEWORD( 1, 1 ), buffer); > + } I believe Windows initializes with version 2. At least that's what my old test says (line 105): https://code.reactos.org/browse/reactos/trunk/rostests/apitests/wininet/Int… (free to use under LGPL... I can make it explicit in the source file, or help with getting it in Winetest format if desired) By the way, the same applies to winhttp in case you're interested: https://code.reactos.org/browse/reactos/trunk/rostests/apitests/winhttp/Win… Thanks! -Thomas

6 7

Re: [PATCH 3/3] winecoreaudio.drv: Use AUHAL API instead of AudioQueue
by Francois Gouget 05 Jul '14

05 Jul '14

On Fri, 27 Jun 2014, Andrew Eikum wrote: [...] > + if(This->wrap_bufsize_frames < *nframes){ > + free(This->wrap_buffer); > + This->wrap_buffer = malloc(data->mBuffers[0].mDataByteSize); > + This->wrap_bufsize_frames = *nframes; Does the AUHAL API require that we use malloc() / free() here (and in the other locations dealing with wrap_buffer) or could this be switched to HeapAlloc() / HeapFree()? If we're free to use the latter doing so would be more consistent with the rest of Wine. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Sufficently advanced incompetence is indistinguishable from malice.

2 1

Re: [PATCH 4/4] vbscript/tests: Added tests for the subtype of TypeName(try 2)
by Marvin 05 Jul '14

05 Jul '14

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=7857 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 3/4] vbscript: Implemented Abs(try 6)
by Marvin 05 Jul '14

05 Jul '14

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=7856 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 2/4] vbscript: Implemented Sgn(try 6)
by Marvin 05 Jul '14

05 Jul '14

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=7855 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 1/4] vbscript: Implemented VarType(try 6)
by Marvin 05 Jul '14

05 Jul '14

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=7854 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: oleaut32: Implement ICreateTypeLib2_fnSet*CustData ICreateTypeLib2_fnSet*HelpStringContext
by Andrew Eikum 04 Jul '14

04 Jul '14

This patch looks mostly good, but see below for a couple fixes. Also, it should be split. You could split it into one patch for the CustData functions and one for HelpStringContext. You should also write some tests for them. They'd be best in test_CreateTypeLib(), which is a really big function. Basically, it sets and retrieves a bunch of typelib stuff, then saves and re-loads the typelib from disk, and then retrieves everything again to verify it saved correctly. The HelpStringContext test should be very easy to write, but the CustData functions are a little bit more complicated. Be sure to run the tests on the testbot before submitting. There are often differences between Windows versions that you'll need to allow for. Just out of curiosity, do you have an application that actually uses these functions, or are you implementing them simply for completeness? On Fri, Jul 04, 2014 at 01:03:44AM +0200, Guillaume Charifi wrote: > static HRESULT WINAPI ICreateTypeInfo2_fnSetVarCustData(ICreateTypeInfo2 *iface, > UINT index, REFGUID guid, VARIANT *varVal) > { > + TLBGuid *tlbguid; > + > ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); > - FIXME("%p %u %s %p - stub\n", This, index, debugstr_guid(guid), varVal); > - return E_NOTIMPL; > + TLBVarDesc *pVDesc = &This->vardescs[index]; > + > + TRACE("%p %u %s %p\n", This, index, debugstr_guid(guid), varVal); > + > + if (!guid || !varVal) > + return E_INVALIDARG; > + > + if(index >= This->cFuncs) > + return E_INVALIDARG; > + This should be cVars. > static HRESULT WINAPI ICreateTypeInfo2_fnSetImplTypeCustData(ICreateTypeInfo2 *iface, > UINT index, REFGUID guid, VARIANT *varVal) > { > + TLBGuid *tlbguid; > + > ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); > - FIXME("%p %u %s %p - stub\n", This, index, debugstr_guid(guid), varVal); > - return E_NOTIMPL; > + TLBImplType *pRDesc = &This->impltypes[index]; > + > + TRACE("%p %u %s %p\n", This, index, debugstr_guid(guid), varVal); > + > + if (!guid || !varVal) > + return E_INVALIDARG; > + > + if(index >= This->cFuncs) > + return E_INVALIDARG; > + And this should be cImplTypes. Andrew

1 0

Re: regsvr32: Add Unicode support (try 7)
by Frédéric Delanoy 04 Jul '14

04 Jul '14

On Fri, Jul 4, 2014 at 2:51 PM, Hugh McMaster <hugh.mcmaster(a)outlook.com> wrote: > Changelog: Convert programs/regsvr32/regsvr32.c to Unicode (try 7). > > This version removes the MultiByteToWideChar calls from version six and instead makes use of a modified resource string. All non-relevant changes have been removed from this version. > > If you would like me to modify all of the po files, I am happy to do so. Just let me know. :) The po file changes are auto-generated, so no need to include them in the patch (as anything auto-generated). Frédéric

1 0

Wine freetext search no longer working
by Hugh McMaster 03 Jul '14

03 Jul '14

As of 29 June 2014, the freetext source code search option at http://source.winehq.org/search is not working. The error message is "Unexpected return value 2 from Glimpse". A quick search on the internet reveals the following from http://lxr.sourceforge.net/en/troubleshooting.shtml: Unexpected return value x from Glimpse Glimpse was unable to complete the free-text search query. If x is 2, files are inaccessible. These usually are the auxiliary caches, which may be missing or have incorrect access rights. The relevant directory is defined by the 'glimpsedir' or 'glimpsedirbase' configuration parameters. There is no problem with the identifier search option. -- Hugh McMaster

2 3

Re: [PATCH 2/4] vbscript: Implemented Sgn(try 5)
by Piotr Caban 03 Jul '14

03 Jul '14

Hi, +Sub testSgnError(strings, error_num) + on error resume next + + Call Err.clear() + Call Sgn(strings) + Call ok(Err.number = error_num, "Err.number = " & Err.number) +End Sub + +Call testSgnError(Null, 445) This test fails on windows. Tests needs to pass both on windows and on wine. + if(V_VT(arg) == VT_NULL) { + FIXME("Null argument not supported\n"); + return E_NOTIMPL; + } Please fix the indentation here. Cheers, Piotr

2 2

Re: [PATCH] riched20: Implement ITextSelection::GetText. (try 2)
by Huw Davies 03 Jul '14

03 Jul '14

On Wed, Jul 02, 2014 at 08:01:32PM +0800, Jactry Zeng wrote: > --- a/dlls/riched20/richole.c > +++ b/dlls/riched20/richole.c > @@ -783,11 +783,32 @@ static HRESULT WINAPI ITextSelection_fnInvoke( > static HRESULT WINAPI ITextSelection_fnGetText(ITextSelection *me, BSTR *pbstr) > { > ITextSelectionImpl *This = impl_from_ITextSelection(me); > + ME_Cursor *start = NULL, *end = NULL; > + int nChars; > + > if (!This->reOle) > return CO_E_RELEASED; > + TRACE("%p\n", pbstr); > + if (!pbstr) > + return E_INVALIDARG; > > - FIXME("not implemented\n"); > - return E_NOTIMPL; > + ME_GetSelection(This->reOle->editor, &start, &end); > + nChars = ME_GetCursorOfs(end) - ME_GetCursorOfs(start); > + TRACE("%p, %p\n", start, end); This TRACE isn't very useful. Either print out the cursors' values or remove it. Other than that, this looks good to me. Huw.

1 0

Re: [PATCH (try2)] winecoreaudio.drv: Use AUHAL API instead of AudioQueue
by Ken Thomases 02 Jul '14

02 Jul '14

On Jul 1, 2014, at 2:53 PM, Andrew Eikum wrote: > try2: Resample outside of the callback thread. Actually try to use the > given format in IsFormatSupported. Well, the resampling has been moved off of the callback thread, but it happens with the spin lock held. So, it can still block the callback thread for the duration. Ideally, there wouldn't be a need for the spin lock; some sort of lockless data structure could be used to move buffers into and out of buffer lists. Given that a spin lock is used, we should try hard to keep the work done while it's held to a minimum. My first thought was that it should be possible to use a sort of double-buffering scheme. Within the lock, just swap some pointers so the callback thread can work with a different buffer. Then the resampling can be done outside of the lock. My second thought is that's exactly what the GetBuffer() / ReleaseBuffer() scheme is about. I think that Core Audio should map pretty cleanly to DirectSound. It should not be necessary to use a wrap buffer or a temp buffer. It should be possible to preallocate all buffers at the right size during Initialize (you can query the device, audio unit, and converter for the information necessary to compute the buffer size). We should be able to return the actual "device" period. It should be possible to avoid copying audio data. If we can't implement a lockless buffer list, then the spin lock would only be used to move buffers in and out of lists. Once the buffers are in the right list, the resampling can be done without the lock being held. All of that said, I seem to recall you tried to achieve something like that with the AudioQueue approach and kept hitting problems that prevented it. So, if I'm talking out of my ass, please disregard. One last thing: if no sample rate conversion is required (requested sample rate matches the device sample rate), it would be ideal to avoid using the converter. -Ken

1 1

Re: advapi32: Implement RegSetKeySecurity on top of NtSetSecurityObject.
by Alexandre Julliard 02 Jul '14

02 Jul '14

"Erich E. Hoover" <erich.e.hoover(a)gmail.com> writes: > @@ -2469,9 +2469,9 @@ LSTATUS WINAPI RegSetKeySecurity( HKEY hkey, SECURITY_INFORMATION SecurityInfo, > if (!pSecurityDesc) > return ERROR_INVALID_PARAMETER; > > - FIXME(":(%p,%d,%p): stub\n",hkey,SecurityInfo,pSecurityDesc); > + TRACE("(%p,%d,%p)\n",hkey,SecurityInfo,pSecurityDesc); > > - return ERROR_SUCCESS; > + return RtlNtStatusToDosError( NtSetSecurityObject( hkey, SecurityInfo, pSecurityDesc ) ); You'd need to handle special root keys, or at least have tests for them. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/4] vbscript: Implemented Abs(try 5)
by Piotr Caban 02 Jul '14

02 Jul '14

Hi, because of the test failures in previous patch you will need to resend this patch anyway. While doing it could you please remove additional newline character from: + assert(args_cnt == 1); + + + if(V_VT(arg) == VT_NULL) + return return_null(res); Thanks, Piotr

1 0

Re: [1/2] ddraw: add dsurface dimension tests, try 11
by Henri Verbeet 02 Jul '14

02 Jul '14

On 30 June 2014 17:42, Patrick Rudolph <siro(a)das-labor.org> wrote: > Subject: ddraw: add dsurface dimension checks > This subject line has some room for improvement. > + if ((desc->dwWidth > 0xffff) || (desc->dwHeight > 0xffff)) > + { > + HeapFree(GetProcessHeap(), 0, texture); > + return DDERR_INVALIDPARAMS; > + } Please just merge this with the other surface dimension check a couple of lines earlier.

1 0

Re: [2/2] ddraw: add dsurface dimension tests, try 11
by Henri Verbeet 02 Jul '14

02 Jul '14

On 30 June 2014 17:42, Patrick Rudolph <siro(a)das-labor.org> wrote: > + const static struct "static const" > + {16}, {0x0000F800}, {0x000007E0}, {0x0000001F}, {0x00000000} Please use lowercase hex constants. > + static struct > + { > + DWORD dwFlags; > + DWORD dwCaps; > + DWORD dwWidth; > + DWORD dwHeight; > + HRESULT hr; > + } Please drop the dw prefixes and capitals from the field names here. > + /* 6: Test maximum surface height */ > + {DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT, DDSCAPS_OFFSCREENPLAIN, 1, 0x10000, DDERR_INVALIDPARAMS}, > + /* 7: Test maximum surface width */ > + {DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT, DDSCAPS_OFFSCREENPLAIN, 0x10000, 1, DDERR_INVALIDPARAMS}, It would perhaps also be useful to verify that e.g. a 1 by 0xffff surface actually is allowed. > + /* 8: Test OUTOFVIDEOMEMORY */ > + {DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY, > + 0xffff, 0xffff, DDERR_OUTOFVIDEOMEMORY}, Double indentation here, please. > + ddcaps.dwSize = sizeof(DDCAPS); ddcaps.dwSize = sizeof(ddcaps); > + /* expect an error if the hardware doesn't support videomemory */ > + if (!(ddcaps.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) > + tests[8].hr = DDERR_NODIRECTDRAWHW; You can just handle that when testing the expected result. (And then "tests" can just be const.) E.g.: hr = IDirectDraw_CreateSurface(...); if (tests[i].caps & DDSCAPS_VIDEOMEMORY && !(ddcaps.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) ok(hr == DDERR_NODIRECTDRAWHW, ...); else ok(hr == tests[i].hr, ...); > + surfacedesc.dwFlags = tests[i].dwFlags | DDSD_PIXELFORMAT; It seems arbitrary to put DDSD_CAPS in the table, but not DDSD_PIXELFORMAT. IMO either both should be added here, or both should be in the table. > + hr = IDirectDraw_CreateSurface(ddraw, &surfacedesc, &surface, NULL); > + ok(hr == tests[i].hr, "Pixelformat %s, test %d returned %08x\n", formats[j].name, i, hr); > + > + if (surface) > + { > + IDirectDrawSurface_Release(surface); > + surface = NULL; > + } hr = IDirectDraw_CreateSurface(...); ... if (FAILED(hr)) continue; IDirectDrawSurface_Release(surface); > + ok(SUCCEEDED(hr), "CreateSurface returned %08x\n", hr); > + if (surface) The if is redundant here, since you're claiming that creating the surface should always succeed a line earlier. > + surface = NULL; This doesn't really do anything, since "surface" is never used afterwards.

1 0

Re: [1/2] imagehlp: Implement (parts of) BindImageEx (try 10)
by Jacek Caban 02 Jul '14

02 Jul '14

Hi Bernhard, On 06/30/14 19:15, Bernhard Reiter wrote: > diff --git a/dlls/imagehlp/tests/image.c b/dlls/imagehlp/tests/image.c > index e008b0b..d93130c 100644 > --- a/dlls/imagehlp/tests/image.c > +++ b/dlls/imagehlp/tests/image.c > @@ -31,6 +31,9 @@ > static HMODULE hImageHlp; > > static BOOL (WINAPI *pImageGetDigestStream)(HANDLE, DWORD, DIGEST_FUNCTION, DIGEST_HANDLE); > +static BOOL (WINAPI *pBindImageEx)(DWORD Flags, PCSTR ImageName, > + PCSTR DllPath, PCSTR SymbolPath, > + PIMAGEHLP_STATUS_ROUTINE StatusRoutine); > > /* minimal PE file image */ > #define VA_START 0x400000 > @@ -149,6 +152,9 @@ struct expected_update_accum > BOOL todo; > }; > > +static int status_routine_called[14] = {0}; > + > + > static BOOL WINAPI accumulating_stream_output(DIGEST_HANDLE handle, BYTE *pb, > DWORD cb) > { > @@ -273,6 +279,52 @@ static void update_checksum(void) > bin.nt_headers.OptionalHeader.CheckSum = sum; > } > > +BOOL WINAPI TestingStatusRoutine(IMAGEHLP_STATUS_REASON reason, PSTR ImageName, PSTR DllName, > + ULONG_PTR Va, ULONG_PTR Parameter) > +{ Make it static. > + char kernel32_path[MAX_PATH]; > + > + status_routine_called[reason]++; > + > + todo_wine ok((reason == BindImportModule) || (reason == BindImportProcedure) || > + (reason == BindForwarderNOT), "expected reason to be one of BindImportModule, " > + "BindImportProcedure, or BindForwarderNOT, got %d\n", reason); How about moving that to the switch that you need anyway? > + > + switch(reason) > + { > + case BindOutOfMemory: > + case BindRvaToVaFailed: > + case BindNoRoomInImage: > + case BindImportModuleFailed: > + case BindImportProcedureFailed: > + break; How about default: ok(0, "..."); > + > + case BindImportModule: > + ok(!strcmp(DllName, "KERNEL32.DLL"), "expected DllName to be KERNEL32.DLL, got %s\n", > + DllName); > + break; > + > + case BindImportProcedure: > + GetSystemDirectoryA(kernel32_path, MAX_PATH); > + strcat(kernel32_path, "\\KERNEL32.DLL"); > + ok(!lstrcmpiA(DllName, kernel32_path), "expected DllName to be %s, got %s\n", > + kernel32_path, DllName); > + ok(!strcmp((LPSTR)Parameter, "ExitProcess"), > + "expected Parameter to be ExitProcess, got %s\n", (LPSTR)Parameter); > + break; > + > + case BindForwarder: > + case BindForwarderNOT: > + case BindImageModified: > + case BindExpandFileHeaders: > + case BindImageComplete: > + case BindMismatchedSymbols: > + case BindSymbolsNotUpdated: > + break; > + } Same here. You really need cases for expected values. > + return TRUE; > +} > + > static void test_get_digest_stream(void) > { > BOOL ret; > @@ -329,6 +381,54 @@ static void test_get_digest_stream(void) > DeleteFileA(temp_file); > } > > +static void test_bind_image_ex(void) > +{ > + BOOL ret; > + HANDLE file; > + char temp_file[MAX_PATH]; > + DWORD count; > + > + /* Call with a non-existant file */ > + SetLastError(0xdeadbeef); > + ret = pBindImageEx(BIND_NO_BOUND_IMPORTS | BIND_NO_UPDATE | BIND_ALL_IMAGES, temp_file, NULL, > + NULL, (void *)TestingStatusRoutine); > + todo_wine ok(!ret && ((GetLastError() == ERROR_FILE_NOT_FOUND) || > + (GetLastError() == ERROR_INVALID_PARAMETER)), > + "expected ERROR_FILE_NOT_FOUND or ERROR_INVALID_PARAMETER, got %d\n", > + GetLastError()); > + > + file = create_temp_file(temp_file); > + if (file == INVALID_HANDLE_VALUE) > + { > + skip("couldn't create temp file\n"); > + return; > + } > + > + WriteFile(file, &bin, sizeof(bin), &count, NULL); > + FlushFileBuffers(file); > + CloseHandle(file); > + > + /* Finally, call with a proper PE file */ > + SetLastError(0xdeadbeef); > + ret = pBindImageEx(BIND_NO_BOUND_IMPORTS | BIND_NO_UPDATE | BIND_ALL_IMAGES, temp_file, NULL, > + NULL, (void *)TestingStatusRoutine); > + ok(ret, "BindImageEx failed: %d\n", GetLastError()); > + > + todo_wine ok(status_routine_called[BindImportModule] == 1, > + "Expected StatusRoutine to be called once with reason BindImportModule, " > + "but it was called %d times\n", status_routine_called[BindImportModule]); > + > + /* Under wvistau64 (64 bit image), w2008s64 (64 bit image) and w7pro64 (64 bit image), > + * StatusRoutine is called with reason BindForwarderNOT instead of BindImportProcedure. */ Please avoid such comments. Testbot VM names are not related to the code nor permanent. Cheers, Jacek

1 0

Re: [PATCH] riched20: Implement ITextSelection::GetText. (resend)
by Huw Davies 02 Jul '14

02 Jul '14

On Wed, Jul 02, 2014 at 05:09:47PM +0800, Jactry Zeng wrote: > + buffer = heap_alloc((nChars + 1) * sizeof(WCHAR)); > + if (!buffer) > + return E_OUTOFMEMORY; > + ME_GetTextW(This->reOle->editor, buffer, nChars, start, nChars, 0); > + buffer[nChars] = 0; > + /* FIXME: a '\r' should be appended at the end of a story */ > + *pbstr = SysAllocString(buffer); > + heap_free(buffer); There's no need for an intermediate buffer here. Use SysAllocStringLen() to allocate the BSTR and pass it to ME_GetTextW(). Huw.

2 1

Re: [PATCH 4/4] vbscript/tests: Added tests for the subtype of TypeName
by Marvin 02 Jul '14

02 Jul '14

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=7804 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 3/4] vbscript: Implemented Abs(try 5)
by Marvin 02 Jul '14

02 Jul '14

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=7803 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 2/4] vbscript: Implemented Sgn(try 5)
by Marvin 02 Jul '14

02 Jul '14

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=7802 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 1/4] vbscript: Implemented VarType(try 5)
by Marvin 02 Jul '14

02 Jul '14

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=7801 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: shlwapi/tests: Add tests for PathIsRelativeA/W.
by Alexandre Julliard 01 Jul '14

01 Jul '14

Zhenbo Li <litimetal(a)gmail.com> writes: > +void test_PathIsRelativeA(void) > +{ > + BOOL ret; > + int i, num; > + static const char *flag[2] = {"FALSE", "TRUE"}; This is not a good idea. There's no guarantee that the return value is always 0 or 1. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/3] winecoreaudio.drv: Use AUHAL API instead of AudioQueue
by Ken Thomases 01 Jul '14

01 Jul '14

Hi, I'm concerned about the use of the AudioConverter API within the capture callback (ca_capture_cb). I have it embedded in my memory that it's not permitted to call a converter on the device thread. I can't find a hard and fast declaration of that in the documentation, although Technical Note TN2091: Device input using the HAL Output Audio Unit does say this: <https://developer.apple.com/library/mac/technotes/tn2091/_index.html> "If sample rate conversion is needed, it can be accomplished by buffering the input and converting the data on a separate thread with another AudioConverter." If what you're doing were allowed, it would seem they would have mentioned that and not suggested the use of "a separate thread". It also seems that the HAL Output Audio Unit would just do this itself and not have the restriction on the sample rate in the first place. I could have sworn that the API would actually generate errors if you tried to use it on the AUHAL's thread, but I may be thinking of the AUConverter audio unit, instead. Ah, after more searching, I believe it was for the AUConverter audio unit. There's an error, kAudioUnitErr_CannotDoInCurrentContext, that is generated if you try to use such a unit or if you try to make the AudioOutputUnit do the conversion itself. Besides my specific recollection that sample rate conversion is not allowed, there's the general requirement to avoid slow operations in those callbacks. The call to AudioConverterFillComplexBuffer() may be such a slow operation. So could the calls to malloc() in your ca_capture_cb() and feed_cb(). Could you not move the sample rate conversion to the application thread, at the point where the application calls in to get the captured data (or metadata about it)? In AudioClient_IsFormatSupported(), is it really the case that any format for which a stream description can be constructed is supported? Is there a need to try setting the format on an AudioConverter to see if it will accept it? There are still two mentions of AudioQueue in lines like: WARN("AudioQueue doesn't support per-channel volume control\n"); -Ken

2 1

Re: [PATCH 3/5] ddraw/tests: Get rid of struct vertex.
by Marvin 01 Jul '14

01 Jul '14

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=7787 Your paranoid android. === w8 (32 bit visual) === visual.c:2633: Test failed: unexpected colortable on offscreen surface

2 1

Re: [PATCH] riched20: Don't create too many IRichEditOle interface for a RichEdit. (try 4)
by Huw Davies 01 Jul '14

01 Jul '14

On 30 Jun 2014, at 17:08, Jactry Zeng wrote: > --- > dlls/riched20/editor.c | 13 +++++++++++-- > dlls/riched20/editstr.h | 1 + > dlls/riched20/tests/richole.c | 19 ++++++++++++++++++- > 3 files changed, 30 insertions(+), 3 deletions(-) Looks good to me. Huw.

1 0

Re: [PATCH 5/5] ddraw/tests: Get rid of struct nvertex.
by Marvin 01 Jul '14

01 Jul '14

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=7789 Your paranoid android. === w8 (32 bit visual) === visual.c:2631: Test failed: unexpected colortable on offscreen surface

1 0

Re: [PATCH 4/5] ddraw/tests: Get rid of struct tvertex.
by Marvin 01 Jul '14

01 Jul '14

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=7788 Your paranoid android. === w8 (32 bit visual) === visual.c:2632: Test failed: unexpected colortable on offscreen surface

1 0

Re: d3dx9: Implement D3DXCreateTorus() + tests
by Matteo Bruni 30 Jun '14

30 Jun '14

Hi Gediminas, 2014-06-30 19:29 GMT+02:00 Gediminas Jakutis <gediminas(a)varciai.lt>: > --- > dlls/d3dx9_36/d3dx9_36.spec | 2 +- > dlls/d3dx9_36/mesh.c | 129 +++++++++++++++++++++++++++++++ > dlls/d3dx9_36/tests/mesh.c | 183 ++++++++++++++++++++++++++++++++++++++++++++ > include/d3dx9shape.h | 2 + > 4 files changed, 315 insertions(+), 1 deletion(-) > +HRESULT WINAPI D3DXCreateTorus(struct IDirect3DDevice9 *device, + float innerradius, float outerradius, UINT sides, UINT rings, struct ID3DXMesh **mesh, ID3DXBuffer **adjacency) The "usual" style is 8 spaces for line continuations (that also applies to some other places in the patch). + float sin; + float cos; Not really an issue but I'd prefer if these wouldn't shadow the functions from math.h. + if (!device || innerradius < 0.0f || outerradius < 0.0f || sides < 3 || rings < 3 || !mesh) + { + return D3DERR_INVALIDCALL; + } Not strictly required but you can either avoid the curly braces (here and below) or add a WARN for the error return condition. Probably a WARN here is nicer. + rotation_step = D3DX_PI / sides * -2.0f; + rotation_curr = 0; Please use 0.0f there instead. + for (i = 0; i < sides; ++i) + { + sin = sinf(rotation_curr); + cos = cosf(rotation_curr); + vertices[i].position.x = innerradius * cos + outerradius; + vertices[i].position.y = 0.0f; + vertices[i].position.z = innerradius * -sin; + vertices[i].normal.x = cos; + vertices[i].normal.y = 0.0f; + vertices[i].normal.z = -sin; + + rotation_curr += rotation_step; + } I might be mistaken but I think you can remove the "-" from the previous "-2.0f" and from both "-sin" here. + for (i = 0; i < numfaces - sides * 2; ++i) + { + faces[i][0] = i % 2 ? i / 2 + sides : i / 2; + faces[i][1] = (i / 2 + 1) % sides ? i / 2 + 1 : i / 2 + 1 - sides; + if ((i + 1 >= sides * 4) && !((i + 1) % sides) && !((i + 1) / sides % 2)) + { + faces[i][2] = (i + 1) / 2; + } + else if (i) + { + faces[i][2] = (i + 1) % (sides * 2) ? (i + 1) / 2 + sides : (i / sides) * sides; + } + else + { + faces[i][2] = sides; + } + } Can't the last "else" just be dropped (and the condition from the previous "else" removed)? I.e. the first "else" for the i == 0 case is equivalent to the second one, AFAICS. Actually the first two branches also look to be the same so this should be enough for the third vertex of each face: faces[i][2] = (i + 1) % (sides * 2) ? (i + 1) / 2 + sides : (i + 1) / 2; + for (j = 0; i < numfaces; ++i, ++j) + { + faces[i][0] = i % 2 ? j / 2 : sides * (rings - 1) + j / 2; This should be equivalent: faces[i][0] = i % 2 ? j / 2 : i / 2; I don't mind all that much for this one though. + faces[i][1] = (i / 2 + 1) % sides ? i / 2 + 1 : i / 2 + 1 - sides; + faces[i][2] = i == numfaces - 1 ? 0 : (j + 1) / 2; + } I guess this separate loop for the last "strip" of the mesh is there to avoid a bunch of "% numvert" in the previous loop. That's okay for me. + hr = D3DXCreateTorus(NULL, 0.0f, 0.0f, 3, 3, &torus, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n",hr,D3DERR_INVALIDCALL); Missing spaces after the commas. The notes regarding vertices and faces generation also apply to compute_torus in the test obviously. For some reason your patch has DOS-style CRLF line terminators and that made "git apply" fail for me. Testbot didn't complain though so probably that's not an issue. Generally it's preferred to generate patches with "git format-patch" or even better directly "git send-email".

1 0

Re: [PATCH] riched20: Don't create too many IRichEditOle interfaces for a RichEdit. (try 3)
by Huw Davies 30 Jun '14

30 Jun '14

On Thu, Jun 26, 2014 at 02:52:16PM +0800, Jactry Zeng wrote: > diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c > index 2af2582..55821bf 100644 > --- a/dlls/riched20/editor.c > +++ b/dlls/riched20/editor.c > @@ -4468,7 +4468,20 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, > case EM_GETOLEINTERFACE: > { > LPVOID *ppvObj = (LPVOID*) lParam; > - return CreateIRichEditOle(editor, ppvObj); > + if (editor->reOle) > + { > + *ppvObj = editor->reOle; > + IRichEditOle_AddRef(*ppvObj); > + return 1; > + } > + > + if (CreateIRichEditOle(editor, ppvObj)) > + { > + editor->reOle = *ppvObj; > + IRichEditOle_AddRef(*ppvObj); > + return 1; > + } > + return 0; I'm sure you can think about how to simplify this a bit. The clue that it needs simplification is that you've got two AddRef()s in there. Hint: The code is trying to do two things: 1. If needed, assign an interface to reOle 2. AddRef and return. > --- a/dlls/riched20/richole.c > +++ b/dlls/riched20/richole.c > @@ -126,12 +126,13 @@ IRichEditOle_fnRelease(IRichEditOle *me) > > TRACE ("%p ref=%u\n", This, ref); > > - if (!ref) > + if (ref == 1) > { > TRACE ("Destroying %p\n", This); > This->txtSel->reOle = NULL; > ITextSelection_Release(&This->txtSel->ITextSelection_iface); > IOleClientSite_Release(&This->clientSite->IOleClientSite_iface); > + This->editor->reOle = NULL; No, this is wrong. This function should remain unchanged. The editor is in charge of the reOle reference, so it needs to release it when the editor is destroyed - ie in ME_DestroyEditor(). Huw.

2 2

RFC: patch 105133
by Jérôme Gardou 30 Jun '14

30 Jun '14

Hello wine team. According to the patch status page, the following patch is still marked as "new". http://source.winehq.org/patches/data/105133 Is there any prioritisation for the testbot regarding the jobs it processes ? Also, that put aside, I'd like to discuss the approach and the problem there as I understand it: with "modern" stubs, allocations and frees are made per argument. If there is no prioritisation on how this is done, the "freeer" of one argument can rely on data which were freed before in the loop and overwritten, thus causing the mayhem in the heap that can be witnessed here (see https://bugs.winehq.org/show_bug.cgi?id=36743). The patch tries to overcome the problem and frees the arguments marked as "MustFree" before anything else. I believe this is the right approach, but a comment from someone more proficient as me in RPC matters would be greatly appreciated. Regards Jérôme

2 3

Re: [PATCH 3/5] d3d8: Check the device status in present calls.
by Marvin 30 Jun '14

30 Jun '14

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=7768 Your paranoid android. === w8 (32 bit device) === device.c:2397: Test failed: Expected foreground window 000301BA, got 0002004C. device.c:3039: Test failed: Expected wndproc 0x412780, got 0x412780.

1 0

Re: [PATCH 2/5] d3d8: Improve d3d8_device_TestCooperativeLevel().
by Marvin 30 Jun '14

30 Jun '14

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=7767 Your paranoid android. === w8 (32 bit device) === device.c:2397: Test failed: Expected foreground window 000301BA, got 0002004C. device.c:3039: Test failed: Expected wndproc 0x412780, got 0x412780.

1 0

Re: [2/2] ddraw: add dsurface dimension tests, try 10
by Stefan Dösinger 30 Jun '14

30 Jun '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, You forgot to fix some IDirectDrawSurface2 macros. Otherwise this looks good. Thanks again for your work! Stefan Am 2014-06-29 16:37, schrieb Patrick Rudolph: > + hr = IDirectDraw2_CreateSurface(ddraw, &surfacedesc, &surface, NULL); > + ok(hr == tests[i].hr, "Pixelformat %s, test %d returned %08x\n", formats[j].name, i, hr); > + > + if (surface) > + { > + IDirectDrawSurface2_Release(surface); > + surface = NULL; > + } > ... > + hr = IDirectDraw2_CreateSurface(ddraw, &surfacedesc, &surface, NULL); > + ok(SUCCEEDED(hr), "CreateSurface returned %08x\n", hr); > + if (surface) > + { > + hr = IDirectDrawSurface2_GetSurfaceDesc(surface, &surfacedesc); > + ok(SUCCEEDED(hr), "GetSurfaceDesc returned %x\n", hr); -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTsTBWAAoJEN0/YqbEcdMwThEP/3uJuJuU4gZNiiRy3AkP6guK cVnLXyasOBmwMNxLSFnt1RXQmYmcmY/cR16I/RRd1NbemC8+tB8PbO3Vp6bTGnx0 i4ZM+EFh+6F6xFzjua99sK67x0MNXqW+fp1L8tz5804piaqcJK/MX9XloMeG45ZL WrGVFqZnFKb67OjoXKqZSo0S4bR/GJveRz9x8KxpGnqsc2Wa/sRftIoiO67FSoaq P1ffH0OEPbkj7pzXFyV2BwHFVIC4LzFXmTWVNgmZfNSnTPossSyg8tuCe9+ZvVZa lVHRu95nda2nh/RRfEk+jH2strX2psmb20/bsNa1RQ4ujWJT+HBcaGbeicsyzqZL i+iJjNG/Pm0DRZ6DPfnUfW6/xIJW89L1fZ8sHLtSJ+jsR3tGQeYV5IAh0G5SBnM2 tXsbrQkVeZ3UfwGVK3zxl+C4UqkXyOhxSR2Bagr3QJqPGi7z2MR0/ScRdfJAAuMj 3yUbHZFYzsGBrgWZ4LYGDaZN2HL2Bnb7Er7QXPCSApgE8klHUwGTOPiRmyuKyYkJ cgysMnnxflVRwLEaMO6roLw4xL849yOiWGIJkFJ+zWZxuweEBEjOPUUv7ch+PfLY UNAWE7+BerPf/0UyNZvXw3MtYOd7cQxFCfwItboUV3iFEaG3ZBYhpT6+/mITHJ2i eP7C9M4fGnoU8F6TbLcZ =ELAp -----END PGP SIGNATURE-----

1 0

Re: [1/2] ddraw: add dsurface dimension tests, try 10
by Stefan Dösinger 30 Jun '14

30 Jun '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, This patch looks good to me. There are two minor style issues, but I don't think they warrant a resend. If Henri has further suggestions you can fix those style issues as well: Note that I have not tested them on Windows yet. My my Mingw is currently broken, and I'm still struggling with Gentoo's crossdev tool. The tests pass on Linux on 32 and 64 bit Wine builds. Am 2014-06-29 16:37, schrieb Patrick Rudolph: > + if ((desc->dwWidth>0xFFFF) || (desc->dwHeight>0xFFFF)) Most other places (and your patch 2) use 0xffff and spaces around ">". > - > - /* Check that we have enough video ram left */ > + > if (pool == WINED3D_POOL_DEFAULT && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) Trailing whitespace. I think Alexandre's git automatically removes that. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTsS+qAAoJEN0/YqbEcdMwrjwP/1duFUNuI9buzIl58xj/uRc0 zueU33ssfT0ktJWY2RIWpsOQI79j+WX3MlQvRTCKBY6vYPhYKM8DzAN4QNgGhGLT yPBnmrKQiQwRfmDlpXJkwB1/mV3gSIc6RYHW2vMu2qyiOAPS13Mb5gDuQFnlhLNm tlWrVmvTslkL0hdFt5w/uumqZO/NHnN7kdSktMHFtdQaRYT9PSldYGdYQTT4mFul 8lQ2DaKfUQPc92iJSywEMRwQs/NZf0FYsNaNN47YDAj+8xi4tsQjHoSAZzaU6LVP /izGhSzwTFToEO+MHgYbuU8NNFLSGcceNSkaEzMikIyLYvaHYvBhRSnb9ki6Y04s F2timDIagvSUqn97GTlM2FvQBn8vHVlTFLKx4FPlFC6sFXoJPkQkDf6zjPuRn4oY ZkbXemBJNnU+sLHoOpRJGhoYLktEYmOvHc0WPar3QvrGd1xKbUeRAOUO5YMMPiKe CbhBs00GBrxjaBoXUkiGRnHCs+cBRIo3IbcFrCE3LX5/aDlASNg70p6y2JqGi+BJ aiitq7ds6+OAlvbagPwuuR2YMfSVa5DFbvi8kMpJj+Uh+VQa/8829oY1XVqS3n9j uE/Vd1LqCmLA/wKVG8WqJ60O/pz0nO3fXx4ChLp3fVWu+DHF+XT4PW83FFAX8+u/ jkU5hoc6qI3sXbmggbS6 =ApEH -----END PGP SIGNATURE-----

1 0

Re: [PATCH 3/5] d3d8: Check the device status in present calls.
by Michael Stefaniuc 30 Jun '14

30 Jun '14

On 06/30/2014 11:17 AM, Henri Verbeet wrote: > diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c > index e9f4976..067a3e0 100644 > --- a/dlls/d3d8/swapchain.c > +++ b/dlls/d3d8/swapchain.c > @@ -91,11 +91,15 @@ static HRESULT WINAPI d3d8_swapchain_Present(IDirect3DSwapChain8 *iface, > const RGNDATA *dirty_region) > { > struct d3d8_swapchain *swapchain = impl_from_IDirect3DSwapChain8(iface); > + struct d3d8_device *device = impl_from_IDirect3DDevice8(swapchain->parent_device); I kinda don't like this: impl_from_IFoo() should be called only from methods of IFoo. For the rest there is unsafe_impl_from_IFoo(). But in this case, my first impulse would be to make swapchain->parent_device a struct d3d8_device thus avoiding the impl_from_IDirect3DDevice8() altogether. bye michael

1 0

Test bot error unrelated to patch, should I resend?
by Joris van der Wel 29 Jun '14

29 Jun '14

After I submitted a patch the testbot failed because of an error unrelated to my patch: === build (build) === Could not copy the patch to the VM: the "nc -q0 '10.42.42.130' '4242'" command returned 1 Should I resend my patch, or will this be resolved on its own? Thanks

3 3

Re: [Patch 1/2] winecfg: Set default button in Libraries tab [fixes bug 12804]
by André Hentschel 29 Jun '14

29 Jun '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 24.06.2014 10:35, schrieb Hugh McMaster: > This patch sets the default button to IDC_DLLS_ADDDLL in the Libraries tab of winecfg when a user is typing in the combo box. > > This allows the user to hit the Enter key and add the override. Currently, hitting the Enter key closes winecfg, which is causing problems with many users. > > The patch fixes bug 12804 and was tested by Austin English. That's just a workaround, if you modify winecfg to run on Windows you'll see that the button works there as expected, the problem lies deeper in the Wine code... Of course we maybe want a workaround to satisfy our users... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQGcBAEBAgAGBQJTqdjyAAoJEGm5GZTakYsswH4L/198JPSwjgYiwSnLkYgBjZJ6 YD5XWVA3YfdexdV2urNIIN8fHv97xVR9INqnbEksS/HJpTY9QU9CIYTSw8IkxlS4 3423KKJe+St7cjKLwoAMFK6LJNQrtloxik2S8Y7y7QMLocPxmRPZOFK45032RTEM BH/vAwxtud4yux13rKsl9TX4Z6LwoqeKcGk9k0I2vYy0ez53rIS0bP9sytasNTLL 34Vmj65kVX5lQGYNhECgkd5W2LNDSUxXecpc+BQ1iaHNNnGkne0uZPERVoqIRHYv TZuhtzF/VI4nXO9bRnAkZhMycHH8aZI4vk5D/kvamzEApDx8dC78S+s0by+RFLfb 7UMaV24GM6DI3QS6aK7e/UjTSBKq4fqyOykrn0Pdjhb7fx5OPHevV84HoPil5Sx0 LRsrNZQY+tr+0jqHvAV0YPohspZb05qZDQbv/6jnt085m6SIQdPiJq4RqD6Vwl81 cpy1fYd1hTO1hY5zSrVl+6TbN9PgniTb6d5OfhI5+g== =Z18S -----END PGP SIGNATURE-----

2 2

Re: [4/5] user32: Set capture earlier on popup menus.
by Marvin 29 Jun '14

29 Jun '14

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=7665 Your paranoid android. === wxppro (32 bit msg) === msg.c:11766: Test failed: SetActiveWindow(0): 0: the msg sequence is not complete: expected 0086 - actual 0000 msg.c:11787: Test failed: SetActiveWindow(hwnd), hwnd not visible: 8: in msg 0x0086 expecting wParam 0x1 got 0x0 msg.c:11793: Test failed: SetActiveWindow(popup), hwnd not visible, popup not visible: 9: in msg 0x0086 expecting wParam 0x1 got 0x0 msg.c:13528: Test failed: key release only: 0: the msg sequence is not complete: expected 0101 - actual 0000 msg.c:13540: Test failed: key press only: 0: the msg sequence is not complete: expected 0100 - actual 0000 msg.c:13552: Test failed: key press repeat: 0: the msg sequence is not complete: expected 0100 - actual 0000 msg.c:13564: Test failed: key release repeat: 0: the msg sequence is not complete: expected 0101 - actual 0000 msg.c:13584: Test failed: key press after setkeyboardstate: 0: the msg sequence is not complete: expected 0100 - actual 0000 msg.c:13604: Test failed: key release after setkeyboardstate: 0: the msg sequence is not complete: expected 0101 - actual 0000 msg.c:13804: Test failed: window hotkey press LWIN: 1: the msg sequence is not complete: expected 0100 - actual 0000 msg.c:13829: Test failed: window hotkey release: 1: the msg sequence is not complete: expected 0101 - actual 0000 msg.c:13834: Test failed: window hotkey release LWIN: 1: the msg sequence is not complete: expected 0101 - actual 0000 msg.c:13862: Test failed: window hotkey combined: 7: the msg sequence is not complete: expected 0100 - actual 0000 msg.c:13876: Test failed: window hotkey previous: 4: the msg sequence is not complete: expected 0100 - actual 0000 msg.c:13891: Test failed: window hotkey new: 3: the msg sequence is not complete: expected 0101 - actual 0000 msg.c:13915: Test failed: thread hotkey press LWIN: 1: the msg sequence is not complete: expected 0100 - actual 0000 msg.c:13944: Test failed: thread hotkey release: 1: the msg sequence is not complete: expected 0101 - actual 0000 msg.c:13952: Test failed: thread hotkey release LWIN: 1: the msg sequence is not complete: expected 0101 - actual 0000 === w7u (32 bit msg) === msg.c:12099: Test failed: unexpected hwnd 00090138 msg.c:12121: Test failed: bad time 30ab9/30ac9

1 0

Re: [2/2] ddraw: add dsurface dimension tests, try 9
by Stefan Dösinger 29 Jun '14

29 Jun '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-06-28 17:43, schrieb Patrick Rudolph: > + for (j = 0; j < sizeof(formats) / sizeof(*formats); j ++) > + { > + for (i = 0; i < sizeof(tests) / sizeof(*tests); i ++) > + { I don't think we use "i ++" with a space anywhere. Please make it i++ or ++i. > + hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); > + ok(SUCCEEDED(hr), "SetCooperativeLevel failed with %08x\n", hr); > + IDirectDraw_Release(ddraw); > + DestroyWindow(window); > +} The SetCooperativeLevel call is redundant here. I think it was used in the old test because dsurface.c re-used the IDirectDraw object. > + hr = IDirectDraw2_CreateSurface(ddraw, &surfacedesc, &surface, NULL); > + ok(hr == tests[i].hr, "Pixelformat %s, test %d returned %08x\n", formats[j].name, i, hr); > + > + if (surface) > + { > + IDirectDrawSurface2_Release(surface); > + surface = NULL; > + } IDirectDraw2_CreateSurface returns an IDirectDrawSurface, not IDirectDrawSurface2. Other than that this patch looks good to me. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTr7XvAAoJEN0/YqbEcdMwYwMP/RXeG9kiO+8EJVRDOaPiSi3O YOWppnsurP6oDCWo9RdtdbarfLGYeypGMPwTi/RAkdgYFbBJvqZhMGyINQ3DqCkn nLVKZCfSBkKFFRG3IR4HixVqqlk/vXqtdFizV7IuzQYuGLdUCFPDKYqldDCQtdGH vKGH97qJjIe28ArcHXPufdpV0ZxJBgKPn4XxD8ZquElPEPB0obF7jONYMohmWvWr 7bea+n7ecKNlfWUM/ROb0S/OBP2l8aQ/ZoGKdxQTJKDS6LJzAbkClt5limDnsToV uabvHXvfv8t4jw2Sa3MkJEAcqWQ4fgkcqxltGk/AKNdmgs0Wfhp7ZdLGpZqFPjp6 tlNWsoU69NHRocghc41UB2droIbcU17U7jP7hd1kZOwGg1ksjDoDF2P/n375MFV7 gdKEMELD0c/i9Hy6pFYpQUgnS5X6pNcnHJR3EcxOi/lLUMBMnPpsWiDIQzcG9f58 hcTznm8MR2J1tphYZ4bnE7VmOXZOpDNqY7kyLe8PRMaOJlo70Z2yRAiqTL1dCqVP ntZ7i7CeSxrejg8SWkzWwgBKKMHJ22fCK3UkfewbLqxmUcMVteypZ/ESh82C3LFE OZVOW/iY2Ilt+dEdoH6guRV/2trzfj3UXOsLC9ZNmcl+VL4PLN+N8gytH9Q23/Ak ApTtStXqJfLTv4OI7AHI =VHdx -----END PGP SIGNATURE-----

1 0

Re: [1/2] ddraw: add dsurface dimension tests, try 9
by Stefan Dösinger 29 Jun '14

29 Jun '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-06-28 17:43, schrieb Patrick Rudolph: > + if ((desc->ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) && (hr == E_OUTOFMEMORY)) > + hr = DDERR_OUTOFVIDEOMEMORY; I don't like this. wined3d should return WINED3DERR_OUTOFVIDEOMEMORY when the emulated adapter memory is exhausted. I guess it returns E_OUTOFMEMORY because it first tries to allocate heap memory and then checks if there's enough adapter memory left. If you swap the order of operations in resource_init() in dlls/wined3d/resource.c this should be much nicer. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTr7QkAAoJEN0/YqbEcdMwQEAQAJbgNG0XDSpLeU6PjGhJf9+2 jAwldh9cCrKtSotndSe7IQ9aKGKtG/akF7u219ciaEHE2oXy9Qtcj31PIpA0Zh80 V2kv+rMU4gN+b55OaInIO8hEFxMcHEUGcaMguMyUJdjsZtHUBX066QwmP2VKP822 mYsNT4E4pNi20Bn7HoddGzlb5oA0EwNXLojnQhHQLBE6EUSA/EIgYWuRBRcyTGrY 4144gvnXHUMSxajxi+cQKcWKD56+hODNGTtDZeuo94h+PoV/B+QNz0OOUCy5O+3F KnNL/Njy/FeNYoi+MCdVdBhhJiQAaUuV2vhxGbSmHmBf1p71/JcCsORAg5pefemD hRsThGJrNfPPFdksF6pbszEQRPNLU8n0a+5HQ2j7xKqGTmT+Rek1H8etVQM/xVt3 e3nhN5VY2UNT0irckjK0imMr/3ydYs7wWxE++Xh4mKAeXbWII1lcVJSlq+dGTnVx dtOdPUtJS9QSiMgDjBETRG1JjyC57TNfXK2IwLHst1wZ+0jMZ3tENZZX2H6F2XWT T+UK9+lLJnvztmcA8KC4VirsLPJmJJGlhFsuZEsCUUH/rUC3CFFCAuvk3fA83mJp +Nxf/uLkUkSZTAMX717vXoL5p0i6/Vzdx2vYjX3O/H7DiP1mU/OyTOccklhmAhb/ 7K15mms5Z4VV6FdOjXPG =dq6I -----END PGP SIGNATURE-----

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