wine-devel

wine-devel@winehq.org

12 participants
84463 discussions

[AppDB] new screenshot and image classes
by Jonathan Ernst 17 Jan '05

17 Jan '05

Hi Chris, What I wanted to tell you on the channel was to discard the patch named: [AppDb] screenshot and image class Because we discussed it with Paul and I was able to make a new one using his image class code and I used these classes everywhere on the code. The new screenshot code is much better. We'll have to make a script to go trough every old screenshot and create the thumbnails. Before I do the script, please check if the watermarking is nice enough or if we want another logo. The name of the mail containing the new screenshot code is: [AppDB] new screenshot and image classes It is required to create the thumbnails subdirectories in order for the scripts to work. - data/screenshots/thumbnails/ - data/queued/screenshots/thumbnails/ See you.

2 2

WineConf 2005: details
by Brian Vincent 17 Jan '05

17 Jan '05

WHAT: WineConf 2005 WHEN: April 30 - May 1, 2005 WHERE: Institute of Communication Networks and Computer Engineering Stuttgart-Vaihingen Campus University of Stuttgart WHO: Anyone interested in Wine development. Please note: is a developers-only conference. HOW: Check out WineHQ for travel details. We still have quite a lot to work out, including the actual agenda, but we'll update these web pages as more info becomes available: http://www.winehq.org/site/wineconf If you plan on attending, please register on the website using the RSVP form as soon as possible. You can also find details on there about the wineconf mailing list. At this point there's a lot of planning that remains, so you'll have to bear with us as that discussion occurs. For those of you interested in Samba development, you might want to check out the SambaXP conference (http://www.sambaxp.org) since it's going to occur the two days following WineConf. WineConf 2004 was a lot of fun and I hope everyone can make it again. With a little luck we'll be able to attract everyone who couldn't make it to balmy, breezy Minneapolis last year. -Brian

1 0

Re: WineHQ:winetest: produce valid HTML
by Mike Hearn 17 Jan '05

17 Jan '05

On Wed, 12 Jan 2005 17:29:18 +0100, Ferenc Wagner wrote: > ChangeLog: * Generate valid HTML 4.01 Strict. > * Underline vis_note class links, too. Groovy! Is there a todo list of what needs to be done for winetest anywhere? Going to http://test.winehq.com/ still yields an error, you have to know the magic URL and then navigate the builds manually. It'd be nice to get some pretty HTML frontend to that going: a task for somebody who is keen but doesn't want to hack Wine itself maybe? Could you elaborate your plan for winetest Feri? thanks -mike

5 10

Debugging mingw applications using wine
by Bryce McKinlay 17 Jan '05

17 Jan '05

