- wine-devel - winehq.org

Re: [RESEND] user: Select entire text if DLGC_HASSETSEL set
by Alexandre Julliard 16 Aug '06

16 Aug '06

Stefan Siebert <stefan.siebert(a)web.de> writes: > +static void DIALOG_SelectTextIfHasSetSel( HWND hwndEdit ) > +{ > + MSG msg; > + LRESULT dlgCode; > + > + dlgCode = SendMessageW (hwndEdit, WM_GETDLGCODE, msg.wParam, (LPARAM)&msg); msg is not initialized, you are sending garbage to the app. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: winecfg: appdefaults: use more strings from resources, unicode
by Paul Vriens 16 Aug '06

16 Aug '06

On Wed, 2006-08-16 at 06:23 +0200, Frank Richter wrote: > +#define IDS_DEFAULT_SETTINGS 8017 > +#define IDS_EXECUTABLE_FILTER 8018 > +#define IDS_USE_GLOBAL_SETTINGS 8019 > +#define IDS_SELECT_EXECUTABLE 8020 Hi Frank, the patch is applied but the strings are not defined in the .rc files. Looks a bit strange now when starting winecfg. Cheers, Paul.

1 0

Benchmarking Wine
by Tom Wickline 16 Aug '06

16 Aug '06

Hello, I'm planning to update the benchmarks on the wiki with version 9.20 when it's released and thought I would ask in advance if anyone here has any ideas about the benchmarks. The three new benchmarks that I plan to add are 3DMark03, 3DMark05?? and 3DMark06 Anyone here interested in ShaderMark or AquaMark? or any other bench for that matter. Also Ive made a small update to : http://wiki.winehq.org/BenchMark-0%2e9%2e6 The test were not run under optimal conditions, other apps open, not from a clean boot, run in a window, and with debugging on... So the scores should improve :) Cheers, Tom

5 11

Re: advapi32: add GetComputerObjectName tests (revised)
by Paul Vriens 16 Aug '06

16 Aug '06

On Wed, 2006-08-16 at 07:28 -0400, Robert Reif wrote: > Revision based on feedback from Paul Vriens. Hi Robert, your patch was already applied. Could you diff it against current? Cheers, Paul.

1 0

Re: regedit: Write-strings warnings fix and remove superfluous casts (Resend)
by Alexandre Julliard 16 Aug '06

16 Aug '06

Andrew Talbot <Andrew.Talbot(a)talbotville.com> writes: > Please tell me what is wrong with this patch. Thank you. It's causing warnings: gcc -c -I. -I. -I../../include -I../../include -I../../include/msvcrt -DNO_LIBWINE_PORT -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -gstabs+ -Wdeclaration-after-statement -Wpointer-arith -g -O2 -fno-builtin -o childwnd.o childwnd.c childwnd.c: In function 'GetItemFullPath': childwnd.c:135: warning: passing argument 1 of 'CombinePaths' from incompatible pointer type childwnd.c: In function 'GetPathFullPath': childwnd.c:144: warning: passing argument 1 of 'CombinePaths' from incompatible pointer type -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: winecfg: Use WCHARs for window title
by Alexandre Julliard 16 Aug '06

16 Aug '06

Frank Richter <frank.richter(a)gmail.com> writes: > From 8aaa9ca3552c7e3662c58671c9bc789b1492aa32 Mon Sep 17 00:00:00 2001 > From: Frank Richter frank.richter(a)gmail.com <frank.richter(a)gmail.com> > Date: Wed, 16 Aug 2006 05:44:29 +0200 > Subject: [PATCH] winecfg: Use WCHARs for window title You should switch the app name to Unicode too, this way you wouldn't need to change all the format strings. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [1/5] kernel: add VirtualAllocEx remote thread conformance tests (updated)
by Alexandre Julliard 16 Aug '06

16 Aug '06

tkho(a)ucla.edu (Thomas Kho) writes: > diff --git a/dlls/kernel/tests/Makefile.in b/dlls/kernel/tests/Makefile.in > index bfeae14..5f6c12e 100644 > --- a/dlls/kernel/tests/Makefile.in > +++ b/dlls/kernel/tests/Makefile.in > @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. > SRCDIR = @srcdir@ > VPATH = @srcdir@ > TESTDLL = kernel32.dll > -IMPORTS = kernel32 > +IMPORTS = kernel32 user32 It would be cleaner to avoid importing user32 in the kernel tests. What you probably should do is have the test create more instances of itself the way the process test does. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: advapi32: add GetComputerObjectName tests (resend)
by Paul Vriens 16 Aug '06

16 Aug '06

On Tue, 2006-08-15 at 19:01 -0400, Robert Reif wrote: > plain text document attachment (secur32.tests.diff.txt) > diff -puN wine.cvs/dlls/secur32/tests/Makefile.in wine/dlls/secur32/tests/Makefile.in > + rc = GetComputerObjectNameW(formats[i], nameW, &size); > + ok(rc || ((formats[i] == NameUnknown) && > + (GetLastError() == ERROR_INVALID_PARAMETER)) || > + (GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO), > + "GetComputerObjectNameW(%d) failed: %ld\n", > + formats[i], GetLastError()); > + } > +} > + > +START_TEST(secur32) > +{ > + testGetComputerObjectName(); > +} Hi Robert, you must likely have to change the tests to check: a) if secur32 is available (NT4 seems to lack this one) b) W-calls are (sometimes) not present on non-unicode versions of windows. http://test.winehq.org/data/200608151000/ already shows errors with secur32 and NT4 (I get a pop-up that it can't find secur32.dll). Cheers, Paul.

1 0

RFC: XEmbed Systray Patches
by James Liggett 16 Aug '06

16 Aug '06

Hello everyone, After a long hiatus, I'm trying again to get XEmbed systray support into Wine. I've been working on it for the past few days and I've got these patches. These are based on the system tray code from the Wine version used in the Linux port of Picasa [1] (which in turn was based on the work of Mike Hearn and Rob Shearman.) These patches are basically the same thing, with some fixes: 1. Use proper wine_tsx11 locking. 2. Clean up inappropriate C++ comments in that code. 3. Properly populated the XEvent structure to send docking messages. (According to the XEmbed systray spec [2], any unused fields in the message must be set to 0.) 4. Broken into five atomic patches against today's GIT. In my testing on Gnome 2.14, these patches dock much more reliabaly than the last ones, but they're still not quite perfect. In most cases, programs dock fine until about the seventh consecutive run (behavior observed with Steam and a small test program I wrote.) However, I noticed that it works perfectly if I enabled a +x11drv trace, so I suspect that this has something to do with stack problems, but I've been unable to find the source of the problem. I'd appreciate it if someone could give me some assistance on tracking down this issue. If you'd like to test these, please apply them in the order that they're numbered. Any comments/suggestions appreciated. Thnaks, James Liggett [1]: http://code.google.com/wine.html [2]: http://standards.freedesktop.org/systemtray-spec/systemtray-spec-0.2.html#m…

2 13

Re: oleaut32: Added insufficient memory check to ITypelib2:GetDocumentation2
by Dan Kegel 16 Aug '06

16 Aug '06

2006/8/15, Benjamin Arai <me(a)benjaminarai.com>: > ChangeLog: > - Added insufficient memory check to ITypelib2::GetDocumentation2 > - Returns MSDN specified value STG_E_INSUFFICIENTMEMORY Have you *ever* seen this run out of memory in real life? - Dan

1 0

Re: oleaut32: Added insufficient memory check to ITypelib2:GetDocumentation2
by Frank Richter 16 Aug '06

16 Aug '06

On 16.08.2006 04:23, Benjamin Arai wrote: > if(pbstrHelpString) > + { > *pbstrHelpString=SysAllocString(This->DocString); > + if(!*pbstrHelpString) > + return STG_E_INSUFFICIENTMEMORY; > + } > if(pdwHelpStringContext) > *pdwHelpStringContext=This->dwHelpContext; > if(pbstrHelpStringDll) > + { > *pbstrHelpStringDll=SysAllocString(This->HelpStringDll); > + if(!pbstrHelpStringDll) > + return STG_E_INSUFFICIENTMEMORY; > + } Hm, shouldn't pbstrHelpString be freed in case the 2nd allocation fails? -f.r.

1 0

Re: kernel32: add GetNativeSystemInfo (Try 2)
by Dan Kegel 15 Aug '06

15 Aug '06

This patch is good, and helps fix MS Photostory 2 LE's installer ( http://bugs.winehq.org/show_bug.cgi?id=5966 ). Robert, you might need to repost, though; there was a wrapped line.

1 0

[meta-bug] I can not contact Jeremy Newman
by Jérôme Bouat 15 Aug '06

15 Aug '06

Hello, I can not reach Jeremy Newman. I hope he goes well. A very important bug still exist for years but its bugzilla issue gets no response at all : http://bugs.winehq.org/show_bug.cgi?id=5202 Please, say something (i.e. WONTFIX, INVALID, LATER, ...). I hope someone will respond. Thanks.

4 4

Re: user: Pass all required information with internal message when chaining hooks
by Alexandre Julliard 15 Aug '06

15 Aug '06

Vitaliy Margolen <wine-patch(a)kievinfo.com> writes: > This patch deals with two sides of this problem. And actually saves > some time by not calling server one extra time. I don't think that's a good thing, now you risk calling a hook that has been deleted already. You really want to fetch the hook info from the destination thread. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: usp10: Resend - Remove unnecessary casts in test suite
by Alexandre Julliard 15 Aug '06

15 Aug '06

Jeff L <lats(a)yless4u.com.au> writes: > Any problems? It doesn't apply. When resending a patch please regenerate it against the current tip. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: usp10: Resend - Add funtionality for ScriptStringAnalyse
by Alexandre Julliard 15 Aug '06

15 Aug '06

Jeff L <lats(a)yless4u.com.au> writes: > + cMaxItems = 255; /* Pick an abritary size for buffers */ > + if (!*pssa) /* Clean it out and start again */ > + ScriptStringFree(pssa); I still don't see why you want to free a NULL pointer. > + { > + prtssa(*pssa); > + analysis = * pssa; > + prtssa((SCRIPT_STRING_ANALYSIS *)analysis); Why do you print the same object twice? There seems to be a lot of confusion in your code between pointers and pointers to pointers, I think you need to define better data types to clarify this. -- Alexandre Julliard julliard(a)winehq.org

1 0

RFC: XEmbed Systray Patches
by James Liggett 15 Aug '06

15 Aug '06

Hi Everyone, First, I'd like to apologize for sending those tarballs to wine-devel, as I've just been advised on IRC that such a practice discourages reviews. I've attached a text version of the patches in the hopes that it will get some more exposure. Again, sorry for the trouble. :) James

2 1

All right, let's solve these .desktop issues forever
by Scott Ritchie 14 Aug '06

14 Aug '06

As of right now, I'd estimate that over half of our users are using Wine from a terminal window to launch their applications, largely because their window manager doesn't put Wine's Start Menu entries into their applications menu. Wine's been making .desktop files for some time, however it seems like they're being put in the wrong place. There's supposedly a proper, standard place to put them (or there should be), and perhaps a hack can be put in at the package-maintainer level, but in any case this is a pretty big usability issue at the moment. I'm pretty confident that someone here knows the answer to how things should be, and I'm also pretty sure it's a fairly simple change to make. Either way, we need to have a discussion about it - what's the next step here? Thanks, Scott Ritchie

7 8

Re: USER: SystemParametersInfo fixes
by Alexandre Julliard 14 Aug '06

14 Aug '06

Frank Richter <frank.richter(a)gmail.com> writes: > Subject: [PATCH] USER: Fix SPI_SETICONTITLELOGFONT to check for LOGFONTW size > [...] > Subject: [PATCH] USER: initialize size of nonclients struct in load_nonclient_metrics Please don't attach multiple patches, each patch should be a separate mail. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: WineD3D: add rgb24 colorkey conversion
by Alexandre Julliard 14 Aug '06

14 Aug '06

"Roderick Colenbrander" <thunderbird2k(a)gmx.net> writes: > + for (x = 0; x < len; x++) { > + /* Retrieve RGB24 color */ > + DWORD color = *((DWORD*)src); > + /* Store the RGB portion in dest and reserve a byte for alpha */ > + *Dest = color << 8; > + if ((color < surf->SrcBltCKey.dwColorSpaceLowValue) || > + (color > surf->SrcBltCKey.dwColorSpaceHighValue)) > + *Dest |= 0xff; > + src += 3; You should avoid unaligned DWORD accesses, this doesn't work on all platforms. -- Alexandre Julliard julliard(a)winehq.org

1 0

RFC: OpenGL x11drv rewrite (WoW fix)
by Roderick Colenbrander 14 Aug '06

14 Aug '06

Hi, Since the WM rewrite we can only use the visual which was created by x11drv at x11drv initialization. In general this is a simple 32bit RGBA visual or when that's not available it is some 16bit visual. The problem is that the opengl code advertises more formats than this single format. The problem which this can cause is that a 'bad' format is set by SetPixelFormat. In the end when we create a context using wglCreateContext this 'bad' pixelformat is used. When some time later glXMakeCurrent is called we will get a BadMatch. (Note that in a few cases we catch the 'BadMatch' before it happens and create a new GLX Context; this is when context is NULL) The proposed patch which I attached to this email rewrites the pixel format code. First I'll give a short introduction and then I will explain my changes. The functions ChoosePixelFormat/GetPixelFormat/SetPixelFormat/DescribePixelFormat all work with a parameter 'iPixelFormat'. This variable is an index into the table of supported pixel formats. At the moment the index is a direct mapping to the FB config table exported by GLX. I have changed ChoosePixelFormat to only return the format of the main visual. Further this function needs to find a 'closest match' to the requested format, before it tried to find an exact match. I changed the function to look for a close match. Further because only 1 format is supported, the max index the function can return is 1. This kills the direct mapping of the index to the index in the GLX FB config table. All the opengl calls in x11drv got changed to only accept our single format. As I mentioned earlier the opengl calls used the specified iPixelFormat as an index in the GLX FB config table. Because the 1:1 mapping of iPixelFormat to this table got lost I have added a function to retrieve the index of the main visual. Further I had to change our wglMakeCurrent call to retrieve the pixel format to use from the main visual instead of getting it from a GetPixelFormat call. This was done because wglMakeCurrent needs an index into the GLX FB Config table and not in our 'win32 opengl format table' (which only contains 1 format). I have tested the patch in several programs. Before Halflife1 didn't work in 16bit because ChoosePixelFormat was too strict, the game works fine now. Further the patch also fixes the BadMatch error Nvidia users received in World Of Warcraft when using the OpenGL renderer. I think the patch is a correct fix for the BadMatch / ChoosePixelFormat issues. The patch isn't 100% complete yet as I haven't updated the WGL extensions for pbuffer and wglChoosePixelFormat to work with the new pixelformats yet (that's why you see a line WoW hack). I will fix that part when you guys think that the patch is correct. Regards, Roderick Colenbrander -- Der GMX SmartSurfer hilft bis zu 70% Ihrer Onlinekosten zu sparen! Ideal für Modem und ISDN: http://www.gmx.net/de/go/smartsurfer

2 1

Is anyone going to or presenting at Linuxworld?
by Scott Ritchie 14 Aug '06

14 Aug '06

Linuxworldexpo is this week. Since no one's mentioned it yet, I'm assuming that we don't have a booth or speech planned :) http://www.linuxworldexpo.com/live/12/events/12SFO06A At any rate, perhaps we should be going to things like this. There's usually a convention like this (OSCON, etc) every couple of months, and it certainly couldn't hurt to have a Wine evangelist there talking about how powerful Wine is getting and why Wine should be considered as a bigger part of the Linux strategy. What do you think? Thanks, Scott Ritchie

2 1

Re: resend add missing glyph code to GetGlyphIndices
by Dmitry Timoshkov 14 Aug '06

14 Aug '06

"Jeff L" <lats(a)yless4u.com.au> wrote: > -DWORD WineEngGetGlyphIndices(GdiFont font, LPCWSTR lpstr, INT count, > + * */ Strange indentation at the end of a comment. > +DWORD WineEngGetGlyphIndices(HDC hdc, GdiFont font, LPCWSTR lpstr, INT count, > LPWORD pgi, DWORD flags) > { > INT i; > - > + TEXTMETRICW textm; > for(i = 0; i < count; i++) > + { > pgi[i] = get_glyph_index(font, lpstr[i]); > - > + if (pgi[i] == 0) > + { > + if (flags & GGI_MARK_NONEXISTING_GLYPHS) > + pgi[i] = 0x001f; /* Indicate non existance */ > + else > + { > + GetTextMetricsW(hdc, &textm); > + pgi[i] = textm.tmDefaultChar; > + } > + } > + } > return count; > } I'd suggest to move GetTextMetricsW outside of the loop to not kill the performance. > + WCHAR testtext[] = {'T',0x0000,'s','t',0xffff,0}; > + WORD glyphs[(sizeof(testtext)/2)-1]; > + TEXTMETRIC textm; > + > + memset(&lf, 0, sizeof(lf)); > + strcpy(lf.lfFaceName, "Symbol"); > + lf.lfHeight = 20; > + > + hfont = CreateFontIndirectA(&lf); > + hdc = GetDC(0); > + > + ok(GetTextMetrics(hdc, &textm), "GetTextMetric failed\n"); Please set tab width to 8 instead of 4 and do not mix tabs and spaces. -- Dmitry.

3 3

Re: secur32: Fix heap error.
by Kai Blin 14 Aug '06

14 Aug '06

On Monday 14 August 2006 11:57, Kai Blin wrote: > --- > dlls/secur32/dispatcher.c | 1 - > dlls/secur32/ntlm.c | 1 + > 2 files changed, 1 insertions(+), 1 deletions(-) Sorry, this one is obviously a typo. Sending a new one. Kai -- Kai Blin, <kai Dot blin At gmail Dot com> WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin/ -- Will code for cotton.

1 0

Re: secur32: Make AcceptSecurityContext behaviour consistent withWindows.
by Dmitry Timoshkov 14 Aug '06

14 Aug '06

"Kai Blin" <kai.blin(a)gmail.com> wrote: > phNewContext->dwUpper = ctxt_attr; > - phNewContext->dwLower = ret; > + phNewContext->dwLower = (DWORD)helper; You need to cast to ULONG_PTR to make the code 64-bit safe. Also please fix (DWORD)helper casts in other places. -- Dmitry.

2 1

Re: secur32: Clean up AcceptSecurityContext (reduce indent and duplication).
by Kai Blin 14 Aug '06

14 Aug '06

On Sunday 13 August 2006 14:44, Kai Blin wrote: > --- > dlls/secur32/ntlm.c | 372 > ++++++++++++++++++++++----------------------------- > 1 files changed, 164 insertions(+), 208 deletions(-) After sending in the fixes for my "Make AcceptSecurityContext behaviour consistent with Windows, try2" patch, this one won't apply anymore. I'll resend it later today. Kai -- Kai Blin, <kai Dot blin At gmail Dot com> WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin/ -- Will code for cotton.

1 0

Re: gdi: Implement GetFontUnicodeRanges.
by Huw Davies 14 Aug '06

14 Aug '06

On Sun, Aug 13, 2006 at 08:26:24PM +0200, Hans Leidekker wrote: > > Any word on this patch? > > -Hans > > Changelog > Implement GetFontUnicodeRanges on top of fontconfig and freetype. I wonder whether FcFreeTypeCharSet is what you really want here. It uses a lot of heuristics which almost certainly won't match what Windows does, so we're probably better off writing our own. A test (on say Arial) would be useful here. Also note that even if you do use the Fc* functions you'll need to check that the pFc* ptrs are non-NULL before calling them. Huw.

2 1

[UPDATE 3] RFC: XEmbed System Tray Patches
by James Liggett 14 Aug '06

14 Aug '06

Attached is the third update to the xembed systray patches. For this version I've simplified the if statements for checking if we should map tray icon windows or not (As per Scott Ritchie's advice--Thanks again Scott.) As always, further comments/suggestions appreciated. Thanks, James Liggett

1 0

[UPDATE 2] RFC: XEmbed System Tray Patches
by James Liggett 14 Aug '06

14 Aug '06

Attached is the second update of the XEmbed systray patches. Changes in this version: 1. On the advice of Juan Lang, I only acquire the wine tsx11 lock when actually making X calls, and not while initializing data. 2. Added the ability to detect if we have an XEmbed systray so that we can selectively determine if we need to map tray windows or not. Under the last version, the icons would not be mapped under any circumstances whatsoever. While it would work if we had an XEmbed-compliant tray to dock with, the icon wouldn't show up at all if there wasn't one. Things work both ways now. But, if you look at the patches, you'll notice that the logic in the if statements is a little ugly. Is there a cleaner way to do this? Thanks, James Liggett

2 3

Re: secur32: make GetComputerObjectNameA use GetComputerObjectNameW (revised)
by Chris Robinson 13 Aug '06

13 Aug '06

On Sunday 13 August 2006 06:45, Robert Reif wrote: > This patch also adds a partial implementation of GetComputerObjectNameW. The GetComputerObjectNameA function appears to be broken. When GetComputerObjectNameW fails due to too little memory in the name buffer, it sets the buffer size as specified by MSDN. However, when GetComputerObjectNameA calls GetComputerObjectNameW and receives an error code, this isn't copied into its nSize parameter.

2 1

Re: reasons for not accepting the patch
by Dan Kegel 13 Aug '06

13 Aug '06

2006/8/12, Vijay Kiran Kamuju <infyquest(a)gmail.com>: > [Why wasn't the patch > http://www.winehq.org/pipermail/wine-patches/2006-July/029145.html > accepted?] I looked at this a couple days ago, and sent this to the patches' author to encourage him to repost it: -- snip --- 1. The patch is missing the filename header, and cannot be applied to the sources by running 'patch'. 2. the patch was posted with the following legal notice: "Notice: The information contained in this e-mail message and/or attachments to it may contain confidential or privileged information. If you are not the intended recipient, any dissemination, use, review, distribution, printing or copying of the information contained in this e-mail message and/or attachments to it are strictly prohibited." That tells us "You may not use this patch." You have to post patches without that. 3. the message did not contain any license information (e.g. Author: Renu Rajput (Tata Inc.) Copyright 2006 Tata Inc License: LGPL. Adding that would help. 4. The message essentially repeated much of the bug report in bugzilla. That's not needed. Just refer to the bug report. Any one of the above four might have been enough to cause the patch to be ignored. Fix them all and you've got a good shot. Two more tips: 5. The bug report in bugzilla does not link to your proposed fix. Often after I post a proposed fix, I add a comment to bugzilla saying something like "Patch sent: http://www.winehq.org/pipermail/wine-patches/2006-July/029145.html" Not only does this give another way for people to stumble across and review your patch, it also helps avoid duplication of effort. I had no idea you had sent in a patch for this bug already! 6. Patches that do not get applied need to be resent after a few days. Every time you resend it, you should try to improve it or the test case a bit, and make sure it still applies against current cvs or git. Use the same subject line as before, but append "(resend)" to the end. Patches are like TCP/IP. There is no ACK when a packet is corrupt, you have to resend after correcting a bit error! --- snip --- Hope that helps. - Dan

2 1

Re: winmm: prevent NULL dereference in MCI_Close
by Eric Pouech 12 Aug '06

12 Aug '06

Jan Zerebecki wrote: >If this patch is rejected from inclusion, please tell me why, as >I would have to ask anyway. > >From: Jan Zerebecki <jan.wine(a)zerebecki.de> > > > Jan, do you have a specific program that depends on this case ?

2 1

Missing subtitle in WWN 307
by Francois Gouget 12 Aug '06

12 Aug '06

Hi, It's not a big issue but I have noticed that in WWN 311 the article about 'Microsoft WGA & Wine' does not have a subject: http://www.winehq.org/?issue=311#Microsoft%20WGA%20&%20Wine Currently it reads: +----------------------------------------+---------+ |Microsoft WGA & Wine | Archive | +----------------------------------------+---------+ That is it is missing the 'subtitle' underneath the gray bar. So it should look something like this: +----------------------------------------+---------+ |Microsoft WGA & Wine | Archive | +----------------------------------------+---------+ WINE & Microsoft WGA Is this an XML parsing bug? -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Before you criticize someone, walk a mile in his shoes. That way, if he gets angry, he'll be a mile away - and barefoot.

1 0

Wide-string Functions: Double Casting
by Andrew Talbot 12 Aug '06

12 Aug '06

Although I accept that my opinion may not be universally shared :-), I believe that it is better to turn -Wcast-qual on permanently and double-cast the appropriate return values of the relevant wide-string functions (strchrW(), strrchrW(), strpbrkW(), memchrW() and memrchrW()) than to leave it normally turned off: that way, the developers can avoid violations as they go, and give the janitors a break ;-). These functions are ubiquitous and widely understood, and they account for the vast majority of cast-qual warnings. Because, as I understand it, we are aiming for C89 compatibility, and to try to maximise portability, I am proposing to use size_t, rather than uintptr_t (which is a C99 type): it seems like the next-best thing. So I would like to submit a patch that, for example, changes strchrW() to: extern inline WCHAR *strrchrW( const WCHAR *str, WCHAR ch ) { WCHAR *ret = NULL; do { if (*str == ch) ret = (WCHAR *)(size_t)str; } while (*str++); return ret; } What do people think? Should I just send in the patch and see what criticism it engenders? Does anyone have a system on which this would fail or generate other warnings in place of the cast-qual one? Needless to say, I hope to be tackling the cast-qual janitorial task, soon; hence, my sudden interest in this. Thanks, -- Andy.

4 9

Re: ddraw fix for incorrect return value from wined3d take 3.
by Roderick Colenbrander 12 Aug '06

12 Aug '06

Hi, One small comment regarding your patch make sure that you use the same indentation as the rest of the ddraw code. The ddraw code seems to use 4 spaces for a tab and I think your editor is configured to use tabs. Regards, Roderick Colenbrander > The new test cases crashes under wine but not under > windows. The fix for test cases crash is to initialize > the vertexbuffer to NULL when unsuccessful. > > This patch should be used rather then previous one. > > thx > Index: dlls/ddraw/direct3d.c =================================================================== RCS file: /home/wine/wine/dlls/ddraw/direct3d.c,v retrieving revision 1.9 diff -u -r1.9 direct3d.c --- dlls/ddraw/direct3d.c 9 Aug 2006 11:04:37 -0000 1.9 +++ dlls/ddraw/direct3d.c 11 Aug 2006 22:47:16 -0000 @@ -992,8 +992,11 @@ { ERR("(%p) IWineD3DDevice::CreateVertexBuffer failed with hr=%08lx\n", This, hr); HeapFree(GetProcessHeap(), 0, object); + *VertexBuffer = NULL; if (hr == WINED3DERR_INVALIDCALL) return DDERR_INVALIDPARAMS; + if (hr == WINED3DERR_OUTOFVIDEOMEMORY) + return D3DERR_TOOMANYVERTICES; else return hr; } -- Der GMX SmartSurfer hilft bis zu 70% Ihrer Onlinekosten zu sparen! Ideal für Modem und ISDN: http://www.gmx.net/de/go/smartsurfer

1 0

Re: wininet: Support http_proxy environment variable
by Augusto Arcoverde da Rocha 12 Aug '06

12 Aug '06

Exists a opened bug report about the problem which this patch is suposed to fix: http://bugs.winehq.org/show_bug.cgi?id=5625 Can someone give some comments for what this pach wasn't applied? Thanks, Augusto Arcoverde da Rocha

5 10

Re: [UPDATE] RFC: XEmbed System Tray Patches
by Juan Lang 11 Aug '06

11 Aug '06

Hi James, thanks for taking this up. I'd like to have nice docked system tray icons, too. Some small nits on your patches: + wine_tsx11_lock(); + /* set XEMBED protocol data on the window */ + info[0] = 0; /* protocol version */ + info[1] = 1; /* mapped = true */ + XChangeProperty( display, data->whole_window, + x11drv_atom(_XEMBED_INFO), + x11drv_atom(_XEMBED_INFO), 32, PropModeReplace, + (unsigned char*)info, 2); + + /* send the docking request message */ + ZeroMemory( &ev, sizeof(ev) ); + ev.xclient.type = ClientMessage; + ev.xclient.window = systray_window; + ev.xclient.message_type = x11drv_atom(_NET_SYSTEM_TRAY_OPCODE); + ev.xclient.format = 32; + ev.xclient.data.l[0] = CurrentTime; + ev.xclient.data.l[1] = SYSTEM_TRAY_REQUEST_DOCK; + ev.xclient.data.l[2] = data->whole_window; + ev.xclient.data.l[3] = 0; + ev.xclient.data.l[4] = 0; + XSendEvent( display, systray_window, False, NoEventMask, &ev ); + wine_tsx11_unlock(); You do more with the lock held than you need to. Initializing info and ev could both be down without holding the lock. diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index b8c8a7c..3b4bd08 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2741,6 +2741,7 @@ struct set_window_pos_reply { struct reply_header __header; unsigned int new_style; + unsigned int ex_style; }; This diff should be against server/protocol.def, not against server_protocol.h. diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index b26e14f..69c32ef 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -400,6 +400,13 @@ static void systray_dock_window( Display ev.xclient.data.l[3] = 0; ev.xclient.data.l[4] = 0; XSendEvent( display, systray_window, False, NoEventMask, &ev ); + + /* This XSync call is needed to properly send the message to the + * systray window and is required to have icon docking work properly. + * Furthermore, an XSync is shown in an example of how to send proper + * docking messages, see the XEmbed system tray spec for more + * information. */ + XSync(display, False); Why not include this in the original patch (0005 in the series?) --Juan __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

3 2

Wine and Photoshop in news
by Vijay Kiran Kamuju 11 Aug '06

11 Aug '06

Check this link out Its about Wine and Photoshop compatibility. http://www.manilastandardtoday.com/?page=business05_aug01_2006 Can we also try to improve the photoshop compatibility with wine. Today will download the demo and try it on wine current git.

4 5

Re: [wintrust.h] Added some missing struct variables
by Paul Vriens 11 Aug '06

11 Aug '06

