August 2012 - Wine-Devel - list.winehq.org

Re: [PATCH 1/5] d3dx9: Add some traces to D3DXLoadSurfaceFromMemory().
by Henri Verbeet Aug. 28, 2012

Aug. 28, 2012

2012/8/28 Rico Schüller <kgbricola(a)web.de>: > + FIXME("Format conversation missing %#x -> %#x\n", src_format, surfdesc.Format); I don't think that's really what we want it to say.

1 0

Re: shell32: Make ShellExecute use native file association databases as fallback path (resend)
by Alexandre Julliard Aug. 28, 2012

Aug. 28, 2012

Erik van Pienbroek <erik(a)vanpienbroek.nl> writes: > +#if defined(HAVE_FORK) && defined(HAVE_WAITPID) > +static UINT_PTR SHELL_try_native_execute ( const char *openCmd, const char *unixName ) > +{ > + UINT_PTR retval = SE_ERR_NOASSOC; > + pid_t cpid; > + struct stat st; > + > + if (stat(openCmd, &st) == -1) > + { > + TRACE("stat() %s failed: %s\n", openCmd, strerror(errno)); > + return retval; > + } > + > + cpid = fork(); > + if (!cpid) > + { > + /* Prevent the situation where the native file association database > + * tries to run wine to execute a program and we trigger this fallback > + * path again and end up in a recursive loop */ > + if (getenv("WINE_INSIDE_SHELLEXECUTE")) > + { > + TRACE("recursive loop detected, not continuing with ShellExecute call\n"); > + exit(EXIT_SUCCESS); > + } > + setenv("WINE_INSIDE_SHELLEXECUTE", "1", 0); > + > + TRACE("running %s %s\n", openCmd, unixName); > + execlp(openCmd, openCmd, unixName, (char*) NULL); > + /* execlp replaces the current process image with a new process image, > + * so no code below here should get executed by the forked child */ > + } else { > + int status; > + waitpid(cpid, &status, 0); > + TRACE("status %x\n", status); > + if(!WEXITSTATUS(status)) > + retval = 33; > + } > + > + return retval; > +} You want spawnvp(), but that sort of thing should probably go in winebrowser or something like that, and be configurable. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: kernel32: Try to get the drive type from the mountmgr first [resend]
by Alexandre Julliard Aug. 28, 2012

Aug. 28, 2012

Alexandre Goujon <ale.goujon(a)gmail.com> writes: > Should fix bug #17037 > Now that my patch disappeared from source.winehq.org/patches, I'm resending it. > Before commenting, please read the e-mail I sent in July (winehq.org/pipermail/wine-devel/2012-July/096587.html) The goal here is to avoid a mountmgr round-trip for the common case, calling mountmgr first defeats this. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 6/6] Always define WIDL_C_INLINE_WRAPPERS
by Marvin Aug. 28, 2012

Aug. 28, 2012

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 http://testbot.winehq.org/JobDetails.pl?Key=21287 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 6/6] Always define WIDL_C_INLINE_WRAPPERS
by Marvin Aug. 28, 2012

Aug. 28, 2012

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 http://testbot.winehq.org/JobDetails.pl?Key=21286 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 6/6] Always define WIDL_C_INLINE_WRAPPERS
by Marvin Aug. 28, 2012

Aug. 28, 2012

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 http://testbot.winehq.org/JobDetails.pl?Key=21285 Your paranoid android. === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: gdiplus: When copying an image do not round pixel positions up.
by Vincent Povirk Aug. 28, 2012

Aug. 28, 2012

I know this looks wrong, but it's there for a reason, and it matches the behavior of the other interpolations. In my tests, the center of a bitmap pixel is at an integral value, meaning that the pixel at (0,0) is a rectangle extending from (-0.5, -0.5) to (0.5, 0.5), and if you enlarge an image you do get out-of-bounds bits on the lower right. I'm pretty sure I also tested GdipDrawImageRect separately and got the same result.

2 7