I'm trying to debug a windows .exe built with mingw using wine, but winedbg seems to have problems reading stabs from the mingw-built binary. My goal is to be able to debug a cross-compiled, native Java (GCJ) application, but even a simple C "hello world" seems to cause problems. My cross-build environment consists of: - mingw-runtime-3.5 and w32api-3.1from mingw.org - I just used the pre-built binaries - stock binutils 2.15, configured with --target=mingw32 - CVS head gcc 4.0, configured with --target=mingw32 WINE is wine-0.20040914-1.rhfc2.nr from newrpms.sunsite.dk $ mingw32-gcc hello.c -o hello-mingw.exe -g $ wine ./hello-mingw.exe Hello World $ winedbg --gdb ./hello-mingw.exe 0000000a:0000000b: create process 'D:\tests\hello-mingw.exe'/0x77bd003c @00401220 (0<0>) wine: Unhandled exception (thread 0009), starting debugger... WineDbg starting on pid 0x8 Unhandled exception: page fault on read access to 0xb6e4d174 in 32-bit code (0x657997a3). In 32 bit mode. Register dump: CS:0073 SS:007b DS:007b ES:007b FS:003b GS:0033 EIP:657997a3 ESP:5b56bc7c EBP:5b56ed78 EFLAGS:00210246( - 00 -RIZP1) EAX:b6e4d174 EBX:151409b8 ECX:00000000 EDX:261955dc ESI:00000000 EDI:b6e4d174 Stack dump: 0x5b56bc7c: 15135de8 b6e4d174 00000002 00010000 0x5b56bc8c: 00000000 00000000 00000000 00000000 0x5b56bc9c: 00000000 00000000 00000000 5b56cd6c 0x5b56bcac: 00000001 00000000 00000000 00000000 0x5b56bcbc: ffffffff ffffffff 00000000 7fc07000 0x5b56bccc: 7fc06000 00010000 7f980078 000000d5 Backtrace: =>1 0x657997a3 (0x5b56ed78) 2 0x15132ec0 (0x5b56edc8) 3 0x1513371c pe_load_debug_info+0x16c in dbghelp (0x5b56ee04) 4 0x1513391a pe_load_module+0x1ba in dbghelp (0x5b56ef54) 5 0x1512d93e SymLoadModule+0x9e in dbghelp (0x5b56ef94) 6 0x15129fd3 (0x5b56f4d8) 7 0x1512a129 SymInitialize+0x119 in dbghelp (0x5b56f518) 8 0x6101906a (0x5b56f650) 9 0x6101cfba (0x5b56f8e4) 10 0x6101d39a (0x5b56f970) 11 0x6101d422 gdb_remote+0x32 in winedbg (0x5b56fe44) 12 0x610279ec main+0x11c in winedbg (0x5b56fe90) 13 0x610122f1 (0x5b56ff20) 14 0x4824e0e2 (0x5b56fff4) 15 0x43940f31 (0x00000000) .... I've attached the mingw-compiled C binary. Is it worth trying again with a newwer WINE? Thanks! Bryce

4 10

Running dxdiag
by Paul Vriens 17 Jan '05

17 Jan '05

Hi, I was trying to run dxdiag (just for the fun of it). Dxdiag complains that it cannot find any dll. This is correct because what it does is check the directories in the "Path". The dll's are of course not present on a clean install as all are builtin. Loading a dll takes care of this by checking the DllOverrides and acts according to that if it cannot find the dll. How can we act on an app which checks for a 'physical' presence of a dll? For now I did 'ln -s /usr/local/lib/wine/ddraw.dll.so ddraw.dll' to get around this. This is of course not very flexible. Any ideas? Or will any solution yield in a performance drop as we have to do some extra checks? Paul.

4 4

Exiting a tests on the first failure
by Paul Vriens 17 Jan '05

17 Jan '05

Hi, I'm currently looking into the shreg test of shlwapi. In the error-logs on test.winehq.org I see a lot of errors. If the first CreateKey fails, there is no need to continue with the testing (because the rest of the tests will fail as well). What's the best way to stop there?, something like this?: START_TEST(shreg) { HKEY hkey = create_test_entries(); + if (!hkey) return; Cheers, Paul Vriens.

3 4

Re: SHLWAPI: stub implementations
by Robert Shearman 17 Jan '05

17 Jan '05

Hans Leidekker wrote: > -Hans > >Changelog: > Stub implementations for PathUnExpandEnvStringsSHRegEnumUSValue{A,W}, > SHRegCreateUSKey{A,W}, SHRegDeleteEmptyUSKey{A,W}, SHRegDeleteUSValue{A,W}, > SHRegEnumUSValue{A,W}. > > >------------------------------------------------------------------------ > >Index: dlls/shlwapi/path.c >=================================================================== >RCS file: /home/wine/wine/dlls/shlwapi/path.c,v >retrieving revision 1.48 >diff -u -r1.48 path.c >--- dlls/shlwapi/path.c 5 Oct 2004 18:07:14 -0000 1.48 >+++ dlls/shlwapi/path.c 17 Jan 2005 16:36:09 -0000 >@@ -3911,6 +3911,24 @@ > } > > /************************************************************************* >+ * PathUnExpandEnvStringsA [SHLWAPI.@] >+ */ >+BOOL WINAPI PathUnExpandEnvStringsA(LPCSTR pszPath, LPSTR pszBuf, UINT cchBuf) >+{ >+ FIXME("(%s,%s,0x%08x)\n", debugstr_a(pszPath), debugstr_a(pszBuf), cchBuf); >+ return FALSE; >+} > > Can you add documentation for these and the other functions you've added? You'll probably notice that these are the only functions in the files that are now not documented. Rob

