April 2007 - Wine-Devel - list.winehq.org

Re: Move console input/output codepages to server
by Dmitry Timoshkov April 20, 2007

April 20, 2007

"Kirill K. Smirnov" <lich(a)math.spbu.ru> wrote: > @@ -141,12 +138,19 @@ HWND WINAPI GetConsoleWindow(VOID) > */ > UINT WINAPI GetConsoleCP(VOID) > { > - if (!console_input_codepage) > + BOOL ret; > + UINT codepage = GetOEMCP(); /* default value */ > + > + SERVER_START_REQ(get_console_input_info) > { > - console_input_codepage = GetOEMCP(); > - TRACE("%u\n", console_input_codepage); > + req->handle = 0; > + ret = !wine_server_call_err( req ); > + if (ret && reply->codepage) > + codepage = reply->codepage; Did you test what happens when an app sets console code page to a pseudo cp like CP_ACP (0)? Your code will force code page to be always equal to what GetOEMCP returns in that case. -- Dmitry.

1 0

re: clusapi.h - add states for GetNodeClusterState()
by Dan Kegel April 19, 2007

April 19, 2007

You might have more luck getting these three patches in if you also checked in a conformance test that depended on them. And were you careful to write winsxs.h yourself as opposed to copying and pasting from a Microsoft header or web page? - Dan

2 3

Re: Add new dll - sxs.dll
by Michael Stefaniuc April 19, 2007

April 19, 2007

EA Durbin wrote: > > > _________________________________________________________________ > Mortgage refinance is Hot. *Terms. Get a 5.375%* fix rate. Check savings > https://www2.nextag.com/goto.jsp?product=100000035&url=%2fst.jsp&tm=y&searc… > > > > ------------------------------------------------------------------------ > >>From 8df8958bb809e856de99bdbbdfbba828b0a16359 Mon Sep 17 00:00:00 2001 > From: EA Durbin <ead1234(a)hotmail.com> > Date: Thu, 19 Apr 2007 01:03:55 -0500 > Subject: Add new dll sxs.dll > > --- > dlls/sxs/Makefile.in | 14 ++++++++++++++ > dlls/sxs/sxs.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ > dlls/sxs/sxs.spec | 2 ++ > 3 files changed, 62 insertions(+), 0 deletions(-) > create mode 100644 dlls/sxs/Makefile.in > create mode 100644 dlls/sxs/sxs.c > create mode 100644 dlls/sxs/sxs.spec > > diff --git a/dlls/sxs/Makefile.in b/dlls/sxs/Makefile.in > new file mode 100644 > index 0000000..507442a > --- /dev/null > +++ b/dlls/sxs/Makefile.in > @@ -0,0 +1,14 @@ > +TOPSRCDIR = @top_srcdir@ > +TOPOBJDIR = ../.. > +SRCDIR = @srcdir@ > +VPATH = @srcdir@ > +MODULE = sxs.dll > +IMPORTLIB = libsxs.$(IMPLIBEXT) > +IMPORTS = kernel32 > + > +C_SRCS = \ > + sxs.c > + > +(a)MAKE_DLL_RULES@ > + > +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend > diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c > new file mode 100644 > index 0000000..3e033fe > --- /dev/null > +++ b/dlls/sxs/sxs.c > @@ -0,0 +1,46 @@ > +/* > + * sxs main > + * > + * Copyright 2007 EA Durbin > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > + */ > + > +#include <stdarg.h> > + > +#include "windef.h" > +#include "winbase.h" > +#include "winsxs.h" > +#include "wine/debug.h" > + > +WINE_DEFAULT_DEBUG_CHANNEL(sxs); > + > + > +/*********************************************************************** > + * DllMain (SXS.@) > + * > + */ > +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) > +{ > + switch(fdwReason) > + { > + case DLL_WINE_PREATTACH: > + return FALSE; /* prefer native version */ > + case DLL_PROCESS_ATTACH: > + DisableThreadLibraryCalls( hinstDLL ); > + break; > + } > + return TRUE; > +} > diff --git a/dlls/sxs/sxs.spec b/dlls/sxs/sxs.spec > new file mode 100644 > index 0000000..47056cd > --- /dev/null > +++ b/dlls/sxs/sxs.spec > @@ -0,0 +1,2 @@ > +@ stub CreateAssemblyNameObject > +@ stub CreateAsseblyCache ^^^ Typo? bye michael -- Michael Stefaniuc Tel.: +49-711-96437-199 Sr. Network Engineer Fax.: +49-711-96437-111 Red Hat GmbH Email: mstefani(a)redhat.com Hauptstaetterstr. 58 http://www.redhat.de/ D-70178 Stuttgart

2 1

Comments for a patch?
by sol11x86＠comcast.net April 19, 2007

April 19, 2007

On a Solaris system, getaddrinfo is not found during the AC_CHECK_FUNC test, because the libs required for getaddrinfo have not been found on Solaris yet. By moving the AC_CHECK_FUNC for getaddrinfo, below where libsocket and libnsl are checked, getaddrinfo is now found on Solaris, and I'm able to resolve a host and render a page with wine running mozilla.exe. Comments? --- wine.ORIG/configure.ac 2007-04-16 08:10:24.000000000 -0400 +++ wine/configure.ac 2007-04-19 09:14:59.156193000 -0400 @@ -1165,7 +1165,6 @@ ftruncate \ futimes \ futimesat \ - getaddrinfo \ getdirentries \ gethostbyname \ getnameinfo \ @@ -1247,6 +1246,8 @@ AC_CHECK_LIB(resolv,inet_aton) fi +AC_CHECK_FUNCS(getaddrinfo) + dnl **** Check for types **** AC_C_CONST

1 0

Re: xcopy: add Russian resource
by Dmitry Timoshkov April 19, 2007

April 19, 2007

"Kirill K. Smirnov" <lich(a)math.spbu.ru> wrote: > ChangeLog: > add Russian resource Please pass it through a spell checker first, there are spelling errors along with wrong punctuation in your translation. -- Dmitry.

1 0

Re: Implements D3DRMVectorScale
by Dmitry Timoshkov April 19, 2007

April 19, 2007

<David.Adam(a)math.cnrs.fr> wrote: > --- /dev/null > +++ b/include/d3drmdef.h ... > +#ifdef WIN32 > +#define D3DRMAPI __stdcall > +#else > +#define D3DRMAPI > +#endif What's the point of the WIN32 macro test (does this mean that win64 doesn't have stdcall decorations)? Also (I already pointed out to it) is it necessary to introduce D3DRMAPI like microsoft header does instead of using simple WINAPI? > --- /dev/null > +++ b/dlls/d3drm/tests/vector.c > + pD3DRMVectorAdd = (void*)GetProcAddress(hmod, "D3DRMVectorAdd"); ... > + pD3DRMVectorAdd(&r,&u,&v); You do this in all your tests: proc = GetProcAdress("procname"); then call the proc without any check for it being NULL. Why not link to d3drm.dll using import library instead? -- Dmitry.

1 0

re: Comments for a patch?
by Dan Kegel April 19, 2007

April 19, 2007

I'm not an autoconf guru, but I play one on TV. You wrote: +AC_CHECK_FUNC(getaddrinfo, [AC_DEFINE([HAVE_GETADDRINFO], [1], + [Defined to 1 if you have the getadrinfo function,])], + [AC_CHECK_LIB(socket, getaddrinfo, + [AC_DEFINE([HAVE_GETADDRINFO]) LIBS="-lsocket -lnsl $LIBS"], , , -lnsl)]) I'm not sure it's healthy to assume that -lsocket and -lnsl go together like that. Have you looked at how Samba does it? See http://samba.org/ftp/unpacked/distcc/configure.ac - Dan

1 0

Request for small bit of mentoring
by Tom Spear April 18, 2007

April 18, 2007

I found a small bug in the uninstaller program, and would like to write the fix myself. I have a working copy in my local tree, but it duplicates code. Basically I found that uninstaller does not scan the uninstall registry entry of HKEY_CURRENT_USER. I took lines 196-197 and duplicated that, changing HKEY_LOCAL_MACHINE to HKEY_CURRENT_USER, and then did the same for lines 210-228. I would like to get down to a smaller linecount, but I would like to do the patch myself, so I would appreciate some assistance in figuring out how. Could someone email me privately to help? -- Thanks Tom Check out this new 3D Instant Messenger called IMVU. It's the best I have seen yet! http://imvu.com/catalog/web_invitation.php?userId=1547373&from=power-email

3 5

Re: locales, unicode and ansi with msvcrt (bug 8022)
by Kirill K. Smirnov April 18, 2007

April 18, 2007

Hi Jason, While preparing tests I found the 'user' backend of wineconsole works with WriteConsole/WriteFile correct (see test1 and test2), so I used it as etal. I figured out the main issue with cmd: It passes strings to WriteFile in ANSI, but should in OEM. I think the main locale issue is found. CMD and XCOPY violate this. So it is not MSVCRT bug. Moreover, [w]fprintf MUST NOT perform any AnsiToOem convertions (as test3 and test4 show). I made and attached a quick hack to demostrate that cmd was buggy. Attached screenshots show the difference. The patch heals almost everything, even localized filenames. So I'm CC'ing mail to wine-devel, console/cmd gurus must know much more ;-) I found some issues with wprintf, see README for test3 and test4. The attached tests are made with your patch applied. What about running cmd without console, I think it is not a good idea - we must check locale and enconding, thus we must perform various convertions: to utf8, to cp1251, to koi8-r... Or just we must set correct value of console_[input|output]_codepage variables? Does windows console supports UTF8 as output codepage? > Given I don't know russian, is there any chance of writing me a short > program which uses _wfopen, fwprintf, fclose to create me a file with a > name and contents which are russian text, so I can test some of the cmd.exe > issues reported with NLS chars. > Could I also have: > 1. Output from 'chcp' in a windows command prompt c:\>chcp "Текущая кодовая страница: 866" ["Current codepage: 866"] > 2. screen shot of 'dir' in a windows command prompt after running the > program so I know what characters I am expecting > 3. Details of the LANG env var, and details of the xterm (I run Mandrake, > and have Settings->Font and Settings->Encoding options which seem like the > way to tailor what appears LANG=ru_RU.KOI8-R xterm -fn koi10x20 > Hopefully I can take the program and run it under wine, and see what > filename it creates, then work out why DIR doesn't display it correctly. I > am almost certain its because the wine cmd.exe program is converting in the > wrong codepage somehow. I want to do an exercise of unicoding wine's cmd > once I finish work on the commands I have left to do (mostly copy, for and > attrib) > I suspect your winegcc issues are use of the L"unicode string" from my > example at a guess, but to be honest I don't know I've already figured out it: I should pass option "-mno-cygwin" to winegcc. It makes winegcc link against msvcrt.dll instead of glibc. Thanks a lot for working upon this bug! -- Kirill

2 1

Comments for a patch?
by sol11x86＠comcast.net April 18, 2007

April 18, 2007

I am compiling the stock current CVS 0.9.35 code on Solaris 10/X86. I was successful in starting notedpad and winemine, so the base looks good. I installed mozilla-win32-1.7.13-installer.exe, and am able to start mozilla.exe, but it will not lookup host name, and therefore won't render any pages. I saw a message about getaddrinfo not being found, and I figured out that configure was not correctly finding the function due to missing libraries (-lsocket, -lnsl) during the test for getaddrinfo. Once I crafted the patch below, and running autoheader/autoconf and the configure /gmake depend && gmake, the installed wine was able to run mozilla.exe and correctly lookup a hostname and render the page. I'd like comments from the devel-list as this is my first patch. Apologies for not being in GIT format, as I don't have that working quite yet. Patch was crafted from a clean CVS tree against the changes using gdiff -ruN. Notes on the patch: I tried several autoconf configurations, but this was the only one that correctly enabled HAVE_GETADDRINFO in config.h. If someone has improvements on the patch, I'd appreciate it. I'm just not an autoconf guru. Thanks, Ben --------------------------------------------- --- wine.ORIG/configure.ac 2007-04-16 08:10:24.000000000 -0400 +++ wine/configure.ac 2007-04-18 15:48:24.111885000 -0400 @@ -1165,7 +1165,6 @@ ftruncate \ futimes \ futimesat \ - getaddrinfo \ getdirentries \ gethostbyname \ getnameinfo \ @@ -1247,6 +1246,13 @@ AC_CHECK_LIB(resolv,inet_aton) fi +dnl **** Check for getaddrinfo **** + +AC_CHECK_FUNC(getaddrinfo, [AC_DEFINE([HAVE_GETADDRINFO], [1], + [Defined to 1 if you have the getadrinfo function,])], + [AC_CHECK_LIB(socket, getaddrinfo, + [AC_DEFINE([HAVE_GETADDRINFO]) LIBS="-lsocket -lnsl $LIBS"], , , -lnsl)]) + dnl **** Check for types **** AC_C_CONST

1 0