re: xmllite: Store DTD processing mode in reader
by Dan Kegel Aug. 28, 2012

Aug. 28, 2012

Alexandre Julliard wrote: > Explicit ok() calls are better than hiding them inside a macro. Uh-oh. Want me to get rid of this macro +#define CHECK_RET_ERRNO(ret, ex) \ + do { \ + ok(ret == ex, "ret is %d, expected %d\n", ret, ex); \ + ok(errno == ex, "errno is %d, expected %d\n", errno, ex); \ + } while (0) in http://source.winehq.org/patches/data/89349 ?

2 1

Re: [3/3] gdiplus: Make GdipMeasureCharacterRanges/GdipMeasureString/GdipDrawString add extra space around the text.
by Vincent Povirk Aug. 28, 2012

Aug. 28, 2012

> These APIs use different logic for adding extra space, so at the moment > I don't see how gdip_format_string() can be used to do this in one place, > but if somebody has an idea how to do that - patches are welcome. That is highly unlikely, particularly given that MeasureCharacterRanges is the accepted practice for highlighting parts of a string. You should make sure you do your tests so the size in pixels is the em size of the font, or at least at a consistent size between them, as native may cut into the padding if hinting makes the characters proportionally larger (this is the point of having the padding, but for the record I think it is behavior that we shouldn't try to duplicate). Do you have a visual test program for this? I'd like to see something that draws a string overlayed with the measurements, to confirm that the functions are not consistent on Windows (or, if they are, confirm that they are consistent with your patch). If not, I'll write one and send you the source code. + /* FIXME: GenericTypographic format prevents extra margins */ Since no margins is the current behavior, won't that cause a regression? It should be fairly easy to include that exception. Then again, I think I've heard reports that GenericTypographic doesn't work.

2 10

Re: gdiplus: Use outside color from image attributes for an out of bounds pixel.
by Vincent Povirk Aug. 28, 2012

Aug. 28, 2012

> if (src_pointf.X >= srcx && src_pointf.X < srcx + srcwidth && src_pointf.Y >= srcy && src_pointf.Y < srcy+srcheight) > *dst_color = resample_bitmap_pixel(&src_area, src_data, bitmap->width, bitmap->height, &src_pointf, imageAttributes, interpolation); > else > - *dst_color = 0; > + *dst_color = imageAttributes->outside_color; It's like this for a reason. This isn't out of the bounds of the source image, which is when imageAttributes would apply. This is out of the bounds of the parallelogram we're drawing, and we should be leaving that pixel alone.

1 0

Re: [PATCH 1/2] msvcrt: Detect UTF-8 mode
by Alexandre Julliard Aug. 27, 2012

Aug. 27, 2012

Detlef Riekenberg <wine.dev(a)web.de> writes: > @@ -1286,6 +1288,17 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st > case '+': > case ' ': > break; > + case ',': > + if (!memcmp(mode, encoding_utf8, sizeof(encoding_utf8)) ) > + { > + *open_flags |= MSVCRT__O_U8TEXT; > + *open_flags &= ~(MSVCRT__O_TEXT | MSVCRT__O_BINARY | MSVCRT__O_WTEXT | MSVCRT__O_U16TEXT); > + mode += (sizeof(encoding_utf8)/sizeof(MSVCRT_wchar_t)); > + } > + else > + FIXME("mode %s not supported\n", debugstr_w(mode -1)); Your string parsing needs more work. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: xmllite: Store DTD processing mode in reader
by Alexandre Julliard Aug. 27, 2012

