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

Re: wintrust: Only return ERROR_SUCCESS in WinVerifyTrust
by Andreas Mohr Aug. 7, 2006

Aug. 7, 2006

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 Aug. 7, 2006

Aug. 7, 2006

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 Aug. 7, 2006

Aug. 7, 2006

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 Aug. 7, 2006

Aug. 7, 2006

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 Aug. 7, 2006

Aug. 7, 2006

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 Aug. 6, 2006

Aug. 6, 2006

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 Aug. 6, 2006

Aug. 6, 2006

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 Aug. 6, 2006

Aug. 6, 2006

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 Aug. 5, 2006

Aug. 5, 2006

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(a)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(a)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 Aug. 5, 2006

Aug. 5, 2006

Thanks for this great piece of work ! - Stefan

1 0

GlobalMemoryStatus - Photoshop 4 workaround crashes Notes Client running Java
by Stefan Siebert Aug. 5, 2006

Aug. 5, 2006

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 Aug. 5, 2006

Aug. 5, 2006

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 Aug. 5, 2006

Aug. 5, 2006

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 Aug. 5, 2006

Aug. 5, 2006

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 Aug. 4, 2006

Aug. 4, 2006

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 Aug. 4, 2006

Aug. 4, 2006

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 Aug. 4, 2006

Aug. 4, 2006

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 Aug. 4, 2006

Aug. 4, 2006

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 Aug. 4, 2006

Aug. 4, 2006

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 Aug. 4, 2006

Aug. 4, 2006

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 Aug. 4, 2006

Aug. 4, 2006

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 Aug. 4, 2006

Aug. 4, 2006

"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 Aug. 4, 2006

Aug. 4, 2006

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 */ +(a)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 */ +(a)REPLY +(a)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 Aug. 3, 2006

Aug. 3, 2006

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 Aug. 3, 2006

Aug. 3, 2006

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 Aug. 3, 2006

Aug. 3, 2006

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 Aug. 3, 2006

Aug. 3, 2006

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 Aug. 3, 2006

Aug. 3, 2006

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 Aug. 2, 2006

Aug. 2, 2006

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 */ +(a)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; +(a)REPLY +(a)END + + +/* Set current process service thread */ +(a)REQ(set_remote_op_mutex) + obj_handle_t mutex; /* global handle for mutex */ +(a)REPLY +(a)END + + +/* Get service thread mutex */ +(a)REQ(get_remote_op_mutex) + obj_handle_t process; +(a)REPLY + obj_handle_t mutex; +(a)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 Aug. 2, 2006

Aug. 2, 2006

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 Aug. 2, 2006

Aug. 2, 2006

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 Aug. 2, 2006

Aug. 2, 2006

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 Aug. 2, 2006

Aug. 2, 2006

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 Aug. 2, 2006

Aug. 2, 2006

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 Aug. 2, 2006

Aug. 2, 2006

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 Aug. 2, 2006

Aug. 2, 2006

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 Aug. 2, 2006

Aug. 2, 2006

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 Aug. 1, 2006

Aug. 1, 2006

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 Aug. 1, 2006

Aug. 1, 2006

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 Aug. 1, 2006

Aug. 1, 2006

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 Aug. 1, 2006

Aug. 1, 2006

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 Aug. 1, 2006

Aug. 1, 2006

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 Aug. 1, 2006

Aug. 1, 2006

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 Aug. 1, 2006

Aug. 1, 2006

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 Aug. 1, 2006

Aug. 1, 2006

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 Aug. 1, 2006

Aug. 1, 2006

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 Aug. 1, 2006

Aug. 1, 2006

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