1 0

Re: WININET: implement InternetTime{From,To}SystemTime{A,W} (#4)
by Joris Huizer 17 Jan '05

17 Jan '05

Hans Leidekker wrote: Well, if you really want to be sure no bad string overflows occur, this function is still not save: > +/*********************************************************************** > + * InternetTimeToSystemTimeW (WININET.@) > + */ > +BOOL WINAPI InternetTimeToSystemTimeW( LPCWSTR string, SYSTEMTIME* time, DWORD reserved ) > +{ > + unsigned int i; > + WCHAR *s = (LPWSTR)string; > + > + TRACE( "%s %p 0x%08lx\n", debugstr_w(string), time, reserved ); > + > + if (!string || !time || reserved != 0) return FALSE; > + > + /* Convert an RFC1123 time such as 'Fri, 07 Jan 2005 12:06:35 GMT' into > + * a SYSTEMTIME structure. > + */ > + > + while (*s && !isalphaW( *s )) s++; > + if (*s == '\0' || *(s + 1) == '\0' || *(s + 2) == '\0') return FALSE; > + time->wDayOfWeek = 7; > + > + for (i = 0; i < 7; i++) > + { > + if (toupperW( WININET_wkday[i][0] ) == toupperW( *s ) && > + toupperW( WININET_wkday[i][1] ) == toupperW( *(s + 1) ) && > + toupperW( WININET_wkday[i][2] ) == toupperW( *(s + 2) ) ) > + { > + time->wDayOfWeek = i; > + break; > + } > + } What happens if, the string ends with WININET_wkday[i][0] or WININET_wkday[i][1] ? > + > + if (time->wDayOfWeek > 6) return FALSE; > + while (*s && !isdigitW( *s )) s++; What happens if s just became NULL in this loop ? > + time->wDay = strtolW( s, &s, 10 ); > + > + while (*s && !isalphaW( *s )) s++; > + if (*s == '\0' || *(s + 1) == '\0' || *(s + 2) == '\0') return FALSE; > + time->wMonth = 0; > + > + for (i = 0; i < 12; i++) > + { > + if (toupperW( WININET_month[i][0]) == toupperW( *s ) && > + toupperW( WININET_month[i][1]) == toupperW( *(s + 1) ) && > + toupperW( WININET_month[i][2]) == toupperW( *(s + 2) ) ) > + { > + time->wMonth = i + 1; > + break; > + } > + } What happens if, the string ends with WININET_month[i][0] or WININET_month[i][1] ? > + if (time->wMonth == 0) return FALSE; > + > + while (*s && !isdigitW( *s )) s++; > + if (*s == '\0') return FALSE; > + time->wYear = strtolW( s, &s, 10 ); > + > + while (*s && !isdigitW( *s )) s++; > + if (*s == '\0') return FALSE; > + time->wHour = strtolW( s, &s, 10 ); > + > + while (*s && !isdigitW( *s )) s++; > + if (*s == '\0') return FALSE; > + time->wMinute = strtolW( s, &s, 10 ); > + > + while (*s && !isdigitW( *s )) s++; > + if (*s == '\0') return FALSE; > + time->wSecond = strtolW( s, &s, 10 ); > + > + time->wMilliseconds = 0; > + return TRUE; > +} Yes it's a pain, but if you want to be really strict on this, this is not save yet regards, Joris

3 4

Re: Janitorial : add missing declarations ( #3 )
by Alexandre Julliard 17 Jan '05

17 Jan '05

Rémi Assailly <remi.assailly(a)free.fr> writes: > +/* USER */ > +extern DWORD X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, > + DWORD timeout, DWORD mask, DWORD flags ); > +extern void X11DRV_InitKeyboard( BYTE *key_state_table ); > +extern UINT X11DRV_GetKeyboardLayoutList(INT size, HKL *hkl); > +extern HKL X11DRV_GetKeyboardLayout(DWORD dwThreadid); > +extern BOOL X11DRV_GetKeyboardLayoutName(LPWSTR name); > +extern HKL X11DRV_LoadKeyboardLayout(LPCWSTR name, UINT flags); > +extern BOOL X11DRV_UnloadKeyboardLayout(HKL hkl); > +extern HKL X11DRV_ActivateKeyboardLayout(HKL hkl, UINT flags); > +extern SHORT X11DRV_VkKeyScanEx(WCHAR wChar, HKL hkl); There's no need to add prototypes for the exported entry points, they are not called from anywhere inside the dll. It causes more work when changing the functions for no real benefit. -- Alexandre Julliard julliard(a)winehq.org

1 0

unsubscribe lexey
by Alexey A. Gaidioukov 17 Jan '05

17 Jan '05

1 0

Re: more tests for tests.winehq.org
by Ferenc Wagner 17 Jan '05

17 Jan '05

Stefan Leichter <Stefan.Leichter(a)camLine.com> writes: > now we have fixed mingw to build the new test. So perform them after > building ;-) > > ChangeLog > --------------- > Include new tests Thanks for your work and attention! -- Feri.