Aug. 27, 2012

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > @@ -350,34 +353,47 @@ static void test_reader_create(void) > HRESULT hr; > IXmlReader *reader; > IUnknown *input; > + DtdProcessing dtd; > > /* crashes native */ > if (0) > { > pCreateXmlReader(&IID_IXmlReader, NULL, NULL); > - pCreateXmlReader(NULL, (LPVOID*)&reader, NULL); > + pCreateXmlReader(NULL, (void**)&reader, NULL); > } > > - hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); > - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); > + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); > + EXPECT_HR(hr, S_OK); > > test_read_state(reader, XmlReadState_Closed, -1, FALSE); > > + dtd = 2; > + hr = IXmlReader_GetProperty(reader, XmlReaderProperty_DtdProcessing, (LONG_PTR*)&dtd); > + EXPECT_HR(hr, S_OK); > + ok(dtd == DtdProcessing_Prohibit, "got %d\n", dtd); > + > + dtd = 2; > + hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, dtd); > + EXPECT_HR(hr, E_INVALIDARG); > + > + hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, -1); > + EXPECT_HR(hr, E_INVALIDARG); > + > /* Null input pointer, releases previous input */ > hr = IXmlReader_SetInput(reader, NULL); > - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); > + EXPECT_HR(hr, S_OK); Explicit ok() calls are better than hiding them inside a macro. -- Alexandre Julliard julliard(a)winehq.org

1 0

Unused msvcp100 functions?
by Francois Gouget Aug. 27, 2012

Aug. 27, 2012

There are a lot of msvcp100 functions that look like they are unused: * In string.c all of the MSVCP__String_base_*(), MSVCP_basic_string_*(), MSVCP_basic_string_wchar_*() and MSVCP_char_traits_*() functions, basic_string_w?char_replace_helper(). * In locale.c _Locinfo__Locinfo_ctor_bstr(), codecvt_{short,wchar}__Id_func(), collate_{char,short}__Getcat(), various ctype_*() functions, etc. * In ios.c, the basic_istream_*() and basic_ostream_*() functions, ios_base_Index_func() and ios_base_Sync_func(). * In math.c a lot of std_Ctraits_{double,float,long}_*() functions. Is it just that the spec file needs to catch up or that they will be used soon? I attached a more precise list of the suspects. I did not actually verify that all of them are unused but based on the ones I looked at it seems to be the case. If they are indeed unused and will remain so I can submit a patch to remove them. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ The software said it requires Win95 or better, so I installed Linux.

2 1

Re: kernel32: Handle neutral locale names better in GetLocaleInfoEx
by Dmitry Timoshkov Aug. 27, 2012

Aug. 27, 2012

Hi, Are you sure that GetLocaleInfo can't handle these cases on its own? -- Dmitry.

2 1

Re: [3/3] gdiplus: get_log_fontW helper requires a valid graphics object.
by Vincent Povirk Aug. 27, 2012

Aug. 27, 2012

> + GdipFree(backup); I think you want GdipDeletePath. This seems very convoluted. Couldn't we just skip the size conversion in get_log_fontW when graphics is NULL? Any cases where the scaling would produce a size other than the em size need to be fixed in GdipAddPathString anyway.

2 2

Re: msxml3: Implement xmldecl-version property for a reader
by Marvin Aug. 27, 2012

Aug. 27, 2012

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 http://testbot.winehq.org/JobDetails.pl?Key=21252 Your paranoid android. === W2KPROSP4 (32 bit saxreader) === saxreader.c:2365: Test failed: got 0x80040154, expected 0x00000000 saxreader: unhandled exception c0000005 at 00443BC3 === WXPPROSP3 (32 bit saxreader) === saxreader.c:2365: Test failed: got 0x80040154, expected 0x00000000 saxreader: unhandled exception c0000005 at 00443BC3 === W2K3R2SESP2 (32 bit saxreader) === saxreader.c:2365: Test failed: got 0x80040154, expected 0x00000000 saxreader: unhandled exception c0000005 at 00443BC3 === WVISTAADM (32 bit saxreader) === saxreader.c:2365: Test failed: got 0x80040154, expected 0x00000000 saxreader: unhandled exception c0000005 at 00443BC3 === W2K8SE (32 bit saxreader) === saxreader.c:2365: Test failed: got 0x80040154, expected 0x00000000 saxreader: unhandled exception c0000005 at 00443BC3 === W7PRO (32 bit saxreader) === saxreader.c:2365: Test failed: got 0x80040154, expected 0x00000000 saxreader: unhandled exception c0000005 at 00443BC3 === W7PROX64 (32 bit saxreader) === saxreader.c:2365: Test failed: got 0x80040154, expected 0x00000000 saxreader: unhandled exception c0000005 at 00443BC3 === TEST64_W7SP1 (32 bit saxreader) === saxreader.c:2365: Test failed: got 0x80040154, expected 0x00000000 saxreader: unhandled exception c0000005 at 00443BC3 === W7PROX64 (64 bit saxreader) === saxreader.c:2365: Test failed: got 0x80040154, expected 0x00000000 Timeout === TEST64_W7SP1 (64 bit saxreader) === saxreader.c:2365: Test failed: got 0x80040154, expected 0x00000000 Timeout