On Fri, 2006-08-11 at 16:40 +0200, Paul Vriens wrote: > Hi, > > our struct was missing some variables. > > Changelog > Added some missing struct variables > > Cheers, > > Paul > --- > include/wintrust.h | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/include/wintrust.h b/include/wintrust.h > index d490ac9..0230dee 100644 > --- a/include/wintrust.h > +++ b/include/wintrust.h > @@ -254,6 +254,8 @@ typedef struct _CRYPT_PROVIDER_DATA { > HCRYPTMSG hMsg; > DWORD csSigners; > CRYPT_PROVIDER_SGNR *pasSigners; > + DWORD csProvPrivData; > + CRYPT_PROVIDER_PRIVDATA *pasProvPrivData; > DWORD dwSubjectChoice; > union { > struct _PROVDATA_SIP *pPDSip; Hi, please wait with this one. There appears to be some differences in the structure for w2k/winxp (and others?). Cheers, Paul.

1 0

Re: kernel32: redirect GetNativeSystemInfo to GetSystemInfo
by Alexandre Julliard 11 Aug '06

11 Aug '06

Robert Reif <reif(a)earthlink.net> writes: > --- dlls/kernel/kernel32.spec 21 Jun 2006 13:03:23 -0000 1.175 > +++ dlls/kernel/kernel32.spec 11 Aug 2006 01:51:02 -0000 > @@ -546,7 +546,7 @@ > @ stdcall GetNamedPipeHandleStateA(long ptr ptr ptr ptr str long) > @ stdcall GetNamedPipeHandleStateW(long ptr ptr ptr ptr wstr long) > @ stdcall GetNamedPipeInfo(long ptr ptr ptr ptr) > -# @ stub GetNativeSystemInfo > +@ stdcall GetNativeSystemInfo(ptr) GetSystemInfo There's a bit more to it than that, so we probably want to print a FIXME for this one. -- Alexandre Julliard julliard(a)winehq.org

1 0

[wintrust.h] Added some missing struct variables
by Paul Vriens 11 Aug '06

11 Aug '06

Hi, our struct was missing some variables. Changelog Added some missing struct variables Cheers, Paul --- include/wintrust.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/wintrust.h b/include/wintrust.h index d490ac9..0230dee 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -254,6 +254,8 @@ typedef struct _CRYPT_PROVIDER_DATA { HCRYPTMSG hMsg; DWORD csSigners; CRYPT_PROVIDER_SGNR *pasSigners; + DWORD csProvPrivData; + CRYPT_PROVIDER_PRIVDATA *pasProvPrivData; DWORD dwSubjectChoice; union { struct _PROVDATA_SIP *pPDSip; -- 1.4.1.1

1 0

Re: winhelp: fix LZ77 decompressor patch: what's wrong?
by HolyLich 11 Aug '06

11 Aug '06

В сообщении от Friday 11 August 2006 17:17 вы написали: > 2006/8/11, HolyLich <lich(a)math.spbu.ru>: > > I've sent patch several times, but it has not been applied. > > Why not use memmove() instead? > Heh, this problem was discussed before http://www.winehq.org/pipermail/wine-devel/2006-August/050133.html, http://www.winehq.org/pipermail/wine-devel/2006-August/050139.html http://www.winehq.org/pipermail/wine-devel/2006-August/050141.html. memmove cannot be used because it provides other functionality - it doesn't suit LZ77 memcpy cannot be used because it's too clever (copies INTs instead of BYTEs), so doesn't suit LZ77 Solution: while (len--) *dst++=*src++; // The simplies way of memcpy Any more suggestion of bad patch? --HolyLich

2 1

winhelp: fix LZ77 decompressor patch: what's wrong?
by HolyLich 11 Aug '06

11 Aug '06

Hi, I've sent patch several times, but it has not been applied. Patch is reasonable, MIME type is OK. patch -p0 < mbox works ;-) (as recommended at http://winehq.org/site/docs/winedev-guide/style-notes) Please, tell what I must do to this patch to be applied? Thanks a lot -- HolyLich Subject: [RESENDv2] winhelp: fix LZ77 decompressor Date: Thursday 10 August 2006 14:21 From: HolyLich <lich(a)math.spbu.ru> To: wine-patches(a)winehq.org Hi, This patch fixes a bug in LZ77 decompressor which affected only large (>0x1000) compressed embedded files, e.g. images (metafiles). I've never noticed it corrupting small images, but it may. I sent this patch before but messed with MIME. Now it's OK. ChangeLog: winhelp: Fix LZ77 decompressor -------------------------------------------------------

3 2

Rooms for Wineconf - Please act now
by Jeremy White 11 Aug '06

11 Aug '06

Hi Folks, I know that Wineconf is still over a month away, but you'll really regret it if you don't make your accomodation selections now. If you paypal (or even arrange to mail a check) to me *now*, you'll get to hang out with all the cool people, on campus, and learn what the "Drink-making facilities on each corridor" really means, all for the low low price of about 40 pounds (okay, so the exchange rate sucks, and that's $75 US, but still...) If you *don't* get me an room request in the next few days, then I'll have to close down our room reservation, and you'll be stuck in some sleazy motel on the edge of town paying outrageous sums of of money. (Okay, they actually all look like nice places to stay, but they will be a ways away, and they all cost more :-/). Again, see this page for more details: http://www.winehq.org/site/wineconf/travel If you can't do Paypal, I can take a check in US currency as well. Cheers, Jeremy

6 9

Re: wldap32: Write-strings warning fix
by Hans Leidekker 11 Aug '06

11 Aug '06

On Friday 11 August 2006 00:58, Andrew Talbot wrote: > -INT CDECL ber_printf(BerElement*,PCHAR,...); > +INT CDECL ber_printf(BerElement*,LPCSTR,...); This is an API defined by Microsoft, we can't change its prototype. -Hans

2 1

patch feedback?
by Damjan Jovanovic 11 Aug '06

11 Aug '06

Hi I've tried submitting a patch to wine-patches 3 times now in the past 3 weeks, and not only has it not been applied, but I never even got any feedback. Please tell me what I am doing wrong. The latest patch is below. Thank you Damjan --- Damjan Jovanovic <dj015(a)yahoo.com> wrote: > Date: Thu, 3 Aug 2006 23:49:11 -0700 (PDT) > From: Damjan Jovanovic <dj015(a)yahoo.com> > To: wine-patches(a)winehq.org > Subject: setupapi: test+patch for > SetupDiOpenClassRegKeyExW (try 3) > > wine's SetupDiOpenClassRegKeyExW returns FALSE > instead > of INVALID_HANDLE_VALUE in several places, and > doesn't > brace the GUID string like it should. The test > reveals > these problems, and the patch fixes them. > > ChangeLog: > * Fixed returns values, braced GUID string, and > added > a test, for SetupDiOpenClassRegKeyExW. > > Damjan Jovanovic (dj015(a)yahoo.com) > > > a/dlls/setupapi/tests/Makefile.in 2006-07-10 > 18:01:08.000000000 +0200 > +++ b/dlls/setupapi/tests/Makefile.in 2006-08-04 > 16:15:05.000000000 +0200 > @@ -3,7 +3,7 @@ > SRCDIR = @srcdir@ > VPATH = @srcdir@ > TESTDLL = setupapi.dll > -IMPORTS = setupapi kernel32 > +IMPORTS = setupapi kernel32 advapi32 rpcrt4 > > CTESTS = \ > devinst.c \ > --- a/dlls/setupapi/tests/devinst.c 2006-08-03 > 10:07:11.000000000 +0200 > +++ b/dlls/setupapi/tests/devinst.c 2006-08-04 > 17:57:57.000000000 +0200 > @@ -27,6 +27,7 @@ > #include "winuser.h" > #include "winreg.h" > #include "setupapi.h" > +#include "rpc.h" > > #include "wine/test.h" > > @@ -63,7 +64,85 @@ > ok(ret, "SetupDiDestroyDeviceInfoList failed : > %ld\n", error); > } > > +static void test_SetupDiOpenClassRegKeyExW() > +{ > + GUID guid; > + RPC_STATUS rpcStatus; > + HKEY hkey; > + WCHAR *unbracedGuid; > + WCHAR *bracedGuid; > + > + rpcStatus = UuidCreate(&guid); > + if (rpcStatus != RPC_S_OK) > + { > + ok(FALSE, "failed to generate test guid, > error %ld", rpcStatus); > + return; > + } > + > + /* Check return value for non-existant key */ > + hkey = SetupDiOpenClassRegKeyExW(&guid, > KEY_ALL_ACCESS, > + DIOCR_INSTALLER, NULL, NULL); > + ok(hkey == INVALID_HANDLE_VALUE, > + "invalid return value %p from > SetupDiOpenClassRegKeyExW " > + "for non-existant key, expected %p\n", > hkey, INVALID_HANDLE_VALUE); > + > + rpcStatus = UuidToStringW(&guid, > &unbracedGuid); > + if (rpcStatus != RPC_S_OK) > + { > + ok(FALSE, "failed to get string form of > guid, error %ld", rpcStatus); > + return; > + } > + > + bracedGuid = HeapAlloc(GetProcessHeap(), 0, > + (lstrlenW(unbracedGuid) + 3) * > sizeof(WCHAR)); > + if (bracedGuid != NULL) > + { > + HKEY classesKey; > + > + bracedGuid[0] = (WCHAR) '{'; > + memcpy(&bracedGuid[1], unbracedGuid, > + lstrlenW(unbracedGuid) * > sizeof(WCHAR)); > + bracedGuid[1 + lstrlenW(unbracedGuid)] = > (WCHAR) '}'; > + bracedGuid[1 + lstrlenW(unbracedGuid) + 1] > = (WCHAR) 0; > + > + SetLastError(0xdeadbeef); > + classesKey = > SetupDiOpenClassRegKeyExW(NULL, KEY_ALL_ACCESS, > + DIOCR_INSTALLER, NULL, NULL); > + ok(classesKey != INVALID_HANDLE_VALUE, > + "failed to open the device classes > registry key: error %ld\n", > + GetLastError()); > + if (classesKey != INVALID_HANDLE_VALUE) > + { > + DWORD ret; > + HKEY classKey; > + ret = RegCreateKeyW(classesKey, > bracedGuid, &classKey); > + if (ret == ERROR_SUCCESS) > + { > + RegCloseKey(classKey); > + SetLastError(0xdeadbeef); > + classKey = > SetupDiOpenClassRegKeyExW(&guid, KEY_ALL_ACCESS, > + DIOCR_INSTALLER, NULL, NULL); > + /* wine does incorrectly return > FALSE, so ... */ > + ok(classKey != FALSE && classKey != > INVALID_HANDLE_VALUE, > + "failed opening class key, > error %ld\n", GetLastError()); > + RegCloseKey(classKey); > + RegDeleteKeyW(classesKey, > bracedGuid); > + } > + else > + ok(FALSE, "failed creating device > key: error %ld\n", ret); > + RegCloseKey(classesKey); > + } > + > + HeapFree(GetProcessHeap(), 0, bracedGuid); > + } > + else > + ok(FALSE, "failed to allocate memory for > braced guid\n"); > + > + RpcStringFreeW(&unbracedGuid); > +} > + > START_TEST(devinst) > { > test_SetupDiCreateDeviceInfoListEx(); > + test_SetupDiOpenClassRegKeyExW(); > } > --- a/dlls/setupapi/devinst.c 2006-08-03 > 10:07:11.000000000 +0200 > +++ b/dlls/setupapi/devinst.c 2006-08-04 > 18:10:06.000000000 +0200 > @@ -1393,6 +1393,7 @@ > PVOID Reserved) > { > LPWSTR lpGuidString; > + LPWSTR lpBracedGuidString; > HKEY hClassesKey; > HKEY hClassKey; > LPCWSTR lpKeyName; > @@ -1433,21 +1434,37 @@ > if (UuidToStringW((UUID*)ClassGuid, > &lpGuidString) != RPC_S_OK) > { > RegCloseKey(hClassesKey); > - return FALSE; > + return INVALID_HANDLE_VALUE; > + } > + > + lpBracedGuidString = > HeapAlloc(GetProcessHeap(), 0, > + (strlenW(lpGuidString) + 3) * > sizeof(WCHAR)); > + if (lpBracedGuidString == NULL) > + { > + RpcStringFreeW(&lpGuidString); > + RegCloseKey(hClassesKey); > + return INVALID_HANDLE_VALUE; > } > + lpBracedGuidString[0] = (WCHAR) '{'; > + memcpy(&lpBracedGuidString[1], lpGuidString, > + strlenW(lpGuidString) * sizeof(WCHAR)); > + lpBracedGuidString[1 + strlenW(lpGuidString)] = > (WCHAR) '}'; > + lpBracedGuidString[1 + strlenW(lpGuidString) + > 1] = (WCHAR) 0; > + > + RpcStringFreeW(&lpGuidString); > > if (RegOpenKeyExW(hClassesKey, > - lpGuidString, > + lpBracedGuidString, > 0, > KEY_ALL_ACCESS, > &hClassKey)) > { > - RpcStringFreeW(&lpGuidString); > + HeapFree(GetProcessHeap(), 0, lpBracedGuidString); > RegCloseKey(hClassesKey); > - return FALSE; > + return INVALID_HANDLE_VALUE; > } > > - RpcStringFreeW(&lpGuidString); > + HeapFree(GetProcessHeap(), 0, > lpBracedGuidString); > RegCloseKey(hClassesKey); > > return hClassKey; > > > __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com --- a/dlls/setupapi/tests/Makefile.in 2006-07-10 18:01:08.000000000 +0200 +++ b/dlls/setupapi/tests/Makefile.in 2006-08-04 16:15:05.000000000 +0200 @@ -3,7 +3,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = setupapi.dll -IMPORTS = setupapi kernel32 +IMPORTS = setupapi kernel32 advapi32 rpcrt4 CTESTS = \ devinst.c \ --- a/dlls/setupapi/tests/devinst.c 2006-08-03 10:07:11.000000000 +0200 +++ b/dlls/setupapi/tests/devinst.c 2006-08-04 17:57:57.000000000 +0200 @@ -27,6 +27,7 @@ #include "winuser.h" #include "winreg.h" #include "setupapi.h" +#include "rpc.h" #include "wine/test.h" @@ -63,7 +64,85 @@ ok(ret, "SetupDiDestroyDeviceInfoList failed : %ld\n", error); } +static void test_SetupDiOpenClassRegKeyExW() +{ + GUID guid; + RPC_STATUS rpcStatus; + HKEY hkey; + WCHAR *unbracedGuid; + WCHAR *bracedGuid; + + rpcStatus = UuidCreate(&guid); + if (rpcStatus != RPC_S_OK) + { + ok(FALSE, "failed to generate test guid, error %ld", rpcStatus); + return; + } + + /* Check return value for non-existant key */ + hkey = SetupDiOpenClassRegKeyExW(&guid, KEY_ALL_ACCESS, + DIOCR_INSTALLER, NULL, NULL); + ok(hkey == INVALID_HANDLE_VALUE, + "invalid return value %p from SetupDiOpenClassRegKeyExW " + "for non-existant key, expected %p\n", hkey, INVALID_HANDLE_VALUE); + + rpcStatus = UuidToStringW(&guid, &unbracedGuid); + if (rpcStatus != RPC_S_OK) + { + ok(FALSE, "failed to get string form of guid, error %ld", rpcStatus); + return; + } + + bracedGuid = HeapAlloc(GetProcessHeap(), 0, + (lstrlenW(unbracedGuid) + 3) * sizeof(WCHAR)); + if (bracedGuid != NULL) + { + HKEY classesKey; + + bracedGuid[0] = (WCHAR) '{'; + memcpy(&bracedGuid[1], unbracedGuid, + lstrlenW(unbracedGuid) * sizeof(WCHAR)); + bracedGuid[1 + lstrlenW(unbracedGuid)] = (WCHAR) '}'; + bracedGuid[1 + lstrlenW(unbracedGuid) + 1] = (WCHAR) 0; + + SetLastError(0xdeadbeef); + classesKey = SetupDiOpenClassRegKeyExW(NULL, KEY_ALL_ACCESS, + DIOCR_INSTALLER, NULL, NULL); + ok(classesKey != INVALID_HANDLE_VALUE, + "failed to open the device classes registry key: error %ld\n", + GetLastError()); + if (classesKey != INVALID_HANDLE_VALUE) + { + DWORD ret; + HKEY classKey; + ret = RegCreateKeyW(classesKey, bracedGuid, &classKey); + if (ret == ERROR_SUCCESS) + { + RegCloseKey(classKey); + SetLastError(0xdeadbeef); + classKey = SetupDiOpenClassRegKeyExW(&guid, KEY_ALL_ACCESS, + DIOCR_INSTALLER, NULL, NULL); + /* wine does incorrectly return FALSE, so ... */ + ok(classKey != FALSE && classKey != INVALID_HANDLE_VALUE, + "failed opening class key, error %ld\n", GetLastError()); + RegCloseKey(classKey); + RegDeleteKeyW(classesKey, bracedGuid); + } + else + ok(FALSE, "failed creating device key: error %ld\n", ret); + RegCloseKey(classesKey); + } + + HeapFree(GetProcessHeap(), 0, bracedGuid); + } + else + ok(FALSE, "failed to allocate memory for braced guid\n"); + + RpcStringFreeW(&unbracedGuid); +} + START_TEST(devinst) { test_SetupDiCreateDeviceInfoListEx(); + test_SetupDiOpenClassRegKeyExW(); } --- a/dlls/setupapi/devinst.c 2006-08-03 10:07:11.000000000 +0200 +++ b/dlls/setupapi/devinst.c 2006-08-04 18:10:06.000000000 +0200 @@ -1393,6 +1393,7 @@ PVOID Reserved) { LPWSTR lpGuidString; + LPWSTR lpBracedGuidString; HKEY hClassesKey; HKEY hClassKey; LPCWSTR lpKeyName; @@ -1433,21 +1434,37 @@ if (UuidToStringW((UUID*)ClassGuid, &lpGuidString) != RPC_S_OK) { RegCloseKey(hClassesKey); - return FALSE; + return INVALID_HANDLE_VALUE; + } + + lpBracedGuidString = HeapAlloc(GetProcessHeap(), 0, + (strlenW(lpGuidString) + 3) * sizeof(WCHAR)); + if (lpBracedGuidString == NULL) + { + RpcStringFreeW(&lpGuidString); + RegCloseKey(hClassesKey); + return INVALID_HANDLE_VALUE; } + lpBracedGuidString[0] = (WCHAR) '{'; + memcpy(&lpBracedGuidString[1], lpGuidString, + strlenW(lpGuidString) * sizeof(WCHAR)); + lpBracedGuidString[1 + strlenW(lpGuidString)] = (WCHAR) '}'; + lpBracedGuidString[1 + strlenW(lpGuidString) + 1] = (WCHAR) 0; + + RpcStringFreeW(&lpGuidString); if (RegOpenKeyExW(hClassesKey, - lpGuidString, + lpBracedGuidString, 0, KEY_ALL_ACCESS, &hClassKey)) { - RpcStringFreeW(&lpGuidString); + HeapFree(GetProcessHeap(), 0, lpBracedGuidString); RegCloseKey(hClassesKey); - return FALSE; + return INVALID_HANDLE_VALUE; } - RpcStringFreeW(&lpGuidString); + HeapFree(GetProcessHeap(), 0, lpBracedGuidString); RegCloseKey(hClassesKey); return hClassKey;

2 1

Re: segfaults with last selection repaint patch in riched20
by Phil Krylov 11 Aug '06

11 Aug '06

Hi Krzysztof, On 11/08/06, Krzysztof Foltman <wdev(a)foltman.com> wrote: > What are the circumstances? Is it after some delete/insert operation, or > just after document load? Well I have not traced the whole sequence of calls to richedit, but from the display I can suppose the following. I am doing a search operation on some files. When the app finds a match, it fills the richedit with some text including the match, and changes the match's color (supposedly selects the match and calls setcharformat). It works OK. After that I push "Find next" button. After finding another match the app updates richedit text with the new context of the match and (not changed the match's color yet) segfaults. > I'd do an assert(pLastSelStartPara->member.para.nCharOfs <= > pLastSelEndPara->member.para.nCharOfs) or something. That could possibly > shed some light on the issue. When it crashes and falls out to GDB, nCharOfs of the first para is 10, and nCharOfs of the last para is 3. > This git thing is a piece of unreliable unintuitive crap. For sure CVS was simpler, but GIT also has some advantages... I haven't had any problems requiring to git-clone yet, but I still have to hold the GitWine wiki page open in my browser ;) -- Ph.

1 0

segfaults with last selection repaint patch in riched20
by Phil Krylov 11 Aug '06

11 Aug '06

Hi Krzysztof, I was getting a segfault in ME_MarkForPainting() after that patch (BTW great work), and started looking through the code. One thing I found was obviously a typo which can be easily fixed (BTW I don't know for sure but I'd also update pLastSelStartPara and pLastSelEndPara here): --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -529,7 +529,7 @@ ME_InvalidateSelection(ME_TextEditor *ed /* last selection markers aren't always updated, which means they can point past the end of the document */ if (editor->nLastSelStart > len) - editor->nLastSelEnd = len; + editor->nLastSelStart = len; if (editor->nLastSelEnd > len) editor->nLastSelEnd = len; But it did not resolve my problem. I did not have time to find the real reason for the segfault, but here is a quick hack which made the segfault go away and can probably help you in finding the real reason. Sorry, but I can't officially provide you with the failing application (IBM Translation Manager 6.0.9) which is proprietary and only for IBM internal usage. --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -94,7 +94,7 @@ void ME_MarkForWrapping(ME_TextEditor *e void ME_MarkForPainting(ME_TextEditor *editor, ME_DisplayItem *first, ME_DisplayItem *last) { - while(first != last) + while(first && first != last) { first->member.para.nFlags |= MEPF_REPAINT; first = first->member.para.next_para; The backtrace of the segfault was: 1 0x7d948cc0 ME_MarkForPainting+0x10(editor=0x11700f8, first=0x11741d8, last=0x1173ac8) [/home/phil/build/wine-git/dlls/riched20/para.c:99] in riched20 (0x7d948cc0) 2 0x7d948816 ME_InvalidateSelection+0x186(editor=0x11700f8) [/home/phil/build/wine-git/dlls/riched20/paint.c:542] in riched20 (0x7d948816) 3 0x7d9442e9 RichEditANSIWndProc+0x22d9(hWnd=0x100b4, msg=0xb1, wParam=0xe, lParam=0x117) [/home/phil/build/wine-git/dlls/riched20/editor.c:1579] in riched20 (0x7d9442e9) 4 0x7d9466aa RichEdit10ANSIWndProc+0x3a(hWnd=0x100b4, msg=0xb1, wParam=0xe, lParam=0x117) [/home/phil/build/wine-git/dlls/riched20/editor.c:2598] in riched20 (0x7d9466aa) ... -- Ph.

2 1

[UPDATE] RFC: XEmbed System Tray Patches
by James Liggett 10 Aug '06

10 Aug '06

Attached is a major update to the XEmbed systray patches that I sent earlier this week. After a few days of tweaking and testing the code, I think I have found the solution to the race conditions that have plagued previous versions of this work. While this is a major step forward, I still need some assistance with some issues with these patches: 1. I need people to test this on any window manager they can to see if the results that I get can be reproduced, especially on older GNOME versions (I tested on GNOME 2.14) I was able to run a small test app that I made over 120 times, and each time it docked perfectly, no zombie systray adapter windows like before. 2. In order to accomplish this reliability, I've had to ensure that systray windows are *never* mapped. According to the XEmbed specs and my testing, we can't map systray windows ourselves--the tray has to do it, or we get the race conditions. However, my current solution isn't entirely correct. The problem is that systray windows aren't mapped under *any* circumstances. While this allows the docking to work properly, the icons don't show up at all if there's no tray to dock with. I've been contemplating some solutions to the problem but I'm not sure what the correct way to go about this is. My current idea is to add a function to winex11.drv that checks to see if we have a systray window. If the function finds one, then we don't map tray windows. If it doesn't return one, then we map them. Would adding a function like that to x11drv be a good idea? Any comments/suggestions/test results highly appreciated. If you'd like to test these, apply them in the order that they're numbered (should go from 0001 to 0010.) Thanks again, James Liggett

1 0

A advapi32 patch to Implement GetCurrentHwProfileA() fully I found
by Scott Ritchie 10 Aug '06

10 Aug '06

It looks like this patch didn't get into 0.9.19, so I think someone else needs to take ownership of it and figure out what Alexandre wants until it can get in. I'm looking forward to full tilt poker working :) Any volunteers? Thanks, Scott Ritchie ----- Thanks to the AppDB and a little digging, I was able to discover this patch from a long while ago that never got properly forwarded to wine-patches. See here: http://www.winehq.org/pipermail/wine-devel/2006-February/045115.html Apparently, it makes the Full Tilt Poker client work, which is currently broken (see http://appdb.winehq.org/appview.php?iVersionId=2839) Since this patch apparently got lost by the wayside after it showed up on wine-devel, I'm doing the last step for him and sending it on to wine-patches. If this patch does get rejected, I won't be able to fix it, so please post a message on wine-devel so someone else can do it. It would be a shame for this implementation to stay dead for another year. If implemented, this should also close bug 4468: http://bugs.winehq.org/show_bug.cgi?id=4468 Thanks, Scott Ritchie

1 0

Re: wine-ShowCursor-D3D-over-GDI.patch
by Stefan Dösinger 10 Aug '06

10 Aug '06

Am Samstag 29 Juli 2006 11:17 schrieb Andrew Riedi: > Well, here is my first patch, feel free to tell me what all is wrong with > it. I noticed a problem in WoW d3d, so I tracked it down and checked out > msdn. It seems that implementing ShowCursor() over GDI is acceptable, at > least according to msdn, and it seems to work great. Anyhow, this patch > fixes the two mouse cursor problem in WoW, and makes wined3d more > compatible with windows, at least msdn. Here goes nothing. I wrote a little testing app, and unfortunately this is not correct. IDirect3DDevice9::ShowCursor has no effect on the gdi cursor. Part one of that tests are in the minor cursor fix I sent yesterday. The cursor visiblity reported by GetCursorInfo does not change with d3d9device::ShowCursor. The real visibility on the screen does not change either, after ShowCursor(FALSE) the gdi cursor is still visible on windows. The other parts are in my not-yet sent visual test case suite, I didn't send it yet because it needs more work on GetFrontBufferData. What I noticed is that the gdi cursor immediately disappears when SetCursorProperties is called - but GetCursorInfo still returns that it is showed, and the cursor handle is the same :-/ There are some other things which hide the cursor which I didn't find yet. A number of old ddraw games have cursor issues too

1 0

Something wrong with this patch ?
by Stefan Siebert 10 Aug '06

10 Aug '06

I assume there's something wrong with my patch ? I've did some research lately on how 32 Bit programs interact with 16Bit windows. This patch doesn't help if a SendMessage was sent from a 32Bit application because it gets dispatched from the 16Bit thread. So NtCurrentTeb doesn't work. At least it fixes uncaught WM_USER messages in the current process. >user - EditWndProc_common - Ignore WM_USER messages which are not sent >from a vdm >Hello, >this patch fixes a Notes Client crash when building the server console >tab (administration client). After creating a text control for console >commands it sends uncaught WM_USER messages which get interpreted by >Wine as 16Bit messages and crashes badly due to NULL pointers. >Changelog: user/edit.c - EditWndProc_common - Ignore WM_USER messages >which are not sent from a vdm --- Stefan Siebert diff --git a/dlls/user/edit.c b/dlls/user/edit.c old mode 100644 new mode 100755 index c4f95e4..fd74183 --- a/dlls/user/edit.c +++ b/dlls/user/edit.c @@ -439,6 +439,10 @@ static LRESULT WINAPI EditWndProc_common LRESULT result = 0; TRACE("hwnd=%p msg=%x (%s) wparam=%x lparam=%lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), wParam, lParam); + + /* Ignore WM_USER messages which are not sent from a vdm */ + if ((msg >= WM_USER) && (!NtCurrentTeb()->Tib.SubSystemTib)) + return 0; if (!es && msg != WM_NCCREATE) return DefWindowProcT(hwnd, msg, wParam, lParam, unicode);

1 0

static inline wine_get_fs etc
by Tijl Coosemans 10 Aug '06

10 Aug '06

I'm looking at include/wine/library.h and was wondering why the wine_get_fs/gs/... are declared extern and not static like many other functions in that file. Is there any particular reason I'm not seeing? Their __asm__ block is also missing __volatile__ I believe.

3 2

Wine is stripping comments from system register
by Augusto Arcoverde da Rocha 09 Aug '06

09 Aug '06

Hi all, I'm tring store some marks as comments inside of system register, but when I start some wine process and it finish the comments have disappeared from the register file. Is this the expected behaviour? Many thanks, Augusto Arcoverde da Rocha

2 1

localspl.dll: Implementation-Question
by Detlef Riekenberg 09 Aug '06

09 Aug '06

Am Sonntag, den 30.07.2006, 21:41 +0200 schrieb Detlef Riekenberg: > Printmonitors need spoolss.dll,EnumPortsW > > On windows, all work is done in spoolss.dll and winspool.drv is just the > Forwarder (RPC). > We avoid the need for loading spoolss.dll in every App by > doing the work in winspool.drv and use spoolss.dll as relay. > > > Changelog: > - spoolss: add EnumPortsW (by calling winspool.drv) > The Codebase in "dlls/winspool.drv/info.c" get really large and the actual Code-Path is: "winspool.drv -> CUPS/LPR" (with help from GDI). A possible place to split the Code is at the Printmonitor-Level. The Printmonitor for the Standard "Local Ports" in Windows (COM*:, LPT*:, FILE:, Windows-File) was in "localmon.dll" and merged into "localspl.dll" with w2k. On IRC, Alexandre already accepted to handle Wine-Specific Ports ( CUPS:*, LPR:*, Pipe to a unix_app, /unix-File ) together with the Standard Window-Ports in a single Printmonitor: "localspl.dll" The Requirement, that updating the System-Printers in wine must work automatic, need some Attention, when the related code (LoadSystemPrinters) move from "winspool.drv" to "localspl.dll": 1) Changing the Code-Path to "winspool.drv -> localspl.dll -> CUPS/LPR" and using the same Memory-Functions for "localspl.dll" as done in Windows (the Memory-Related Exports from "spoolss.dll"), give us a circular dependency, when we load and call "winspool.drv" from "spoolss.dll". For this reason, using HeapAlloc(GetProcessHeap(), ...) and Friends from "kernel32.dll" is a Possible way to go for "localspl.dll". 2) To let Printing in Wine work as similar as possible as Printing is done in Windows, (but without RPC and without the Spooler-Service) we can change the Code-Path to "winspool.drv -> spoolss.dll -> localspl.dll -> CUPS/LPR" and use the Exports from "spoolss.dll". Since we need the Memory-Exports from "spoolss.dll" also for other Printmonitors and many Names/Prototypes of the other "spoolss.dll" - Exports are Equal to the Functions in "winspool.drv", I prefer Solution "2". (Wine as an EMF-Printing-Backend for samba is only Possible with 2) As a Reference, what windows does, is: winspool.drv --(RPC)--> spoolsv.exe(Spooler Service) --(WINAPI)--> spoolss.dll -> localspl.dll -> Driver for LPT*: / COM*: Any comments please. Thanks -- By By ... ... Detlef

1 0

Re: This patch should fix bug 4863 - Icons in Notes Workspace
by Augusto Arcoverde da Rocha 09 Aug '06

09 Aug '06

Hi all, A little time ago I have sent this patch and now I'm asking to the Wine devel community about the correctness of that code. May be a fix for "Icons in Notes" bug would be incorporated in the next Wine release with some peer-review efforts. Regards, Augusto Arcoverde da Rocha On 7/21/06, Augusto Arcoverde da Rocha <agarobr.listas(a)gmail.com> wrote: > Description: > This patch should fix bug 4863 - Icons in Notes Workspace. > > ChangeLog: > Making SetDIBits function compliant with MSDN documentation by > ignoring the device context parameter if DIB parameter is informed as > having a palette (DIB_PAL_COLORS). > > References: > http://msdn.microsoft.com/library/default.asp?url=/library/en-us/gdi/bitmap… > > Author: > Augusto Arcoverde da Rocha <agarobr\at\yahoo.com.br> > > Notes: > Since I wasn't successful learning more about internal representation > of DIB structure, I couldn't make the apropriated test units for this > fix, sorry. > > >

4 4

Re: version/tests: Write-strings warnings fix
by James Hawkins 09 Aug '06

09 Aug '06

On 8/9/06, Andrew Talbot <Andrew.Talbot(a)talbotville.com> wrote: > Please note: in install.c, I have preserved a distinction between "regedit" > and "regedit.exe" that was in the original code. If this distinction is > accidental, please inform me, via wine-devel, and I shall send a revised > version of this patch. > ... > > @@ -34,6 +34,9 @@ > char filename[MAX_PATH]; > char outBuf[MAX_PATH]; > char windir[MAX_PATH]; > + static CHAR empty[] = "", > + regedit_a[] = "regedit", > + regedit_b[] = "regedit.exe"; > > memset(appdir, 0, MAX_PATH); > memset(windir, 0, MAX_PATH); > Seems like regedit and regedit_exe might be better names than regedit_a/b. -- James Hawkins

2 1

Re: WineD3D: draw buffers support (patch 2)
by Roderick Colenbrander 09 Aug '06

09 Aug '06

This is a slighly updated version of the patch. The code is the same but I changed the comment a little as suggested by Henri as the part about SM3 was wrong. Roderick > Hi, > > This is a second draw buffers / gl_FragColor patch and it depends on the > other patch which was sent earlier today. The previous patch added draw > buffers support and fixed a gl_FragData bug. This patch fixes another case > where we incorrectly use gl_FragData. > > Regards, > Roderick Colenbrander -- Der GMX SmartSurfer hilft bis zu 70% Ihrer Onlinekosten zu sparen! Ideal für Modem und ISDN: http://www.gmx.net/de/go/smartsurfer

1 0

wine
by XIAOJING XIN 09 Aug '06

09 Aug '06

hi how are you? i am one of wine users , it is a very amazing software i like it very much , and i have a problem here , does wine support other language? i use it to run one of foreign software which is Chinese, but , the wine software can not display the language, so what can i do now , does it only support English software? regard thank you very much

5 6

[FreeBSD] locating wine at 0x20000000
by Tijl Coosemans 09 Aug '06

09 Aug '06

Hello all, For the past week or so I've been getting to know Wine and trying to improve/fix the FreeBSD version. I've progressed somewhat since then, though there are still quite a few open issues. One of the problems on FreeBSD is that Wine is loaded at 0x7bf00000. FreeBSD's mmap preserves some space for the data segment (about 512Mb by default) and every future call to mmap with NULL for the addr argument maps memory after that. This is the reason that win98 mode doesn't work, since the shared heap at 0x80000000 isn't available and everything that gets dlopen'ed for instance is located beyond the 2G limit which some programs may not like. So I was thinking of moving Wine to 0x20000000. That would be the easiest solution by far, but, are there any potential problems with that?