1 0

Re: [ck] Re: Threading issues? [ck-request@vds.kolivas.org: ck Digest, Vol 3, Issue 16]
by Mike Hearn 17 Jan '05

17 Jan '05

>>Well, apparently we don't use sched_yield, so the problem must >>> lie somewhere else. Maybe Con can help us out here? Alexandre says he >>> doesn't know what the issue is either and somebody needs to investigate. I >>> guess we do need to concern ourselves over the details :) > > > Interesting. Probably the most valuable information is that it seems to > work fine if we artificially limit the threads to exactly the same > timeslice _or_ we put them at such a low priority that they are forced > to be guaranteed to round robin one task at a time. This is the way 2.4 > used to work which is why with the new 2.6 schedulers which do far more > out-of-order rescheduling some applications have a problem; particularly > under load. I suspect it's actually the latter issue. Locking between > threads should prevent that being a problem, though. You already > mentioned that you dont use sched_yield() and I couldn't even begin to > look at the wine code myself so perhaps you know something more. Hi Con, One thought that occurred to me, and this is just a random theory, is that maybe the issue is not with the Wine code but the Win32 code run on top of it. Do you know how 2.6 scheduling compares with 2.4 and Windows (NT) scheduling? Could it be that some apps are written to expect Windows-style scheduling and fail to work if they don't get it? In case you hadn't noticed, I'm afraid I only have first-year CS knowledge of scheduling :/ thanks -mike

17 43

unsubscribe rajarani
by Ishaq M. 17 Jan '05

17 Jan '05

Systems Engineer Onward Novell Software (I) Pvt.Ltd. ph +91(11)2905-2642 mobile:9810404350

1 0

Mailing list statistics and graphs
by Mike McCormack 17 Jan '05

17 Jan '05