1 0

re: msvcr100: Add wmemmove_s and wmemcpy_s
by Dan Kegel Aug. 26, 2012

Aug. 26, 2012

I asked Alexandre what http://source.winehq.org/patches/data/88732 needed before it could be reviewed. He said it needed to adapt to the recent parameter checking changes. I see that when he took my patch http://www.winehq.org/pipermail/wine-patches/attachments/20120728/bea2581d/… and committed it as http://source.winehq.org/git/wine.git/patch/49560458426cf25b6a36bbf9bad35aa… he could remove a few assignments to *MSVCRT__errno() because MSVCRT_CHECK_PMT now does that for you. But msvcr100's wmemmove_s/wmemcpy_s are different; they do not change errno. Tests in my patch confirm this. So changing msvcr100's CHECK_PMT macro to assign to errno doesn't seem appropriate. So, is there still anything that needs changing?

2 2

Re: About WineHQ Wiki
by Kyle Auble Aug. 26, 2012

Aug. 26, 2012

Sorry if my replies come in large batches, I'm subscribed to the mailing list digest. Sun, 26 Aug 2012 10:08, Cheer Xiao wrote: > Hi all, > I'm a MoinMoin contributor, one of MoinMoin's participating students > in this year's Summer of Code. > 2012/8/26 Kyle Auble <randomidman48(a)yahoo.com>: >> Sat, 25 Aug 2012 14:44, Oleg Yarigin wrote: >>> When I edited pages in the WineHQ Wiki, I notised, its markup lankuage >>> isn`t so good as MediaWiki`s one. How do you think about moving the Wiki >>> into MediaWiki engine? Besides, moving each language section of the Wiki >>> into separated subdomain (like in Wikipedia) would be a good idea too. >> There are some pluggable parsers for Moinmoin, and there may be one >> that allows MediaWiki syntax. After going through and checking, >> categorizing, and editing so many pages, I definitely agree with your >> suggestion that each language be given a domain, instead of one flat >> namespace. Then maybe just add a single common "translation" menu to >> the side toolbar? > Indeed there is a MediaWiki parser[1]. > Also, take a look at MoinMoin 2.0[2]. It has multiple markups support > out of the box (including mediawiki of course). You can even mix them > in a single wiki instance - this is not necessarily a good idea, but > it helps when you have to migrate some content from another wiki by > hand. ... > Feature requests are welcome, but be noted that MoinMoin 2.0 is the > current development version (it's not a development "branch" since the > codebase is almost a total rewrite) and quite likely the feature you > want is already there (or a TODO). :) Hello, I'm glad to hear there's already a line of communication. Allowing people to use MediaWiki syntax will probably be a big plus. There have been performance problems, but I noticed both the Ubuntu and Moinmoin wikis are pretty snappy so I'm thinking it's due to a strained server and using an old version of Moinmoin (although the SystemInfo macro seems to be disabled, I ran across version info somewhere, and I think Wine Wiki is running Moinmoin 1.5 or 1.6). I'm not sure if other problems I've noticed have been fixed in v1.8 or 1.9 so I would have to try out those versions before checking against v2.0. One thing I have done is written up some python code to help convert HTML tables to Moinmoin ones. I checked in Moinmoin's script market, but could only find full-blown page converters, and their output was kind of messy. I probably got carried away, but I'll attach it to http://wiki.winehq.org/WineStatus because I'm using it to move WineHQ's static status pages to the wiki. I guess that would make it LGPL so if you want to salvage a few parts from it or have me submit it to your utility marketplace, just let me know. Sun, 26 Aug 2012 16:07, Andre Hentschel wrote: > Further it seems a bit more complicated with Wine, the moinmoin wiki is sponsored by http://lattica.com/ (whatever > sponsored means, didn't find further information) and the code > is not accessable via a wine git repo (maybe it should be in tools.git, website.git or its own). This also leads to the > fact that we still have no new wiki theme years after the > theme change on the website. > Now that we upgraded the Forum engine we (we as in laxdragon xD) could maybe do something about the wiki, it > needs love. > It seems Kyle is doing a good job at the content, but the content is not everything. Thank you for the compliment. I am actually planning on doing more coding soon, but besides ramping up, I though cleaning up the wiki some first would let me see where the different parts of the project are. Applying the theme from the rest of the WineHQ is on both the WikiToDo and my own list (no guarantees about how long I would take though). Sun, 26 Aug 2012 22:46, Cheer Xiao wrote: > And yes, as I noted in a previous post moin2 is *not* production-ready > yet and I don't suggest you jump ship now. :) > What I do strongly suggest, however, is that you upgrade to moin1.9 > first, since 1) there has been many security fixes[1] which are not > backported to old versions, and 2) upgrade to moin2 will only be > supported from moin1.9. Helping to upgrade the wiki is on my list somewhere between finishing a first round of polishing content and trying a couple of patches to Wine itself. Although the maintainer would actually have to deploy it, I could test and work some of the kinks out of the upgrade using a local install. Dimi Paun put a lot of work into setting up the wiki in the first place and is the maintainer at lattica. From the git logs and mail list, it seems like he has been really busy with other things for a while. At times, Jeremy Newman has raised the possibility of moving the wiki to WineHQ: http://www.winehq.org/pipermail/wine-devel/2006-June/048712.html I remember stumbling across another email too, but I can't find it right now. If it's still a possibilty, I think the first step would be somehow setting up datadumps so we could start on the upgrade. If there is already a feature for admins to do that, maybe Dimi could start putting a daily/weekly tarball on WineHQ's FTP site. If it requires a custom patch though, I could look into doing that too. -Kyle