2 7

Re: [2/2] WINED3D: Fix D3DCOLOR swizzling in shaders.
by Christoph Frick 09 Aug '06

09 Aug '06

On Sat, Aug 05, 2006 at 06:15:42PM +0200, H. Verbeet wrote: > This patch fixes those issues by looking at the data types in the > vertex declaration the shader will be used with. To be able to do > that, we have to wait with compiling the shader until the shader is > first used and we have a vertex declaration. I am not sure, if exactly *this* patch fixes the problem - but i assume so: the colors of the cars and lights in Live For Speed are not fixed also. thanks for that! -- cu

1 0

Re: wineconsole: command line option output / default user backend
by Alexandre Julliard 09 Aug '06

09 Aug '06

Ekkehard Morgenstern <ekkehard.morgenstern(a)onlinehome.de> writes: > This small patch provides command line option output, a "--help" option > and a default user backend ("--backend=user" is default) to "wineconsole". Your mailer wrapped the patch, please resend it. Also please send separate changes as separate patches, and try to follow the coding conventions of the surrounding code. -- Alexandre Julliard julliard(a)winehq.org

6 14

widl: Error on simple idl file
by Elrond 09 Aug '06

09 Aug '06

Hi, The attached idl file gives an error when used with widl -DUSE_TYPEDEF simple.idl I doubt, that it is a syntax error, since adding "-h" creates the header, using "-c" gives the error. The error is: error: Unsupported member type 0x0 Elrond

1 0

Re: ntdll: make shared user data access work
by Alexandre Julliard 09 Aug '06

09 Aug '06

Robert Reif <reif(a)earthlink.net> writes: > diff -p -u -r1.66 thread.c > --- dlls/ntdll/thread.c 26 Jul 2006 14:01:20 -0000 1.66 > +++ dlls/ntdll/thread.c 6 Aug 2006 01:15:43 -0000 > @@ -215,7 +215,7 @@ HANDLE thread_init(void) > > addr = (void *)0x7ffe0000; > size = 0x10000; > - NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 0, &size, MEM_RESERVE, PAGE_READONLY ); > + NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 0, &size, MEM_RESERVE | MEM_COMMIT, PAGE_READONLY); This code is only intended to reserve the space at startup. We need to initialize it properly later on before making it accessible. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: wineconsole: command line option output / configurable default backend
by Alexandre Julliard 09 Aug '06

09 Aug '06

Ekkehard Morgenstern <ekkehard.morgenstern(a)onlinehome.de> writes: > This patch is akin to the previously posted; however, instead of making > the user backend > the default, I read an environment variable WINECONBACKEND to determine > the default. I don't think that's an improvement, please let's not add more obscure environment variables. You should try to use the user backend when the X display is available and fall back to curses otherwise. -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: oleaut32: Add tmarshal conformance test
by Alexandre Julliard 09 Aug '06

09 Aug '06

Dan Hipschman <dsh(a)linux.ucla.edu> writes: > This adds a conformance test written by Rob Shearman. Pretty much all the > code in the four files beginning with "tmarshal" is his. All I did was make > some changes to the Makefiles to be able to test things with IDL components, > and I tweaked his stuff in one or two places where needed. For example, I > wrapped the tests that failed in todo_wine blocks, and I commented out a test > that crashes Wine. All the tests pass on Windows (including the one that > crashes Wine). They don't work on Wine here: ../../../tools/runtest -q -P wine -M oleaut32.dll -T ../../.. -p oleaut32_test.exe.so tmarshal.c && touch tmarshal.ok fixme:ole:ITypeInfo_fnRelease destroy child objects err:ole:marshal_object couldn't get IPSFactory buffer for interface {a028db05-30f0-4b93-b17a-41c72f831d84} err:ole:StdMarshalImpl_MarshalInterface Failed to create ifstub, hres=0x80040155 err:ole:CoMarshalInterface Failed to marshal the interface {a028db05-30f0-4b93-b17a-41c72f831d84}, 80040155 tmarshal.c:139: Test failed: CoMarshalInterface failed with error 0x80040155 err:ole:CoUnmarshalInterface IMarshal::UnmarshalInterface failed, 0x8003001e tmarshal.c:760: Test failed: CoUnmarshalInterface failed with error 0x8003001e wine: Unhandled page fault on write access to 0x00000000 at address 0x15a159 (thread 0009), starting debugger... WineDbg starting on pid 0x8 Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x0015a159). Register dump: CS:0073 SS:007b DS:007b ES:007b FS:003b GS:0033 EIP:0015a159 ESP:0033fc88 EBP:0033fd58 EFLAGS:00010246( - 00 -RIZP1) EAX:00159310 EBX:7b8abaa8 ECX:00000000 EDX:00000001 ESI:8003001e EDI:60412be7 Stack dump: 0x0033fc88: 00159310 7b88c87f 00159310 00000001 0x0033fc98: 0015a500 0015a158 00159310 0033ff2c 0x0033fca8: 7b82be98 7b8415c0 7b8abaa8 8003001e 0x0033fcb8: 60412be7 0033fd58 0033fc90 7b88c805 0x0033fcc8: 00000001 00000000 00000000 00000020 0x0033fcd8: 0033fd58 7bc2764f 00110000 7bc77848 fixme:ntdll:RtlNtStatusToDosErrorNoTeb no mapping for c0000119 Backtrace: =>1 0x0015a159 (0x0015a159) fixme:dbghelp:elf_load_debug_info_from_map Alpha-support for Dwarf2 information for oleaut32_test<elf> 2 0x603092f7 func_tmarshal+0x2f7 [/home/julliard/wine/wine/dlls/oleaut32/tests/tmarshal.c:763] in oleaut32_test (0x603092f7) 3 0x6040ee81 run_test+0x121(name=0x1103a9) [/home/julliard/wine/wine/dlls/oleaut32/tests/../../../include/wine/test.h:365] in oleaut32_test (0x6040ee81) 4 0x6040f1a9 __wine_spec_exe_entry+0x99(peb=0x7ffdf000) [/home/julliard/wine/wine/dlls/winecrt0/exe_entry.c:37] in oleaut32_test (0x6040f1a9) fixme:dbghelp:elf_load_debug_info_from_map Alpha-support for Dwarf2 information for kernel32<elf> 5 0x7b87015b start_process+0xeb(arg=0x0) [/home/julliard/wine/wine/dlls/kernel/process.c:822] in kernel32 (0x7b87015b) fixme:dbghelp:elf_load_debug_info_from_map Alpha-support for Dwarf2 information for libwine.so.1 6 0x6001f887 wine_switch_to_stack+0x17 in libwine.so.1 (0x6001f887) 0x0015a159: addb %dl,0x0(%ecx) Wine-dbg> -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: wineconsole: command line option output / configurable default backend
by Vitaliy Margolen 09 Aug '06

09 Aug '06

Wednesday, August 9, 2006, 2:33:17 AM, Ekkehard Morgenstern wrote: > This patch is akin to the previously posted; however, instead of making > the user backend > the default, I read an environment variable WINECONBACKEND to determine > the default. > If the value isn't set, "curses" will be the default as in the original > code. You patch wrapped again. Please attach it to the e-mail instead. Vitaliy.

2 1

Re: riched20: new selection invalidation logic
by Vitaliy Margolen 09 Aug '06

09 Aug '06

Monday, August 7, 2006, 9:27:16 AM, Krzysztof Foltman wrote: > ChangeLog: > * New, clean, simple selection repaint logic - should fix all > outstanding refresh issues (and bug#5882) > Krzysztof I think this patch takes number of asserts per line to the highest level I've ever seen. Could you explain why you adding asserts everywhere (only 11 in this patch alone!!!)? Instead of using proper error handling? For the past year or more that was the main source of user problems. And if you could how many installers have been broken with this technique, you will probably account for 90% of all the installers that otherwise would work on Wine. Have you even tried your code on purposely broken rtf? How does it handle it? Vitaliy Margolen

3 6

Re: msvcrt: In text mode a ctrl-z signals EOF
by Duane Clark 08 Aug '06

08 Aug '06

Duane Clark wrote: > Changelog: In text mode a ctrl-z signals EOF > Spotted by David Hagood with test suggested by Dan Kegel > Howdy David. Any chance you could try out this patch? I added a conformance test, as suggested by Dan, and it looks like any data after a ctrl-z is stripped. Of course, it may be that in the real world there will never be anything other than additional ctrl-z characters, in which case your version would be fine (and more efficient). http://www.winehq.org/pipermail/wine-patches/2006-August/029544.html

1 0

Re: libs/wine/config.c: use execve on FreeBSD
by Alexandre Julliard 08 Aug '06

08 Aug '06

Tijl Coosemans <tijl(a)ulyssis.org> writes: > * use execve on FreeBSD Renaming the msvcrt function would really be better. Particularly since "extern char **environ" doesn't work right on all platforms. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: usp10: Resend - Add funtionality for ScriptStringAnalyse
by Alexandre Julliard 08 Aug '06

08 Aug '06

Jeff L <lats(a)yless4u.com.au> writes: > + cMaxItems = 255; /* Pick an abritary size for buffers */ > + analysis = (string_analysis*) pssa; > + if (!*pssa) { /* Clean it out and start again */ > + prtssa(*pssa); > + ScriptStringFree((SCRIPT_STRING_ANALYSIS*)analysis); > + } > + analysis = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, > + sizeof(string_analysis)); > + *pssa = (string_analysis*)analysis; I don't follow what you are trying to do here. Why do you print and free a NULL structure? And why do you assign it to analysis and then overwrite it right away with a new allocation? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: winhelp: bug fix in LZ77 decompressor - prehistory to make things clear
by HolyLich 08 Aug '06

08 Aug '06

>> >> Why? >> >> Er, if the memcpy worked (or almost worked) and failed due to overlap >> problems, then memmove will do the trick. Did it ever work at all before? >> Either this code never worked, or you're either seeing a problem that doesn't >> exist/misunderstanding things. >> >> Cheers, Kuba Um, sorry, I didn't understand question. I try to explain why memcpy worked before. It did not worked. As far as I noticed, this bug does not affect small files (<=0x1000) but if file was large enough (>0x1000 byte) - it will appear. In my case it was multi-colour metafile (jwpce.hlp, http://www.physics.ucla.edu/~grosenth/jwpce.html - lots of metafiles). Small pictures are OK, but large are jammed. What is interesting, the bug affected bitmap part of metafile, so no errors while PlayMetaFile, but the result bitmap was jammed a little. --HolyLich

2 1

Re: riched20: modify ME_CharFromPoint to work properly with password controls
by Phil Krylov 08 Aug '06

08 Aug '06

Hi Matt, On 07/08/06, Matt Finnicum <mattfinn(a)gmail.com> wrote: > This patch modifies ME_CharFromPoint to work properly with password > controls (the patch i sent in / got committed a couple days ago). Should not the temp string be freed afterwards? -- Ph.

2 2

Re: winhelp: bug fix in LZ77 decompressor
by HolyLich 08 Aug '06

08 Aug '06

On Tue, 8 Aug 2006 09:37:09 -0400, Kuba Ober <kuba(a)mareimbrium.org> wrote: >> > > Fix rather unusual bug in LZ77 decompressor. We cannot use >> > > memcpy >> > > with overlapped areas because of unpredictable result. We must >> > > copy byte-by-byte. > >> > Why don't you use memmove instead? The man page for memcpy says: >> > Use memmove(3) if the memory areas do overlap. > >> We cannot use memmove. It provides different functionality. It moves >> blocks, but LZ77 decompress algorithm copies bytes. >> >> Let's suppose: >> 012 >> XYZ >> >> When we say 'memmove(1, 0, 2)' we will get: >> 012 >> XXY >> >> But we (LZ77 algorithm) expect: >> 012 >> XXX (three 'X'). >> >> memcpy is rather clever (it optmizes process by coping INT instead of >> BYTES). This optimization is fatal for LZ77. > > Why? > > Er, if the memcpy worked (or almost worked) and failed due to overlap > problems, then memmove will do the trick. Did it ever work at all before? > Either this code never worked, or you're either seeing a problem that doesn't > exist/misunderstanding things. > > Cheers, Kuba memmove provides OTHER functionality - it GUARANTEES, that if blocks overlaps, then destination area will the same as source area before. LZ77 decompress algorithms needs copiing byte-by-byte - of course, if areas overlap, then dest area WILL NOT match the src area before. It IS correct for LZ77! The simpliest version of memcpy routine, like this: void my_memcpy(char *dst, char *src, int len) { while (len-->0) *dst++=*src++; ) WILL work correctly for LZ77. memcpy provided by gcc is optimized - it NOT copies byte-by-byte from beginning till end. If you mediate over lz77 decompress algo (dlls/kernel/lzexpand.c) the things will be clean.

1 0

Re: winhelp: bug fix in LZ77 decompressor
by HolyLich 08 Aug '06

08 Aug '06

> HolyLich wrote: > > ChangeLog: > > Fix rather unusual bug in LZ77 decompressor. We cannot use memcpy > > with overlapped areas because of unpredictable result. We must copy > > byte-by-byte. > Why don't you use memmove instead? The man page for memcpy says: > Use memmove(3) if the memory areas do overlap. We cannot use memmove. It provides different functionality. It moves blocks, but LZ77 decompress algorithm copies bytes. Let's suppose: 012 XYZ When we say 'memmove(1, 0, 2)' we will get: 012 XXY But we (LZ77 algorithm) expect: 012 XXX (three 'X'). memcpy is rather clever (it optmizes process by coping INT instead of BYTES). This optimization is fatal for LZ77. For more information, please, refer to patch. It contains some useful comment. --HolyLich

2 1

Font metrics
by Jeff L 08 Aug '06

08 Aug '06

People, I am working on ScriptStringXtoCP etc in usp10. In setting up the tests for this I notice that ABC widths returned ScriptPlace (*/GetCharABCWidthsI) /*is not the same as Windows does. Have tried an couple of fonts and the results are the subtly different. Before I get too carried away with this, are the ABC widths supposed to be the same in Wine and Windows? Jeff Latimer

1 0

dinput & [Get|Set]CursorPos conandrum
by Vitaliy Margolen 08 Aug '06

08 Aug '06

Some one few weeks ago mentioned that they needed SetCursorPos to work globally (between processes). Well it seems after all we do need that to fix few lots of things, including most mouse related bugs in dinput. Actually the problem I have is not as much with SetCursorPos as with the fact that with multiple processes only one gets MotionNotify (and other notify) events. This gets cursor position out of sync between two processes and causes interesting side-effects. It's not something major but an annoyance. There are could be more serious problems however. The possible solutions might be: 1. Store cursor_pos in wineserver and call wineserver whenever we need it or need to modify it. Seems straight forward but how expensive it would be? 2. Use shared memory. That means we have to allocate it first (will SharedUserData work for this?). And use mutex for sync. 3. Query X for it's cursor position. Pretty much what we do, except that needs to be fixed: Current dinput has lots of problems with lots of games for number of different reasons (and I'm talking about just mouse). To fix some(all) of them we need to move managing of mouse warping to x11drv - only it has enough information about what programs doing to the cursor. And to make it work all we really need is to make GetCursorPos returned cached cursor position and not the latest from X. Any ideas appreciated. Vitaliy

2 4

Re: winhelp: bug fix in LZ77 decompressor
by Michael Stefaniuc 08 Aug '06

08 Aug '06

HolyLich wrote: > ChangeLog: > Fix rather unusual bug in LZ77 decompressor. We cannot use memcpy > with overlapped areas because of unpredictable result. We must copy > byte-by-byte. Why don't you use memmove instead? The man page for memcpy says: Use memmove(3) if the memory areas do overlap. 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

1 0

Re: WineD3D: shader cap fixes
by Roderick Colenbrander 08 Aug '06

08 Aug '06

Use this updated patch. I forgot to initialize some constants to zero and made the diff against a wrong file because of which some crucial changes were missed. Roderick > Hi, > > This patch adds most missing shader capabilities. Some capabilitise are > read from OpenGL but not everything is mappable to Direct3D in some cases an > extension from lets say Nvidia can be used but it is not really worth it. > If there's no OpenGL cap the minimum required values as required by the > shader specs are used. > > Regards, > Roderick Colenbrander -- "Feel free" – 10 GB Mailbox, 100 FreeSMS/Monat ... Jetzt GMX TopMail testen: http://www.gmx.net/de/go/topmail

1 0

Constifying Undocumented Code?
by Andrew Talbot 08 Aug '06

08 Aug '06

Where we emulate undocumented code, is it acceptable to constify the formal arguments, where appropriate? Thanks, -- Andy.

3 3

HAL and Copy Protection
by Jesse Allen 08 Aug '06

08 Aug '06

Does anyone have HAL and SecuRom copy protection working? I'm starting to get support questions with people using HAL and I'm not sure how to help them. I need information now that HAL support is in Wine on whether SecuRom works with it and how to get it to work as I don't have HAL. Jesse

2 6

Re: wined3d: stub out remaining renderstates
by Stefan Dösinger 07 Aug '06

07 Aug '06

Am Dienstag 08 August 2006 00:06 schrieb Jan Zerebecki: > If this patch is rejected from inclusion, please tell me why, as i would > have to ask anyway. It looks like you forgot d3d7 render states like TEXTUREMAPBLEND. This state isn't really important for this patch, I will send an implementation for it tomorrow, but other d3d7 render states are perhaps needed.

1 0

Re: wintrust: Always return ERROR_SUCCESS in WinVerifyTrust [RESEND]
by Paul Vriens 07 Aug '06

07 Aug '06

On Mon, 2006-08-07 at 11:11 -0700, James Hawkins wrote: > Hi, > > Accoring to recent comments by Paul Vriens, Process Explorer now > accepts ERROR_SUCCESS from WinVerifyTrust, and several installers > require ERROR_SUCCESS in order to continue, so everyone is happy. > Fixes bugs 5573 and 3619. > > http://bugs.winehq.org/show_bug.cgi?id=5573 > http://bugs.winehq.org/show_bug.cgi?id=3619 > > Changelog: > * Always return ERROR_SUCCESS in WinVerifyTrust. > > dlls/wintrust/wintrust_main.c | 18 +++++------------- > 1 files changed, 5 insertions(+), 13 deletions(-) > When I run process explorer without tracing/debugging everything is fine. As soon as I add +wintrust,+heap it fails again. There is most likely some heap corruption somewhere (couldn't be more vague). Alexandre's patch to add more free list entries only masked the problem, as far as I can see from the results. Cheers and sorry for the misleading remarks, Paul.

2 2

Re: user[2/2]: Preserve LastError.
by Vitaliy Margolen 07 Aug '06

07 Aug '06

Saturday, July 29, 2006, 7:28:10 PM, Vitaliy Margolen wrote: > ChangeLog: > user: Preserve LastError. > dlls/user/tests/input.c | 4 ++++ > dlls/winex11.drv/x11drv.h | 3 +++ > 2 files changed, 7 insertions(+), 0 deletions(-) Anything wrong with this patch? Test case clearly shows that we should preserve the LastError. Vitaliy Margolen

2 3

Re: wintrust: Only return ERROR_SUCCESS in WinVerifyTrust
by Andreas Mohr 07 Aug '06

07 Aug '06

Hi, On Tue, Aug 01, 2006 at 01:21:57PM -0700, James Hawkins wrote: > My reasoning for reverting the change is that I'd rather have 5 more > apps installing, than one app working (and it's Process Explorer of > all things). Indeed, but I'm not sure it's a good idea to kill all comment annotations in the process. I'd rather even add the fact that this return code change killed more installers than it made apps work. Andreas

4 4

Time to commit remote ops for VirtualAllocEx, CreateRemoteThread
by Dan Kegel 07 Aug '06

07 Aug '06

Tommy's APC version of his VirtualAllocEx / CreateRemoteThread patch seems to be safe (since APCs only run a points where threads in well-written programs are not holding locks), is complete enough to make many apps happy, and is probably the best that can be done without a service thread or a real kernel change. I've encouraged him to submit it for real. Let's get this puppy committed!

7 14

Re: riched20: new selection invalidation logic
by Dan Kegel 07 Aug '06

07 Aug '06

On 8/7/06, Krzysztof Foltman <wdev(a)foltman.com> wrote: > +#define static That deserves a comment, at the very least! I don't think such a define should be allowed. Can you recode without this? I like the number of asserts. It's hard to get this stuff right, and the asserts will help make sure the code is correct. - Dan

1 0

Re: Tijl Coosemans : ntdll: Add FreeBSD default serial port device.
by Marcus Meissner 07 Aug '06

07 Aug '06

On Mon, Aug 07, 2006 at 07:13:04AM -0500, Alexandre Julliard wrote: > Module: wine > Branch: refs/heads/master > Commit: e548d4083177125559f752d902907187cea60474 > URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e548d4083177125559f752d… > > Author: Tijl Coosemans <tijl(a)ulyssis.org> > Date: Sat Aug 5 23:12:22 2006 +0200 > > ntdll: Add FreeBSD default serial port device. > > --- > > dlls/ntdll/directory.c | 7 +++++++ > 1 files changed, 7 insertions(+), 0 deletions(-) > > diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c > index 47d018a..84624a8 100644 > --- a/dlls/ntdll/directory.c > +++ b/dlls/ntdll/directory.c > @@ -175,6 +175,13 @@ #ifdef linux > strcpy( ret, "/dev/ttyS0" ); > ret[strlen(ret) - 1] = '0' + num - 1; > } > +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) > + ret = RtlAllocateHeap( GetProcessHeap(), 0, sizeof("/dev/cuad0") ); Surely you mean strlen()+1. sizeof("hallo") might just be sizeof(char*) Ciao, Marcus

2 1

DirectX can't change Screen depth
by Colin Pitrat 07 Aug '06

07 Aug '06

Hello, I'm maintaining a game named Blip & Blop (http://appdb.winehq.org/appview.php?iAppId=3470), and I have some problems with color depth. If the X server is configured in 16 bits colors, it works well, but if it's in 24 or 32 bits, the app display in black and white, and I've got the following message : fixme:x11drv:X11DRV_desktop_SetCurrentMode Cannot change screen BPP from 32 to 16 Looking at the source, it seems that changing resolution is not implemented, and that doesn't surprise me as it doesn't seem to be a good idea to change X depth to please a wine app (especially if we're emulating a desktop). But shouldn't the 16 bits output be converted by wine to 24/32 bits to be displayed. Is it a problem with the way the game is coded (maybe it should check return code to fall back to another depth) ? Regards, -- Colin Pitrat (Bull Services Telco) Bull, Architect of an Open World (TM) Tél : +33 (0) 1 30 80 72 93 www.bull.com

2 1

regression in current GIT
by Aaron O 06 Aug '06

06 Aug '06

hi, if this is the wrong mailing list, then please correct me. there is a regression in current git revision in Xilero. patch which causes the regression: 3d9e96f3bc34029c93ceb3fd3f9674d2c69e414d is first bad commit commit 3d9e96f3bc34029c93ceb3fd3f9674d2c69e414d Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Aug 5 00:11:17 2006 +0200 wined3d: Volume textures fix. :040000 040000 b07704f9002468b7944e8660eac1434dd5f1ae3f 234b926bd8bb1981d2a07a1f5dd3831f33ce267b M dlls :040000 040000 7203ce1c26132c5232f6c436dd501ff17a0fa47d ab3a496643793857b97c736f706ec3e16d572af3 M include error in program: fixme:d3d:IWineD3DDeviceImpl_GetAvailableTextureMem (0x16c218) : stub, emulating 64MB for now, returning 64MB fixme:ddraw:IDirectDrawImpl_SetCooperativeLevel (0x16bb58)->(0x10024,00000c13) fixme:ddraw:IDirectDrawImpl_SetCooperativeLevel (0x16bb58) Unhandled flag DDSCL_MULTITHREADED, Uh Oh... fixme:x11drv:X11DRV_desktop_SetCurrentMode Cannot change screen BPP from 32 to 16 fixme:d3d:IWineD3DDeviceImpl_SetRenderState >>>>>>>>>>>>>>>>> 500 from glFinalCombinerInputNV() @ device.c / 3846 err:ddraw:IDirectDrawSurfaceImpl_Release (0x1bbb28) Failed to uninit 3D fixme:ddraw:IDirectDrawImpl_SetCooperativeLevel (0x16bb58)->((nil),00000008) fixme:d3d:IWineD3DStateBlockImpl_Release Releasing primary stateblock fixme:d3d:IWineD3DDeviceImpl_Release (0x16c218) Device released with resources still bound, acceptable but unexpected fixme:d3d:dumpResources Leftover resource 0x1bbdd8 with type 1,WINED3DRTYPE_SURFACE fixme:d3d:dumpResources Leftover resource 0x1bbc08 with type 1,WINED3DRTYPE_SURFACE thanks. i can provide any other needed information.

3 4

Re: wine.inf: Windows 9x and Windows NT store the time zone data in different places.
by Vitaliy Margolen 06 Aug '06

06 Aug '06

Friday, August 4, 2006, 9:47:38 AM, Francois Gouget wrote: > So duplicate it so programs find it no matter where they look. > Note: > Another option would be to have a [Timezones9x] section that would set > this data in the alternate location. But we would still need to > duplicate all the data in the inf file anyway. This would also make > checking the inf file consistency harder too. And finally, it would make > it impossible to change the Windows version of a Wine environment after > the fact. So I chose to just duplicate it all. You missed one more option - use registry symlinks. The only problem is - win2k and winXP doesn't have those registry keys in win9x place. Vitaliy Margolen

2 1

Re: wine-ShowCursor-D3D-over-GDI.patch
by Stefan Dösinger 06 Aug '06

06 Aug '06

Am Samstag 29 Juli 2006 11:17 schrieb Andrew Riedi: > Well, here is my first patch, feel free to tell me what all is wrong with > it. I noticed a problem in WoW d3d, so I tracked it down and checked out > msdn. It seems that implementing ShowCursor() over GDI is acceptable, at > least according to msdn, and it seems to work great. Anyhow, this patch > fixes the two mouse cursor problem in WoW, and makes wined3d more > compatible with windows, at least msdn. Here goes nothing. MSDN says that the cursor image set with SetCursorProperties can be shown as a user cursor if it has a size of 32x32 pixels. Otherwise the cursor is emulated like we do it at already in swapchain.c, IDirect3DSwapChain9::Present. So if the cursor image is 32x32 pixels, upload it to a gdi cursor, and do not upload it to a gl texture(doine in SetCusorProperties with the preload call), and do not draw it in present. Activate the user cursor in ShowCursor. If the cursor is not 32x32 pixels then disable the gdi cursor, and draw the cursor as it is done now(upload to a gl texture, call Blt in present. I don't know how to set a gdi cursor, but you can find the image in the d3d surface at surface->resource.allocatedMemory. Be aware that allocatedMemory may be NULL if the image is just stored in a gl texture, so the cleaner way is to call IWineD3DSurface::LockRect to retrieve the image.

3 5

Problems (and fix) when compiling CVS on 64-bit Kubuntu (erroneous freetype-config message)
by Evil Jay 06 Aug '06

06 Aug '06

When compiling Wine on 64-bit Kubuntu 6.06LTS (using the instructions found at http://wiki.winehq.org/WineOn64bit#head-56206e8bc74083807ffe06ccb471d3f964c…) I received a spurious error regarding freetype-config: configure: WARNING: Your system appears to have the FreeType 2 runtime libraries configure: WARNING: installed, but 'freetype-config' is not in your PATH. Install configure: WARNING: the freetype-devel package (or its equivalent on your distribution) configure: WARNING: to enable Wine to use TrueType fonts. configure: WARNING: FreeType is missing. configure: WARNING: Fonts will not be built. Dialog text may be invisible or unaligned. Everything seems to work fine after I compile it though. The fonts display perfectly. I also had to modify the .configure script. The unicode-related section directs it to use the libraries in /usr/lib (whereas I needed it to be using /usr/lib32). If you don't modify this section, make will fail when it tries to link the 64-bit versions. Other than these two minor annoyances, it compiles quite well on 64-bit. ------------------------------------------ evil@pluto:~/install/wine$ LDFLAGS="-L/lib32 -L/usr/lib32 -Wl,-rpath,/lib32 -Wl,-rpath,/usr/lib32" ./configure | grep "type\|font" ... checking for fontforge... fontforge ... checking fontconfig/fontconfig.h usability... yes checking fontconfig/fontconfig.h presence... yes checking for fontconfig/fontconfig.h... yes ... checking for freetype-config... freetype-config checking for FT_Init_FreeType in -lfreetype... no ... checking for -lfreetype soname... libfreetype.so.6 checking for -lfontconfig soname... libfontconfig.so ... config.status: creating fonts/Makefile configure: WARNING: Your system appears to have the FreeType 2 runtime libraries configure: WARNING: installed, but 'freetype-config' is not in your PATH. Install configure: WARNING: the freetype-devel package (or its equivalent on your distribution) configure: WARNING: to enable Wine to use TrueType fonts. configure: WARNING: FreeType is missing. configure: WARNING: Fonts will not be built. Dialog text may be invisible or unaligned. evil@pluto:~/install/wine$ locate freetype-config /usr/share/man/man1/freetype-config.1.gz /usr/bin/freetype-config

1 0

x11drv: Add Xcursor support, prefer it when available.
by Stefan Siebert 05 Aug '06

05 Aug '06

Thanks for this great piece of work ! - Stefan

1 0

GlobalMemoryStatus - Photoshop 4 workaround crashes Notes Client running Java
by Stefan Siebert 05 Aug '06

05 Aug '06

Hello, the implemented workaround for PS4 currently crashes the Notes Client and IBM's JRE complains that it couldn't allocate 16MB of heap memory. My approach would be to get rid of the PS4 workaround, as it's an application problem. Implementing another workaround to get IBM's JRE running might break other applications. My question: Is it ok to remove it via patch or should I write a workaround for IBM's JRE ?

2 1

Fix bug in MSVCRT handling of CTRL-Z at EOF of text files
by David D. Hagood 05 Aug '06

05 Aug '06

The bug in the handling of text mode files with CTRL-Z's at the end is back. Due to compatibility with DOS, which is compatible with CP/M, text mode files may be padded with a number of CTRL-Z characters (\x1A) to fill out a sector. The current Wine implementation of MSVCRT does NOT strip these - this breaks several programs, among them Delorme Street Atlas 5 (my test case for this.) The attached patch corrects this behavior. Changelog: dlls/msvcrt/file.c David Hagood (wowbagger at sktc.net) Remove CTRL-Z's at EOF of text mode files Index: dlls/msvcrt/file.c =================================================================== RCS file: /home/wine/wine/dlls/msvcrt/file.c,v retrieving revision 1.107 diff -u -u -r1.107 file.c --- dlls/msvcrt/file.c 31 Jul 2006 20:02:38 -0000 1.107 +++ dlls/msvcrt/file.c 5 Aug 2006 15:10:33 -0000 @@ -1638,6 +1638,21 @@ { MSVCRT_fdesc[fd].wxflag |= WX_ATEOF; TRACE(":EOF %s\n",debugstr_an(buf,num_read)); + if (MSVCRT_fdesc[fd].wxflag & WX_TEXT) + { + /* if at EOF in text mode, we need to remove any final CTRL-Z's + from the file. Ahh the joys of CP/M^WDOS compatibility. + */ + if (num_read && (bufstart[num_read-1] == 0x1a)) + { + while (num_read && (bufstart[num_read-1] == 0x1a)) + { + num_read --; + } + TRACE("Removing CTRL-Z from EOF\n"); + bufstart[num_read-1] = 0; + } + } } } else

2 1

user32.dll - wine's 16Bit compatibility may crash 32Bit applications
by Stefan Siebert 05 Aug '06

05 Aug '06

Hello, I've found a problem in the current user implementation. If a 32Bit program sends a WM_USER+xx message with 16Bit pendant (i.e. EM_GETLINE / EM_GETLINE16) and forgets to catch it, a crash might be possible (pointer param = NULL). I think that Windows user implementation checks if it is a 16 or 32Bit process. Does anyone know of a way to accomplish such a check in wine ? Thanks for your help, Stefan Siebert

1 0

Re: msi: Write-strings warnings fix
by Mike McCormack 05 Aug '06

05 Aug '06