Fellow bean counters! On the weekend I wrote a quick script to generate a graph of the number of patches committed to the Wine CVS per month. The script and the graph it generates are attached. Anybody think it would be interesting to have a page of similar graphs on WineHQ somewhere that's regenerated once a month? Some ideas: patches committed to winehq per month patches sent to wine-patches per month unique patch authors vs. months lines of code committed per month lines of code sent per month ... Mike Dept of Time Wasting and (Mostly) Useless Statistics #!/usr/bin/perl # filename : winestat.pl # author : Mike McCormack # # A script to generate a graph with the number of patches against Wine per month. use strict; sub make_stat($) { my $month=$_[0]; my $winepatches=0; my $appdbpatches=0; my $lostwagespatches=0; my $cmd = sprintf("wget -q -O - http://www.winehq.org/hypermail/wine-cvs/%d.%02d.txt",$month/12 + 2001,$month%12+1); #print "$cmd\n"; open(IN,"$cmd|") || die "failed to run wget\n"; while(<IN>) { #print $_; if ( s/^Subject: *// ) { #print $_; if ( /^wine/ ) { $winepatches++; } elsif ( /^lostwages/ ) { $lostwagespatches++; } elsif ( /^appdb/ ) { $appdbpatches++; } else { #print "unknown module $_\n"; } } } printf(OUT "%d %3d %3d %3d\n", $month, $winepatches, $lostwagespatches, $appdbpatches); close IN; } my $month; open(OUT, ">stat"); for($month=1; $month<=(12*4+1); $month++) { make_stat($month); } close OUT; # <mike_m> it'd be nice to figure out how to get the x axis to display the date nicely # <papineau> set xdata time open (GNUPLOT, "|gnuplot"); print GNUPLOT "set title \"Wine patches\"\n"; print GNUPLOT "set xlabel \"Months\"\n"; print GNUPLOT "set ylabel \"Number\"\n"; print GNUPLOT "set term png xffffff x000000 x404040 x0000c0 xffa500 x66cdaa xcdb5cd\n"; print GNUPLOT "set boxwidth 0.3\n"; print GNUPLOT "set output \"winestat.png\"\n"; print GNUPLOT "plot \"stat\" using 1:2 title \"Wine\" w boxes fs solid 1\n"; #print GNUPLOT "plot \"stat\" using 1:2 title \"Wine\" w boxes fs solid 1, \\\n"; #print GNUPLOT " \"stat\" using 1:3 title \"Appdb\" w boxes fs solid 2, \\\n"; #print GNUPLOT " \"stat\" using 1:4 title \"LostWages\" w boxes fs solid 3 \n"; close GNUPLOT;

1 0

Pirates! under wine
by Oliver Stieber 16 Jan '05

16 Jan '05

Hi, I've been working on DirectX 9 over the past week and have managed to get Sid Meier's Pirates! http://www.atari.com/pirates/pirates/index.php working better than it does for me under cedega (see screenshot attached) along with quite a few demos using Directx 9. There's still quite a lot of work to do to get a full Directx 9 implementation but it shouldn't take too long to get Directx 9 in wine as functional as DirectX under cedega. I'm just doing a bit of housekeeping so the patches will be ready for next week along with a list of what's working and what's not. ___________________________________________________________ ALL-NEW Yahoo! Messenger - all new features - even more fun! http://uk.messenger.yahoo.com

4 6

Q HeapAlloc.
by Oliver Stieber 16 Jan '05

16 Jan '05

Hi, I been having a problem where HeapAlloc is failing even though there's plenty of virtual memory left I've done a bit of digging but haven't been able to get to the bottom of it. First of all I've checked that HeapAlloc will go into swap by allocating a lot of 64meg blocks and writing to them to force linux to allocate them properly, and it works fine. Then I changed alloc.c so that CreateSubHeap writes the status returned by NtAllocateVirtualMemory and I get C00017 STATUS_NO_MEMORY. HEAP_CreateSubHeap Could not allocate 00410000 bytes reason: C00017 [STATUS_NO_MEMORY] an I double checked this by putting a malloc in just after the failure, which failed. So then I wrote a a small non-wine test program run as a seperate process to allocate ten times as much ram and ran it while just after the crash (while the debug box was still up) and it works fine. Any ideas? Top says Mem: 514916k total, 388032k used, 126884k free, 4244k buffers Swap: 401584k total, 251488k used, 150096k free, 62916k cached Virt : 2279m RES : 150m Shared: 807m Mem : 30.0% wine-preloader ___________________________________________________________ ALL-NEW Yahoo! Messenger - all new features - even more fun! http://uk.messenger.yahoo.com

3 5

Re: [AppDB] new screenshot and image classes
by Jonathan Ernst 16 Jan '05

16 Jan '05

Here is a script that will recreate missing thumbnails and apply the watermarking. Please configure the script by modifying the first lines and don't forget to create the thumbnail directories. Other than that everything should be fine. Usage: 1)chmod u+x ./thumbs.php 2)edit clean.php to set up the database connection and other settings (first lines) 3)./thumbs.php

1 0

DCE 1.2.2 released under LGPL license (strategically important for Wine)
by Luke Kenneth Casson Leighton 16 Jan '05

16 Jan '05

