- Wine-devel - list.winehq.org

Re: Make RECT identical to RECTL, fix compile warnings (resending)
by Dimitrie O. Paun 28 Dec '02

28 Dec '02

On December 27, 2002 01:29 pm, Dan Kegel wrote: > I think this patch touches every single TRACE > statement that prints out a RECT. Many different > formats are used... might be nice to standardize them > sometime. (See my related post about maybe using > macros for that.) Now that you've identified all these places, it seems to me the perfect oportunity to standardise them. At the very least, we should convert them all to a common format (say (x0,y0)-(x1,y1), or anything you fancy) so we can more easily grep/sed for them later. But I'd certainly prefer the debugrect() approach, provided Alexandre accepts it. -- Dimi.

2 1

WinXP conformance test update
by David Miller 28 Dec '02

28 Dec '02

I noticed two tests were still missing information. Here are the results of those tests. C:\winetests>kernel32_test.exe file file.c:633:Current offset = 0015 file.c:658:Current offset = 0015 file: 487239 tests executed, 0 marked as todo, 0 failures. C:\winetests>kernel32_test.exe generated generated: 609 tests executed, 0 marked as todo, 0 failures.

1 0

Fwd: Get rid of W->A calls: GetPrinterDriverDirectory (2nd)
by Stefan Leichter 28 Dec '02

28 Dec '02

