- Wine-devel - list.winehq.org

Account for possible missing backslah in GetTempPath
by Uwe Bonnes 09 May '02

09 May '02

Changelog: files/directory.c: GetTempPath[A|W] Acount for a possible missing backslash for size calculation -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Free Software: If you contribute nothing, expect nothing -- Index: wine/files/directory.c =================================================================== RCS file: /home/wine/wine/files/directory.c,v retrieving revision 1.45 diff -u -r1.45 directory.c --- wine/files/directory.c 9 Mar 2002 23:50:37 -0000 1.45 +++ wine/files/directory.c 9 May 2002 16:31:31 -0000 @@ -186,6 +186,21 @@ if (!(ret = GetEnvironmentVariableA( "TEMP", path, count ))) if (!(ret = GetCurrentDirectoryA( count, path ))) return 0; + if ((ret) && (ret +1 > count)) + /* We need to return the required length including the + trailing backslash. So we have to acually get the string + to test if the backslash is there */ + { + char *buffer; + UINT ret1; + if ((buffer = HeapAlloc( GetProcessHeap(), 0, ret ))) + { + ret1 = GetTempPathA(ret,buffer); + if (buffer[ret1-1] != '\\') + ret++; + HeapFree( GetProcessHeap(), 0, buffer ); + } + } if (count && (ret < count - 1) && (path[ret-1] != '\\')) { path[ret++] = '\\'; @@ -207,6 +222,21 @@ if (!(ret = GetEnvironmentVariableW( temp, path, count ))) if (!(ret = GetCurrentDirectoryW( count, path ))) return 0; + if ((ret) && (ret +1 > count)) + /* We need to return the required length including the + trailing backslash. So we have to acually get the string + to test if the backslash is there */ + { + WCHAR *buffer; + UINT ret1; + if ((buffer = HeapAlloc( GetProcessHeap(), 0, ret ))) + { + ret1 = GetTempPathW(ret,buffer); + if (buffer[ret1-1] != '\\') + ret++; + HeapFree( GetProcessHeap(), 0, buffer ); + } + } if (count && (ret < count - 1) && (path[ret-1] != '\\')) { path[ret++] = '\\';

1 0

test handling of trailing backslash in dlls/kernel/tests/path.c
by Uwe Bonnes 09 May '02

09 May '02

Changelog: dlls/kernel/tests/path.c: test_InitPathA Test what happens when TMP variable has no trailing backslash A patch to correct that hbehaviour follows. -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Free Software: If you contribute nothing, expect nothing -- Index: wine/dlls/kernel/tests/path.c =================================================================== RCS file: /home/wine/wine/dlls/kernel/tests/path.c,v retrieving revision 1.3 diff -u -r1.3 path.c --- wine/dlls/kernel/tests/path.c 6 May 2002 20:13:16 -0000 1.3 +++ wine/dlls/kernel/tests/path.c 9 May 2002 16:23:44 -0000 @@ -19,6 +19,7 @@ */ #include <stdio.h> +#include <assert.h> #include "wine/test.h" #include "winbase.h" #include "winuser.h" @@ -330,20 +331,22 @@ { CHAR tmppath[MAX_PATH], /*path to TEMP */ tmpstr[MAX_PATH], - tmpstr1[MAX_PATH]; + tmpstr1[MAX_PATH], + envstr[MAX_PATH]; DWORD len,len1; INT id; HANDLE hndl; /* Test GetTempPathA */ - len=GetTempPathA(MAX_PATH,tmppath); + len=GetTempPathA(0,tmppath); ok(len!=0 && len < MAX_PATH,"GetTempPathA failed"); + len1=GetTempPathA(len,tmppath); ok(HAS_TRAIL_SLASH_A(tmppath), "GetTempPathA returned a path that did not end in '\\'"); lstrcpyA(tmpstr,"aaaaaaaa"); len1=GetTempPathA(len,tmpstr); - ok(len1==len+1, - "GetTempPathA should return string length %d instead of %d",len+1,len1); + ok(len1+1==len, + "GetTempPathA should return string %s length %d instead of %d",tmpstr, len,len1+1); if(WIN2K_PLUS(version)) { /* in Win2k, the path won't be modified, but in win98, wine it is */ todo_wine { @@ -351,6 +354,20 @@ "GetTempPathA should not have modified the buffer"); } } + + /* Now set the TMP variable to GetTempPath without the trailing backslash + to test for completion of backslash */ + len1 = GetEnvironmentVariableA("TMP",envstr,MAX_PATH); + ok(len1< MAX_PATH, "TMP Envirinment Variable too long"); + tmppath[len-2] = '\0'; + ok(SetEnvironmentVariableA("TMP",tmppath),"SetEnvironmentVariable(\"TMP\") failed"); + len1=GetTempPathA(0,tmppath); + len1=GetTempPathA(len1,tmppath); + ok(HAS_TRAIL_SLASH_A(tmppath), + "GetTempPathA didn't correct a TMP setting without trailing '\\'"); + ok(SetEnvironmentVariableA("TMP",envstr),"Can't reset TMP environment variable"); + len1=GetTempPathA(len,tmppath); + /* Test GetTmpFileNameA The only test we do here is whether GetTempFileNameA passes or not. We do not thoroughly test this function yet (specifically, whether

1 0

error while installing from source
by ---(rick moranis)--- 09 May '02

09 May '02

i recieved this error while trying to install from source (20020411): Performing 'make install' as root to install binaries, enter root password Password: **************************************** /bin/bash: - : unrecognized option Either you entered an incorrect password or we failed to run 'make install' correctly. If you didn't enter an incorrect password then please report this error to wine-devel(a)winehq.com. Installation failed, aborting. wackness(a)SLIZ:/download/wine-20020411$ i know that the site recommends binaries, but they don't seem to function properly. i'm running slackware 8 linux. _________________________________________________________________ Send and receive Hotmail on your mobile device: http://mobile.msn.com

3 2

compile error
by Stefan Leichter 09 May '02

09 May '02

Hello, i'm unable to build the current cvs on an Red Hat 5.2 (Apollo) box. i know the system is a little bit outdated but as i did not read about the problem on this newsgroup. i just like to make sure that you know about it. Stefan make[2]: Entering directory `/camdev/projects/sle/wine/dlls/ntdll' LD_LIBRARY_PATH="../../library:../../unicode:$LD_LIBRARY_PATH" ../../tools/winebuild/winebuild -fPIC -L../../dlls -o ntdll.spec.c -spec ./ntdll.spec gcc -c -I. -I. -I../../include -I../../include -g -O2 -Wall -fPIC -D__WINE__ -D_NTSYSTEM_ -D_REENTRANT -I/usr/X11R6/include -o ntdll.spec.o ntdll.spec.c gcc -c -I. -I. -I../../include -I../../include -g -O2 -Wall -fPIC -D__WINE__ -D_NTSYSTEM_ -D_REENTRANT -I/usr/X11R6/include -o cdrom.o cdrom.c cdrom.c: In function `CDROM_GetIdeInterface': cdrom.c:98: warning: implicit declaration of function `major' cdrom.c:105: `IDE6_MAJOR' undeclared (first use this function) cdrom.c:105: (Each undeclared identifier is reported only once cdrom.c:105: for each function it appears in.) cdrom.c:106: `IDE7_MAJOR' undeclared (first use this function) cdrom.c:110: warning: implicit declaration of function `minor' cdrom.c: In function `CDROM_ScsiPassThroughDirect': cdrom.c:1039: storage size of `cmd' isn't known cdrom.c:1040: storage size of `sense' isn't known cdrom.c:1066: `CGC_DATA_WRITE' undeclared (first use this function) cdrom.c:1069: `CGC_DATA_READ' undeclared (first use this function) cdrom.c:1072: `CGC_DATA_NONE' undeclared (first use this function) cdrom.c:1079: `CDROM_SEND_PACKET' undeclared (first use this function) cdrom.c:1040: warning: unused variable `sense' cdrom.c:1039: warning: unused variable `cmd' cdrom.c: In function `CDROM_ScsiPassThrough': cdrom.c:1103: storage size of `cmd' isn't known cdrom.c:1104: storage size of `sense' isn't known cdrom.c:1137: `CGC_DATA_WRITE' undeclared (first use this function) cdrom.c:1140: `CGC_DATA_READ' undeclared (first use this function) cdrom.c:1143: `CGC_DATA_NONE' undeclared (first use this function) cdrom.c:1150: `CDROM_SEND_PACKET' undeclared (first use this function) cdrom.c:1104: warning: unused variable `sense' cdrom.c:1103: warning: unused variable `cmd' make[2]: *** [cdrom.o] Error 1 make[2]: Leaving directory `/camdev/projects/sle/wine/dlls/ntdll' make[1]: *** [ntdll/ntdll.dll.so] Error 2 make[1]: Leaving directory `/camdev/projects/sle/wine/dlls' make: *** [dlls] Error 2

3 3

Wine and ctl3d.dll
by Ian D. Stewart 09 May '02

09 May '02

Dear Developers, In going over the log file from a recent attempt to install Baldur's Gate, I ran across the following warning: :warn:module:BUILTIN32_dlopen cannot open .so lib for builtin ctl3d.dll: ctl3d.dll.so: cannot open shared object file: No such file or directory I looked in wine/dlls and sure enough, there was no entry for ctl3d. What facilities does this library provide, and are there any plans to implement it in wine? Thanx, Ian

2 1

Getting heap error messages, using winelib
by blight 08 May '02

08 May '02

Hi! I am linking my app against winelib that i can use binary windows dlls with it... It compiles and links, but when running it i am getting this error message a few times: err:heap:HEAP_GetPtr Invalid heap 00000000! i am not doing anything to init libwine (since i wasn't able to find information about using it, just how to convert windows code with winemaker), all i did was link against libwine and libkernel32... does anyone know how to get it working? btw: how do i build wine with debugging enabled (-g3) ? thanks, blight ________________________________________________________________ Keine verlorenen Lotto-Quittungen, keine vergessenen Gewinne mehr! Beim WEB.DE Lottoservice: http://tippen2.web.de/?x=13

2 1

Problem with InstallShield (Was Re: [Bug 629] Changed - Problem with InstallShield: ole:CoTreatAsClass(stub), ole:CoGetClassObject)
by Andriy Palamarchuk 08 May '02

08 May '02

A problem with InstallShield was reported to Bugzilla. InstallShield support is very critical for the project and I decided to announce this bug on wine-devel. http://bugs.winehq.com/show_bug.cgi?id=629 I do not have time to do deep investigation of the issue. Please, take ownership of the bug if you start to work on it. Thanks, Andriy Palamarchuk __________________________________________________ Do You Yahoo!? Yahoo! Health - your guide to health and wellness http://health.yahoo.com

13 27

Re: Fixes to _lcreat
by Francois Gouget 08 May '02

08 May '02

On Wed, 8 May 2002, Jakob Eriksson wrote: [...] > Index: dlls/kernel/tests/directory.c > =================================================================== > RCS file: /home/wine/wine/dlls/kernel/tests/directory.c,v > retrieving revision 1.2 > diff -u -r1.2 directory.c > --- dlls/kernel/tests/directory.c 1 Apr 2002 21:00:26 -0000 1.2 > +++ dlls/kernel/tests/directory.c 7 May 2002 23:28:33 -0000 > @@ -126,3 +126,4 @@ > test_GetSystemDirectoryA(); > test_GetSystemDirectoryW(); > } > + Maybe not really necessary :-) > Index: dlls/kernel/tests/file.c > =================================================================== > RCS file: /home/wine/wine/dlls/kernel/tests/file.c,v > retrieving revision 1.2 > diff -u -r1.2 file.c > --- dlls/kernel/tests/file.c 6 May 2002 20:12:55 -0000 1.2 > +++ dlls/kernel/tests/file.c 7 May 2002 23:28:33 -0000 [...] > @@ -170,6 +185,261 @@ > > ok( HFILE_ERROR == _lclose(filehandle), "_lclose should whine about this." ); > > +<<<<<<< file.c > + ok( DeleteFileA( filename ) != 0, "DeleteFileA complains." ); > +} Wow! You have conflicts in your patch! You should resolve those and resubmit. Or maybe this was the wrong diff? -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ Advice is what we ask for when we already know the answer but wish we didn't -- Eric Jong