dear wine developers, you may have noticed that DCE 1.2.2 was released on the 12th january 2005 under an LGPL license. as you are no doubt aware, the significance of DCE/RPC is very, very high. in particular, with FreeDCE using an NTLMSSP authentication plugin and a "Named Pipes" transport in samba or samba tng, it becomes possible for FreeDCE to be utilised to make DCOM applications work under Wine. DCOM applications can be made to WORK under Wine using FreeDCE, Samba or Samba TNG with NamedPipes. unmodified Win32 applications can do DCE/RPC and DCOM utilising FreeDCE and Samba, with a minimum of development effort inside Wine and Samba. also, FreeDCE can be leveraged to provide _proper_ implementations of the underlying Win32 interfaces. for example, REGEDT32.EXE can be made to work over a network running _natively_ under Wine. NetUserGetInfo can return "meaningful" information. NetShareEnum likewise. NetServerGetInfo likewise. the list goes on [to cover a large section of the Win32 API developed in the 80s and early 90s] so may i take this as an opportunity to point out two things: 1) articles and news regarding the release of DCE 1.2.2 http://www.opengroup.org/comm/press/05-01-12.htm http://advogato.org/article/817.html http://it.slashdot.org/article.pl?sid=05/01/14/1833226&tid=117&tid=187&tid=… 2) DCE 1.2.2, FreeDCE and Samba TNG have zero funding of any kind. the possibilities are very exciting, yet curiously these strategically important projects that could remove microsoft's stranglehold on hundreds of thousands of businesses and millions of home users world-wide are drastically underutilised. i will do what i can, but my spare time (and elrond's) are precious resources. the opportunity is there: all i can do is present it to you. l. -- -- <a href="http://lkcl.net">http://lkcl.net</a> --

4 4

nv driver causes Xrender bug to be misdetected
by Mike Hearn 16 Jan '05

16 Jan '05

Hi, Using the so-called 'open source' nv driver that ships with Xorg causes Wine at least on my hardware to misdetect libXrender as being buggy. This disables clientside font rendering and also causes the entire screen to go black whenever a Wine application has focus. Just letting people know in case they see similar symptoms. I normally run with the binary nvidia driver which doesn't have the same problem, so I'll not be debugging this anytime soon. thanks -mike

1 0

Re: [AppDB] screenshot and image class
by Paul van Schayck 16 Jan '05

16 Jan '05

Hey Jonathan, On Sun, 16 Jan 2005 13:40:00 +0100, Jonathan Ernst <Jonathan(a)ernstfamily.ch> wrote: > The Image class (used by the Screenshot class) handles image file from > the filesystem point of view. It's here that thumbnail creation, file > deletion, etc. will take place. Paul said he'll work on this part soon. I think you completely missed I already created that. See this: http://www.meosource.com/firefox/wine/ The whole class can be found here: http://www.meosource.com/firefox/wine/image.phps As you can see the class is probably bloated for the purpose we have with the appdb. But you can just strip unused functions. But it has nice features like logs , watermarks and borders. It's not doing file deletion, that should be handeled in the screenshot class. Paul

1 0