Hello Alexandre, why is this patch still waiting to be applied? If something is wrong please tell it loud on the mailing list. Stefan ---------- Weitergeleitete Nachricht ---------- Subject: Fwd: Get rid of W->A calls: GetPrinterDriverDirectory Date: Sat, 21 Dec 2002 09:52:30 +0100 From: Stefan Leichter <Stefan.Leichter(a)camLine.com> To: wine-devel(a)winehq.com Hello, is there any reason why this patch did not made it into CVS & 20021219? Stefan ---------- Weitergeleitete Nachricht ---------- Subject: Get rid of W->A calls: GetPrinterDriverDirectory Date: Sun, 15 Dec 2002 10:24:44 +0100 From: Stefan Leichter <Stefan.Leichter(a)camLine.com> To: wine-patches(a)winehq.com Hello, after spending some days fixing the read-write errors on my DDYS-T18350 disk here a new patch Changelog ------------ moved implementation of GetPrinterDriverDirectory from ascii to unicode Index: dlls/winspool/info.c =================================================================== RCS file: /home/wine/wine/dlls/winspool/info.c,v retrieving revision 1.61 diff -u -r1.61 info.c --- dlls/winspool/info.c 12 Nov 2002 02:22:24 -0000 1.61 +++ dlls/winspool/info.c 15 Dec 2002 08:40:09 -0000 @@ -41,6 +41,7 @@ #include "winbase.h" #include "winerror.h" #include "winreg.h" +#include "winternl.h" #include "wine/windef16.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -2390,23 +2391,23 @@ } /*************************************************************************** ** - * GetPrinterDriverDirectoryA [WINSPOOL.@] + * GetPrinterDriverDirectoryW [WINSPOOL.@] */ -BOOL WINAPI GetPrinterDriverDirectoryA(LPSTR pName, LPSTR pEnvironment, +BOOL WINAPI GetPrinterDriverDirectoryW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, LPBYTE pDriverDirectory, DWORD cbBuf, LPDWORD pcbNeeded) { DWORD needed; - TRACE("(%s, %s, %ld, %p, %ld, %p)\n", pName, pEnvironment, Level, - pDriverDirectory, cbBuf, pcbNeeded); + TRACE("(%s, %s, %ld, %p, %ld, %p)\n", debugstr_w(pName), + debugstr_w(pEnvironment), Level, pDriverDirectory, cbBuf, pcbNeeded); if(pName != NULL) { - FIXME("pName = `%s' - unsupported\n", pName); + FIXME("pName = `%s' - unsupported\n", debugstr_w(pName)); SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } if(pEnvironment != NULL) { - FIXME("pEnvironment = `%s' - unsupported\n", pEnvironment); + FIXME("pEnvironment = `%s' - unsupported\n", debugstr_w(pEnvironment)); SetLastError(ERROR_INVALID_ENVIRONMENT); return FALSE; } @@ -2414,10 +2415,16 @@ WARN("Level = %ld - assuming 1\n", Level); /* FIXME should read from registry */ - needed = GetSystemDirectoryA(pDriverDirectory, cbBuf); + needed = GetSystemDirectoryW( (LPWSTR)pDriverDirectory, cbBuf/sizeof(WCHAR)); + /* GetSystemDirectoryW returns number of TCHAR without '\0' + * adjust this now + */ needed++; + needed*=sizeof(WCHAR); + if(pcbNeeded) *pcbNeeded = needed; + TRACE("required <%08lx>\n", *pcbNeeded); if(needed > cbBuf) { SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; @@ -2427,25 +2434,41 @@ /*************************************************************************** ** - * GetPrinterDriverDirectoryW [WINSPOOL.@] + * GetPrinterDriverDirectoryA [WINSPOOL.@] */ -BOOL WINAPI GetPrinterDriverDirectoryW(LPWSTR pName, LPWSTR pEnvironment, +BOOL WINAPI GetPrinterDriverDirectoryA(LPSTR pName, LPSTR pEnvironment, DWORD Level, LPBYTE pDriverDirectory, DWORD cbBuf, LPDWORD pcbNeeded) { - LPSTR pNameA = NULL, pEnvironmentA = NULL; + UNICODE_STRING nameW, environmentW; BOOL ret; - - if(pName) - pNameA = HEAP_strdupWtoA( GetProcessHeap(), 0, pName ); - if(pEnvironment) - pEnvironmentA = HEAP_strdupWtoA( GetProcessHeap(), 0, pEnvironment ); - ret = GetPrinterDriverDirectoryA( pNameA, pEnvironmentA, Level, - pDriverDirectory, cbBuf, pcbNeeded ); - if(pNameA) - HeapFree( GetProcessHeap(), 0, pNameA ); - if(pEnvironmentA) - HeapFree( GetProcessHeap(), 0, pEnvironmentA ); + DWORD pcbNeededW; + INT len = cbBuf * sizeof(WCHAR)/sizeof(CHAR); + WCHAR *driverDirectoryW = NULL; + + if (len) driverDirectoryW = HeapAlloc( GetProcessHeap(), 0, len ); + + if(pName) RtlCreateUnicodeStringFromAsciiz(&nameW, pName); + else nameW.Buffer = NULL; + if(pEnvironment) RtlCreateUnicodeStringFromAsciiz(&environmentW, pEnvironment); + else environmentW.Buffer = NULL; + + ret = GetPrinterDriverDirectoryW( nameW.Buffer, environmentW.Buffer, Level, + (LPBYTE)driverDirectoryW, len, &pcbNeededW ); + if (ret) { + ret = WideCharToMultiByte( CP_ACP, 0, driverDirectoryW, -1, + pDriverDirectory, cbBuf, NULL, NULL); + *pcbNeeded = WideCharToMultiByte( CP_ACP, 0, driverDirectoryW, -1, + NULL, 0, NULL, NULL); + } else + *pcbNeeded = pcbNeededW * sizeof(CHAR)/sizeof(WCHAR); + + TRACE("provided<%ld> required <%ld>\n", cbBuf, *pcbNeeded); + + if(driverDirectoryW) + HeapFree( GetProcessHeap(), 0, driverDirectoryW ); + RtlFreeUnicodeString(&environmentW); + RtlFreeUnicodeString(&nameW); return ret; } ------------------------------------------------------- -------------------------------------------------------

1 0

Wine Contrib 0.6
by Dimitrie O. Paun 28 Dec '02

28 Dec '02

Folks, A new version of Wine-Contrib is available at: http://www.dssd.ca/wine/Wine-Contrib-0.6.html courtesy of Tom & Tony. -- Dimi.

3 2

Re: Do not free the header while unmapping the xxxx_UNPREPARE messages
by Eric Pouech 28 Dec '02