1 0

Regression - err:module:MZ_DoLoadImage insufficient DOS memory
by Andriy Palamarchuk 08 May '02

08 May '02

I tested an application while researching bug 637: http://bugs.winehq.com/show_bug.cgi?id=637 Suddely on Tuesday after refreshing Wine I started to get those errors. The relevant part of the error log (sorry for the line wrapping): 080706b8:Call winedos.LoadDosExe(0804d5e0 "C:\\Program Files\\Chami\\HTML-Kit\\Bin\\HTMLKit.exe",00000014) ret=0804c04f 080706b8:trace:file:SetFilePointer handle 20 offset 0 high 0 origin 0 080706b8: set_file_pointer( handle=20, low=0, high=0, whence=0 ) 080706b8: set_file_pointer() = 0 { new_low=0, new_high=0 } 080706b8:trace:file:ReadFile 20 0x405b6ce0 64 0x405b6cdc (nil) 080706b8: get_handle_fd( handle=20, access=80000000 ) 080706b8: get_handle_fd() = 0 { fd=10, type=1, flags=0 } 080706b8:trace:module:MZ_InitMemory Initializing DOS memory structures 080706b8:trace:module:MZ_DoLoadImage Allocating DOS memory (min=6349136, max=6346368) 080706b8:err:module:MZ_DoLoadImage insufficient DOS memory 080706b8:Ret winedos.LoadDosExe() retval=00000000 ret=0804c04f wine: can't exec 'HTMLKit.exe': error=8 I *think* I refreshed CVS on Monday and the issue was not there, so this happened on Monday-Tuesday. I reviewed the recent patches, but did not find anything suspicios. Does anybody recognizes the issue? Andriy __________________________________________________ Do You Yahoo!? Yahoo! Health - your guide to health and wellness http://health.yahoo.com

1 0

Property Sheet empty
by Insyde 08 May '02

08 May '02

Hi, I've noticed that property sheet is not yet completely implemented. But I've seen no errors regarding to it. I've build 2 programs one with simple tab control screen and another with a property sheet. (I know they're different, but I mada this to see the code). Tab control works, but the property sheet is not mounted. It just shows the tab with no content. Don't know if there's already a program to test it, but if you want I can send the source. Thanks Ricardo.

2 1