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