1 0

Re: po: Update German translation
by Julian Rüger Aug. 26, 2012

Aug. 26, 2012

Hi André, war ich zu langsam? ;) Das Komma ist an der Stelle grammatikalisch falsch, glaube ich. "Die verbundenen Controller" sollten auch Plural bleiben. Mein Vorschlag wäre irgendwie so etwas: "Nach dem De-/Aktivieren eines Gerätes wird die Liste der verbundenen Controller bis zum Neustart dieses Applets nicht [mehr] aktualisiert." Viele Grüsse, Julian Am Samstag, den 25.08.2012, 13:40 +0200 schrieb André Hentschel: > "After disabling or enabling a device, the connected joysticks won't be " > "updated here until you restart this applet." >-msgstr "" >+msgstr "Nach dem deaktivieren oder aktivieren eines Gerätes, wird der " >+"verbundene Controller hier bis zum Neustart des Applets nicht mehr " >+"aktualisiert."

1 1

Re: winhttp: disable TLSv1.1/1.2 by default
by Marcus Meissner Aug. 26, 2012

Aug. 26, 2012

On Sun, Aug 26, 2012 at 11:50:15AM +0900, Hiroshi Miura wrote: > > Windows 7 disables TLSv1.1/1.2 by default. > This patch intend to behave same as Windows. Please do not... The newer TLSv1.x fix some shortcomings of the older TLS versions. Is there a specific problem you see? Otherwise, I object. Ciao, MArcus > Signed-off-by: Hiroshi Miura <miurahr(a)linux.com> > --- > dlls/winhttp/net.c | 74 > ++++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 74 insertions(+) > > > > diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c > index 5ec4e1a..03cf9b7 100644 > --- a/dlls/winhttp/net.c > +++ b/dlls/winhttp/net.c > @@ -52,6 +52,7 @@ > #include "winbase.h" > #include "winhttp.h" > #include "wincrypt.h" > +#include "winreg.h" > > #include "winhttp_private.h" > > @@ -109,8 +110,10 @@ MAKE_FUNCPTR( SSL_load_error_strings ); > MAKE_FUNCPTR( SSLv23_method ); > MAKE_FUNCPTR( SSL_CTX_free ); > MAKE_FUNCPTR( SSL_CTX_new ); > +MAKE_FUNCPTR( SSL_CTX_ctrl ); > MAKE_FUNCPTR( SSL_new ); > MAKE_FUNCPTR( SSL_free ); > +MAKE_FUNCPTR( SSL_ctrl ); > MAKE_FUNCPTR( SSL_set_fd ); > MAKE_FUNCPTR( SSL_connect ); > MAKE_FUNCPTR( SSL_shutdown ); > @@ -408,12 +411,66 @@ static int netconn_secure_verify( int preverify_ok, X509_STORE_CTX *ctx ) > } > return ret; > } > + > +static long get_tls_option(void) { > + long tls_option; > + DWORD type, val, size; > + HKEY hkey,tls12_client,tls11_client; > + LONG res; > + const WCHAR Schannel_Prot[] = { /* SYSTEM\\CurrentControlSet\\Control\\SecurityProviders\\SCANNEL\\Protocols */ > + 'S','Y','S','T','E','M','\\', > + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', > + 'C','o','n','t','r','o','l','\\', > + 'S','e','c','u','r','i','t','y','P','r','o','v','i','d','e','r','s','\\', > + 'S','C','H','A','N','N','E','L','\\', > + 'P','r','o','t','o','c','o','l','s',0 }; > + const WCHAR TLS12_Client[] = {'T','L','S',' ','1','.','2','\\','C','l','i','e','n','t',0}; > + const WCHAR TLS11_Client[] = {'T','L','S',' ','1','.','1','\\','C','l','i','e','n','t',0}; > + const WCHAR DisabledByDefault[] = {'D','i','s','a','b','l','e','d','B','y','D','e','f','a','u','l','t',0}; > + > + tls_option = SSL_OP_NO_SSLv2; /* disable SSLv2 for security reason, and secur32/Schannel(GnuTLS) don't support it */ > + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, > + Schannel_Prot, > + 0, KEY_READ, &hkey); > + if (res != ERROR_SUCCESS) { > + tls_option |= SSL_OP_NO_TLSv1_2; > + tls_option |= SSL_OP_NO_TLSv1_1; > + goto end; > + } > + if (RegOpenKeyExW(hkey, TLS12_Client, 0, KEY_READ, &tls12_client) == ERROR_SUCCESS) { > + size = sizeof(DWORD); > + if (RegQueryValueExW(tls12_client, DisabledByDefault, NULL, &type, (LPBYTE) &val, &size) || type != REG_DWORD) { > + tls_option |= SSL_OP_NO_TLSv1_2; > + } else { > + tls_option |= val?SSL_OP_NO_TLSv1_2:0; > + } > + RegCloseKey(tls12_client); > + } else { > + tls_option |= SSL_OP_NO_TLSv1_2; > + } > + if (RegOpenKeyExW(hkey, TLS11_Client, 0, KEY_READ, &tls11_client) == ERROR_SUCCESS) { > + size = sizeof(DWORD); > + if (RegQueryValueExW(tls11_client, DisabledByDefault, NULL, &type, (LPBYTE) &val, &size) || type != REG_DWORD) { > + tls_option |= SSL_OP_NO_TLSv1_1; > + } else { > + tls_option |= val?SSL_OP_NO_TLSv1_1:0; > + } > + RegCloseKey(tls11_client); > + } else { > + tls_option |= SSL_OP_NO_TLSv1_1; > + } > + RegCloseKey(hkey); > + > +end: > + return tls_option; > +} > #endif > > BOOL netconn_init( netconn_t *conn, BOOL secure ) > { > #if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO) > int i; > + long tls_option; > #endif > > conn->socket = -1; > @@ -453,8 +510,10 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) > LOAD_FUNCPTR( SSLv23_method ); > LOAD_FUNCPTR( SSL_CTX_free ); > LOAD_FUNCPTR( SSL_CTX_new ); > + LOAD_FUNCPTR (SSL_CTX_ctrl); > LOAD_FUNCPTR( SSL_new ); > LOAD_FUNCPTR( SSL_free ); > + LOAD_FUNCPTR( SSL_ctrl ); > LOAD_FUNCPTR( SSL_set_fd ); > LOAD_FUNCPTR( SSL_connect ); > LOAD_FUNCPTR( SSL_shutdown ); > @@ -494,11 +553,20 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) > LOAD_FUNCPTR( sk_num ); > #undef LOAD_FUNCPTR > > +#define pSSL_CTX_set_options(ctx,op) \ > + pSSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,(op),NULL) > +#define pSSL_set_options(ssl,op) \ > + pSSL_ctrl((ssl),SSL_CTRL_OPTIONS,(op),NULL) > + > pSSL_library_init(); > pSSL_load_error_strings(); > > method = pSSLv23_method(); > ctx = pSSL_CTX_new( method ); > + > + tls_option = get_tls_option(); > + pSSL_CTX_set_options(ctx, tls_option); > + > if (!pSSL_CTX_set_default_verify_paths( ctx )) > { > ERR("SSL_CTX_set_default_verify_paths failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); > @@ -676,12 +744,18 @@ BOOL netconn_connect( netconn_t *conn, const struct sockaddr *sockaddr, unsigned > BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) > { > #ifdef SONAME_LIBSSL > + long tls_option; > + > if (!(conn->ssl_conn = pSSL_new( ctx ))) > { > ERR("SSL_new failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); > set_last_error( ERROR_OUTOFMEMORY ); > goto fail; > } > + > + tls_option = get_tls_option(); > + pSSL_set_options(conn->ssl_conn, tls_option); > + > if (!pSSL_set_ex_data( conn->ssl_conn, hostname_idx, hostname )) > { > ERR("SSL_set_ex_data failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); > > >