Andrew Talbot wrote: > MSI{Get|Set}FeatureState(), MSI{Get|Set}ComponentState() and > MSI{Get|Set}Property() have appropriate const string arguments in the SDK. Which version of the Windows SDK is that? > -UINT WINAPI MsiGetFeatureStateA(MSIHANDLE hInstall, LPSTR szFeature, > +UINT WINAPI MsiGetFeatureStateA(MSIHANDLE hInstall, LPCSTR szFeature, > INSTALLSTATE *piInstalled, INSTALLSTATE *piAction) According to my version of the Windows SDK, these changes are wrong. Mike

3 2

tools/winemaker prints unexpected output
by Saulius Krasuckas 04 Aug '06

04 Aug '06

Now I am running it on a latest GIT tree this way: $ tools/winapi/msvcmaker --no-wine .: searching for /^Makefile.in$/ And after a while it appends this string to the end of last line: readline() on closed filehandle IN at tools/winapi/msvcmaker line 134. Maybe it doesn't indicate any harm, but in ideal world this should be fixed. I don't know perl, unfortunately.

2 1

[ws2_32] connect doesn't generate FD_CONNECT event in non-blocking mode
by Tijl Coosemans 04 Aug '06

04 Aug '06

dlls/ws2_32/tests/sock.c:event_client:597: /* Prepare event notification for connect, makes socket nonblocking */ event = WSACreateEvent (); WSAEventSelect ( mem->s, event, FD_CONNECT ); tmp = connect ( mem->s, (struct sockaddr*) &mem->addr, sizeof ( mem->addr ) ); if ( tmp != 0 && ( err = WSAGetLastError () ) != WSAEWOULDBLOCK ) ok ( 0, "event_client (%x): connect error: %d\n", id, err ); tmp = WaitForSingleObject ( event, INFINITE ); When dlls/ws2_32/socket.c:WS_connect returns 0 (because unix connect returns 0) no FD_CONNECT event is ever generated and the call on the last line above never returns. So who's wrong, the test case or WS_connect?

1 0

VNC and worms
by Krzysztof Foltman 04 Aug '06

04 Aug '06

Can anyone figure out how to fix this display artifact that's very frequent when using Wine through VNC servers (tightvncserver and realvncserver, to be precise). http://foltman.com/worms.png It appears randomly on some redraws and not other ones (dragging the window off screen and back often makes the text look normal). Krzysztof

2 1

Re: advapi32: Add more SID tests
by Robert Reif 04 Aug '06

04 Aug '06

Robert Reif wrote: > Adds more SID tests. > Fixes some Windows failures by checking version first. > Add some more info on failed tests. > Removes Windows version check. diff -p -u -r1.34 security.c --- dlls/advapi32/tests/security.c 31 Jul 2006 09:33:04 -0000 1.34 +++ dlls/advapi32/tests/security.c 4 Aug 2006 12:14:56 -0000 @@ -18,15 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> #include <stdio.h> -#include "wine/test.h" +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winerror.h" #include "aclapi.h" #include "winnt.h" +#include "winternl.h" #include "sddl.h" +#include "ntsecapi.h" + +#include "wine/test.h" typedef VOID (WINAPI *fnBuildTrusteeWithSidA)( PTRUSTEEA pTrustee, PSID pSid ); typedef VOID (WINAPI *fnBuildTrusteeWithNameA)( PTRUSTEEA pTrustee, LPSTR pName ); @@ -49,6 +55,11 @@ typedef BOOL (WINAPI *fnGetFileSecurityA typedef DWORD (WINAPI *fnRtlAdjustPrivilege)(ULONG,BOOLEAN,BOOLEAN,PBOOLEAN); typedef BOOL (WINAPI *fnCreateWellKnownSid)(WELL_KNOWN_SID_TYPE,PSID,PSID,DWORD*); +typedef NTSTATUS (WINAPI *fnLsaQueryInformationPolicy)(LSA_HANDLE,POLICY_INFORMATION_CLASS,PVOID*); +typedef NTSTATUS (WINAPI *fnLsaClose)(LSA_HANDLE); +typedef NTSTATUS (WINAPI *fnLsaFreeMemory)(PVOID); +typedef NTSTATUS (WINAPI *fnLsaOpenPolicy)(PLSA_UNICODE_STRING,PLSA_OBJECT_ATTRIBUTES,ACCESS_MASK,PLSA_HANDLE); + static HMODULE hmod; fnBuildTrusteeWithSidA pBuildTrusteeWithSidA; @@ -61,6 +72,10 @@ fnConvertStringSidToSidA pConvertStringS fnGetFileSecurityA pGetFileSecurityA; fnRtlAdjustPrivilege pRtlAdjustPrivilege; fnCreateWellKnownSid pCreateWellKnownSid; +fnLsaQueryInformationPolicy pLsaQueryInformationPolicy; +fnLsaClose pLsaClose; +fnLsaFreeMemory pLsaFreeMemory; +fnLsaOpenPolicy pLsaOpenPolicy; struct sidRef { @@ -87,7 +102,7 @@ static void test_str_sid(char *str_sid) } } else - trace("%s couldn't be converted\n", str_sid); + trace("%s couldn't be converted, returned %ld\n", str_sid, GetLastError()); } static void test_sid(void) @@ -180,7 +195,6 @@ static void test_sid(void) LocalFree( psid ); } - trace("String SIDs:\n"); test_str_sid("AO"); test_str_sid("RU"); test_str_sid("AN"); @@ -799,6 +813,7 @@ static void test_token_attr(void) trace("\t%s, %s\\%s use: %d attr: 0x%08lx\n", SidString, Domain, Name, SidNameUse, Groups->Groups[i].Attributes); LocalFree(SidString); } + HeapFree(GetProcessHeap(), 0, Groups); /* user */ ret = GetTokenInformation(Token, TokenUser, NULL, 0, &Size); @@ -852,19 +867,19 @@ static void test_LookupAccountSid(void) ret = AllocateAndInitializeSid(&SIDAuthNT, 2, SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS, 0, 0, 0, 0, 0, 0, &pUsersSid); - ok(ret, "AllocateAndInitializeSid failed with error %ld\n", GetLastError()); + ok(ret, "AllocateAndInitializeSid failed with error %ld\n", GetLastError()); /* try NULL account */ acc_size = MAX_PATH; dom_size = MAX_PATH; ret = LookupAccountSid(NULL, pUsersSid, NULL, &acc_size, domain, &dom_size, &use); - ok(ret, "Expected TRUE, got FALSE\n"); + ok(ret, "LookupAccountSid() Expected TRUE, got FALSE\n"); /* try NULL domain */ acc_size = MAX_PATH; dom_size = MAX_PATH; ret = LookupAccountSid(NULL, pUsersSid, account, &acc_size, NULL, &dom_size, &use); - ok(ret, "Expected TRUE, got FALSE\n"); + ok(ret, "LookupAccountSid() Expected TRUE, got FALSE\n"); pCreateWellKnownSid = (fnCreateWellKnownSid)GetProcAddress( hmod, "CreateWellKnownSid" ); @@ -882,11 +897,114 @@ static void test_LookupAccountSid(void) dom_size = MAX_PATH; if (LookupAccountSid(NULL, &max_sid.sid, account, &acc_size, domain, &dom_size, &use)) trace(" %d: %s %s\\%s %d\n", i, str_sid, domain, account, use); - LocalFree(str_sid); + LocalFree(str_sid); } } else - trace(" CreateWellKnownSid(%d) failed: %ld\n", i, GetLastError()); + trace(" CreateWellKnownSid(%d) failed: %ld\n", i, GetLastError()); + } + + pLsaQueryInformationPolicy = (fnLsaQueryInformationPolicy)GetProcAddress( hmod, "LsaQueryInformationPolicy"); + pLsaOpenPolicy = (fnLsaOpenPolicy)GetProcAddress( hmod, "LsaOpenPolicy"); + pLsaFreeMemory = (fnLsaFreeMemory)GetProcAddress( hmod, "LsaFreeMemory"); + pLsaClose = (fnLsaClose)GetProcAddress( hmod, "LsaClose"); + + if (pLsaQueryInformationPolicy && pLsaOpenPolicy && pLsaFreeMemory && pLsaClose) + { + NTSTATUS status; + LSA_HANDLE handle; + LSA_OBJECT_ATTRIBUTES object_attributes; + + ZeroMemory(&object_attributes, sizeof(object_attributes)); + + status = pLsaOpenPolicy( NULL, &object_attributes, POLICY_ALL_ACCESS, &handle); + ok(status == STATUS_SUCCESS, "LsaOpenPolicy() returned 0x%08lx\n", status); + + if (status == STATUS_SUCCESS) + { + PPOLICY_ACCOUNT_DOMAIN_INFO info; + status = pLsaQueryInformationPolicy(handle, PolicyAccountDomainInformation, (PVOID*)&info); + ok(status == STATUS_SUCCESS, "LsaQueryInformationPolicy() failed, returned 0x%08lx\n", status); + if (status == STATUS_SUCCESS) + { + ok(info->DomainSid!=0, "LsaQueryInformationPolicy(PolicyAccountDomainInformation) missing SID\n"); + if (info->DomainSid) + { + int count = *GetSidSubAuthorityCount(info->DomainSid); + int len = GetSidLengthRequired(count); + + CopySid(len, &max_sid, info->DomainSid); + + ret = pConvertSidToStringSidA(&max_sid.sid, &str_sid); + ok(ret, "ConvertSidToStringSidA() failed: %ld\n", GetLastError()); + if (ret) + { + acc_size = MAX_PATH; + dom_size = MAX_PATH; + ret = LookupAccountSid(NULL, &max_sid.sid, account, &acc_size, domain, &dom_size, &use); + ok(ret, "LookupAccountSid(%s) failed: %ld\n", str_sid, GetLastError()); + if (ret) + trace(" %s %s\\%s %d\n", str_sid, domain, account, use); + LocalFree(str_sid); + } + + max_sid.sid.SubAuthority[count] = DOMAIN_USER_RID_ADMIN; + max_sid.sid.SubAuthorityCount = count + 1; + + ret = pConvertSidToStringSidA(&max_sid.sid, &str_sid); + ok(ret, "ConvertSidToStringSidA() failed: %ld\n", GetLastError()); + if (ret) + { + acc_size = MAX_PATH; + dom_size = MAX_PATH; + ret = LookupAccountSid(NULL, &max_sid.sid, account, &acc_size, domain, &dom_size, &use); + ok(ret, "LookupAccountSid(%s) failed: %ld\n", str_sid, GetLastError()); + if (ret) + trace(" %s %s\\%s %d\n", str_sid, domain, account, use); + LocalFree(str_sid); + } + + max_sid.sid.SubAuthority[count] = DOMAIN_USER_RID_GUEST; + max_sid.sid.SubAuthorityCount = count + 1; + + ret = pConvertSidToStringSidA(&max_sid.sid, &str_sid); + ok(ret, "ConvertSidToStringSidA() failed: %ld\n", GetLastError()); + if (ret) + { + acc_size = MAX_PATH; + dom_size = MAX_PATH; + ret = LookupAccountSid(NULL, &max_sid.sid, account, &acc_size, domain, &dom_size, &use); + ok(ret, "LookupAccountSid(%s) failed: %ld\n", str_sid, GetLastError()); + if (ret) + trace(" %s %s\\%s %d\n", str_sid, domain, account, use); + LocalFree(str_sid); + } + + max_sid.sid.SubAuthority[count] = 1000; + max_sid.sid.SubAuthorityCount = count + 1; + + ret = pConvertSidToStringSidA(&max_sid.sid, &str_sid); + ok(ret, "ConvertSidToStringSidA() failed: %ld\n", GetLastError()); + if (ret) + { + acc_size = MAX_PATH; + dom_size = MAX_PATH; + ret = LookupAccountSid(NULL, &max_sid.sid, account, &acc_size, domain, &dom_size, &use); + /* this can fail if no user accounts exist */ + if (ret) + trace(" %s %s\\%s %d\n", str_sid, domain, account, use); + else + trace("LookupAccountSid(%s) failed: %ld\n", str_sid, GetLastError()); + LocalFree(str_sid); + } + } + + pLsaFreeMemory((LPVOID)info); + } + + status = pLsaClose(handle); + ok(status == STATUS_SUCCESS, "LsaClose() failed, returned 0x%08lx\n", status); + } } } }

1 0

Re: advapi32: Add more SID tests
by Alexandre Julliard 04 Aug '06

04 Aug '06

Robert Reif <reif(a)earthlink.net> writes: > Adds more SID tests. > Fixes some Windows failures by checking version first. You shouldn't check the Windows version, you should check the features themselves. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: user [1/2]: Add a test for CreateWindowEx
by Alexandre Julliard 04 Aug '06

04 Aug '06

Dan Hipschman <dsh(a)linux.ucla.edu> writes: > @@ -137,8 +137,10 @@ static void test_parent_owner(void) > trace( "main window %p main2 %p desktop %p child %p\n", hwndMain, hwndMain2, desktop, child ); > > /* child without parent, should fail */ > + SetLastError(ERROR_SUCCESS); > test = CreateWindowExA(0, "ToolWindowClass", "Tool window 1", > WS_CHILD, 0, 0, 100, 100, 0, 0, 0, NULL ); > + todo_wine ok( GetLastError() != ERROR_SUCCESS, "CreateWindowExA should call SetLastError\n" ); 0xdeadbeef is usually a better choice than ERROR_SUCCESS for that sort of thing. Also you might as well check for the expected value instead of only checking that it has been modified. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: urlmon: Delay-load cabinet.dll as native urlmon doesn't import it.
by Alexandre Julliard 04 Aug '06

04 Aug '06

Robert Shearman <rob(a)codeweavers.com> writes: > + if (!hCabinet) return HRESULT_FROM_WIN32(GetLastError()); > + pExtract = GetProcAddress(hCabinet, "Extract"); > + if (!pExtract) return HRESULT_FROM_WIN32(GetLastError()); > + > + hr = pExtract(dest, szCabName); > + FreeLibrary(hCabinet); > + return hr; > +} Unless the app depends on it, it's usually better to not free the library on each call, otherwise repeated calls to the function will be very expensive. You can free the library in PROCESS_DETACH. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: msi: The input buffer length is the number of characters excluding the NULL terminator, so fix an off by one error [RESEND]
by Alexandre Julliard 04 Aug '06

04 Aug '06