Re: WININET: implement InternetTime{From,To}SystemTime{A,W} (#3)
by Dmitry Timoshkov 16 Jan '05

16 Jan '05

"Hans Leidekker" <hans(a)it.vu.nl> wrote: > This version has the proper A->W crosscalls as suggested by Alexandre, > includes the extra tests from Dmitry and makes them pass. You're still making a lot of assumptions about the input string. Any extra space or comma will break your code. -- Dmitry.

1 0

Fwd: Photoshop on amd64
by Ferenc Wagner 16 Jan '05

16 Jan '05

Hi, I'm forwarding this messages from the users' newsgroup. Have you gurus got an idea?

1 0

Re: PSAPI: stub implementations (#3)
by Juan Lang 16 Jan '05

16 Jan '05

Hi Hans, +BOOL WINAPI GetPerformanceInfo( PPERFORMANCE_INFORMATION info, DWORD size ) +{ + NTSTATUS status; + + TRACE( "(%p, %ld)\n", info, size ); + + status = NtQueryInformationProcess( GetCurrentProcess(), SystemPerformanceInformation, info, size, NULL ); + + if (status) + { + SetLastError( RtlNtStatusToDosError( status )); + return FALSE + } + return FALSE; Shouldn't this return TRUE on success? --Juan __________________________________ Do you Yahoo!? Read only the mail you want - Yahoo! Mail SpamGuard. http://promotions.yahoo.com/new_mail

1 0

DIB direct drawing - Bug 412: Implementing a DIB engine
by Alejandro Bonet 15 Jan '05

15 Jan '05

Well, i'm a novice here (in wine and linux), but i think i could help with this task. I'm a good windows application developer (www.babel7.com), and i wrote two programs with some of the semantics you are looking for: painting over BMPs (or better DIBs). The 2 programs are for 256 colors and true RGB. They write on file BMPs. The painting functions were written to generate pie graphs, poligonals, rectangles, and so on, but they can be readapted to write on DIBs in memory. The sintax help (comm line wo parms) is in Spanish, but i will not ask for excuses for it. The use is very simple. I will rewrite an english sintax help if i begin with the task. You can download it and test if i could help. If yes, i will begin with the task... And time will say!! http://www.babel7.com/bmps.zip Regards... Aljandro Bonet Babel Informatica SL Madrid alex(a)winbabel.org

1 0

Re: PSAPI: stub implementations (#2)
by Rob Shearman 15 Jan '05

15 Jan '05

Hans Leidekker wrote: >Call SetLastError() on failure, as suggested by Juan Lang. > > -Hans > >Changelog: > Stub implementations for EnumPageFiles{A,W}, GetProcessImageFileName{A,W}. > Implement GetPerformanceInfo, GetProcessMemoryInfo on top of > NtQueryInformationProcess and GetWsChanges, QueryWorkingSet{,Ex} on top > of NtQueryVirtualMemory. > > >------------------------------------------------------------------------ > >@@ -443,15 +461,85 @@ > } > > /*********************************************************************** >+ * GetPerformanceInfo (PSAPI.@) >+ */ >+BOOL WINAPI GetPerformanceInfo( PPERFORMANCE_INFORMATION info, DWORD size ) >+{ >+ NTSTATUS status; >+ >+ TRACE( "(%p, %ld)\n", info, size ); >+ >+ if (size < sizeof(PERFORMANCE_INFORMATION)) >+ { >+ SetLastError( ERROR_INSUFFICIENT_BUFFER ); >+ return FALSE; >+ } >+ > > This check is redundant. All NtQueryInformation* functions check the buffer size for you. >+ status = NtQueryInformationProcess( GetCurrentProcess(), SystemPerformanceInformation, info, size, NULL ); >+ >+ if (status) >+ { >+ SetLastError( RtlNtStatusToDosError( status )); >+ return FALSE >+ } >+ return FALSE; >+} > > >@@ -459,14 +547,25 @@ > /*********************************************************************** > * GetWsChanges (PSAPI.@) > */ >-BOOL WINAPI GetWsChanges(HANDLE hProcess, >- PPSAPI_WS_WATCH_INFORMATION lpWatchInfo, DWORD cb) >+BOOL WINAPI GetWsChanges( HANDLE process, PPSAPI_WS_WATCH_INFORMATION watchinfo, DWORD size ) > { >- FIXME("(hProcess=%p, %p, %ld): stub\n", >- hProcess, lpWatchInfo, cb); >+ NTSTATUS status; >+ >+ TRACE( "(%p, %p, %ld)\n", process, watchinfo, size ); >+ >+ if (size < sizeof(PSAPI_WS_WATCH_INFORMATION)) >+ { >+ SetLastError( ERROR_INSUFFICIENT_BUFFER ); >+ return FALSE; >+ } > > So is this. > >- memset(lpWatchInfo, 0, cb); >+ status = NtQueryVirtualMemory( process, NULL, ProcessWorkingSetWatch, watchinfo, size, NULL ); > >+ if (status) >+ { >+ SetLastError( RtlNtStatusToDosError( status )); >+ return FALSE >+ } > return TRUE; > } > > > Could you also make sure that the NtDll functions that you are calling give out a useful fixme message when called from these functions? At the moment you are mostly replacing some good fixme messages with bad fixme messages. Rob

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