1 0

Question about some Linux integration
by Oleg Yarigin Aug. 25, 2012

Aug. 25, 2012

Hi! I have an idea to move some Wine parts into Linux subsystems. For instance, Wine apps windows and window content can be drawn with Desktop Manager via USER32.DLL opposite of using Wine Server. Similar thing can be with clipboard. I understand, it`s a big work, what is must to be started with an EXE loader. So I have a few questions before I can start: 1. Does Wine loader have any mechanism for loading .so files. 2. May I move all loader stuff from NTDLL to the loader. Is it rational? I asked, becouse there are a lot of stuff, that can be unloaded after program loading. And an off-top question: where is wine_server_call realisation defined? --- Oleg

2 2

About WineHQ Wiki
by Oleg Yarigin Aug. 25, 2012

Aug. 25, 2012

Hi to all! When I edited pages in the WineHQ Wiki, I notised, its markup lankuage isn`t so good as MediaWiki`s one. How do you think about moving the Wiki into MediaWiki engine? Besides, moving each language section of the Wiki into separated subdomain (like in Wikipedia) would be a good idea too. --- Oleg

1 0

Re: [1/16] po: Update Russian translation
by Dmitry Timoshkov Aug. 24, 2012

Aug. 24, 2012

These new translations look at least questionable to say the least. -- Dmitry.

2 1

Re: advapi32/tests: Skip a couple of registry tests on NT4 to avoid crashing it.
by Alexandre Julliard Aug. 24, 2012

Aug. 24, 2012

Francois Gouget <fgouget(a)free.fr> writes: > I know it's bad form to test for the Windows version but I'm not sure > what other check would be relevant here. I think we can safely ignore such old versions at this point. -- Alexandre Julliard julliard(a)winehq.org

1 0

configure --with-osmesa fails to link
by Peter Urbanec Aug. 24, 2012

Aug. 24, 2012

I just turned on --with-osmesa and configure fails for me: > checking for -lOSMesa... not found > configure: error: libOSMesa development files not found (or too old), > OpenGL rendering in bitmaps won't be supported. > This is an error since --with-osmesa was requested config.log output would suggest that perhaps the test is being treated as C code, but libOSMesa needs to link with C++ libs. > configure:9067: checking for -lOSMesa > configure:9092: gcc -o conftest -g3 -feliminate-unused-debug-symbols > -O0 -mtune=core2 conftest.c -lOSMesa -lSM -lICE -lXext -lX11 > -lm >&5 > /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/../../../../lib64/libOSMesa.so: > undefined reference to `operator delete[](void*)' > /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/../../../../lib64/libOSMesa.so: > undefined reference to `operator new(unsigned long)' > /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/../../../../lib64/libOSMesa.so: > undefined reference to `_glapi_get_proc_address' > /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/../../../../lib64/libOSMesa.so: > undefined reference to `operator delete(void*)' > /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/../../../../lib64/libOSMesa.so: > undefined reference to `_glapi_get_dispatch_table_size' > /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/../../../../lib64/libOSMesa.so: > undefined reference to `operator new[](unsigned long)' > /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/../../../../lib64/libOSMesa.so: > undefined reference to `__cxa_pure_virtual' > /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/../../../../lib64/libOSMesa.so: > undefined reference to `__gxx_personality_v0' > /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/../../../../lib64/libOSMesa.so: > undefined reference to `_glapi_get_context' > /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/../../../../lib64/libOSMesa.so: > undefined reference to `vtable for __cxxabiv1::__vmi_class_type_info' > /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/../../../../lib64/libOSMesa.so: > undefined reference to `vtable for __cxxabiv1::__class_type_info' > /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/../../../../lib64/libOSMesa.so: > undefined reference to `_glapi_add_dispatch' > /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/../../../../lib64/libOSMesa.so: > undefined reference to `_glapi_check_multithread' > /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/../../../../lib64/libOSMesa.so: > undefined reference to `_glapi_tls_Context' > /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/../../../../lib64/libOSMesa.so: > undefined reference to `_glapi_set_context' > /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/../../../../lib64/libOSMesa.so: > undefined reference to `vtable for __cxxabiv1::__si_class_type_info' > /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/../../../../lib64/libOSMesa.so: > undefined reference to `_glapi_set_dispatch' > /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/../../../../lib64/libOSMesa.so: > undefined reference to `_glapi_tls_Dispatch' > collect2: ld returned 1 exit status This is on Gentoo x64 with: media-libs/mesa-8.1_rc1_pre20120814 (classic egl g3dvl gallium llvm nptl osmesa shared-glapi vdpau xvmc -bindist -d3d -debug -gbm -gles1 -gles2 -kernel_FreeBSD -openvg -pax_kernel -pic -r600-llvm-compiler -selinux -video_cards_i915 -video_cards_i965 -video_cards_intel -video_cards_nouveau -video_cards_r100 -video_cards_r200 -video_cards_r300 -video_cards_r600 -video_cards_radeon -video_cards_radeonsi -video_cards_vmware -wayland -xa -xorg) sys-devel/gcc-4.6.3 (cxx fortran graphite mudflap multilib nls nptl openmp -altivec -bootstrap -build -doc -fixed-point -gcj -go -gtk -hardened -libssp -multislot -nocxx -nopie -nossp -objc -objc++ -objc-gc -test -vanilla) Any suggestions as to how this could be fixed? My autoconf skills are no match for this problem :-( Thanks.

3 3