"James Hawkins" <truiken(a)gmail.com> writes: > Is there anything wrong with this patch? Yes, the length does include the terminating null. That's what the rest of the function expects, and AFAICT it's what the callers expect too (and it's the standard behavior of API functions that take a buffer length). -- Alexandre Julliard julliard(a)winehq.org

1 0

ntdll: CreateRemoteThread and friends for remote processes, take 3, via APCs
by tkho＠ucla.edu 04 Aug '06

04 Aug '06

ntdll: CreateRemoteThread and friends for remote processes, take 3, via APCs Hello, Much thanks for the comments on yesterday's patch of a service thread implementation for remote process operations. This patch uses APCs to implement CreateRemoteThread/RtlCreateUserThread, VirtualAllocEx/NtAllocateVirtualMemory and VirtualQueryEx/NtQueryVirtualMemory. APCs are queued per-thread, so I made minimal changes to add a per-process APC queue. Of course, this implementation suffers from the limitation that the remote process must go into an interuptible wait for the operation to succeed; an operation targeting a suspended process would block. Stefan Siebert mentioned that VirtualQueryEx is necessary for Lotus Notes Software Diagnostics (nsd.exe). I successfully tested this function with a simple program that prints a process' memory map: http://www.codecomments.com/archive371-2005-3-421246.html Lastly, I should mention that I have two pending patches to add conformance tests for remote processes operations: http://www.winehq.org/pipermail/wine-patches/2006-July/029259.html http://www.winehq.org/pipermail/wine-patches/2006-July/029260.html Thanks, Thomas Kho --- include/wine/server_protocol.h | 2 +- server/process.c | 1 + server/process.h | 1 + server/thread.c | 50 ++++++++++++++++++++++++---------------- server/thread.h | 23 +++++++++++++++++- server/timer.c | 2 +- 6 files changed, 55 insertions(+), 24 deletions(-) diff --git a/server/process.c b/server/process.c index 3e5ef97..75ca490 100644 --- a/server/process.c +++ b/server/process.c @@ -254,6 +254,7 @@ struct thread *create_process( int fd, s list_init( &process->locks ); list_init( &process->classes ); list_init( &process->dlls ); + list_init( &process->system_apc ); gettimeofday( &process->start_time, NULL ); process->end_time.tv_sec = process->end_time.tv_usec = 0; diff --git a/server/process.h b/server/process.h index 6edb1e6..2e9c9b8 100644 --- a/server/process.h +++ b/server/process.h @@ -78,6 +78,7 @@ struct process struct list dlls; /* list of loaded dlls */ void *peb; /* PEB address in client address space */ void *ldt_copy; /* pointer to LDT copy in client addr space */ + struct list system_apc; /* queue of system aync procedure calls */ }; struct process_snapshot diff --git a/server/thread.c b/server/thread.c index 60b74c9..d21df7f 100644 --- a/server/thread.c +++ b/server/thread.c @@ -64,19 +64,6 @@ struct thread_wait struct wait_queue_entry queues[1]; }; -/* asynchronous procedure calls */ - -struct thread_apc -{ - struct list entry; /* queue linked list */ - struct object *owner; /* object that queued this apc */ - void *func; /* function to call in client */ - enum apc_type type; /* type of apc function */ - void *arg1; /* function arguments */ - void *arg2; - void *arg3; -}; - /* thread operations */ @@ -464,6 +451,8 @@ static int check_wait( struct thread *th } other_checks: + /* FIXME remote operations will block on suspended threads */ + if ((wait->flags & SELECT_INTERRUPTIBLE) && !list_empty(&thread->process->system_apc)) return STATUS_USER_APC; if ((wait->flags & SELECT_INTERRUPTIBLE) && !list_empty(&thread->system_apc)) return STATUS_USER_APC; if ((wait->flags & SELECT_ALERTABLE) && !list_empty(&thread->user_apc)) return STATUS_USER_APC; if (wait->flags & SELECT_TIMEOUT) @@ -622,15 +611,32 @@ void wake_up( struct object *obj, int ma } } +/* return a pointer to the correct queue */ +static struct list *get_apc_queue( struct thread *thread, + enum apc_queue apc_queue ) +{ + switch (apc_queue) + { + case APC_PROCESS_QUEUE_SYSTEM: + return &thread->process->system_apc; + case APC_THREAD_QUEUE_SYSTEM: + return &thread->system_apc; + case APC_THREAD_QUEUE_USER: + default: + return &thread->user_apc; + } +} + /* queue an async procedure call */ int thread_queue_apc( struct thread *thread, struct object *owner, void *func, - enum apc_type type, int system, void *arg1, void *arg2, void *arg3 ) + enum apc_type type, enum apc_queue apc_queue, void *arg1, + void *arg2, void *arg3 ) { struct thread_apc *apc; - struct list *queue = system ? &thread->system_apc : &thread->user_apc; + struct list *queue = get_apc_queue( thread, apc_queue ); /* cancel a possible previous APC with the same owner */ - if (owner) thread_cancel_apc( thread, owner, system ); + if (owner) thread_cancel_apc( thread, owner, apc_queue ); if (thread->state == TERMINATED) return 0; if (!(apc = mem_alloc( sizeof(*apc) ))) return 0; @@ -648,10 +654,11 @@ int thread_queue_apc( struct thread *thr } /* cancel the async procedure call owned by a specific object */ -void thread_cancel_apc( struct thread *thread, struct object *owner, int system ) +void thread_cancel_apc( struct thread *thread, struct object *owner, + enum apc_queue apc_queue ) { struct thread_apc *apc; - struct list *queue = system ? &thread->system_apc : &thread->user_apc; + struct list *queue = get_apc_queue( thread, apc_queue ); LIST_FOR_EACH_ENTRY( apc, queue, struct thread_apc, entry ) { if (apc->owner != owner) continue; @@ -665,8 +672,9 @@ void thread_cancel_apc( struct thread *t static struct thread_apc *thread_dequeue_apc( struct thread *thread, int system_only ) { struct thread_apc *apc = NULL; - struct list *ptr = list_head( &thread->system_apc ); + struct list *ptr = list_head( &thread->process->system_apc ); + if (!ptr) ptr = list_head( &thread->system_apc ); if (!ptr && !system_only) ptr = list_head( &thread->user_apc ); if (ptr) { @@ -1007,7 +1015,9 @@ DECL_HANDLER(queue_apc) struct thread *thread; if ((thread = get_thread_from_handle( req->handle, THREAD_SET_CONTEXT ))) { - thread_queue_apc( thread, NULL, req->func, APC_USER, !req->user, + enum apc_queue queue; + queue = req->user ? APC_THREAD_QUEUE_USER : APC_THREAD_QUEUE_SYSTEM; + thread_queue_apc( thread, NULL, req->func, APC_USER, queue, req->arg1, req->arg2, req->arg3 ); release_object( thread ); } diff --git a/server/thread.h b/server/thread.h index 61911cd..b8b6cf0 100644 --- a/server/thread.h +++ b/server/thread.h @@ -96,6 +96,25 @@ struct thread_snapshot int priority; /* priority class */ }; +/* asynchronous procedure calls */ +struct thread_apc +{ + struct list entry; /* queue linked list */ + struct object *owner; /* object that queued this apc */ + void *func; /* function to call in client */ + enum apc_type type; /* type of apc function */ + void *arg1; /* function arguments */ + void *arg2; + void *arg3; +}; + +enum apc_queue +{ + APC_THREAD_QUEUE_USER, + APC_THREAD_QUEUE_SYSTEM, + APC_PROCESS_QUEUE_SYSTEM +}; + extern struct thread *current; /* thread functions */ @@ -112,8 +131,8 @@ extern void kill_thread( struct thread * extern void break_thread( struct thread *thread ); extern void wake_up( struct object *obj, int max ); extern int thread_queue_apc( struct thread *thread, struct object *owner, void *func, - enum apc_type type, int system, void *arg1, void *arg2, void *arg3 ); -extern void thread_cancel_apc( struct thread *thread, struct object *owner, int system ); + enum apc_type type, enum apc_queue apc_queue, void *arg1, void *arg2, void *arg3 ); +extern void thread_cancel_apc( struct thread *thread, struct object *owner, enum apc_queue apc_queue ); extern int thread_add_inflight_fd( struct thread *thread, int client, int server ); extern int thread_get_inflight_fd( struct thread *thread, int client ); extern struct thread_snapshot *thread_snap( int *count ); diff --git a/server/timer.c b/server/timer.c index d1c035b..f6e23c8 100644 --- a/server/timer.c +++ b/server/timer.c @@ -136,7 +136,7 @@ static int cancel_timer( struct timer *t } if (timer->thread) { - thread_cancel_apc( timer->thread, &timer->obj, 0 ); + thread_cancel_apc( timer->thread, &timer->obj, APC_THREAD_QUEUE_USER ); release_object( timer->thread ); timer->thread = NULL; } --- dlls/kernel/kernel32.spec | 3 + dlls/kernel/process.c | 108 ++++++++++++++++++++++++++++++++++++++++ dlls/kernel/thread.c | 24 +++++++-- dlls/ntdll/ntdll_misc.h | 2 + dlls/ntdll/thread.c | 85 +++++++++++++++++++++++++++++++ dlls/ntdll/virtual.c | 37 ++++++++++++-- include/wine/server_protocol.h | 31 +++++++++++ include/winternl.h | 58 +++++++++++++++++++++ server/process.c | 67 +++++++++++++++++++++++++ server/protocol.def | 21 ++++++++ server/request.h | 2 + server/trace.c | 12 ++++ 12 files changed, 436 insertions(+), 14 deletions(-) diff --git a/dlls/kernel/kernel32.spec b/dlls/kernel/kernel32.spec index 7369b59..80fcba4 100644 --- a/dlls/kernel/kernel32.spec +++ b/dlls/kernel/kernel32.spec @@ -1239,3 +1239,6 @@ # Unix files # Init code @ cdecl __wine_kernel_init() + +# Remote process operations +@ cdecl __wine_RemoteProcessOperation(ptr ptr ptr) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index 7092d2c..07fa4ef 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -2827,3 +2827,111 @@ BOOL WINAPI CmdBatNotification( BOOL bBa FIXME("%d\n", bBatchRunning); return FALSE; } + +/*********************************************************************** + * __wine_RemoteProcessOperation (KERNEL32.@) Not a Windows API + * + * Execute a remote operation. + * arg1 is an all-access handle to the requesting process. + * arg2 is a pointer to the RemoteOp structure in the requesting process. + * arg3 is an event to notify the requesting process of completion. + */ +void WINAPI CALLBACK __wine_RemoteProcessOperation( ULONG_PTR arg1, + ULONG_PTR arg2, + ULONG_PTR arg3 ) +{ + HANDLE hProcess = (HANDLE) arg1; + void *args = (void *) arg2; + HANDLE hEvent = (HANDLE) arg3; + struct RemoteOp ro; + + NtReadVirtualMemory( hProcess, args, &ro, sizeof(ro), NULL ); + + switch( ro.op ) + { + case RO_NEW_THREAD: + { + CLIENT_ID cidLocal; + HANDLE hThread; + NTSTATUS ret; + + ro.status = RtlCreateUserThread( NtCurrentProcess(), NULL, + ro.thread.suspended, + ro.thread.stack_addr, + ro.thread.stack_reserve, + ro.thread.stack_commit, + ro.thread.start, + ro.thread.param, + ro.thread.handle_ptr ? &hThread : 0, + ro.thread.id_ptr ? &cidLocal : 0); + if (ro.status) break; + + if (ro.thread.handle_ptr) + { + HANDLE hRemoteNewThread; + if ((ret = NtDuplicateObject( NtCurrentProcess(), hThread, + hProcess, &hRemoteNewThread, 0, 0, + DUPLICATE_SAME_ACCESS| + DUPLICATE_CLOSE_SOURCE ))) + ERR("Cannot duplicate handle in remote process, error %lu\n", + ret); + else + { + if ((ret = NtWriteVirtualMemory( hProcess, + ro.thread.handle_ptr, + &hRemoteNewThread, + sizeof(HANDLE), NULL ))) + ERR("Cannot write back handle, error %lu\n", ret); + } + } + if (ro.thread.id_ptr) + if ((ret = NtWriteVirtualMemory( hProcess, ro.thread.id_ptr, + &cidLocal, sizeof(CLIENT_ID), + NULL ))) + ERR("Cannot write back thread id, error %lu\n", ret); + + break; + } + case RO_ALLOCATE: + { + ro.status = NtAllocateVirtualMemory( NtCurrentProcess(), + &ro.alloc.ret, + ro.alloc.zero_bits, + &ro.alloc.size, + ro.alloc.type, + ro.alloc.protect ); + break; + } + case RO_QUERY: + { + void *res; + NTSTATUS ret; + SIZE_T res_len; + + if (!(res = HeapAlloc( GetProcessHeap(), 0, ro.query.len ))) + { + ro.status = STATUS_NO_MEMORY; + break; + } + ro.status = NtQueryVirtualMemory( NtCurrentProcess(), ro.query.addr, + ro.query.info_class, res, + ro.query.len, &res_len ); + if (ro.query.res_len) + if ((ret = NtWriteVirtualMemory( hProcess, ro.query.res_len, + &res_len, sizeof(SIZE_T), NULL ))) + ERR("Cannot write back thread id, error %lu\n", ret); + if (ro.query.buffer) + if ((ret = NtWriteVirtualMemory( hProcess, ro.query.buffer, + res, ro.query.len, NULL ))) + ERR("Cannot write back thread id, error %lu\n", ret); + HeapFree( GetProcessHeap(), 0, res ); + } + } + + /* FIXME optimize write back */ + NtWriteVirtualMemory( hProcess, args, &ro, sizeof(ro), NULL ); + + NtSetEvent( hEvent, NULL ); + NtClose( hEvent ); + NtClose( hProcess ); +} diff --git a/dlls/kernel/thread.c b/dlls/kernel/thread.c index bf29aac..bfa8ef4 100644 --- a/dlls/kernel/thread.c +++ b/dlls/kernel/thread.c @@ -66,7 +66,7 @@ static void CALLBACK THREAD_Start( void LPTHREAD_START_ROUTINE func = info->func; void *arg = info->arg; - RtlFreeHeap( GetProcessHeap(), 0, info ); + VirtualFreeEx( GetCurrentProcess(), info, 0, MEM_RELEASE ); if (TRACE_ON(relay)) DPRINTF("%04lx:Starting thread (entryproc=%p)\n", GetCurrentThreadId(), func ); @@ -122,13 +122,25 @@ HANDLE WINAPI CreateRemoteThread( HANDLE SIZE_T stack_reserve = 0, stack_commit = 0; struct new_thread_info *info; - if (!(info = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*info) ))) + if (!(info = VirtualAllocEx( hProcess, NULL, sizeof(*info), + MEM_COMMIT|MEM_RESERVE, + PAGE_EXECUTE_READWRITE ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return 0; } - info->func = start; - info->arg = param; + + /* FIXME sub with is_current_process() in ntdll */ + if (hProcess != GetCurrentProcess()) + { + struct new_thread_info nti = { start, param }; + WriteProcessMemory( hProcess, info, &nti, sizeof(nti), NULL ); + } + else + { + info->func = start; + info->arg = param; + } if (flags & STACK_SIZE_PARAM_IS_A_RESERVATION) stack_reserve = stack; else stack_commit = stack; @@ -147,7 +159,7 @@ HANDLE WINAPI CreateRemoteThread( HANDLE if (NtResumeThread( handle, &ret )) { NtClose( handle ); - RtlFreeHeap( GetProcessHeap(), 0, info ); + VirtualFreeEx( hProcess, info, 0, MEM_RELEASE ); SetLastError( ERROR_NOT_ENOUGH_MEMORY ); handle = 0; } @@ -155,7 +167,7 @@ HANDLE WINAPI CreateRemoteThread( HANDLE } else { - RtlFreeHeap( GetProcessHeap(), 0, info ); + VirtualFreeEx( hProcess, info, 0, MEM_RELEASE ); SetLastError( RtlNtStatusToDosError(status) ); handle = 0; } diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 03110a4..cdf6c63 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -61,6 +61,8 @@ extern void DECLSPEC_NORETURN server_pro extern void DECLSPEC_NORETURN server_protocol_perror( const char *err ); extern void DECLSPEC_NORETURN server_exit_thread( int status ); extern void DECLSPEC_NORETURN server_abort_thread( int status ); +extern NTSTATUS NTDLL_remote_call( HANDLE process, struct RemoteOp *ro ); + /* module handling */ extern NTSTATUS MODULE_DllThreadAttach( LPVOID lpReserved ); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index dbcc5a6..94c146b 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -385,6 +385,73 @@ static void start_thread( struct wine_pt func( arg ); } +/*********************************************************************** + * get_remote_call_handler + */ +static NTSTATUS get_remote_call_handler( void **func ) +{ + static void *handler = NULL; + HMODULE hkernel32; + UNICODE_STRING module; + ANSI_STRING function; + WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; + NTSTATUS ret; + + if (handler != NULL) + { + *func = handler; + return STATUS_SUCCESS; + } + + RtlInitUnicodeString(&module, kernel32W); + RtlInitAnsiString(&function, "__wine_RemoteProcessOperation"); + if ((ret = LdrGetDllHandle(0, 0, &module, &hkernel32))) + return ret; + if ((ret = LdrGetProcedureAddress(hkernel32, &function, 0, &handler))) + return ret; + *func = handler; + return STATUS_SUCCESS; +} + +/*********************************************************************** + * NTDLL_remote_call + */ +NTSTATUS NTDLL_remote_call( HANDLE process, struct RemoteOp *ro ) +{ + NTSTATUS ret; + HANDLE done_event; + void *func; + + /* FIXME check this */ + if ((ret = NtCreateEvent(&done_event, EVENT_ALL_ACCESS, NULL, FALSE, + FALSE))) + return ret; + + if ((ret = get_remote_call_handler(&func))) + { + ERR("Cannot locate remote call handler\n"); + return ret; + } + + SERVER_START_REQ( remote_op ) + { + req->handle = process; + req->op = ro->op; + req->event = done_event; + req->args = ro; + req->func = func; + + ret = wine_server_call( req ); + } + SERVER_END_REQ; + + if (ret) return ret; + + NtWaitForSingleObject( done_event, FALSE, NULL ); + NtClose( done_event ); + + return STATUS_SUCCESS; +} /*********************************************************************** * RtlCreateUserThread (NTDLL.@) @@ -408,8 +475,22 @@ NTSTATUS WINAPI RtlCreateUserThread( HAN if( ! is_current_process( process ) ) { - ERR("Unsupported on other process\n"); - return STATUS_ACCESS_DENIED; + struct RemoteOp ro; + + ro.op = RO_NEW_THREAD; + ro.thread.suspended = suspended; + ro.thread.stack_addr = stack_addr; + ro.thread.stack_reserve = stack_reserve; + ro.thread.stack_commit = stack_commit; + ro.thread.start = start; + ro.thread.param = param; + ro.thread.handle_ptr = handle_ptr; + ro.thread.id_ptr = id; + + if ((status = NTDLL_remote_call( process, &ro ))) + return status; + + return ro.status; } if (pipe( request_pipe ) == -1) return STATUS_TOO_MANY_OPENED_FILES; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index f7b829f..ee6a196 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1317,8 +1317,25 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( if (!is_current_process( process )) { - ERR("Unsupported on other process\n"); - return STATUS_ACCESS_DENIED; + struct RemoteOp ro; + + ro.op = RO_ALLOCATE; + ro.alloc.ret = *ret; + ro.alloc.zero_bits = zero_bits; + ro.alloc.size = *size_ptr; + ro.alloc.type = type; + ro.alloc.protect = protect; + + if ((status = NTDLL_remote_call( process, &ro ))) + return status; + + TRACE("NtAllocateVirtualMemory addr=%x, status=%x\n", ro.alloc.ret, + (unsigned) status); + + *ret = ro.alloc.ret; + *size_ptr = ro.alloc.size; + + return ro.status; } /* Round parameters to a page boundary */ @@ -1578,8 +1595,20 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HA if (!is_current_process( process )) { - ERR("Unsupported on other process\n"); - return STATUS_ACCESS_DENIED; + struct RemoteOp ro; + NTSTATUS status; + + ro.op = RO_QUERY; + ro.query.addr = (void *) addr; + ro.query.info_class = info_class; + ro.query.buffer = buffer; + ro.query.len = len; + ro.query.res_len = res_len; + + if ((status = NTDLL_remote_call( process, &ro ))) + return status; + + return ro.status; } base = ROUND_ADDR( addr, page_mask ); diff --git a/include/winternl.h b/include/winternl.h index 5177348..4d92e42 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2243,7 +2243,6 @@ extern NTSTATUS wine_nt_to_unix_file_nam UINT disposition, BOOLEAN check_case ); extern NTSTATUS wine_unix_to_nt_file_name( const ANSI_STRING *name, UNICODE_STRING *nt ); - /*********************************************************************** * Inline functions */ @@ -2396,6 +2395,63 @@ static inline PLIST_ENTRY RemoveTailList return e; } +struct RemoteOp { + int op; /* in, FIXME enum remote_op */ + NTSTATUS status; /* out */ + + union { + struct { + /* in */ + ULONG zero_bits; + ULONG type; + ULONG protect; + /* in/out */ + PVOID ret; + SIZE_T size; + } alloc; + struct { + PVOID addr; + SIZE_T size; + ULONG type; + } free; + struct { + PVOID addr; + SIZE_T size; + ULONG new_prot; + ULONG old_prot; + } protect; + struct { + LPVOID addr; + MEMORY_INFORMATION_CLASS info_class; + PVOID buffer; + SIZE_T len; + SIZE_T *res_len; + } query; + struct { + PVOID addr; + SIZE_T size; + ULONG unknown; + } lock; + struct { + PVOID addr; + SIZE_T size; + ULONG unknown; + } unlock; + struct { + /* in */ + BOOLEAN suspended; + PVOID stack_addr; + SIZE_T stack_reserve; + SIZE_T stack_commit; + PRTL_THREAD_START_ROUTINE start; + void *param; + /* out */ + HANDLE *handle_ptr; + CLIENT_ID *id_ptr; + } thread; + }; +}; + #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */ diff --git a/server/process.c b/server/process.c index 75ca490..6ecc7b7 100644 --- a/server/process.c +++ b/server/process.c @@ -1056,3 +1056,70 @@ DECL_HANDLER(get_process_idle_event) release_object( process ); } } + +/* Signal a remote operation it */ +DECL_HANDLER(remote_op) +{ + int access; + struct process *src = NULL, *dst = NULL; + struct thread *thread; + obj_handle_t dupevent = NULL, dupprocess = NULL; + + switch ( req->op ) + { + case RO_NEW_THREAD: + access = PROCESS_CREATE_THREAD | PROCESS_QUERY_INFORMATION + | PROCESS_VM_OPERATION | PROCESS_VM_READ + | PROCESS_VM_WRITE; + break; + case RO_ALLOCATE: + case RO_FREE: + case RO_PROTECT: + case RO_LOCK: /* FIXME check */ + case RO_UNLOCK: /* FIXME check */ + access = PROCESS_VM_OPERATION; + break; + case RO_QUERY: + access = PROCESS_QUERY_INFORMATION; + break; + default: + set_error( STATUS_INVALID_PARAMETER ); + return; + } + + if (!(src = get_process_from_handle( (obj_handle_t) 0xffffffff, 0 ))) + goto cleanup; + if (!(dst = get_process_from_handle( req->handle, access ))) + goto cleanup; + if (!(thread = get_process_first_thread( dst ))) + { + /* FIXME check if this can even happen */ + set_error( STATUS_ACCESS_DENIED ); + goto cleanup; + } + + /* duplicate done event handle */ + dupevent = duplicate_handle(src, req->event, dst, 0, 0, + DUPLICATE_SAME_ACCESS); + if (!dupevent) goto cleanup; + /* duplicate an all-access handle to requesting process */ + dupprocess = duplicate_handle(src, (obj_handle_t) 0xffffffff, dst, 0, 0, + DUPLICATE_SAME_ACCESS); + if (!dupprocess) + { + close_handle( dst, dupevent, 0 ); + goto cleanup; + } + + /* queue remote_op on the remote process' apc queue */ + if (!thread_queue_apc( thread, NULL, req->func, APC_USER, + APC_PROCESS_QUEUE_SYSTEM, + dupprocess, req->args, dupevent )) + set_error( STATUS_INVALID_HANDLE ); + +cleanup: + if (src) + release_object( src ); + if (dst) + release_object( dst ); +} diff --git a/server/protocol.def b/server/protocol.def index e64cf43..98671ae 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2618,3 +2618,24 @@ #define MAILSLOT_SET_READ_TIMEOUT 1 @REPLY VARARG(target_name,unicode_str); /* target name */ @END + + +/* Signal a remote operation */ +@REQ(remote_op) + obj_handle_t handle; /* handle to target process */ + int op; /* remote operation */ + obj_handle_t event; /* completion event */ + void* args; /* pointer to arguments in requesting process */ + void* func; /* pointer to remote op handler in kernel32 */ +@REPLY +@END +enum remote_op +{ + RO_NEW_THREAD, + RO_ALLOCATE, + RO_FREE, + RO_LOCK, + RO_PROTECT, + RO_QUERY, + RO_UNLOCK +};

5 5

Re: msi: The input buffer length is the number of characters excluding the NULL terminator, so fix an off by one error [RESEND]
by Mike McCormack 04 Aug '06

04 Aug '06

James Hawkins wrote: > Is there anything wrong with this patch? > > This fixes bug 5768. > http://bugs.winehq.org/show_bug.cgi?id=5768 > > Changelog: > * The input buffer length is the number of characters excluding the > NULL terminator, so fix an off by one error. msi_strcpy_to_awstring is used by many functions to return strings, so how about a test case? Mike

1 0

Re: widl: Write forward declarations for coclass definitions
by Alexandre Julliard 03 Aug '06

03 Aug '06

Dan Hipschman <dsh(a)linux.ucla.edu> writes: > diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h > index e0c1c3c..262ed37 100644 > --- a/dlls/mshtml/mshtml_private.h > +++ b/dlls/mshtml/mshtml_private.h > @@ -53,7 +53,8 @@ typedef enum { > EDITMODE > } USERMODE; > > -typedef struct { > +/* "typedef struct HTMLDocument HTMLDocument;" is in mshtml.h */ > +struct HTMLDocument { > const IHTMLDocument2Vtbl *lpHTMLDocument2Vtbl; It would be better to rename the types instead of depending on having a typedef in a system header for an unrelated type. -- Alexandre Julliard julliard(a)winehq.org

3 4

null dereference in dbghelp
by Jan Zerebecki 03 Aug '06

03 Aug '06

I tried to hack on http://bugs.winehq.org/show_bug.cgi?id=4848 and dbghelp failed on me. Log about the failure: http://bugs.winehq.org/attachment.cgi?id=3151&action=view Jan

2 1

Re: Implement SetThreadPriority
by Chris Robinson 03 Aug '06

03 Aug '06

Is there anything still wrong with this patch? I believe I've addressed the concerns brought up before. If this patch is still unacceptable, what needs to be done to make it acceptable?

2 2

Re: usp10: resend Remove a test that fails on Windows
by Alexandre Julliard 03 Aug '06

03 Aug '06

Jeff L <lats(a)yless4u.com.au> writes: > Hans and I have worked this one a fair bit and think it looks to be > the final. Can you apply this? It would be a lot cleaner to create the DC in the caller and pass it to the functions that need it. -- Alexandre Julliard julliard(a)winehq.org

1 0

ntdll: CreateRemoteThread and RtlCreateUserThread for remote processes, take 2
by tkho＠ucla.edu 03 Aug '06

03 Aug '06

ntdll: CreateRemoteThread and RtlCreateUserThread for remote processes, take 2 Hello, This is an implementation of CreateRemoteThread and RtlCreateUserThread for remote processes that re-introduces a service thread for each process and uses a signal to flag pending operations. Operations are guarded by a global mutex for each process. A recent thread for the implementation of the functions via thread hijacking with ptrace is at http://winehq.org/pipermail/wine-devel/2006-July/049593.html I have created a wiki page at http://wiki.winehq.org/RemoteProcessOperations to document the discussion of this class of functions. Note: With the service thread, this mutex-and-signals approach could be exchanged for queued APCs on the service thread. In addition, there are unaddressed issues with this implementation (thread attach notifications, etc). Is this a step in the right direction? Thomas Kho --- dlls/kernel/thread.c | 42 +++++- dlls/ntdll/Makefile.in | 1 dlls/ntdll/loader.c | 1 dlls/ntdll/ntdll.spec | 4 + dlls/ntdll/ntdll_misc.h | 73 +++++++++++ dlls/ntdll/server.c | 3 dlls/ntdll/service.c | 267 ++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/signal_i386.c | 19 +++ dlls/ntdll/thread.c | 102 +++++++++++++++ dlls/ntdll/virtual.c | 55 ++++++++ include/thread.h | 3 include/wine/server_protocol.h | 54 ++++++++ include/winternl.h | 1 server/handle.c | 2 server/process.c | 97 +++++++++++++++ server/process.h | 1 server/protocol.def | 28 ++++ server/request.h | 6 + server/thread.c | 9 + server/trace.c | 36 +++++ 20 files changed, 788 insertions(+), 16 deletions(-) diff --git a/dlls/kernel/thread.c b/dlls/kernel/thread.c index bf29aac..162b898 100644 --- a/dlls/kernel/thread.c +++ b/dlls/kernel/thread.c @@ -47,12 +47,12 @@ #include "kernel_private.h" WINE_DEFAULT_DEBUG_CHANNEL(thread); WINE_DECLARE_DEBUG_CHANNEL(relay); - struct new_thread_info { LPTHREAD_START_ROUTINE func; void *arg; }; +static struct new_thread_info threadInfo; /*********************************************************************** @@ -62,11 +62,12 @@ struct new_thread_info */ static void CALLBACK THREAD_Start( void *ptr ) { - struct new_thread_info *info = ptr; + struct new_thread_info *info = ptr ? ptr : &threadInfo; LPTHREAD_START_ROUTINE func = info->func; void *arg = info->arg; - RtlFreeHeap( GetProcessHeap(), 0, info ); + if (ptr) + RtlFreeHeap( GetProcessHeap(), 0, info ); if (TRACE_ON(relay)) DPRINTF("%04lx:Starting thread (entryproc=%p)\n", GetCurrentThreadId(), func ); @@ -116,11 +117,11 @@ HANDLE WINAPI CreateRemoteThread( HANDLE LPTHREAD_START_ROUTINE start, LPVOID param, DWORD flags, LPDWORD id ) { - HANDLE handle; + HANDLE handle, hServiceThreadMutex; CLIENT_ID client_id; NTSTATUS status; SIZE_T stack_reserve = 0, stack_commit = 0; - struct new_thread_info *info; + struct new_thread_info *info = NULL; if (!(info = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*info) ))) { @@ -130,12 +131,29 @@ HANDLE WINAPI CreateRemoteThread( HANDLE info->func = start; info->arg = param; + if (hProcess != GetCurrentProcess()) + { + status = __wine_get_remote_op_mutex(hProcess, &hServiceThreadMutex); + if (status) return status; + + WriteProcessMemory(hProcess, &threadInfo, info, + sizeof(struct new_thread_info), NULL); + } + if (flags & STACK_SIZE_PARAM_IS_A_RESERVATION) stack_reserve = stack; else stack_commit = stack; - status = RtlCreateUserThread( hProcess, NULL, TRUE, - NULL, stack_reserve, stack_commit, - THREAD_Start, info, &handle, &client_id ); + if (hProcess != GetCurrentProcess()) + status = RtlCreateUserThread( hProcess, NULL, TRUE, + NULL, stack_reserve, stack_commit, + THREAD_Start, NULL, &handle, + &client_id ); + else + status = RtlCreateUserThread( hProcess, NULL, TRUE, + NULL, stack_reserve, stack_commit, + THREAD_Start, info, &handle, + &client_id ); + if (status == STATUS_SUCCESS) { if (id) *id = (DWORD)client_id.UniqueThread; @@ -149,6 +167,7 @@ HANDLE WINAPI CreateRemoteThread( HANDLE NtClose( handle ); RtlFreeHeap( GetProcessHeap(), 0, info ); SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + if (hProcess != GetCurrentProcess()) handle = 0; } } @@ -157,8 +176,15 @@ HANDLE WINAPI CreateRemoteThread( HANDLE { RtlFreeHeap( GetProcessHeap(), 0, info ); SetLastError( RtlNtStatusToDosError(status) ); + if (hProcess != GetCurrentProcess()) handle = 0; } + + if (hProcess != GetCurrentProcess()) + { + RtlFreeHeap( GetProcessHeap(), 0, info ); + __wine_release_remote_op_mutex(hServiceThreadMutex); + } return handle; } diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 646808f..ea843d2 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -38,6 +38,7 @@ C_SRCS = \ sec.c \ serial.c \ server.c \ + service.c \ signal_i386.c \ signal_powerpc.c \ signal_sparc.c \ diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 184f64f..d093e59 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2151,6 +2151,7 @@ void WINAPI LdrInitializeThunk( ULONG un RtlLeaveCriticalSection( &loader_section ); if (nt->FileHeader.Characteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) VIRTUAL_UseLargeAddressSpace(); + SERVICE_init(); return; error: diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4b5549f..2e26a6e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1390,3 +1390,7 @@ # Filesystem @ cdecl wine_nt_to_unix_file_name(ptr ptr long long) @ cdecl wine_unix_to_nt_file_name(ptr ptr) @ cdecl __wine_init_windows_dir(wstr wstr) + +# Remote process locking +@ cdecl __wine_get_remote_op_mutex(long ptr) +@ cdecl __wine_release_remote_op_mutex(long) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 03110a4..cfd37e7 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -177,4 +177,77 @@ static inline struct ntdll_thread_regs * return (struct ntdll_thread_regs *)NtCurrentTeb()->SpareBytes1; } +extern void SERVICE_init(void); + +struct RemoteOp { + enum enum_op { + RO_NEW_THREAD, + RO_ALLOCATE, + RO_FREE, + RO_LOCK, + RO_PROTECT, + RO_QUERY, + RO_UNLOCK + } op; + + /* in */ + HANDLE hDoneEvent; + /* out */ + NTSTATUS status; + + union { + struct { + PVOID ret; + ULONG zero_bits; + SIZE_T size; + ULONG type; + ULONG protect; + } alloc; + struct { + PVOID addr; + SIZE_T size; + ULONG type; + } free; + struct { + PVOID addr; + SIZE_T size; + ULONG new_prot; + ULONG old_prot; + } protect; + struct { + LPVOID addr; + MEMORY_INFORMATION_CLASS info_class; + PVOID buffer; + SIZE_T len; + SIZE_T res_len; + } query; + struct { + PVOID addr; + SIZE_T size; + ULONG unknown; + } lock; + struct { + PVOID addr; + SIZE_T size; + ULONG unknown; + } unlock; + struct { + /* in */ + HANDLE src_process; + BOOLEAN suspended; + PVOID stack_addr; + SIZE_T stack_reserve; + SIZE_T stack_commit; + PRTL_THREAD_START_ROUTINE start; + void *param; + /* out */ + HANDLE *handle_ptr; + CLIENT_ID *id_ptr; + } thread; + }; +}; + +extern struct RemoteOp ro; +extern volatile int pending_service_req; + #endif diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 841604a..9124751 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -880,6 +880,7 @@ void server_init_process(void) sigaddset( &block_set, SIGUSR1 ); sigaddset( &block_set, SIGUSR2 ); sigaddset( &block_set, SIGCHLD ); + sigaddset( &block_set, SIGRTMIN ); /* receive the first thread request fd on the main socket */ ntdll_get_thread_data()->request_fd = receive_fd( &dummy_handle ); @@ -934,6 +935,8 @@ #endif req->reply_fd = reply_pipe[1]; req->wait_fd = ntdll_get_thread_data()->wait_fd[1]; req->debug_level = (TRACE_ON(server) != 0); + req->event = ro.hDoneEvent; + ro.hDoneEvent = 0; /* creation mutex released after server call */ ret = wine_server_call( req ); NtCurrentTeb()->ClientId.UniqueProcess = (HANDLE)reply->pid; NtCurrentTeb()->ClientId.UniqueThread = (HANDLE)reply->tid; diff --git a/dlls/ntdll/service.c b/dlls/ntdll/service.c new file mode 100644 index 0000000..ba6c895 --- /dev/null +++ b/dlls/ntdll/service.c @@ -0,0 +1,267 @@ +/* + * Service thread + * + * Copyright 2006 Google (Thomas Kho) + * + * 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 + */ + +/* FIXME remove extraneous includes */ +#include "config.h" +#include "wine/port.h" + +#include <sys/types.h> +#ifdef HAVE_SYS_MMAN_H +#include <sys/mman.h> +#endif +#ifdef HAVE_SYS_TIMES_H +#include <sys/times.h> +#endif + +#define NONAMELESSUNION +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "thread.h" +#include "winternl.h" +#include "wine/library.h" +#include "wine/server.h" +#include "wine/pthread.h" +#include "wine/debug.h" +#include "ntdll_misc.h" +#include "wine/exception.h" + +WINE_DEFAULT_DEBUG_CHANNEL(thread); + + +#define IS_OPTION_TRUE(ch) ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1') + +volatile int pending_service_req = 0; + +/*********************************************************************** + * use_service_thread + */ +static BOOL use_service_thread(void) +{ + static const WCHAR WineW[] = {'S','o','f','t','w','a','r','e','\\', + 'W','i','n','e',0}; + static const WCHAR UseServiceThreadW[] = {'U','s','e', + 'S','e','r','v','i','c','e', 'T','h','r','e','a','d',0}; + + char tmp[80]; + HANDLE root, hkey; + DWORD dummy; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + BOOL ret = FALSE; + + attr.Length = sizeof (OBJECT_ATTRIBUTES); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); + attr.RootDirectory = root; + RtlInitUnicodeString( &nameW, WineW ); + + /* @@ Wine registry key: HKCU\Software\Wine\Network */ + if (!NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr )) + { + RtlInitUnicodeString( &nameW, UseServiceThreadW ); + if (!NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, tmp, + sizeof(tmp), &dummy )) + { + WCHAR *str = (WCHAR *)((KEY_VALUE_PARTIAL_INFORMATION *)tmp)->Data; + ret = IS_OPTION_TRUE( str[0] ); + } + NtClose( hkey ); + } + NtClose( root ); + return ret; +} + + +/*********************************************************************** + * create_global_mutex + */ +static HANDLE create_global_mutex(void) +{ + HANDLE hServiceThreadMutex = NULL; + HANDLE hGlobalServiceThreadMutex = NULL; + NTSTATUS status; + OBJECT_ATTRIBUTES attr; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = NULL; + attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_OPENIF; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + status = NtCreateMutant (&hServiceThreadMutex, MUTEX_ALL_ACCESS, &attr, + FALSE); + //printf("created mutant %x, status=%x\n", hServiceThreadMutex, status); + NtDuplicateObject(NtCurrentProcess(), hServiceThreadMutex, + NULL, &hGlobalServiceThreadMutex, + 0, FALSE, DUPLICATE_CLOSE_SOURCE|DUPLICATE_SAME_ACCESS| + DUP_HANDLE_MAKE_GLOBAL); + //printf("new mutant %x, status=%x\n", hGlobalServiceThreadMutex, status); + return hGlobalServiceThreadMutex; +} + + +/*********************************************************************** + * SERVICE_thread + * + * Service thread loop + */ +static DWORD WINAPI SERVICE_thread(LPVOID arg) +{ + static unsigned int i = 0; + sigset_t sigset; + + /* unblock SIGRTMIN only for service thread */ + sigemptyset( &sigset ); + sigaddset( &sigset, SIGRTMIN ); + sigprocmask( SIG_UNBLOCK, &sigset, NULL ); + + //printf("setting event inside SERVICE_thread\n"); + /* signal that the service thread has been created */ + NtSetEvent(*(HANDLE *) arg, NULL); + + /* all work for this thread is done in the rt0 signal handler in + * signal_i386.c */ + while (TRUE) + { + struct timeval timeout = {1, 0}; + + select(0, NULL, NULL, NULL, &timeout); + + if (!pending_service_req) + continue; + pending_service_req = 0; + + switch( ro.op ) + { + case RO_NEW_THREAD: + { + HANDLE hNewThread; + CLIENT_ID cidLocal; + NTSTATUS ret; + HANDLE hServiceThreadMutex = NULL; + /* + printf("inside wine_cloned_thread_creator, " + "params (%x, %x, %x, %x, %x, %x, %x, %x, %x, %x)\n", + ro.thread.suspended, ro.thread.stack_addr, + ro.thread.stack_reserve, ro.thread.stack_commit, + ro.thread.start, ro.thread.param, + ro.hDoneEvent, ro.thread.src_process, + ro.thread.handle_ptr, ro.thread.id_ptr); + */ + + ret = RtlCreateUserThread( NtCurrentProcess(), NULL, + ro.thread.suspended, + ro.thread.stack_addr, + ro.thread.stack_reserve, + ro.thread.stack_commit, ro.thread.start, + ro.thread.param, + ro.thread.handle_ptr ? &hNewThread : 0, + ro.thread.id_ptr ? &cidLocal : 0); + //printf("RtlCreateUserThread status %x in service thread\n", ret); + + if (ro.thread.handle_ptr) + { + HANDLE hRemoteNewThread; + ret = NtDuplicateObject(NtCurrentProcess(), hNewThread, + ro.thread.src_process, + &hRemoteNewThread, 0, 0, + DUPLICATE_SAME_ACCESS| + DUPLICATE_CLOSE_SOURCE); + if (ret) printf("error 1 %x\n", ret); + /* + printf("writing handle %x (dup of %x)\n", hRemoteNewThread, + hNewThread); + */ + ret = NtWriteVirtualMemory(ro.thread.src_process, + ro.thread.handle_ptr, + &hRemoteNewThread, sizeof(HANDLE), + NULL); + if (ret) printf("error 2 %x\n", ret); + } + if (ro.thread.id_ptr) + { + ret = NtWriteVirtualMemory(ro.thread.src_process, ro.thread.id_ptr, + &cidLocal, + sizeof(CLIENT_ID), NULL); + if (ret) printf("error 5 %x\n", ret); + } + + NtClose(ro.thread.src_process); + break; + } + case RO_ALLOCATE: + { + ro.status = NtAllocateVirtualMemory( NtCurrentProcess(), + &ro.alloc.ret, + ro.alloc.zero_bits, + &ro.alloc.size, + ro.alloc.type, + ro.alloc.protect ); + NtSetEvent( ro.hDoneEvent, NULL ); + NtClose( ro.hDoneEvent ); + break; + } + } + } +} + + +/*********************************************************************** + * SERVICE_init + * + * Initialize the service thread + * + * FIXME check return codes + */ +void SERVICE_init() +{ + HANDLE hNewThread, hGlobalServiceThreadMutex, hThreadCreatedEvent; + + if (!use_service_thread()) + { + ERR("service thread disabled\n"); + return; + } + + hGlobalServiceThreadMutex = create_global_mutex(); + + NtCreateEvent(&hThreadCreatedEvent, EVENT_ALL_ACCESS, + NULL, FALSE, FALSE); + + RtlCreateUserThread( NtCurrentProcess(), NULL, FALSE, NULL, + 0, 0, SERVICE_thread, &hThreadCreatedEvent, + &hNewThread, NULL ); + NtClose(hNewThread); + + NtWaitForSingleObject(hThreadCreatedEvent, FALSE, NULL); + NtClose(hThreadCreatedEvent); + + //ERR("hNewThread=%x, mutex=%x\n", hNewThread, hGlobalServiceThreadMutex); + SERVER_START_REQ( set_remote_op_mutex ) + { + req->mutex = hGlobalServiceThreadMutex; + wine_server_call( req ); + } + SERVER_END_REQ; +} diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 99685f3..508b4dd 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1209,6 +1209,17 @@ #endif /* __HAVE_VM86 */ /********************************************************************** + * rt0_handler + * + * Handler for SIGRTMIN. + */ +static HANDLER_DEF(rt0_handler) +{ + pending_service_req = 1; +} + + +/********************************************************************** * segv_handler * * Handler for SIGSEGV and related errors. @@ -1439,6 +1450,7 @@ #endif /* linux */ sigaddset( &sig_act.sa_mask, SIGINT ); sigaddset( &sig_act.sa_mask, SIGUSR1 ); sigaddset( &sig_act.sa_mask, SIGUSR2 ); + sigaddset( &sig_act.sa_mask, SIGRTMIN ); #if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) sig_act.sa_flags = SA_RESTART; @@ -1473,6 +1485,7 @@ int __wine_set_signal_handler(unsigned i BOOL SIGNAL_Init(void) { int have_sigaltstack = 0; + sigset_t sigset; #ifdef HAVE_SIGALTSTACK struct sigaltstack ss; @@ -1505,6 +1518,12 @@ #endif #ifdef __HAVE_VM86 if (set_handler( SIGUSR2, have_sigaltstack, (void (*)())usr2_handler ) == -1) goto error; #endif + if (set_handler( SIGRTMIN, 0, (void (*)())rt0_handler ) == -1) goto error; + + /* block SIGRTMIN by default */ + sigemptyset( &sigset ); + sigaddset( &sigset, SIGRTMIN ); + sigprocmask( SIG_BLOCK, &sigset, NULL ); return TRUE; diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index dbcc5a6..9cf8407 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -62,6 +62,7 @@ static size_t sigstack_total_size; static ULONG sigstack_zero_bits; struct wine_pthread_functions pthread_functions = { NULL }; +struct RemoteOp ro = { 0 }; /*********************************************************************** * init_teb @@ -76,6 +77,7 @@ static inline NTSTATUS init_teb( TEB *te teb->Tib.Self = &teb->Tib; teb->StaticUnicodeString.Buffer = teb->StaticUnicodeBuffer; teb->StaticUnicodeString.MaximumLength = sizeof(teb->StaticUnicodeBuffer); + teb->GotThreadMutex = 0; if (!(thread_regs->fs = wine_ldt_alloc_fs())) return STATUS_TOO_MANY_THREADS; thread_data->request_fd = -1; @@ -385,6 +387,52 @@ static void start_thread( struct wine_pt func( arg ); } +/*********************************************************************** + * __wine_get_remote_op_mutex (NTDLL.@) Not a Windows API + * + * return the service mutex, or a null handle with success if the thread + * already has the mutex + */ +NTSTATUS WINAPI __wine_get_remote_op_mutex(HANDLE hProcess, HANDLE *hMutex) +{ + NTSTATUS status; + + if (NtCurrentTeb()->GotThreadMutex) + { + *hMutex = NULL; + return STATUS_SUCCESS; + } + + SERVER_START_REQ( get_remote_op_mutex ) + { + req->process = hProcess; + if (!(status = wine_server_call( req ))) + *hMutex = reply->mutex; + } + SERVER_END_REQ; + + if (status || *hMutex == NULL) + return status ? status : STATUS_NOT_IMPLEMENTED; + + status = NtWaitForSingleObject(*hMutex, FALSE, 0); + NtCurrentTeb()->GotThreadMutex = 1; + + return STATUS_SUCCESS; +} + +/*********************************************************************** + * __wine_release_remote_op_mutex (NTDLL.@) Not a Windows API + */ +NTSTATUS WINAPI __wine_release_remote_op_mutex(HANDLE hMutex) +{ + NTSTATUS status; + + if (hMutex == NULL) return STATUS_SUCCESS; + + NtCurrentTeb()->GotThreadMutex = 0; + status = NtReleaseMutant(hMutex, NULL); + return status; +} /*********************************************************************** * RtlCreateUserThread (NTDLL.@) @@ -408,8 +456,58 @@ NTSTATUS WINAPI RtlCreateUserThread( HAN if( ! is_current_process( process ) ) { - ERR("Unsupported on other process\n"); - return STATUS_ACCESS_DENIED; + HANDLE hThreadCreatedEvent; + HANDLE hServiceThreadMutex; + struct RemoteOp n; + + status = __wine_get_remote_op_mutex(process, &hServiceThreadMutex); + if (status) return status; + + status = NtCreateEvent(&hThreadCreatedEvent, EVENT_ALL_ACCESS, NULL, + FALSE, FALSE); /* FIXME check this */ + + n.op = RO_NEW_THREAD; + n.thread.suspended = suspended; + n.thread.stack_addr = stack_addr; + n.thread.stack_reserve = stack_reserve; + n.thread.stack_commit = stack_commit; + n.thread.start = start; + n.thread.param = param; + n.thread.handle_ptr = handle_ptr; + n.thread.id_ptr = id; + n.thread.src_process = NULL; + n.hDoneEvent = NULL; + + status = NtWriteVirtualMemory(process, &ro, &n, + sizeof(struct RemoteOp), NULL); + if (status) + { + NtClose( hThreadCreatedEvent ); + return status; + } + + SERVER_START_REQ( remote_op ) + { + req->handle = process; + /* This pair of handles is duplicated and forwarded to the remote + * process. The done event is actually set in the remote process + * during the init_thread server call because it is right after + * this that the thread is suspended. */ + req->event = hThreadCreatedEvent; + req->event_ptr = &ro.hDoneEvent; + req->src_process = NtCurrentProcess(); + req->src_process_ptr = &ro.thread.src_process; + + status = wine_server_call( req ); + } + SERVER_END_REQ; + if (status) return status; + + NtWaitForSingleObject(hThreadCreatedEvent, FALSE, NULL); + __wine_release_remote_op_mutex(hServiceThreadMutex); + + NtClose(hThreadCreatedEvent); + return status; } if (pipe( request_pipe ) == -1) return STATUS_TOO_MANY_OPENED_FILES; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index f7b829f..0600170 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1317,8 +1317,59 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( if (!is_current_process( process )) { - ERR("Unsupported on other process\n"); - return STATUS_ACCESS_DENIED; + HANDLE hThreadCreatedEvent; + HANDLE hServiceThreadMutex; + struct RemoteOp n; + + status = __wine_get_remote_op_mutex(process, &hServiceThreadMutex); + if (status) return status; + + status = NtCreateEvent(&hThreadCreatedEvent, EVENT_ALL_ACCESS, NULL, + FALSE, FALSE); /* FIXME check this */ + + n.op = RO_ALLOCATE; + n.alloc.ret = *ret; + n.alloc.zero_bits = zero_bits; + n.alloc.size = *size_ptr; + n.alloc.type = type; + n.alloc.protect = protect; + n.hDoneEvent = NULL; + + status = NtWriteVirtualMemory(process, &ro, &n, + sizeof(struct RemoteOp), NULL); + if (status) + { + NtClose( hThreadCreatedEvent ); + return status; + } + + SERVER_START_REQ( remote_op ) + { + req->handle = process; + + req->event = hThreadCreatedEvent; + req->event_ptr = &ro.hDoneEvent; + req->src_process = NULL; + req->src_process_ptr = NULL; + + status = wine_server_call( req ); + } + SERVER_END_REQ; + + if (status) return status; + + NtWaitForSingleObject(hThreadCreatedEvent, FALSE, NULL); + + NtReadVirtualMemory(process, &ro, &n, sizeof(struct RemoteOp), + NULL); + + *ret = n.alloc.ret; + *size_ptr = n.alloc.size; + + __wine_release_remote_op_mutex(hServiceThreadMutex); + + NtClose(hThreadCreatedEvent); + return n.status; } /* Round parameters to a page boundary */ diff --git a/include/thread.h b/include/thread.h index 68d7ae2..d6a36e5 100644 --- a/include/thread.h +++ b/include/thread.h @@ -57,7 +57,8 @@ typedef struct _TEB ULONG_PTR dpmi_vif; /* 200 protected mode virtual interrupt flag */ DWORD vm86_pending; /* 204 data for vm86 mode */ /* here is plenty space for wine specific fields (don't forget to change pad6!!) */ - DWORD pad6[309]; /* 208 */ + DWORD GotThreadMutex; /* 208 */ + DWORD pad6[308]; /* 20c */ ULONG gdiRgn; /* 6dc */ ULONG gdiPen; /* 6e0 */ diff --git a/server/process.c b/server/process.c index 3e5ef97..651ded6 100644 --- a/server/process.c +++ b/server/process.c @@ -22,12 +22,15 @@ #include "config.h" #include "wine/port.h" #include <assert.h> +#include <errno.h> #include <limits.h> +#include <linux/user.h> #include <signal.h> #include <string.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include <sys/ptrace.h> #include <sys/time.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> @@ -36,6 +39,10 @@ #include <unistd.h> #ifdef HAVE_POLL_H #include <poll.h> #endif +#include <sys/wait.h> +#include <sys/types.h> +#include <linux/unistd.h> +#include <errno.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -250,6 +257,7 @@ struct thread *create_process( int fd, s process->winstation = 0; process->desktop = 0; process->token = token_create_admin(); + process->service_mutex = NULL; list_init( &process->thread_list ); list_init( &process->locks ); list_init( &process->classes ); @@ -1055,3 +1063,92 @@ DECL_HANDLER(get_process_idle_event) release_object( process ); } } + +/* Signal a remote operation it */ +DECL_HANDLER(remote_op) +{ + int access; + struct process *src = NULL, *dst = NULL; + struct thread *thread = NULL; + int pid; + obj_handle_t dupevent = NULL, dupprocess = NULL; + + /* get process object */ + access = PROCESS_CREATE_THREAD | PROCESS_QUERY_INFORMATION + | PROCESS_VM_OPERATION | PROCESS_VM_READ | PROCESS_VM_WRITE; + if (!(dst = get_process_from_handle( req->handle, access ))) + { + set_error( STATUS_ACCESS_DENIED ); + goto cleanup; + } + + if (!(thread = get_process_first_thread( dst ))) + { + set_error( STATUS_ACCESS_DENIED ); + goto cleanup; + } + + pid = thread->unix_pid; + + /* clone event and process handles and write to target process */ + if (!(src = get_process_from_handle((obj_handle_t) 0xffffffff, 0))) + { + set_error( STATUS_ACCESS_DENIED ); + goto cleanup; + } + if (req->event) + { + dupevent = duplicate_handle(src, req->event, dst, 0, 0, + DUPLICATE_SAME_ACCESS); + write_process_memory(dst, req->event_ptr, sizeof(obj_handle_t), + (char *) &dupevent); + } + if (req->src_process) + { + dupprocess = duplicate_handle(src, req->src_process, dst, 0, 0, + DUPLICATE_SAME_ACCESS); + write_process_memory(dst, req->src_process_ptr, + sizeof(obj_handle_t), (char *) &dupprocess); + } + + kill(pid, SIGRTMIN); + +cleanup: + if (src) + release_object( src ); + if (dst) + release_object( dst ); +} + +/* FIXME We can actually put the mutex data in a specific place and read + * from it. */ + +/* Set service thread mutex */ +DECL_HANDLER(set_remote_op_mutex) +{ + struct process *p; + if (!(p = get_process_from_handle((obj_handle_t) 0xffffffff, 0))) + { + set_error( STATUS_INVALID_HANDLE ); + return; + } + p->service_mutex = req->mutex; + release_object( p ); +} + +/* Get service thread mutex */ +DECL_HANDLER(get_remote_op_mutex) +{ + struct process *p; + if (!(p = get_process_from_handle(req->process, 0))) + { + set_error( STATUS_INVALID_HANDLE ); + return; + } + if (!(reply->mutex = p->service_mutex)) + { + set_error( STATUS_NOT_IMPLEMENTED ); + return; + } + release_object( p ); +} diff --git a/server/process.h b/server/process.h index 6edb1e6..eb13043 100644 --- a/server/process.h +++ b/server/process.h @@ -78,6 +78,7 @@ struct process struct list dlls; /* list of loaded dlls */ void *peb; /* PEB address in client address space */ void *ldt_copy; /* pointer to LDT copy in client addr space */ + obj_handle_t service_mutex; /* mutex of service thread */ }; struct process_snapshot diff --git a/server/protocol.def b/server/protocol.def index e64cf43..3dcf500 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -280,6 +280,7 @@ struct token_groups int reply_fd; /* fd for reply pipe */ int wait_fd; /* fd for blocking calls pipe */ int debug_level; /* new debug level */ + obj_handle_t event; /* set to notify remote process */ @REPLY process_id_t pid; /* process id of the new thread's process */ thread_id_t tid; /* thread id of the new thread */ @@ -2618,3 +2619,30 @@ #define MAILSLOT_SET_READ_TIMEOUT 1 @REPLY VARARG(target_name,unicode_str); /* target name */ @END + + +/* Signal a remote operation */ +@REQ(remote_op) + obj_handle_t handle; /* process handle */ + + obj_handle_t event; + void* event_ptr; + obj_handle_t src_process; + void* src_process_ptr; +@REPLY +@END + + +/* Set current process service thread */ +@REQ(set_remote_op_mutex) + obj_handle_t mutex; /* global handle for mutex */ +@REPLY +@END + + +/* Get service thread mutex */ +@REQ(get_remote_op_mutex) + obj_handle_t process; +@REPLY + obj_handle_t mutex; +@END diff --git a/server/thread.c b/server/thread.c index feb3259..f610d28 100644 --- a/server/thread.c +++ b/server/thread.c @@ -886,6 +886,15 @@ DECL_HANDLER(init_thread) } debug_level = max( debug_level, req->debug_level ); + if (req->event) + { + struct event *event; + if (event = get_event_obj( current->process, req->event, + EVENT_MODIFY_STATE )) + set_event( event ); + close_handle( current->process, req->event, NULL ); + } + reply->pid = get_process_id( process ); reply->tid = get_thread_id( current ); reply->version = SERVER_PROTOCOL_VERSION;

4 6

Re: Problem with ValidateInUseArena
by Diego A. Degese 03 Aug '06

03 Aug '06

The problem is: when in directx.c (Line 787, into the loop) try to Call function HeapAlloc in the first iteration, it crash with the error invalid in-use arena magic. I found this errors: stateLookup isn't allocated. It is a dword * []. minLookup and maxLookup isn't initialized. I copy the code for more information. --- CUT HERE --- /* Load all the lookup tables TODO: It may be a good idea to make minLookup and maxLookup const and populate them in wined3d_private.h where they are declared */ minLookup[WINELOOKUP_WARPPARAM] = D3DTADDRESS_WRAP; maxLookup[WINELOOKUP_WARPPARAM] = D3DTADDRESS_MIRRORONCE; minLookup[WINELOOKUP_MAGFILTER] = WINED3DTEXF_NONE; maxLookup[WINELOOKUP_MAGFILTER] = WINED3DTEXF_ANISOTROPIC; for (i = 0; i < MAX_LOOKUPS; i++) { // THIS IS THE LINE stateLookup[i] = HeapAlloc(GetProcessHeap(), 0, sizeof(*stateLookup[i]) * (1 + maxLookup[i] - minLookup[i]) ); // THIS IS THE LINE } --- CUT HERE --- Regards Diego Diego A. Degese wrote: > Ok.... this is the complete trace.... > I try to find more information about it > > Diego > > Andreas Mohr wrote: >> Hi, >> >> On Tue, Aug 01, 2006 at 05:40:24PM -0300, Diego A. Degese wrote: >> >>> 0009:Call ntdll.RtlAllocateHeap(00110000,00000000,00000014) >>> ret=7ec142bc >>> 0009:err:heap:HEAP_ValidateInUseArena Heap 0x110000: invalid in-use >>> arena magic for 0x17c228 >>> Heap: 0x110000 >>> Next: 0x3e30000 Sub-heaps: 0x110000 >>> Free lists: >>> Block Stat Size Id >>> 0x110038 free 00000010 prev=0x17c228 next=0x110048 >>> 0x110048 free 00000020 prev=0x110038 next=0x110058 >>> 0x110058 free 00000030 prev=0x110048 next=0x110068 >>> 0x110068 free 00000040 prev=0x110058 next=0x110078 >>> 0x110078 free 00000060 prev=0x110068 next=0x110088 >>> 0x110088 free 00000080 prev=0x110078 next=0x110098 >>> 0x110098 free 00000100 prev=0x110088 next=0x1100a8 >>> 0x1100a8 free 00000200 prev=0x110098 next=0x1100b8 >>> 0x1100b8 free 00000400 prev=0x1100a8 next=0x17aa60 >>> 0x1100c8 free 00001000 prev=0x17aa60 next=0x1100d8 >>> 0x1100d8 free ffffffff prev=0x1100c8 next=0x17c228 >>> >> >> This probably means that either the block directly before the >> 0x17c228 block >> or the block right at 0x17c228 got corrupted (overwritten with excessive >> length or maybe some random access to the arena flags area by a >> rogue pointer). >> Try to figure out via wine debug channels or additional manually >> inserted >> source traces, which pointer variable the previous block gets >> allocated for >> and where it's being written to (most likely incorrectly). >> You could also figure out which address the arena magic for 0x17c228 >> resides at and do a character/hex dump of the surrounding area to >> find out >> what kind of data is corrupting this area... (maybe a text string or >> characteristic numbers?). >> >> Andreas >> >>

1 0

Name problems with HTMLDocument, InternetExplorer and WebBrowser
by Dan Hipschman 02 Aug '06

02 Aug '06

Hi all, I'd like to submit a patch which makes widl output forward declarations to the header file for coclass definitions. Currently this is done only if the coclass has its own forward declaration. For example, [ uuid(...) ] coclass Foo; [ uuid(...) ] coclass Bar { ... }; Foo will get declared (via typedef) in the header but Bar will not. The only problem is that when I fix widl it breaks the build in three places: make[2]: Entering directory `/var/build/wine/dlls/mshtml' In file included from conpoint.c:33: mshtml_private.h:99: error: conflicting types for `HTMLDocument' ../../include/mshtml.h:26023: error: previous declaration of `HTMLDocument' was here make[2]: Entering directory `/var/build/wine/dlls/shdocvw' In file included from classinfo.c:26: shdocvw.h:133: error: conflicting types for `WebBrowser' ../../include/exdisp.h:1907: error: previous declaration of `WebBrowser' was here shdocvw.h:143: error: conflicting types for `InternetExplorer' ../../include/exdisp.h:1918: error: previous declaration of `InternetExplorer' was here The problem is that the three names are declared coclasses in the IDL files which generates code like this: #ifndef __Foo_FWD_DEFINED__ #define __Foo_FWD_DEFINED__ typedef struct Foo Foo; #endif /* defined __Foo_FWD_DEFINED__ */ and is included in the files shown above which redeclare the names like this: typedef struct { ... } Foo; There's actually an easy fix if we just change the latter declaration to struct Foo { ... }; but I'm not sure this is not a kludge. Do the names really represent the same types, or is a namespace collision? Thanks, Dan

3 2

VB6 app that embeds a browser window fails on wine; want test case?
by Dan Kegel 02 Aug '06

02 Aug '06

Piero Proietti wrote a nice demo app in VB6 which embeds a browser window. It doesn't work in Wine. I think Jacek has been committing patches that ought to help this ( e.g. http://winehq.org/pipermail/wine-cvs/2006-July/024993.html ) but it's not quite there yet. Piero's willing to tailor the test app to our needs. Should I ask him to strip it down to be noniteractive, i.e. to just load a single static HTML page from disk, to make looking at the logs easier? Or is it better for him to post a minibrowser with nav buttons etc? - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

3 2

WineConf 2006
by Robert Shearman 02 Aug '06

02 Aug '06

Hi fellow Wine developers, Our annual Wine conference is taking place in approximately 6 weeks time. It is an opportunity for you to put names to faces and to talk about projects that are too crazy to think about discussing on wine-devel! It is also an opportunity to share knowledge and to share some drinks! When is it? 16th & 17th September 2006 Where is it? University of Reading Who Should Come? Anyone interested in Wine development. Please note: this is a developers-only conference. How To Sign Up? Check out http://www.winehq.org/site/wineconf for details. Please RSVP if you intend to come. What's the Agenda? We'll be starting a thread on that shortly. What's Urgent? The University is requiring that we have an exact head count for rooms on campus. What's more, we have to give them that count a month in advance, and they will not give us a refund for folks that don't show up or want to change things around. Hence, if you would like one of the convienient, reasonably priced rooms on campus, you need to follow the payment step at: http://www.winehq.org/site/wineconf/travel as soon as possible to book your room. Note that since we won't get any refunds for cancellations, we won't be able to refund your money either :-( . I thought WineConf 2005 was a lot of fun and I think everyone else who attended would agree with me, so hurry up and make your travel arrangements and RSVP now! -- Rob Shearman

1 0

msvcrt/libc clash?
by Tijl Coosemans 02 Aug '06

02 Aug '06

Somewhat further along the way of fixing Wine on FreeBSD I'm stuck with what appears to be a clash between msvcrt and libc. Attached is the output of running "env WINEDEBUG=trace+msvcrt notepad". It looks like msvcrt's _spawnve is called to run a Wine process. The same happens when running the msvcrt file test (2nd attachment), where the test on line 563 and 565 fails. The actual problem is probably with the _execve symbol, because FreeBSD doesn't have any of the spawn calls. So, how to solve this?

2 2

Problem with ValidateInUseArena
by Diego A. Degese 02 Aug '06

02 Aug '06

Hi.. i'm new in the list but i want to contribute in devel and testing with the wine team. I found this problem and i try to fix it, but i post to list because this problem can affect to other wine parts. WINEDEBUG variable was setted to all Executed Command: wine PES5.EXE Trace ----- CUT HERE ----- 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps (0x17be04, 0x7c01c130) 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps Filling vendor string NVIDIA Corporation 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps found GL_VENDOR ("NVIDIA Corporation")->(0x10de) 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps found GL_VERSION ("2.0.2 NVIDIA 87.62")->10.8762->(0x000a223a) 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps found GL_RENDERER ("GeForce 6600 GT/AGP/SSE2/3DNOW!")->(0x0250) 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps ClipPlanes support - num Planes=6 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps Lights support - max lights=8 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps Maximum texture size support - max texture size=4096 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps Maximum point size support - max texture size=1.000000 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps GL_Extensions reported: 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_color_buffer_float 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_depth_texture 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_draw_buffers 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_fragment_program 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: ARB Pixel Shader support - version=11 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: ARB Pixel Shader support - GL_MAX_TEXTURE_IMAGE_UNITS_ARB=16 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: ARB Pixel Shader support - max float constants=256 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_fragment_program_shadow 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_fragment_shader 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: ARB_fragment_shader (GLSL) support - max float ps constants=512 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_half_float_pixel 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_imaging 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: ARB imaging support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_multisample 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: ARB Multisample support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_multitexture 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: ARB Multitexture support - GL_MAX_TEXTURE_UNITS_ARB=4 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_occlusion_query 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: ARB Occlusion Query support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_pixel_buffer_object 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: ARB Pixel Buffer support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_point_parameters 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: ARB Point parameters support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_point_sprite 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: ARB point sprite support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_shadow 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_shader_objects 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_shading_language_100 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_texture_border_clamp 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: ARB Texture border clamp support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_texture_compression 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: ARB Texture Compression support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_texture_cube_map 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: ARB Texture Cube Map support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps IMPLIED: NVIDIA (NV) Texture Gen Reflection support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_texture_env_add 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: ARB Texture Env Add support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_texture_env_combine 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: ARB Texture Env combine support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_texture_env_dot3 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: ARB Dot3 support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_texture_float 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_texture_mirrored_repeat 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: ARB Texture mirrored repeat support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_texture_non_power_of_two 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_texture_rectangle 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_transpose_matrix 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_vertex_buffer_object 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: ARB Vertex Buffer support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_vertex_program 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: ARB Vertex Shader support - version=11 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: ARB Vertex Shader support - max float constants=256 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_vertex_shader 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: ARB_vertex_shader (GLSL) support - max float vs constants=256 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ARB_window_pos 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ATI_draw_buffers 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ATI_texture_float 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_ATI_texture_mirror_once 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: ATI Texture Mirror Once support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_S3_s3tc 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_texture_env_add 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: EXT Texture Env Add support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_abgr 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_bgra 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_blend_color 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_blend_equation_separate 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_blend_func_separate 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_blend_minmax 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_blend_subtract 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_compiled_vertex_array 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_Cg_shader 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_depth_bounds_test 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_draw_range_elements 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_fog_coord 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: EXT Fog coord support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_framebuffer_object 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: EXT Frame Buffer Object support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_multi_draw_arrays 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_packed_depth_stencil 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_packed_pixels 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_pixel_buffer_object 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_point_parameters 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: EXT Point parameters support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_rescale_normal 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_secondary_color 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: EXT Secondary coord support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_separate_specular_color 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_shadow_funcs 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_stencil_two_side 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: EXT Stencil two side support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_stencil_wrap 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: EXT Stencil wrap support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_texture3D 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_texture_compression_s3tc 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: EXT Texture S3TC compression support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_texture_cube_map 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_texture_edge_clamp 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_texture_env_combine 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: EXT Texture Env combine support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_texture_env_dot3 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: EXT Dot3 support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_texture_filter_anisotropic 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: EXT Texture Anisotropic filter support. GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 16 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_texture_lod 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: EXT Texture LOD support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_texture_lod_bias 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: EXT Texture LOD bias support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_texture_mirror_clamp 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_texture_object 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_texture_sRGB 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_timer_query 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_EXT_vertex_array 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_HP_occlusion_test 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_IBM_rasterpos_clip 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_IBM_texture_mirrored_repeat 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_KTX_buffer_region 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_blend_square 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_copy_depth_to_color 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_depth_clamp 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_fence 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_float_buffer 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_fog_distance 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: NVIDIA (NV) Fog Distance support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_fragment_program 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: NVIDIA (NV) Pixel Shader support - version=11 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_fragment_program_option 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: NVIDIA (NV) Pixel Shader support - version=11 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_fragment_program2 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: NVIDIA (NV) Pixel Shader support - version=11 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_half_float 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_light_max_exponent 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_multisample_filter_hint 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_occlusion_query 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: NVIDIA (NV) Occlusion Query (3) support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_packed_depth_stencil 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_pixel_data_range 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_point_sprite 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_primitive_restart 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_register_combiners 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: NVIDIA (NV) Register combiners (1) support - GL_MAX_GENERAL_COMBINERS_NV=8 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_register_combiners2 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: NVIDIA (NV) Register combiners (2) support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_texgen_reflection 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: NVIDIA (NV) Texture Gen Reflection support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_texture_compression_vtc 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_texture_env_combine4 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: NVIDIA (NV) Texture Env combine (4) support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_texture_expand_normal 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_texture_rectangle 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_texture_shader 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: NVIDIA (NV) Texture Shader (1) support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_texture_shader2 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: NVIDIA (NV) Texture Shader (2) support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_texture_shader3 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: NVIDIA (NV) Texture Shader (3) support 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_vertex_array_range 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_vertex_array_range2 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_vertex_program 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: NVIDIA (NV) Vertex Shader support - version=10 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_vertex_program1_1 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: NVIDIA (NV) Vertex Shader support - version=11 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_vertex_program2 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: NVIDIA (NV) Vertex Shader support - version=20 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_vertex_program2_option 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: NVIDIA (NV) Vertex Shader support - version=20 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NV_vertex_program3 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps FOUND: NVIDIA (NV) Vertex Shader support - version=20 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_NVX_conditional_render 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_SGIS_generate_mipmap 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_SGIS_texture_lod 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_SGIX_depth_texture 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_SGIX_shadow 0009:trace:d3d_caps:IWineD3DImpl_FillGLCaps - GL_SUN_slice_accum 0009:trace:d3d:IWineD3DImpl_FillGLCaps extension detection call ok directx.c / 774 0009:Call ntdll.RtlAllocateHeap(00110000,00000000,00000014) ret=7ec142bc 0009:err:heap:HEAP_ValidateInUseArena Heap 0x110000: invalid in-use arena magic for 0x17c228 Heap: 0x110000 Next: 0x3e30000 Sub-heaps: 0x110000 Free lists: Block Stat Size Id 0x110038 free 00000010 prev=0x17c228 next=0x110048 0x110048 free 00000020 prev=0x110038 next=0x110058 0x110058 free 00000030 prev=0x110048 next=0x110068 0x110068 free 00000040 prev=0x110058 next=0x110078 0x110078 free 00000060 prev=0x110068 next=0x110088 0x110088 free 00000080 prev=0x110078 next=0x110098 0x110098 free 00000100 prev=0x110088 next=0x1100a8 0x1100a8 free 00000200 prev=0x110098 next=0x1100b8 0x1100b8 free 00000400 prev=0x1100a8 next=0x17aa60 0x1100c8 free 00001000 prev=0x17aa60 next=0x1100d8 0x1100d8 free ffffffff prev=0x1100c8 next=0x17c228 ----- CUT HERE ----- Regards, and sorry for my english Diego

2 1

wine_main_preload_info not found, cannot use first megabyte, *.exe don't work
by Pavel Roskin 02 Aug '06

02 Aug '06

Hello! Something strange to happened my Wine installation recently. I'm getting following messages if I run any program from Wine: $ winemine wine_main_preload_info not found err:dosmem:setup_dos_mem Cannot use first megabyte for DOS address space, please report wine_main_preload_info not found err:dosmem:setup_dos_mem Cannot use first megabyte for DOS address space, please report The programs still work fine after those for lines are printed. What's worse is that that Windows PE files don't work at all, including those that come with Wine: $ wine winhlp32.exe wine_main_preload_info not found wine: could not load L"C:\\windows\\winhlp32.exe": Module not found I'm using current Wine from git on Fedora Core development (future FC6) for x86_64, glibc-2.4.90, gcc-4.1.1, Linux 2.6.18-rc2 (actually, the current version from the wireless-2.6 branch). The CPU is Intel with EM64T. Wine is compiled with default settings for i386 by the i386 compatibility compiler and i386 compatibility libraries included in Fedora. I removed ~/.wine to start with a clean system. Since I keep updating the kernel and Wine almost every day and I upgraded from FC5 to Development recently, it's hard to say what's the exact reason. P.S. I have a 32-bit Ubuntu 6.04 installation on the same machine, so I used chroot to compile and run Wine under Ubuntu under the same 64-bit kernel. I also used linux32 to fool uname into thinking it's an i686 machine. The messages from ELF programs are gone, but PE files still fail: $ winemine $ wine winhlp32.exe wine: could not load L"C:\\windows\\winhlp32.exe": Module not found Moreover, if I run this Wine on Fedora, the results are the same - no more messages about wine_main_preload_info and setup_dos_mem. I guess it's a compile issue. Unfortunately, the difference between config.status in both builds is quite significant to pinpoint the reason. -- Regards, Pavel Roskin

3 10

Re: wine.inf: add a computer SID
by Alexandre Julliard 02 Aug '06

02 Aug '06

Robert Reif <reif(a)earthlink.net> writes: > This patch adds a computer SID. A computer SID should be > unique on a network but wine is a long way away from having > network security working so this isn't a big issue. You can use > a program like NewSID (http://www.sysinternals.com/Utilities/NewSid.html) > to change the SID. Another option would be to generate a unique > SID in wineprefixcreate or at install time. That would probably be a better idea. Otherwise, by the time we start to make use of it everybody will have the same value in their registry. -- Alexandre Julliard julliard(a)winehq.org

1 0

check this out dvdshrink workig with wine
by Vijay Kiran Kamuju 02 Aug '06

02 Aug '06

Hi, Check this link out How to run dvdshrink with wine http://mrbass.org/linux/ubuntu/dvdshrink/ Thanks, VJ

1 0

Identified regression wined3d regression in current GIT
by Alexander Nicolaysen Sørnes 02 Aug '06

02 Aug '06

Greetings, The following commit causes The Settlers IV to crash when entering the main menu. Author: Roderick Colenbrander wined3d: Optimize d3dfmt_convert_surface. dc743d82fff84743e09a1c86d5e803ca8a7c375d http://source.winehq.org/git/?p=wine.git;a=commit;h=dc743d82fff84743e09a1c8… A demo of the game available here ftp://ftp.ubisoft.fr/pub/demos/strategie/thesettlers4_demo.exe Regards, Alexander N. Sørnes

1 0

Simple installer regression testing
by Dan Kegel 01 Aug '06

01 Aug '06

It would be nice to have a simple way to verify that wine can still install apps properly. Ideally this test should run on either Windows or Wine unchanged, and should verify the checksum of all installed files. So I whipped up a demo of how to do this for winzip 10: http://kegel.com/wine/test-winzip100.tgz The archive contains a shell script winzip100.sh that downloads winzip, verifies its checksum, installs it, and verifies the checksum of all the files it should have installed. It's wine-specific, but just barely; with very little change it should work on cygwin, too. It requires you to install autoit first. Autoit is a popular windows scripting tool which is even somewhat open source, see http://www.autoitscript.com/forum/index.php?showtopic=8389, and in any case is free to use. Anyway, this is just a proof of concept. I'd like to expand this to handle a largish number of apps as time goes on. In particular, I'd like something like this to be in place and easy for anybody to run themselves before we do a 1.0 release. If you're wondering why I'm not using cxtest for this, it's because a) that only supports wine, not windows, and b) cxtest seems a bit harder to set up than this. Comments welcome... - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

2 2

Re: HAL and Copy Protection
by Jesse Allen 01 Aug '06

01 Aug '06

On 8/1/06, Martin Owens <doctormo(a)gmail.com> wrote: > the important part is not that HAL supports SecuRom (which it won't IMHO) > but if wine can use the direct access to the hardware in order to allow > securom to work through wine. > > Yes, that is correct. However I'm not sure if Wine interprets the HAL events correctly, or HAL overrides the important settings for correct hardware access. It's hard to know without having HAL on my system to look at.

1 1

wine notepad.exe: Segmentation fault
by Molle Bestefich 01 Aug '06

01 Aug '06

Been running 0.9.15 for a while without problems. Since a week ago (or so) when I updated to HEAD, all I get from Wine is this: wine-git # notepad Segmentation fault Nuking ~/.wine doesn't help: wine-git # rm -rf ~/.wine wine-git # notepad wine: creating configuration directory '/root/.wine'... /usr/local/bin/../lib/../bin/wineprefixcreate: line 171: 8574 Segmentation fault "${WINELOADER:-$bindir/wine}" rundll32.exe setupapi.dll,InstallHinfSection DefaultInstall 128 wine.inf wine: wineprefixcreate failed while creating '/root/.wine'. GDB tells me a lot I don't quite understand: wine-git # gdb --quiet --args /usr/local/bin/wine-pthread /usr/local/bin/notepad.exe Using host libthread_db library "/lib/tls/libthread_db.so.1". (gdb) r Starting program: /usr/local/bin/wine-pthread /usr/local/bin/notepad.exe [Thread debugging using libthread_db enabled] [New Thread -1211160288 (LWP 9620)] Program received signal SIGSEGV, Segmentation fault. [Switching to Thread -1211160288 (LWP 9620)] 0x00000000 in ?? () (gdb) bt #0 0x00000000 in ?? () #1 0x7ffb0a40 in wine_server_call (req_ptr=0xbfe60d90) at server.c:321 #2 0x7ffb1bd4 in server_init_thread (unix_pid=9620, unix_tid=9620, entry_point=0x0) at server.c:937 #3 0x7ffb90b1 in thread_init () at thread.c:279 #4 0x7ff99cc6 in __wine_process_init () at loader.c:2365 #5 0xb7e417d6 in wine_init (argc=2, argv=0xbfe61464, error=0xbfe60fd0 "", error_size=1024) at loader.c:664 #6 0x7bf0117a in main (argc=2, argv=0xbfe61464) at main.c:58 (gdb) frame 1 #1 0x7ffb0a40 in wine_server_call (req_ptr=0xbfe34e10) at server.c:321 321 pthread_functions.sigprocmask( SIG_BLOCK, &block_set, &old_set ); (gdb) info locals req_ptr = (void *) 0xbfe34e10 old_set = {__val = {0 <repeats 11 times>, 3219344856, 2147308640, 3219344768, 3084813777, 2147158852, 9, 3219344800, 0, 0, 3219344792, 8, 0, 14, 0, 0, 3219344784, 3084988334, 3219344832, 16, 3219344856, 1}} (gdb) print block_set $1 = {__val = {268511747, 0 <repeats 31 times>}} (gdb) print /a block_set $2 = {__val = {0x10012a03, 0x0 <repeats 31 times>}} (gdb) print /a old_set $3 = {__val = {0x0 <repeats 11 times>, 0xbfe34dd8, 0x7ffd5460 <__wine_dbch___default+340>, 0xbfe34d80, 0xb7de85d1 <sendmsg+33>, 0x7ffb0b44 <wine_server_send_fd+148>, 0x9, 0xbfe34da0, 0x0, 0x0, 0xbfe34d98, 0x8, 0x0, 0xe, 0x0, 0x0, 0xbfe34d90, 0xb7e12fae <__wine_dbg_get_channel_flags+14>, 0xbfe34dc0, 0x10, 0xbfe34dd8, 0x1}} The only thing I can come up with that might cause a segfault in pthread_functions.sigprocmask() is a missing call to a pthread init function. I've grepped through the sources, but unfortunately I was unable to find any place where that is called (except for kthread.c, and I believe that modern systems all use pthread - right?), so I'm without clues. The only thing I can think of that might have happened (other than a Wine bug) is GCC or GLIBC being upgraded by 'emerge world'. GCC --version says "gcc (GCC) 3.3.6 (Gentoo 3.3.6, ssp-3.3.6-1.0, pie-8.7.8)", while ls /lib/libc* says "libc-2.3.6.so". Any suggestions (please!)?

5 6

Where can I get answers concerning winelib?
by Johannes Holzer 01 Aug '06

01 Aug '06

Hi Cause i get no answer to my winelib questions. Where can i ask about winelib? johannes holzer

2 1

usp10: resend Remove a test that fails on Windows
by Jeff L 01 Aug '06

01 Aug '06

This patch fixes a problem where a test fails in windows. It may also fix a problem with 64 bit code but I am unable to test that. I does this by declaring the HDC as global so it can be reused between test runs in test_ScriptItemIzeShapePlace and test_ScriptGetCMap. Change log: Fix glyph comparsion between tests. Jeff

1 0

usp10: Remove a test that fails on Windows
by Jeff L 01 Aug '06

01 Aug '06

This patch fixes a problem where a test fails in windows. It may also fix a problem with 64 bit code but I am unable to test that. I does this by declaring the HDC as global so it can be reused between test runs in test_ScriptItemIzeShapePlace and test_ScriptGetCMap. Change log: Fix glyph comparsion between tests. Jeff

1 0

Re: usp10: Remove a test that fails on Windows.
by Jeff Latimer 01 Aug '06

01 Aug '06

Hans, the test does fail on windows but that is becuase it is checking gylphs that are different between the windows and wine (ie. while the unicode is the same the gylphs are different). I don't know how to overcome that issue. What is it is supposed to do is check that there is a consistent translation between unicode and glyphs. It works 19 times out of 20 on my 32 bit system. Obviously there is an inconsisency. Is there any advice on how to achieve the aim of the test? Jeff Hans Leidekker wrote: >This test fails on Alexandre's system and also fails on my Windows XP >system, so I propose to remove it. > > > -Hans > >Changelog > Remove a test that fails on Windows. > > >------------------------------------------------------------------------ > >001e954162666f1e4de46326c94c7ee357157793 >diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c >index 2a3d9c4..14ed56c 100644 >--- a/dlls/usp10/tests/usp10.c >+++ b/dlls/usp10/tests/usp10.c >@@ -222,7 +222,6 @@ void test_ScriptGetCMap(unsigned short p > unsigned short pwOutGlyphs3[256]; > WCHAR TestItem1[6] = {'T', 'e', 's', 't', 'a', 0}; > DWORD dwFlags; >- int cnt; > > /* We need a valid HDC to drive a lot of Script functions which requires the following * > * to set up for the tests. */ >@@ -269,10 +268,7 @@ void test_ScriptGetCMap(unsigned short p > hr = ScriptGetCMap(hdc, &psc, TestItem1, cInChars, dwFlags, pwOutGlyphs3); > ok (hr == 0, "ScriptGetCMap should return 0 not (%08x)\n", (unsigned int) hr); > ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); >- for (cnt=0; cnt < cChars && pwOutGlyphs[cnt] == pwOutGlyphs3[cnt]; cnt++) {} >- ok (cnt == cInChars, "Translation not correct. WCHAR %d - %04x != %04x\n", >- cnt, pwOutGlyphs[cnt], pwOutGlyphs3[cnt]); >- >+ > hr = ScriptFreeCache( &psc); > ok (!psc, "psc is not null after ScriptFreeCache\n"); > } > > >------------------------------------------------------------------------ > > > >

2 2

Found a sample with source code of the broken character models/misplaced vertices
by Jason Green 01 Aug '06

01 Aug '06

The SkinnedMesh sample from the dx8.1 sdk is broken in shader mode, but you have to change the caps to get anything to show up. In directx.c, I set MaxVertexBlendMatrices to 4 and MaxVertexBlendMatrixIndex to 0 (to match to caps of my machine in Windows), then launched the sample and switched to Software mode, then Shader mode. (if you go straight to shader mode, it crashes - yet another bug. ;-) It results in a broken animation and misplaced vertices like many games have been experiencing: http://www.cmhousing.net/wine/skinnedmesh_broke.png We finally have a simple sample to experiment with which, when fixed, should fix the broken models in most newer games [hopefully].

1 0

Tower of Goo regression (ddraw rewrite)
by Joseph Garvin 31 Jul '06

31 Jul '06

The last version of wine I tried this game with was before the ddraw rewrite and it looked fine then. When you drag goo upwards, a text message appears telling you how many meters high your tower is -- this is now drawn upside down. You can get tower of goo for free here: http://www.experimentalgameplay.com/game.php?g=1 The sound also seems really messed up but before I was playing with it off so I don't know if that's a regression.

3 2

Re: Implement SetThreadPriority
by Detlef Riekenberg 31 Jul '06

31 Jul '06

Chris Robinson wrote: > + // Use the minimum real-time priority possible for now (on Linux, > 1 for > + // SCHED_FIFO and 0 for SCHED_OTHER) I did not test the Patch, but C++ - Comments are not allowed in wine (not compatible with all compilers) It seems to be an updated Patch from Mike. IMHO, a note in the Mail to wine-patches would be nice. We really need a clean sound. Thanks. -- By By ... ... Detlef

1 0

please help with patch submission
by Damjan Jovanovic 31 Jul '06

31 Jul '06

Hi I have a short patch that fixes serious bugs I've encountered in setupapi's SetupDiOpenClassRegKeyExW(). It's been mailed twice to wine-patches and is attached for reference. Is there anything wrong with it? Please comment. Thank you Damjan __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com --- wine-0.9.17-old/dlls/setupapi/devinst.c 2006-07-10 18:01:08.000000000 +0200 +++ wine-0.9.17/dlls/setupapi/devinst.c 2006-07-28 14:12:39.000000000 +0200 @@ -33,20 +33,21 @@ #include "winnls.h" #include "setupapi.h" #include "wine/debug.h" #include "wine/unicode.h" #include "ddk/cfgmgr32.h" #include "initguid.h" #include "winioctl.h" #include "rpc.h" #include "rpcdce.h" +#include "ddk/cfgmgr32.h" #include "setupapi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi); /* Unicode constants */ static const WCHAR ClassGUID[] = {'C','l','a','s','s','G','U','I','D',0}; static const WCHAR Class[] = {'C','l','a','s','s',0}; static const WCHAR ClassInstall32[] = {'C','l','a','s','s','I','n','s','t','a','l','l','3','2',0}; static const WCHAR NoDisplayClass[] = {'N','o','D','i','s','p','l','a','y','C','l','a','s','s',0}; @@ -1314,20 +1315,21 @@ * SetupDiOpenClassRegKeyExW (SETUPAPI.@) */ HKEY WINAPI SetupDiOpenClassRegKeyExW( const GUID* ClassGuid, REGSAM samDesired, DWORD Flags, PCWSTR MachineName, PVOID Reserved) { LPWSTR lpGuidString; + WCHAR guidStringWithBraces[MAX_GUID_STRING_LEN]; HKEY hClassesKey; HKEY hClassKey; LPCWSTR lpKeyName; if (MachineName != NULL) { FIXME("Remote access not supported yet!\n"); return INVALID_HANDLE_VALUE; } @@ -1354,35 +1356,39 @@ { return INVALID_HANDLE_VALUE; } if (ClassGuid == NULL) return hClassesKey; if (UuidToStringW((UUID*)ClassGuid, &lpGuidString) != RPC_S_OK) { RegCloseKey(hClassesKey); - return FALSE; + return INVALID_HANDLE_VALUE; } + guidStringWithBraces[0] = (WCHAR) '{'; + CopyMemory(&guidStringWithBraces[1], lpGuidString, + (MAX_GUID_STRING_LEN - 3) * sizeof(WCHAR)); + guidStringWithBraces[1 + strlenW(lpGuidString)] = (WCHAR) '}'; + guidStringWithBraces[2 + strlenW(lpGuidString)] = 0; + RpcStringFreeW(&lpGuidString); if (RegOpenKeyExW(hClassesKey, - lpGuidString, + guidStringWithBraces, 0, KEY_ALL_ACCESS, &hClassKey)) { - RpcStringFreeW(&lpGuidString); RegCloseKey(hClassesKey); - return FALSE; + return INVALID_HANDLE_VALUE; } - RpcStringFreeW(&lpGuidString); RegCloseKey(hClassesKey); return hClassKey; } /*********************************************************************** * SetupDiOpenDeviceInterfaceW (SETUPAPI.@) */ BOOL WINAPI SetupDiOpenDeviceInterfaceW( HDEVINFO DeviceInfoSet,

2 3

Re: shdocvw: Added type library.
by Alexandre Julliard 31 Jul '06

31 Jul '06

Jacek Caban <jacek(a)codeweavers.com> writes: > diff --git a/dlls/shdocvw/shdocvw.idl b/dlls/shdocvw/shdocvw.idl > new file mode 100644 > index 0000000..45b9111 > --- /dev/null > +++ b/dlls/shdocvw/shdocvw.idl You can't name the file shdocvw.idl, otherwise make will try to rebuild the existing shdocvw.h from it. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: advapi32: add more helper functions
by Alexandre Julliard 31 Jul '06

31 Jul '06

Robert Reif <reif(a)earthlink.net> writes: > /************************************************************ > + * ADVAPI_GetComputerNameW > + * > + * Gets the local computer name. > + */ > +LPCWSTR ADVAPI_GetComputerNameW() > +{ > + static WCHAR buf[MAX_COMPUTERNAME_LENGTH + 1]; > + DWORD dwSize = sizeof(buf); > + if (!GetComputerNameW(buf, &dwSize)) > + buf[0] = 0; > + return buf; You don't want to use a static buffer, that's not thread-safe. -- Alexandre Julliard julliard(a)winehq.org

1 0

windowd threads and winelib
by Johannes Holzer 31 Jul '06

31 Jul '06

Hi I want to compile a windows application with winelib. The application uses threads (_beginthreadNT with bcc, _beginthreadex with gcc/mingw). The necessary Headerfile "process.h" is in /usr/include/wine/msvcrt. I learned, the the glibc-Library is incompatible with MS-Threads. Now - which C-Library i have to use? STLport? I'm shure that i'm not the only one with the problem. Guides? FAQ? Should I use an alternate implementation of the thread functions with pthreads?

1 0

Re: wine notepad.exe: Segmentation fault
by Molle Bestefich 31 Jul '06

31 Jul '06

> > The only thing I can think of that might have happened (other than a > > Wine bug) is GCC or GLIBC being upgraded by 'emerge world'. GCC > > --version says "gcc (GCC) 3.3.6 (Gentoo 3.3.6, ssp-3.3.6-1.0, > > pie-8.7.8)", while ls /lib/libc* says "libc-2.3.6.so". > > Perhaps you can revert to 0.9.15 and rebuild with your newer gcc and > glibc to see if those are causing the problem. Good idea, just did that. That seems to work fine, so GCC / glibc is not the problem. (I found that Portage doesn't activate the new GCC, it only installs it. So the only actual upgrade was to glibc, and that was a minor bump from 2.3.5 to 2.3.6 according to the install log.. Anyway.) > If not, git-bisect should help you find the offending changeset. Doing that just now, thanks. (Takes forever, I wonder if "make clean" at each step is really necessary..)

1 0

Indentifying Unicode scripts
by Jeff L 31 Jul '06

31 Jul '06

As part of implementing uniscribe, I am looking at breaking down strings into their various unicode scripts (ie. numeric, arabic etc). The first step is to identify the scripts in the string. The simple approach is for me to code some ranges and check which script a character belongs to. I am wondering if there is some other method to identify scripts that I should use that is wine conformant. Jeff

4 5

Re: [AppDB] Resend: Change 'vendor' to 'developer'
by Chris Morgan 31 Jul '06

31 Jul '06

On Sunday 30 July 2006 7:45 am, Alexander Nicolaysen Sørnes wrote: > The patch is the same; I would just like to point out that this change has > been discusses, and there were no objections to it. > > Change 'vendor' to 'developer'. Variable names are not changed, so this > patch should not cause any trouble. > > Lørdag 29 juli 2006 15:49, skrev killertux killertux: > > -I and Tony Lambergs decided half year ago that "Vendor" == > > "Developper" > > > > -adding Distributor and Publisher will make things harder and it's > > useless since appdb is for testing info therefore we are interested > > about developper. > > > > -anyway Vendor can be also [Freeware], [Open Source Software], > > [Shareware] > > but I am not so happy reading licence agreements. > > > > -I think we should rename "Vendor" to "Developper" > > I'd prefer we switched 'Vendor' to "Company". Company is simplier and in more common usage and its likely that people will look at the box, see a company name and be able to match it to this field. They won't have any idea about publisher, vendor, distributor or developer, they'll just pick the biggest name other than the name of the program and likely go with that. Also, if everyone wants to make this change and is serious about it then we should also rename the database columns and fix up the sql as well to keep these names in sync, otherwise people maintaining the appdb code will somehow have to know that each instance of 'vendor' is really something else like 'x'. Chris

4 3

Punkbuster Support
by EA Durbin 30 Jul '06

30 Jul '06

Do we currently have a team working with evenbalance to test punkbuster support under wine? If not, is there anyone who would be interested in forming a team to troubleshoot/develop punkbuster compatibility under wine? According to the transgaming forums cedega is currently working with punkbuster to fix any problems that arise with punkbuster, and It would be nice if we could do the same.

1 0

Re: [PATCH] _REENTRANT no longer used in wine source
by Dan Kegel 30 Jul '06

30 Jul '06

On 7/28/06, Drew Ronneberg <drew_ronneberg(a)yahoo.com> wrote: > -AC_SUBST(DLLFLAGS,"-D_REENTRANT") > +AC_SUBST(DLLFLAGS,"") Are you quite sure about that? The C runtime library uses this symbol. Unless you have a very good reason for removing that, I'd leave well enough alone...

1 0

Re: user[2/2]: Preserve LastError.
by Detlef Riekenberg 30 Jul '06

30 Jul '06

Vitaliy Margolen wrote: > ChangeLog: > user: Preserve LastError. You can move the ok() for GetLastError() direct after GetKeyNameTextA(): > + SetLastError(0xdeadbeef); > len = GetKeyNameTextA(i << 16, buff, sizeof(buff)); > + ok( GetLastError() == 0xdeadbeef, > + "%d Wrong LastError = %ld\n", i, GetLastError()); > ok(len | !buff[0], "%d: Buffer is not zeroed\n", i); Just my 2 ¢ -- By By ... ... Detlef

2 1

Re: [AppDB] Add rating-related functions
by Chris Morgan 30 Jul '06

30 Jul '06

You'll want to make these functions static member functions of the version class. Since we can't really mark them static with php4 that means just putting them in the version class and making sure they don't refer to $this. There should be other examples of this with calls to functions in the maintainer class in sidebar_admin.php. Chris On Sunday 30 July 2006 9:20 am, Alexander Nicolaysen Sørnes wrote: > Add functions to get the number and per centage of versions with a given > rating. These will be used in my next patch. > > > Regards, > > Alexander N. Sørnes

1 0

Printing to a file
by Duane Clark 30 Jul '06

30 Jul '06

Currently, using the Wine supplied print dialog, printing to a file results in a file named "FILE:". In Windows (at least Win2k) a simple one line dialog box is put up where the filename can be typed in. I don't see a reason why a full Save As dialog would not be preferable; some programs override the standard dialog with a full Save As dialog. It looks to me like the correct place to do this is in gdi/printdrv.c CreateSpoolFile(). So I have tried adding the attached patch to the function to play with, adding comdlg32 to the libraries in the makefile. But the call to GetSaveFileNameW(&ofn) crashes. I guess the first question is whether it is ok to call that from printdrv. And if so, is there an example of how to do it correctly?

3 3

Re: advapi32: add more helper functions
by Detlef Riekenberg 30 Jul '06

30 Jul '06

Robert Reif wrote: > +BOOL ADVAPI_GetComputerSid(PSID sid) > + if ((ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, > + "SECURITY\\SAM\\Domains\\Account", 0, > + KEY_READ, &key)) == ERROR_SUCCESS) I did not test the patch, but is there a Reason against UNICODE here ? (The other calls already use UNICODE in this Function) -- By By ... ... Detlef

1 0

Re: usp10: Resend - Add funtionality for ScriptStringAnalyse
by Hans Leidekker 30 Jul '06

30 Jul '06

On Sunday 30 July 2006 09:30, Jeff L wrote: > + Script_string_analysis *pScript_str_analysis; > + void *pAnalysis_ptrstr; Uniscribe is about scripts, so why not leave off these 'Script' prefixes? Furthermore, I think encoding the type in the variable name is redundant, you get that information from reading the declaration. Also, the void pointer variable is not needed, you can cast *pssa straight away. So, what about something like this instead?: string_analysis *analysis; -Hans

1 0

Re: usp10: Resend - Add funtionality for ScriptStringAnalyse
by Vitaliy Margolen 30 Jul '06

30 Jul '06

Saturday, July 29, 2006, 8:34:31 PM, Jeff L wrote: > A resend with after a shortening of the variable names, fixing the > handelling of multiple scripts and a slight rework to remove tests > before HeapFree calls and > meanigful variables. You need to make few more changes: > - lstrcpyW(lf.lfFaceName, (WCHAR *) "Courier"); > + lstrcpyW(lf.lfFaceName, (WCHAR *) L"Courier"); This is not portable and should be something like: const WCHAR courierW[] = {'C','o','u','r','i','e','r',0}; lstrcpyW(lf.lfFaceName, courierW); > - WCHAR teststr[6] = {'T', 'e', 's', 't', 'a', '\0'}; > + WCHAR teststr[6] = {'T', 'e', 's', 't', 'b', '\0'}; Drop the lenght: WCHAR teststr[] = {'T', 'e', 's', 't', 'b', '\0'}; > + hr = ScriptStringAnalyse( NULL, (void*)pString, cString, cGlyphs, iCharset, dwFlags, I don't think you need to cast a pointer into (void *) they all already are. > -/* Commented code it pending new code in ScriptStringAnalysis */ > -/* ok(hr == S_OK, "ScriptStringAnalyse Stub should return S_OK not %08x\n", (unsigned int) hr);*/ > -/* ok(pssa != NULL, "ScriptStringAnalyse pssa should not be NULL\n");*/ Does it crash that you commented it? If it doesn't crash but just doesn't work do this instead: todo_wine { ok(failing_test); ok(failing_test); } > + ok(hr == S_OK, "ScriptStringAnalyse Stub should return S_OK not %08x\n", (unsigned int) hr); That's not correct. Don't cast hr, use proper format instead: ok(hr == S_OK, "ScriptStringAnalyse Stub should return S_OK not %08lx\n", hr); > +typedef struct script_string_analysis_ptrs > +{ > + int cGlyphs; > + SCRIPT_VISATTR *psva; Please use the same format as the rest of the file / recommended Wine format - in this case 4 space indent. > + if (1 > cString || NULL == pString) { > + TRACE("cString %d, pString(%p)\n", cString, pString); > + return E_INVALIDARG; > + } Can you use something that every other person would understand? if (cString < 1 || !pString) { Please use WARN if you want to indicate app's errors: WARN("cString %d, pString(%p)\n", cString, pString); But in particular case, I don't see a need for this. You already have all dumping TRACE right at the beginning of the function. It will log any errors as well. Vitaliy Margolen

2 1

Re: [AppDB] Avoid sending a bad bug link e-mail
by Chris Morgan 30 Jul '06

30 Jul '06

This doesn't look right, we aren't setting any $sMsg or $sSubject in this case. Chris On Saturday 29 July 2006 8:09 pm, Alexander Nicolaysen Sørnes wrote: > If a user deletes a bug link he has submitted, don't send him an e-mail > telling him it has been rejected. > > > Regards, > > Alexander N. Sørnes

1 0

Audio stuttering issue
by Chris 29 Jul '06

29 Jul '06

I know there's been discussions on this before, and the only concensus reached was "use kernel 2.6.17", which apparently helps with processes that wait on pipes. There was this patch (which I tested and did have a very noticeable positive effect): http://wiki.winehq.org/Implement_SetThreadPriority that uses sched_setscheduler to change the scheduling policy and priority of the thread, but was rejected because it always ran privileged and allowed apps to deadlock the system if it ran a real-time thread without yielding. However, when looking at my man pages, I found this: Since Linux 2.6.12, the RLIMIT_RTPRIO resource limit defines a ceiling on an unprivileged process's priority for the SCHED_RR and SCHED_FIFO policies. If an unprivileged process has a non-zero RLIMIT_RTPRIO soft limit, then it can change its scheduling policy and priority, subject to the restriction that the priority cannot be set to a value higher than the RLIMIT_RTPRIO soft limit. If the RLIMIT_RTPRIO soft limit is 0, then the only permitted change is to lower the priority. Subject to the same rules, another unprivileged process can also make these changes, as long as the effective user ID of the process making the change matches the real or effective user ID of the target process. See getrlimit(2) for further information on RLIMIT_RTPRIO. Privileged (CAP_SYS_NICE) processes ignore this limit; as with older older kernels, they can make arbitrary changes to scheduling policy and priority. Meaning, if a user has their system set so that a user (or specific user(s)) have a non-zero RLIMIT_RTPRIO rlimit, normal unprivileged apps can change their scheduling policy and increase their priority up to that value; exactly what that patch does, but without needing special privileges. What would you think about implementing that patch so that it runs unprivileged, but allows the user to set their system so Wine can set time-critical thread scheduling? In this way, it would be completely up to the user if they wanted to run an app that can set real-time scheduling for cleaner audio, or not and have potential stuttering. Or if you still don't want something like that merged in, I'd like to alert the author of that patch that it doesn't require root privs to work. It just needs a non-0 value for RLIMIT_RTPRIO (ulimit -r).

2 4

Re: Win64 patch 2/2 (winedbg)
by Alexandre Julliard 29 Jul '06

29 Jul '06

Ge van Geldorp <ge(a)gse.nl> writes: > case AddrModeFlat: > - dbg_printf("0x%08lx", addr->Offset); > + dbg_printf("0x%08llx", addr->Offset); %ll formats are not portable, please avoid them. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: usp10: Implement digit substitution functions and add stubs
by Hans Leidekker 29 Jul '06

29 Jul '06

On Saturday 29 July 2006 12:33, Albert Lee wrote: > This adds implementations for ScriptRecordDigitSubstitution and > ScriptApplyDigitSubstitution that should be correct. Thanks for your patch Albert. I noticed that the changes to the spec file are missing. It would also be nice if you could integrate your test in Wine's testing framework and send that as a separate patch. Ask me if you need help doing so. -Hans

1 0

Idear for OpenGL overdraw child windows Bug
by Florian Köberle 29 Jul '06

29 Jul '06

When OpenGL draws, child windows get overdrawn. The suggestions to solve these problem where all based on the idear of clipping that what OpenGL render so that OpenGL doesn't overdraw them. What do you think of the idear of letting OpenGL overdrawing the child windows, but then after this we redraw all the child windows? There are two things who have to be done: 1.) find out when OpenGL finished his drawing 2.) find a way to draw the child windows. possible solutions for 2.) The easiest (but slowest) way of doing this could be a broadcast of the window message WM_PAINT to all child windows. A fast version could save the drawn child windows in a buffer with a additional 1 bit alpha channel. The alpha channel remember where the child windows are. This is done only when the child windows change. Every time OpenGL finished his drawing, the buffer content is drawn over the OpenGL output. idears for 1.) When doublebuffering is used (which is usually the case), every drawing is finished with a swapbuffer call wich takes as argument a DC. A test if the pixelformat of the DC is supporting OpenGL may avoid side effects. Have a look at the attached source code of a OpenGL program with a grey child window in the top middle(not visible in wine because of the bug). There you can see a how a pixelformat with OpenGL support is choosen for the DC. Old OpenGL programs without doublebuffer support call glFlush to make sure that all drawings are done and not unfinished. So we simply have to change glFlush that it redraw the child windows when no doublebuffering is used. What do you think about that idear? Bug Report about that topic: http://bugs.winehq.org/show_bug.cgi?id=2398

2 2

Re: wine-ShowCursor-D3D-over-GDI.patch
by H. Verbeet 29 Jul '06

29 Jul '06

On 29/07/06, Andrew Riedi <andrewriedi(a)gmail.com> wrote: > Well, here is my first patch, feel free to tell me what all is wrong with > it. I noticed a problem in WoW d3d, so I tracked it down and checked out > msdn. It seems that implementing ShowCursor() over GDI is acceptable, at > least according to msdn, and it seems to work great. Anyhow, this patch > fixes the two mouse cursor problem in WoW, and makes wined3d more compatible > with windows, at least msdn. Here goes nothing. > > -- > Andrew Riedi That's not quite what MSDN says. It says that the Direct3D cursor can be implemented either by using user32 cursors to draw the cursor, or by doing the drawing itself. We currently do the latter, so I don't think we should touch the user32 cursor in IWineD3DDeviceImpl_ShowCursor(). Also see MSDN on IDirect3DDevice9::SetCursorProperties(). You'll probably want to check if the application calls SetCursor(NULL) anywhere, I don't think that works properly at the moment in wine, if no cursor has been explicitly set before. (It checks if the cursor has changed in SetCursor(), but initially thread_info->cursor seems to be NULL, rather than the default cursor.) Note that you'll have to add your own TRACEs to do that though, as the TRACE in SetCursor() won't catch it. Also, please try to use the same style for patches as the rest of the file. ie, spaces rather than tabs, braces, etc.

1 0

winspool: use printmonitors to manage the Ports
by Detlef Riekenberg 28 Jul '06

28 Jul '06

Hi. Printing in wine use gdi32.dll, gdi.exe, winspool.drv and wineps.drv as Printer-Driver with CUPS/LPR as backend. Many things are not correct (See: http://wiki.winehq.org/Printing ). After some Patches, Wine is able to manage Printmonitors. With the current work, a framework is added and wine start to use the Printmonitors to manage the Printerports. (Patch for wine-0.9.18, should also work for current HEAD) I used various monitors for testing: 1: redmonnt.dll from RedMon 1.7 2: pdfcmnnt.dll from PDFCreator 0.9.2 3: localspl.dll from w2ksp4 4: a partial portmonitor for local Ports, added to winspool.drv You can use a native printui.dll and play with the "Ports"-Page wine rundll32.exe printui.dll,PrintUIEntry /s Some notes about the Patch. - FAR is used in "ddk/winsplp.h", but this does not work with wine. I removed that Keyword, but it is still present in the w2k3ddk An alternative would be "#define FAR" and "#undef FAR" around '#include "ddk/winsplp.h"' in "dlls/winspool.drv/info.c". Another Idea? - The Spooler-Configuration was still using the Path from the old config - File. (Software\Wine\Wine\Config\Spooler\<Portname>) Do we still need this? (A clean way is a seperate Portmonitor) - native localspl.dll need a vailid Section [Ports] in "win.ini" to load. (I used "FILE:=" and "LPT1:=" as entries) - Only Portmonitors, that use "InitializePrintMonitor" are supported. "InitializePrintMonitorUI" requires a "InitializePrintMonitor2" to be implemented, but this is a later step. - AddPort/ConfigurePort/DeletePort in localspl.dll need support for "InitializePrintMonitor2" and all around XcvData. - AddPort/ConfigurePort/DeletePort in the internal Portmonitor is not complete. (As Example, I simple reuse the "Save to File" - Dialog) - The codebase for winspool.drv is really large (>240k) and I want to split the source. The correct way is creating "localspl.dll" for the local Portmonitor (as w2k and above) and another dll for the CUPS/LPR - Handling (and maybe Software\Wine\Wine\Config\Spooler\<Portname>). A different fast hack is simple a new sourcefile for "winspool.drv" for a CUPS/LPR-Monitor and a local Portmonitor. - the internal Portmonitor uses the Registry, where the Ports - Section from "win.ini" is redirected by "IniFileMapping" on windows. - The Ports for the used CUPS/LPR - Printers is a later issue, when wine starts to use the managed Ports. Please try this Patch and point your Ideas and Hints here, so I can split the code into a set of Patches that can go clean into the Tree. Thanks to all for your Help -- By By ... ... Detlef

1 0

Re: wined3d: More shader fixes / new instructions
by H. Verbeet 28 Jul '06

28 Jul '06

On 28/07/06, Jason Green <jave27(a)gmail.com> wrote: > - GLSL: Translate oC0-oC3 output registers (multiple render targets) > to gl_FragData[] register. We don't support draw buffers yet, but > this allows shader programs that use those registers to compile (such > as Settlers 2) If you do that, you should use gl_FragData[] for *all* render targets, including the first one. gl_FragColor will write to all render targets.

2 1

Re: [Bug 5769] Regression of wine 0.9.6 in riched20 causes program to fail
by Phil Krylov 28 Jul '06

28 Jul '06

I was using fresh GIT from 2006-07-26.

1 0

Re: oleaut32: implement DISPID_PICT_HANDLE
by Robert Shearman 28 Jul '06

28 Jul '06

Juan Lang wrote: >ChangeLog: implement DISPID_PICT_HANDLE in OLEPicture::Invoke. Also correct return for stubbed DISPIDs from FALSE to VARIANT_FALSE. > > I have a series of patches that I'm just about to send that implements this and the rest of the dispids in OLEPicture::Invoke. -- Rob Shearman

1 0

RE: [Bug 5139] Americas Army will not install properly
by EA Durbin 27 Jul '06

27 Jul '06

>------- Additional Comments From dank(a)kegel.com 2006-27-07 11:39 ------- >All but the very last fix made it into wine-0.9.18. >That should be enough to get you into the game. >The next fix ought to be in wine-0.9.19. > Congrats, you beat cedega to supporting america's army. Now if we can liason with evenbalance and get punkbuster working under wine we'll be all set.

1 0

Wine compilation on ARM
by Vijay Kiran Kamuju 27 Jul '06

27 Jul '06

Hi, I have made a small patch has put in some basic framework for winedbg and wineserver for compiling on ARM (i think so). See WineHQ #285 (http://www.winehq.com/?issue=285#Cross-Compiling%20Wine). I donot have an ARM based machine and linux installed on it. And havent test it thorughly, I need someone to test this one. This patch may contain some bugs, use at your own risk. Please send me your comments Thanks, VJ

1 0

Recent problems with shdocvw
by Vitaliy Margolen 27 Jul '06

27 Jul '06

Ever since replacement of Mozilla Active X control with new gecko. And shift of attention to mshtml we have lots of programs that still need shdocvw break. Is this a temporary or intentional? Could author look at related bugs on bugzilla? -- Best regards, Vitaliy

3 3

RE: [Bug 5139] Americas Army will not install properly
by EA Durbin 27 Jul '06

27 Jul '06

Many thanks to all who fixed this bug. >From: Wine Bugs <wine-bugs(a)winehq.org> >To: ead1234(a)hotmail.com >Subject: [Bug 5139] Americas Army will not install properly >Date: Thu, 27 Jul 2006 11:39:05 -0500 > >http://bugs.winehq.org/show_bug.cgi?id=5139 > > > > > >------- Additional Comments From dank(a)kegel.com 2006-27-07 11:39 ------- >All but the very last fix made it into wine-0.9.18. >That should be enough to get you into the game. >The next fix ought to be in wine-0.9.19. > >-- >Configure bugmail: http://bugs.winehq.org/userprefs.cgi?tab=email >------- You are receiving this mail because: ------- >You reported the bug, or are watching the reporter. >You are a voter for the bug, or are watching someone who is.

1 0

Fwd: Download-Version for the Win2003 SPI - DDK
by Tom Booker 27 Jul '06

27 Jul '06

On 7/27/06, Detlef Riekenberg <wine.dev(a)web.de> wrote: > Do not forget to read the License. > (.... to design, develop and test your programs for use with > Microsoft Windows software) I think by "Microsoft Windows software" they mean Microsoft Windows itself, not the software used on it... So, even with your definition of wine, using this to further wine development would be a violation of the license. So IMHO, wine is really a set of API-Testing Programs with some Examples > (in programs). The other Code is only an addon to make our API-Testing > Programs and Examples work on unix ;-) > -- Thanks Tom Check out this new 3D Instant Messenger called IMVU. It's the best I have seen yet! http://www.imvu.com/catalog/web_registration.php?userId=1547373 -- Thanks Tom Check out this new 3D Instant Messenger called IMVU. It's the best I have seen yet! http://www.imvu.com/catalog/web_registration.php?userId=1547373

1 0

Re: WineD3D: Do not use the IWineD3DSurface for the cursor
by H. Verbeet 27 Jul '06

27 Jul '06

On 27/07/06, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > alternatives are do copy the blitting code into present or to add some hack > to prevent the original surface from beeing destroyed. What about simply creating a new surface and copying the original surface's contents?

2 1

Re: wined3d: Fix some upside-down rendering issues for shaders
by Jesse Allen 27 Jul '06

27 Jul '06

On 7/26/06, Jason Green <jave27(a)gmail.com> wrote: > Flips the resulting y position in both ARB and GLSL vertex shaders if > the current rendertarget was rendered upside down. Also, slightly > decreases the number of available float PARAMs to ARB vertex shaders > to fix a recent regression for some ATI users and to accomodate the > reference to the PROJECTION matrix in the vertex shader. > > This fixes most of the upside-down rendering issues in Max Payne 2, > Half Life 2, Civilization 4, and Tomb Raider: Legends and has no > noticeable drop in FPS. Many of the character/object models are still > broken, but that's a different issue unfortunately. > > Jason > > This does not fix battlefront, but it has to be related.

1 0

Download-Version for the Win2003 SPI - DDK
by Detlef Riekenberg 27 Jul '06

27 Jul '06

Hi. The actual DDK can be obtained through MSDN-Subscription or ordered on CD (shipping and handling fee), as you can read here: http://www.microsoft.com/whdc/devtools/ddk/default.mspx They forgot to mention, that the KMDF-ISO-Image (~300MB) has a subdirectory with the name "w2k3ddk". Kernel Mode Driver Framework: http://www.microsoft.com/whdc/driver/wdf/KMDF.mspx Do not forget to read the License. (.... to design, develop and test your programs for use with Microsoft Windows software) So IMHO, wine is really a set of API-Testing Programs with some Examples (in programs). The other Code is only an addon to make our API-Testing Programs and Examples work on unix ;-) -- By By ... ... Detlef

1 0

Re: msi: Don't set the shortcut's working directory if it's NULL.
by Dan Kegel 27 Jul '06

27 Jul '06

On 7/27/06, Mike McCormack <mike(a)codeweavers.com> wrote: > --- > dlls/msi/action.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) That fixes the last AA installer crash. As soon as that's committed we can close out http://bugs.winehq.org/show_bug.cgi?id=5139 Thanks!! - Dan

1 0

Winelib and msvcrt/process.h
by Johannes Holzer 27 Jul '06

27 Jul '06

Hi Everybody. I have some problems compiling my win32 Application with Windows-Threads ("_beginthreadex") against winelib. It seems, that i cannot use the header files in /usr/include/wine/msvcrt. Wine Version 0.9.8, 0.9.16, 0.9.17 GCC: gcc version 4.0.2 20050901 (prerelease) (SUSE Linux), gcc 3.4.4-r1 ssp-3.4.4-1.0 pie-8.7.8 (gentoo) 1st try: Compile with $wineg++ -c -I. -I../com -o ../com/b12.o ../com/b12.cppIn file included from ../com/b12.cpp:22: ../com/W32/b12s.cpp:12:21: error: process.h: No such file or directory ../com/W32/b12s.cpp: In function 'void* pvSTART_THREAD(void* (*)(void*), unsigned int, B12_ThreadClass*, B00_ThreadIdType*)': ../com/W32/b12s.cpp:109: error: '_beginthreadex' was not declared in this scope ../com/W32/b12s.cpp: In function 'F02_ErrorType B12_errSET_ENVIRONMENT_STRING(const str&, const str&)': ../com/W32/b12s.cpp:360: error: invalid conversion from 'const char*' to 'char*' ../com/W32/b12s.cpp:360: error: initializing argument 1 of 'int putenv(char*)' winegcc: g++ failed. okay, i need process.h. so i use the -mno-cygwin - switch, wich includes the "msvcrt"-path and sets some #defines. Now the 2nd try: $ wineg++ -c -I. -I../com -o ../com/b12.o ../com/b12.cpp -mno-cygwin /usr/include/c++/4.0.2/cstdio:168: error: '::snprintf' has not been declared /usr/include/c++/4.0.2/cstdio:169: error: '::vfscanf' has not been declared /usr/include/c++/4.0.2/cstdio:170: error: '::vscanf' has not been declared /usr/include/c++/4.0.2/cstdio:172: error: '::vsscanf' has not been declared /usr/include/c++/4.0.2/cstdio:178: error: '__gnu_cxx::snprintf' has not been declared /usr/include/c++/4.0.2/cstdio:179: error: '__gnu_cxx::vfscanf' has not been declared /usr/include/c++/4.0.2/cstdio:180: error: '__gnu_cxx::vscanf' has not been declared /usr/include/c++/4.0.2/cstdio:182: error: '__gnu_cxx::vsscanf' has not been declared /usr/include/c++/4.0.2/i586-suse-linux/bits/c++locale.h:55: error: 'uselocale' was not declared in this scope /usr/include/c++/4.0.2/i586-suse-linux/bits/c++locale.h:55: error: invalid type in declaration before ';' token /usr/include/c++/4.0.2/i586-suse-linux/bits/c++locale.h: In function 'int std::__convert_from_v(char*, int, const char*, _Tv, __locale_struct* const&, int)': /usr/include/c++/4.0.2/i586-suse-linux/bits/c++locale.h:73: error: '__gnu_cxx::__uselocale' cannot be used as a function /usr/include/c++/4.0.2/i586-suse-linux/bits/c++locale.h:84: error: 'snprintf' is not a member of 'std' /usr/include/c++/4.0.2/i586-suse-linux/bits/c++locale.h:90: error: '__gnu_cxx::__uselocale' cannot be used as a function /usr/include/bits/sigthread.h: At global scope: /usr/include/bits/sigthread.h:32: error: expected ',' or '...' before '*' token /usr/include/c++/4.0.2/cwchar:151: error: '::fwide' has not been declared /usr/include/c++/4.0.2/cwchar:158: error: '::mbsinit' has not been declared [ ... a lot more errors ... ] If I ommit -mno-cygwin and set "-I/usr/include/wine/msvcrt" , i get the same results lioke with -mno-cygwin. Where is the Problem? How can i compile this file? johannes Holzer

1 0

Re: Winebrowser: Let the browser decide how to handle a given url
by Dan Kegel 27 Jul '06

27 Jul '06

On 7/27/06, Stefan Siebert <stefan.siebert(a)web.de> wrote: > This is an enhancement for winebrowser. Currently http urls are only > accepted if they are prefixed (http://). Although the browser should > know how to handle a given url best. The patch passes every given url to > the browser (if it is not a mailto: url). > So programs like the Notes Client may use winebrowser and the user is > not forced to type the http:// prefix. While your patch points out a bug in wine, and makes Notes work better, the description's slightly off. I think a bare hostname by itself isn't a URL; to be a URL, you need a protocol prefix. So a better description might be "assume any address given by the user is a web page unless a protocol prefix is present which indicates that the address is something else".

1 0

Regression in wine 0.9.6 in riched20 causes program to fail
by Arren Lex 27 Jul '06

27 Jul '06

Wine suffered a regression between 06:47:19 CST (12:47:19 UTC) and 06:47:20 CST (12:47:20 UTC). CVS indicates that the files P wine/dlls/riched20/caret.c P wine/dlls/riched20/editor.c P wine/dlls/riched20/paint.c were modified in this interval. The regression causes the open-source KeyNote note editor (http://keynote.sf.net) to crash after a few clicks through the sample note file. More information and screenshot in bugzilla entry: http://bugs.winehq.org/show_bug.cgi?id=5769 If you need more information, please be very explicit in your instructions about how I should get it. I have little experience with the development\debugging side of Linux. Thanks a lot for Wine in all its glory!

1 0

Broken character models in dx8/9 games in wined3d
by Jason Green 27 Jul '06

27 Jul '06

I've spent a couple of days researching the issue of broken/upside-down character/object models in Wine in almost all newer games when you have vertex shaders enabled (Civ4, Half Life 2, Oblivion, Max Payne 2, etc.). I think I've boiled it down to a single case: When "device->renderUpsideDown" is set in the case where vertex shaders are enabled. That flag gets set in device.c:7395 when the current renderTarget is not on the current swapchain. The comments in the source say that the upside-downedness is produced by glCopyTexImage, so it sets a flag to flip everything over. In the case w/o shaders, there is code in drawprim.c which loads the WORLDVIEW and PROJECTION matrices and then multiplies those matrices by one which inverts the y coordinates when that flag is set. That seems to work in the case without vertex shaders, but when shaders are enabled, they bypass the WORLD, VIEW, and PROJECTION matrices entirely. The shader case was written when only software shaders worked, but that is no longer true. It loads identity matrices and performs the y flip, but that code is entirely irrelevant since the vertex shader doesn't reference those matrices; it only uses constants that are passed by the app, which we can't perform any type of fixup on since we don't know which constants will be used for which calculation. So, I think what we need to do is prevent ourselves from having to do any flipping whatsoever. That's the part that I'm not sure how to do and is the reason for this email. Can we load the textures in system memory first, perform a software reversing process, then load that up with glCopyTexImage instead? Will we need to do that type of fixup every time the app locks/unlocks/changes part of the texture? Or, is there a better way? I think I've figured out the problem, it's just the next step of fixing it that I'm unsure of. :-) >From a few hackish tests, I've been able to fix some of the issues where the only thing wrong was that the images were upside-down with this hack (for GLSL shader mode only): diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 84f90f5..d0325d9 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -719,6 +719,7 @@ #endif shader_addline(&buffer, "gl_FogFragCoord = clamp(gl_FogFragCoord, 0.0, 1.0);\n"); } + shader_addline(&buffer, "gl_Position = gl_Position * gl_ModelViewProjectionMatrix;\n"); shader_addline(&buffer, "}\n\0"); TRACE("Compiling shader object %u\n", shader_obj); This works because the gl_ModelViewProjectionMatrix is just a matrix which reverses the y position when This->renderUpsideDown == TRUE, otherwise it's the identity matrix. Here are a few comparison screenshots: Oblvion: --------- Before: http://www.cmhousing.net/wine/oblivion2.png After: http://www.cmhousing.net/wine/oblivion_sortacorrect3.png Civ4: ----- Before: http://www.cmhousing.net/wine/civ4_before.png After: http://www.cmhousing.net/wine/civ4_leaderhead.png Half Life 2: ------------- After: http://www.cmhousing.net/wine/hl2_rightsideup.png (the bottom got screwed up, but normally the guy on the picture is upside-down) Many of the character models and other objects are still broken even with that hack, but that's because we should be flipping more than just the final position - we should be flipping a whole row of constants that the app is using before it starts its calculations. Instead of trying to do that, we should fix the root of the problem IMHO. Anyway, any ideas are welcome. :-) Jason

5 14

Re: WineD3D: BltFast/BltOverride color keying
by Roderick Colenbrander 26 Jul '06

26 Jul '06

Use this version instead as the previous one didn't compile due to an extra '(' :( Roderick > Hi, > > This patch adds color keying support to *_BltOverride. It required changes > to *_BltFast to properly pass 'BLT' flags instead of 'BLTFAST' to > *_BltOverride. Next it adds SRC/DEST color keying to *_BltOverride. > > Further to get color keying working at all it fixed a small error in > LoadTexture which I paste here because it is hard to spot in the patch. Right > now a check in there looks like: > (This->Flags & SFLAG_GLCKEY && !(This->CKeyFlags & DDSD_CKSRCBLT)) || > /* Reload: vice versa OR */ > (!(This->Flags & SFLAG_GLCKEY) && !This->CKeyFlags & DDSD_CKSRCBLT) || > > The third '!' was removed as indicated by the comment this fixes color > keying. Next to this some gcc warning was silenced by adding some more braces. > > Regards, > Roderick Colenbrander > -- Echte DSL-Flatrate dauerhaft für 0,- Euro*. Nur noch kurze Zeit! "Feel free" mit GMX DSL: http://www.gmx.net/de/go/dsl

1 0

registry entry creation problems
by Kuba Ober 26 Jul '06

26 Jul '06

Hi, I'm trying to install some registry entries via a custom .inf file. Eventually the .inf file will do more than install registry entries, so I can't just use regedit and .reg files for the task. The relay shows that the entries were supposedly created without problems (retval == ERROR_SUCCESS), but subsequent runs of regedit show that nothing of the sort has happened. I've done it all on a fresh wine prefix, like so: $ rpm -q wine-core wine-core-0.9.16-2.fc4 $ rm -rf ~/wp $ wineprefixcreate --wineprefix ~/wp /vol1/home/kuba/wp updated successfully. $ WINEDEBUG=relay WINPREFIX=~/wp wine rundll32 setupapi.dll,InstallHinfSection DefaultInstall 0 z:\\home\\kuba\\build.inf 2> log $ WINEPREFIX=~/wp regedit /E z:\\home\\kuba\\foo.reg HKEY_CURRENT_USER None of the keys from the .inf file appear in ~/foo.reg, even though the relay dump would have you think that their creation had succeeded. Manual creation of keys via $ WINEPREFIX=~/wp regedit works fine. Below is the relay trace, with my annotations. I'd appreciate any suggestions as to how to debug this. Cheers, Kuba 0009:Call advapi32.RegCreateKeyW(80000001,7fc8d818 L"Environment",7fc8f838) ret=420bd1ca 0009:Call ntdll.NtCreateKey(7fc8f838,000f003f,7fc8d6a4,00000000,7fc8d6bc,00000000,00000000) ret=7b4e19dd 0009:Ret ntdll.NtCreateKey() retval=00000000 ret=7b4e19dd 0009:Call ntdll.RtlNtStatusToDosError(00000000) ret=7b4e19e8 0009:Ret ntdll.RtlNtStatusToDosError() retval=00000000 ret=7b4e19e8 0009:Ret advapi32.RegCreateKeyW() retval=00000000 ret=420bd1ca * HKCU/Environment was successfully created/opened. 0009:Call advapi32.RegSetValueExW(00000044,7fc8d818 L"TEMP",00000000,00000001,7ff19ae8,0000000e) ret=420bd56e 0009:Call ntdll.NtSetValueKey(00000044,7fc8d6e4,00000000,00000001,7ff19ae8,0000000e) ret=7b4e34ca 0009:Ret ntdll.NtSetValueKey() retval=00000000 ret=7b4e34ca 0009:Call ntdll.RtlNtStatusToDosError(00000000) ret=7b4e34d5 0009:Ret ntdll.RtlNtStatusToDosError() retval=00000000 ret=7b4e34d5 0009:Ret advapi32.RegSetValueExW() retval=00000000 ret=420bd56e * HKCU/Environment/TEMP was successfully set. 0009:Call advapi32.RegCloseKey(00000044) ret=420bd19f 0009:Call ntdll.NtClose(00000044) ret=7b4e1097 0009:Ret ntdll.NtClose() retval=00000000 ret=7b4e1097 0009:Call ntdll.RtlNtStatusToDosError(00000000) ret=7b4e10a2 0009:Ret ntdll.RtlNtStatusToDosError() retval=00000000 ret=7b4e10a2 0009:Ret advapi32.RegCloseKey() retval=00000000 ret=420bd19f * The key was successfully closed.

1 0

Re: [oleaut32 1/2] Resend: Implements function varformat:VarWeekdayName
by Alexandre Julliard 26 Jul '06

26 Jul '06

"Benjamin Arai" <me(a)benjaminarai.com> writes: > + str = HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*size); > + if (!str) > + return E_OUTOFMEMORY; > + size = GetLocaleInfoW(LOCALE_USER_DEFAULT,localeValue, str, size); > + if (!size) { > + ERR("GetLocaleInfo of 0x%lx failed in 2nd stage?!\n", localeValue); > + HeapFree(GetProcessHeap(),0,str); > + return HRESULT_FROM_WIN32(GetLastError()); > + } > + *pbstrOut = SysAllocString(str); You should do the GetLocaleInfoW directly into the destination string instead of allocating another buffer. -- Alexandre Julliard julliard(a)winehq.org

1 0

vartest.c contains varformat.c tests
by Benjamin Arai 26 Jul '06

26 Jul '06

Hi, A bug was submitted (http://bugs.winehq.org/show_bug.cgi?id=5306) that vartest.c was getting too large and that it needs to be smaller. I don't think to much can be done about the size but I did notice that all the tests for varformat.c are being put into vartest.c as opposed to making a new test file test/varformat.c. Would there be any problems if I create a new test file for varformat.c and move the appropriate test from vartest.c to it? -- Benjamin Arai http://www.benjaminarai.com

4 3

Re: usp10: Implement ScriptGetGlyphABCWidth.
by Alexandre Julliard 26 Jul '06

26 Jul '06

Hans Leidekker <hans(a)it.vu.nl> writes: > -Hans > > Changelog > Implement ScriptGetGlyphABCWidth. > Add a test for ScriptGetGlyphABCWidth and ScriptCacheGetHeight. The tests fail here: ../../../tools/runtest -q -P wine -M usp10.dll -T ../../.. -p usp10_test.exe.so usp10.c && touch usp10.ok usp10.c:273: Test failed: Translation not correct. WCHAR 0 - 0000 != 0035 usp10.c:722: Test failed: expected S_OK, got 0x80070006 -- Alexandre Julliard julliard(a)winehq.org

3 2

Re: ADDRESS -> ADDRESS64 (winedbg, resubmit)
by Dmitry Timoshkov 26 Jul '06

26 Jul '06

"Ge van Geldorp" <ge(a)gse.nl> wrote: > +char* memory_offset_to_string(char *str, DWORD64 offset, unsigned mode) > +{ > +printf("memory_offset_to_string\n"); This debug printf apparently should be removed. -- Dmitry.

1 0

Re: wined3d: Fix crash caused by bad TRACE
by H. Verbeet 26 Jul '06

26 Jul '06

On 26/07/06, Jason Green <jave27(a)gmail.com> wrote: > Not sure when this bug showed up, but I've recently had a few apps > randomly crash on me, and this was the cause. I think that TRACE has been there for a long time, but the bug might have become visible when we increased the amount of available texture stages by using register combiners.

1 0

Re: msi: Always load all the components. (resend)
by Dan Kegel 26 Jul '06

26 Jul '06

On 7/25/06, Mike McCormack <mike(a)codeweavers.com> wrote: > (better) Fix for bug #3590 (Python 2.4.2). > Remember to set component->Enabled. > Update some test cases that now pass. Sweet -- Python now installs! Or, as we say around these parts, LGTM.

1 0

Drive mapping of Z:
by schollsky＠arcor.de 25 Jul '06

25 Jul '06

Dear friends and developers of WINE, I've been using your application now for some time, and it works quite well yet. However, I found the mapping of Drive Z: to root, which seems a bit strange to me. I've also read some of your discussion on this topic, too. Personally, I'd consider this a maybe issue of security. Nowadays Linux users don't care as much about security as server admins would do. Alas, Linux being a multi-user system by tradition should take care of "normal" home desktop users trying to migrate from proprietary realms. It would help a lot if WINE would do a more secure installation by default, but this is only my 2p. (Maybe it's possible just to leave out the Z: mapping?) Kind regards, schollsky

20 33

msvcrt: _getmaxstdio and _setmaxstdio
by Phil Lodwick 25 Jul '06

25 Jul '06

Greetings, I have an application that requires these functions which are currently stubs in wine. These functions set/retrieve the number of files that can be simultaneously open at the stdio level. As of now the Win32 platform has a default of 512 and can be set as high as 2048. There is probably quite a bit of work required to be truly compatible. For example, fail when you try to fopen() more than the maximum number of files. My simple fix for my app is to set an initial static variable to 512 and allow this variable to be set via _setmaxstdio as long as it is less <= 2048 and return this variable when _setmaxstdio is called. Is such a patch a positive thing because it allows more apps to run, or is it a negative thing because it might mask the fact that more work needs to be done? Perhaps add a WARN that these values are for informational purposes only and may not be enforced? MSDN _setmaxstdio: http://msdn2.microsoft.com/en-us/library/6e3b887c.aspx MSDN _getmaxstdio: http://msdn2.microsoft.com/en-us/library/6e3b887c.aspx Phil

2 1

[RSAENH] CPGetHashParam / Bug 5639 part 2
by Karsten Elfenbein 25 Jul '06

25 Jul '06

Hi, Same question for this one. It fixes the case when CryptGetHashParam is called with pbData=NULL to determine the needed buffer size for the hash value. It fixes the http://bugs.winehq.org/attachment.cgi?id=3024&action=view testcase in http://bugs.winehq.org/show_bug.cgi?id=5639 Karsten

2 1

[RSAENH] CPEncrypt / Bug 5639
by Karsten Elfenbein 25 Jul '06

25 Jul '06

Hi, I wonder if the attached patche would make in into git? It fixes the case when CryptEncrypt is called with pbData=NULL to determine the needed buffer size after encryption. It fixes the http://bugs.winehq.org/attachment.cgi?id=3023&action=view testcase in http://bugs.winehq.org/show_bug.cgi?id=5639 Karsten

1 0

Lotus Notes 7 success!
by Dan Kegel 25 Jul '06

25 Jul '06

Thanks to a few targeted patches written by Stefan Siebert and James Hawkins, and of course decades of effort by the whole Wine team, Lotus Notes 7 trial version now installs and runs! See http://wiki.winehq.org/LotusNotes for details. I just spent an hour or so playing with Notes as a plain old email client. It had a few mysterious crashes, but in general seemed usable. (Not that I'd ever use it after getting used to gmail, but that's another story.) I filed bug http://bugs.winehq.org/show_bug.cgi?id=5752 about a strangeness in the email client. - Dan

3 2

Freetype configure checks are backward
by Gerald Pfeifer 25 Jul '06

25 Jul '06

I believe the Freetype configure checks are backward. First we check for the library being present, and only then do we check for the freetype-config problem: AC_SUBST(FREETYPELIBS,"") AC_SUBST(FREETYPEINCL,"") AC_CHECK_LIB(freetype,FT_Init_FreeType,ft_lib=yes,ft_lib=no,$X_LIBS) if test "$ft_lib" = "no" then wine_cv_msg_freetype=no else AC_CHECK_PROG(ft_devel,freetype-config,freetype-config,no) This fails to work when Freetype is installed somewhere outside of /usr/ such as /usr/local/ with /usr/local/bin in the path. freetype-config would of course know where to look for the library, but we perform the check for the library first, without taking the output of freetype-config into concern. Wouldn't it make sense to revert these two changes? Gerald

1 1

Re: WineD3D: DDS file writer
by H. Verbeet 25 Jul '06

25 Jul '06

On 25/07/06, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > I have written this function while debugging the font issue in Battlefield > 1942. It writes the surface contents unmodified in a .dds file which can be > read by the dxtex utility in the DirectX sdk, and a few Linux applications. > It doesn't have to convert the surface's content, so it minimizes possible > bugs in the dumping code. I have #if 0 -ed the code because it is only needed > for debugging and can be activated as needed, but I think it can be quite > useful to debug issues with compressed surfaces. Why is this in surface_gdi.c instead of surface.c?

2 1

Re: Win64 patch 3/6 (resend)
by Dmitry Timoshkov 25 Jul '06

25 Jul '06

"Ge van Geldorp" <ge(a)gse.nl> wrote: > --- a/include/wine/server_protocol.h > +++ b/include/wine/server_protocol.h > @@ -33,6 +33,9 @@ struct reply_header > struct request_max_size > { > int pad[16]; > +#ifdef _WIN64 > + int pad64[10]; > +#endif > }; Why is this required? Is that due to asserts in server/request.c, open_master_socket() ? Is changing 'int' to 'long' a better fix? Also probably the fix should go in server/protocol.def instead. -- Dmitry.

3 6

Repetitve fixme for each file accessed.
by Segin 25 Jul '06

25 Jul '06

I keep getting stub fixme's for each and every single file that is access in Wine, especially via an installer. THe fixmes look like: fixme:sfc:SfcIsFileProtected ((nil), L"C:\\Program Files\\GeneXproTools 4\\SampleRuns\\XOR.gep") stub Does this have anything to do with the ClamAV integration I've heard you guys talking about? -- The real problem with C++ for kernel modules is: the language just sucks. -- Linus Torvalds

5 6

Re: oleaut32: Adding a NULL to a safearray is supposed to crash
by Robert Shearman 25 Jul '06

25 Jul '06

Neil Skrypuch wrote: >diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c >index 0eb92da..d3dd5e1 100644 >--- a/dlls/oleaut32/safearray.c >+++ b/dlls/oleaut32/safearray.c >@@ -843,12 +843,6 @@ HRESULT WINAPI SafeArrayPutElement(SAFEA > if (!psa || !rgIndices) > return E_INVALIDARG; > >- if (!pvData) >- { >- ERR("Invalid pvData would crash under Win32!\n"); >- return E_INVALIDARG; >- } >- > hRet = SafeArrayLock(psa); > > if (SUCCEEDED(hRet)) > > This patch looks good to me and it fixes a number of installers. -- Rob Shearman

2 1

Re: [oleaut32 2/3] Removes stub for varformat:VarWeekdayName
by Robert Shearman 25 Jul '06

25 Jul '06

Benjamin Arai wrote: >diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec >index ad110c7..9e1f1db 100644 >--- a/dlls/oleaut32/oleaut32.spec >+++ b/dlls/oleaut32/oleaut32.spec >@@ -124,7 +124,7 @@ > 125 stdcall VarBoolFromStr(wstr long long ptr) > 126 stdcall VarBoolFromDisp(ptr long ptr) > 127 stdcall VarFormatCurrency(ptr long long long long long ptr) >-128 stub VarWeekdayName # stdcall (long long long long ptr) >+128 stdcall VarWeekdayName(long long long long ptr) > 129 stdcall VarMonthName(long long long ptr) > 130 stdcall VarUI1FromI2(long ptr) > 131 stdcall VarUI1FromI4(long ptr) > > This should be included in the first patch. -- Rob Shearman

1 0

Re: [oleaut32 1/3] Implements function varformat:VarWeekdayName
by Robert Shearman 25 Jul '06

25 Jul '06

Benjamin Arai wrote: > /********************************************************************** >+ * VarWeekdayName [OLEAUT32.128] >+ * >+ * Print the specified month as localized name. >+ * >+ * PARAMS >+ * iWeekday [I] day number of week 0 = sys default, 1 = Monday, etc >+ * fAbbrev [I] 0 - full name, !0 - abbreviated name >+ * iFirstDay [I] first day week, 0 = sys default, 1 = Monday, etc >+ * dwFlags [I] flag stuff. only VAR_CALENDAR_HIJRI possible. > > s/flag stuff/flags/ >+ >+ size = GetLocaleInfoW(LOCALE_USER_DEFAULT,localeValue, NULL, 0); >+ if (!size) { >+ FIXME("GetLocaleInfo 0x%lx failed.\n", localeValue); > > This should be an ERR instead. >+ return E_INVALIDARG; > > I don't think this is a good error code to return here. Even E_UNEXPECTED would be better, although perhaps HRESULT_FROM_WIN32(GetLastError()) would be the best. >+ } >+ str = HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*size); >+ if (!str) >+ return E_OUTOFMEMORY; >+ size = GetLocaleInfoW(LOCALE_USER_DEFAULT,localeValue, str, size); >+ if (!size) { >+ FIXME("GetLocaleInfo of 0x%lx failed in 2nd stage?!\n", localeValue); >+ HeapFree(GetProcessHeap(),0,str); >+ return E_INVALIDARG; > > Ditto for the above two comments; -- Rob Shearman

1 0

Re: usp10: Resend - Add funtionality for ScriptStringAnalyse
by Alexandre Julliard 25 Jul '06

25 Jul '06

Jeff L <lats(a)yless4u.com.au> writes: > + psssa = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(Scriptstringanalysis)); > + *pssa = (Scriptstringanalysis*)psssa; Please try to find better names for your variables, don't name everything pssa or psssa or pssap etc. Also please use underscores to separate words in identifiers so that they are readable. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: Remove unused "ignore" field in widl structures
by Dan Hipschman 25 Jul '06

25 Jul '06

On Mon, Jul 24, 2006 at 11:49:35AM -0700, Dan Hipschman wrote: > > This field is superfluous: > > [widl]$ find -name "*.[chly]" | xargs fgrep -n ignore > ./parser.y:1049: t->ignore = parse_only; > ./parser.y:1126: f->ignore = parse_only; > ./widltypes.h:208: int ignore, is_const, sign; > ./widltypes.h:238: int ignore, idx; > ./parser.tab.c:3841: t->ignore = parse_only; > ./parser.tab.c:3918: f->ignore = parse_only; This patch has been obsoleted by the patch, "widl [1/2]: Fix redefinition of types in output (take 2)," here: <http://www.winehq.org/pipermail/wine-patches/2006-July/028998.html>, which rather than removing the ignore field, puts it to use.

1 0

Cursor patches
by H. Verbeet 24 Jul '06

24 Jul '06

Attached to this mail are a couple of patches that should fix some issues with mouse cursors. It would be nice if some people could have a look and see if the patches break anything. Patches 1-4 move cursors into the server, 5 adds support for Xcursor cursors, 6 & 7 are cleanups, 8 fixes loading of .cur cursors, 9 adds support for animated cursors and 10 adds support for 32bpp cursors.

4 9

Re: Possible bug in Wine or NDISWRAPPER
by gslink 24 Jul '06

24 Jul '06

The most common problem with Ndiswrapper is that it requires more than a 4k stack. The result you are getting may be coming from a stack overflow caused by a combination of Wine and Ndiswrapper. Compile and install the native drivers for your lan card and see if that makes a difference. The signal strength icon will also start working.

3 5

Re: wcmd: strip quotes around executable and retry on error
by Thomas Kho 24 Jul '06

24 Jul '06

On 7/6/06, Thomas Kho <tkho(a)ucla.edu> wrote: > wcmd: strip quotes around executable and retry on error > wcmd currently gives a 'File not found' error for the command: > `./wine wcmd /c "notepad test.txt"` because it only tries to execute the > program "notepad text.txt". In XP, cmd.exe starts notepad.exe with test.txt as > its argument upon not finding a "notepad text.txt" executable. Hi, Is there something wrong with this patch? http://www.winehq.org/pipermail/wine-patches/2006-July/028367.html Thanks, Thomas Kho

3 4

How do I get the unix filename for a wine handle?
by wino＠piments.com 24 Jul '06

24 Jul '06

>> Currently I'm working on a scan-after-write functionality: Whenever a >> file was changed the virusscanner checks the file. My plan is to hook in NtWriteFile() (dlls/ntdll/file.c), because whenever a windows program writes to a file this function is called. why not scan-before-write? you have a hook into the write process, why not block the write if you have a hit?

1 0

Re: usp10: Implement and test ScriptCacheGetHeight. (rediffed)
by Jeff Latimer 24 Jul '06

24 Jul '06

Hans, I don't think that your test was applied, only the function was. Jeff Hans Leidekker wrote: >Lotus Notes calls this one. See bug 4944. > > -Hans > >Changelog > Implement and test ScriptCacheGetHeight. > > >------------------------------------------------------------------------ > >bd39fa31f57846d1fd50aebd9425a739e6c74d9e >diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c >index cbaf44a..51f967a 100644 >--- a/dlls/usp10/tests/usp10.c >+++ b/dlls/usp10/tests/usp10.c >@@ -561,6 +561,40 @@ static void test_ScriptString(void) > } > } > >+void test_ScriptCacheGetHeight(void) >+{ >+ HRESULT hr; >+ HDC hdc; >+ HWND hwnd; >+ SCRIPT_CACHE sc = NULL; >+ LONG height; >+ >+ hwnd = CreateWindowExA(0, "static", "", WS_POPUP, 0, 0, 100, 100, 0, 0, 0, NULL); >+ assert(hwnd != 0); >+ >+ hdc = GetDC(hwnd); >+ ok(hdc != NULL, "HDC failed to be created\n"); >+ >+ hr = ScriptCacheGetHeight(NULL, NULL, NULL); >+ ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08lx\n", hr); >+ >+ hr = ScriptCacheGetHeight(NULL, &sc, NULL); >+ ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08lx\n", hr); >+ >+ hr = ScriptCacheGetHeight(NULL, &sc, &height); >+ ok(hr == E_PENDING, "expected E_PENDING, got 0x%08lx\n", hr); >+ >+ height = 0; >+ >+ hr = ScriptCacheGetHeight(hdc, &sc, &height); >+ ok(hr == S_OK, "expected S_OK, got 0x%08lx\n", hr); >+ >+ ok(height > 0, "expected height > 0\n"); >+ >+ ReleaseDC(hwnd, hdc); >+ DestroyWindow(hwnd); >+} >+ > START_TEST(usp10) > { > unsigned short pwOutGlyphs[256]; >@@ -570,4 +604,5 @@ START_TEST(usp10) > test_ScriptGetFontProperties(); > test_ScriptTextOut(); > test_ScriptString(); >+ test_ScriptCacheGetHeight(); > } > >

3 8

Re: [kernel] Add dummy HeapSetInformation, take 2
by Dmitry Timoshkov 24 Jul '06

24 Jul '06

"Dan Kegel" <dank(a)kegel.com> wrote: > Changelog: > include/winnt.h: add enum HEAP_INFORMATION_CLASS > kernel/heap.c: add dummy HeapSetInformation() > +enum _HEAP_INFORMATION_CLASS { > + HeapCompatibilityInfo > +}; PSDK uses Information not just short Info at the end. -- Dmitry.

1 0

Re: usp10: Add funtionality for ScriptStringAnalyse
by Detlef Riekenberg 24 Jul '06

24 Jul '06

Jeff wrote: > + if (psssa->pssap->psva) > + HeapFree(GetProcessHeap(), 0, psssa->pssap->psva); > + if (psssa->pssap->piAdvance) > + HeapFree(GetProcessHeap(), 0, > psssa->pssap->piAdvance); > + if (psssa->pssap->pGoffset) > + HeapFree(GetProcessHeap(), 0, > psssa->pssap->pGoffset); > + if (psssa->pssap->pwOutGlyphs) > + HeapFree(GetProcessHeap(), 0, > psssa->pssap->pwOutGlyphs); A NULL-Pointer is handled by HeapFree() and we cleaned up similar unneeded "if " - tests recently. Thanks. -- By By ... ... Detlef

2 1

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