28 Dec '02

Dmitry Timoshkov wrote: > Hello, > > this patch is aimed to fix crashes in the old 16-bit game, which > calls waveOutUnprepareHeader16 for busy headers. MMDRV_Message > in that case returns WAVERR_STILLPLAYING, but it's not stopping > MMDRV_WaveOut_UnMap16To32A() from freeing the header. Slightly > later game calls waveOutReset16() which crashes. In that case > the duty of freeing the header should be moved to a higher level. > I have generalized this approach to all similar cases. I'd rather see the fix being made completely in message16.c by adding the return value to the unmapping functions IMO, it better encapsulates all the 32<=>16 message mappings, and it's bad to spread this across several compilation unit A+ -- Eric Pouech

2 5

i would like to do some translation work where do i need to start ?
by Ezequiel Perez 28 Dec '02

28 Dec '02

Hi, I'm Ezequiel Perez i would like to do some translation work where do i need to start? I can translate it to the spanish language I live in Buenos Aires, Argentina, my ICQ is 126918474, my MSN Messenger is eazel7(a)msn.com

2 1

make uninstall trying to remove aclocal??
by Mark Knecht 28 Dec '02

28 Dec '02

Hi, I note that at the end of make uninstall the scripts seem to be attempting to remove a shared directory. I really am not sure this is a good idea, or at the least the desired action is not taking place... In my case the directory is actually a link, but I think you should not be removing it anyway. Thanks, Mark rm -f /usr/local/share/aclocal/wine.m4 rmdir /usr/local/share/aclocal rmdir: `/usr/local/share/aclocal': Not a directory make: [uninstall] Error 1 (ignored) [root(a)Godzilla share]# ls -al aclocal lrwxrwxrwx 1 root root 18 Dec 6 18:00 aclocal -> /usr/share/aclocal [root(a)Godzilla share]#

1 0

Couldn't find a decent font, aborting
by Mark Knecht 27 Dec '02

27 Dec '02

Hi, On many installations, and even when running just wcmd, I'm getting this error message: [mark(a)Godzilla mark]$ wcmd err:wineconsole:WINECON_Fatal Couldn't find a decent font, aborting [mark(a)Godzilla mark]$ wine --version Wine 20021219 [mark(a)Godzilla mark]$ I've quickly searched through the Devel and User archives, and searched using Google, but found just about nothing on the subject. The only suggestion was to run in 640x480 desktop mode, which I tried but it didn't help at all. Tony has been very helpful at Wine-User but we haven't discovered the solution. Wine is running Quicken, Winzip and WS_FTP just fine. I've tried WinAmp3 which comes up but does not generate sound at all. I'm using the new Jack drivers for Wine, so I wasn't expecting perfection in that area just yet, but hope to work with Chris Morgan to make that more solid. I have lots of Windows audio apps to try out. My machine is RH 7.3, running Alsa and Jack for sound and doing high-end audio stuff. It's up to date with new RPMs, but is a sort of minimalistic machine in terms of non-audio apps. Wine is from CVS yesterday. I'm running a no Windows installation. I'm currently running KDE 3.0.X. Can you folks recommend how I go about fixing this? What fonts are required to be installed to make Wine happy? How do I give you good feedback if I can't run the debugger? This morning I've done: make uninstall make clean make but chose to not overwrite my current registry file. Let me know if you need more information. I appreciate your help in advance. Merry Christmas and Happy Holidays! Cheers, Mark

2 2

RE: PATCH: dlls/cabinet/cabextract.c and off_t
by Patrik Stridvall 27 Dec '02

27 Dec '02

> On Fri, 27 Dec 2002, Greg Turner wrote: > >>>> If we really want to use off_t in this file (instead of > cab_off_t) > >>>> we need to #include sys/types.h, or we'll break > non-Linux systems. > >> Short to medium term, do you agree with my fix (#include > >> <sys/types.h>) so that Wine also builds on non-Linux systems? > > Maybe. I don't object, since it should be harmless to add > this, but I > > seem to be missing the point of why sys/types.h is needed at all. > > cab_off_t is just typedef'ed to UINT32, which should > compile just fine > > with only winnt.h, I think. Is there a particular scenario you are > > encountering that fails? If so, what is the compile error? > > The following line is the problem: > > fol->offset[0] = base_offset + (off_t) > EndGetI32(buf+cffold_DataOffset); > ^^^^^ > > Here we use off_t (which requires sys/types.h), that's why I wrote "If > we really want to use off_t in this file. Should this simply become > cab_off_t? Since the type of fol->offset is cab_off_t presumably... That is how I fixed it in my tree.

1 0

RtlUnicodeStringToInteger prototype (resending)
by Dan Kegel 27 Dec '02

27 Dec '02

I sent this to wine-patches on the 25th, but it never appeared in the archive; is that list moderated? - Dan Changelog: * dlls/ntdll/{,tests/}rtlstr.c - fix prototype for RtlUnicodeToInteger Dan Kegel License: LGPL Index: dlls/ntdll/rtlstr.c =================================================================== RCS file: /home/wine/wine/dlls/ntdll/rtlstr.c,v retrieving revision 1.25 diff -u -r1.25 rtlstr.c --- dlls/ntdll/rtlstr.c 12 Nov 2002 02:17:34 -0000 1.25 +++ dlls/ntdll/rtlstr.c 25 Dec 2002 18:52:54 -0000 @@ -843,17 +843,17 @@ */ NTSTATUS WINAPI RtlUnicodeStringToInteger( const UNICODE_STRING *str, - int base, - int * pdest) + ULONG base, + PULONG pdest) { LPWSTR lpwstr = str->Buffer; WCHAR wchCurrent = 0; int CharsParsed = 0; - int RunningTotal = 0; + ULONG RunningTotal = 0; char bMinus = 0; /* no checking done on UNICODE_STRING and int* in native DLL either */ - TRACE("(%p, %d, %p)", str, base, pdest); + TRACE("(%p, %lu, %p)", str, base, pdest); switch (base) { @@ -895,8 +895,7 @@ wchCurrent = '0' + 10 + wchCurrent - 'A'; if ((wchCurrent - '0') >= base || wchCurrent < '0') { - *pdest = bMinus ? -RunningTotal: RunningTotal; - return STATUS_SUCCESS; + break; } /* * increase significance of previous digits each time @@ -905,6 +904,6 @@ RunningTotal = wchCurrent - '0' + RunningTotal * base; } - *pdest = bMinus ? -RunningTotal : RunningTotal; + *pdest = bMinus ? ((~RunningTotal)+1UL) : RunningTotal; return STATUS_SUCCESS; } Index: dlls/ntdll/tests/rtlstr.c =================================================================== RCS file: /home/wine/wine/dlls/ntdll/tests/rtlstr.c,v retrieving revision 1.2 diff -u -r1.2 rtlstr.c --- dlls/ntdll/tests/rtlstr.c 19 Dec 2002 21:15:41 -0000 1.2 +++ dlls/ntdll/tests/rtlstr.c 25 Dec 2002 18:52:54 -0000 @@ -66,7 +66,7 @@ /* more function pointers here */ /*static DWORD (WINAPI *pRtlIsTextUnicode)(LPVOID, DWORD, DWORD *);*/ -static NTSTATUS (WINAPI *pRtlUnicodeStringToInteger)(const UNICODE_STRING *, int, int *); +static NTSTATUS (WINAPI *pRtlUnicodeStringToInteger)(const UNICODE_STRING *, ULONG, PULONG); static void InitFunctionPtrs() { @@ -123,7 +123,7 @@ static void test_RtlUnicodeStringToInteger(void) { - int dest = 0; + ULONG dest = 0; int i; DWORD result; @@ -131,6 +131,7 @@ static const WCHAR stringwithint[][12] = { {'1','0','1','1','1','0','1','1','0','0',0}, {'1','2','3','4','5','6','7',0}, + {'-','2','1','4','7','4','8','3','6','4','7',0}, {'2','1','4','7','4','8','3','6','4','8',0}, {'-','2','1','4','7','4','8','3','6','4','8',0}, {'-','2','1','4',0}, @@ -141,11 +142,12 @@ {'0','x','1','2','3','4','5',0}, {'1','x','3','4',0} }; - static const int expectedresults[] = { + static const ULONG expectedresults[] = { 1011101100, 1234567, - 2147483648, - 2147483648, + -2147483647, + 2147483648UL, + 2147483648UL, /* 2 ^ 31 === - (2 ^ 31) */ -214, 214, 214, @@ -155,34 +157,37 @@ 1 }; /* these are for stringwithint[0]: */ - static const int expectedresultsbase[] = { + static const ULONG expectedresultsbase[] = { 748, /* base 2 */ 136610368, /* base 8 */ 1011101100, /* base 10 */ 286265600, /* base 16 */ }; - - for (i = 0; i < sizeof(expectedresults) / sizeof(int); i++) + + /* check assumption made in -0 test case */ + ok((2147483648UL == ((~2147483648UL) + 1UL)), "LONG is not 32 bits?"); + + for (i = 0; i < sizeof(expectedresults) / sizeof(expectedresults[0]); i++) { dest = 0xdeadbeef; pRtlInitUnicodeString(&uni, stringwithint[i]); result = pRtlUnicodeStringToInteger(&uni, 0, &dest); ok(result == 0, "call failed: RtlUnicodeStringToInteger(\"%S\", %d, [out])", uni.Buffer, 0); - ok(dest == expectedresults[i], "didn't return expected value (test %d): expected: %d, got: %d}", i, expectedresults[i], dest); + ok(dest == expectedresults[i], "didn't return expected value (test %d): expected: %lu, got: %lu}", i, expectedresults[i], dest); } pRtlInitUnicodeString(&uni, stringwithint[0]); result = pRtlUnicodeStringToInteger(&uni, 2, &dest); ok(result == 0, "call failed: RtlUnicodeStringToInteger(\"%S\", %d, [out])", uni.Buffer, 2); - ok(dest == expectedresultsbase[0], "didn't return expected value: \"%S\"; expected: %d, got: %d}", uni.Buffer, expectedresultsbase[0], dest); + ok(dest == expectedresultsbase[0], "didn't return expected value: \"%S\"; expected: %lu, got: %ld}", uni.Buffer, expectedresultsbase[0], dest); result = pRtlUnicodeStringToInteger(&uni, 8, &dest); ok(result == 0, "call failed: RtlUnicodeStringToInteger(\"%S\", %d, [out])", uni.Buffer, 8); - ok(dest == expectedresultsbase[1], "didn't return expected value: \"%S\"; expected: %d, got: %d}", uni.Buffer, expectedresultsbase[1], dest); + ok(dest == expectedresultsbase[1], "didn't return expected value: \"%S\"; expected: %lu, got: %ld}", uni.Buffer, expectedresultsbase[1], dest); result = pRtlUnicodeStringToInteger(&uni, 10, &dest); ok(result == 0, "call failed: RtlUnicodeStringToInteger(\"%S\", %d, [out])", uni.Buffer, 10); - ok(dest == expectedresultsbase[2], "didn't return expected value: \"%S\"; expected: %d, got: %d}", uni.Buffer, expectedresultsbase[2], dest); + ok(dest == expectedresultsbase[2], "didn't return expected value: \"%S\"; expected: %lu, got: %ld}", uni.Buffer, expectedresultsbase[2], dest); result = pRtlUnicodeStringToInteger(&uni, 16, &dest); ok(result == 0, "call failed: RtlUnicodeStringToInteger(\"%S\", %d, [out])", uni.Buffer, 16); - ok(dest == expectedresultsbase[3], "didn't return expected value: \"%S\"; expected: %d, got: %d}", uni.Buffer, expectedresultsbase[3], dest); + ok(dest == expectedresultsbase[3], "didn't return expected value: \"%S\"; expected: %lu, got: %ld}", uni.Buffer, expectedresultsbase[3], dest); } START_TEST(rtlstr)

2 2