wine-devel August 2006

wine-devel@winehq.org

119 participants
247 discussions

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

05 Aug '06

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

2 1

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

05 Aug '06

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

2 1

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

05 Aug '06

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

1 0

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

05 Aug '06

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

3 2

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

04 Aug '06

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

2 1

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

04 Aug '06

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

1 0

VNC and worms
by Krzysztof Foltman 04 Aug '06

04 Aug '06

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

2 1

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

04 Aug '06

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

1 0

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

04 Aug '06

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

2 2

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

04 Aug '06

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

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel August 2006