- wine-devel - winehq.org

Contributing to WINE
by Ronald Robin 23 Sep '04

23 Sep '04

0 *H÷ 010 +0 *H÷ $ÀContent-Type: multipart/alternative; boundary="----=_NextPart_000_0023_01C4A0DF.30188140" This is a multi-part message in MIME format. ------=_NextPart_000_0023_01C4A0DF.30188140 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Hi! My name is Ronald and I was wondering if any of you guys out there can help me get in touch with Mr. Alexander Julliard or any of the leaders here in the WINE community. We've been trying to get in touch with him for months now and we have consistently failed to receive a response. My company, SpecOps Labs, would like to discuss how we can contribute and work together with the WINE community. We believe we have a lot to contribute to the WINE community. However, without contact with any of the executives at WINEHQ, we are unable to do so. We want to engage in an initial dialog with Mr. Julliard. Our CTO has already tried emailing him twice. It's possible we don't have the right contact information. We'd greatly appreciate it if someone here could help us out. ------=_NextPart_000_0023_01C4A0DF.30188140 Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable <html xmlns:o=3D"urn:schemas-microsoft-com:office:office" = xmlns:w=3D"urn:schemas-microsoft-com:office:word" = xmlns=3D"http://www.w3.org/TR/REC-html40"> <head> <META HTTP-EQUIV=3D"Content-Type" CONTENT=3D"text/html; = charset=3Dus-ascii"> <meta name=3DGenerator content=3D"Microsoft Word 11 (filtered medium)"> <style>  </style> </head> <body lang=3DEN-US link=3Dblue vlink=3Dpurple> <div class=3DSection1> Hi! My name is Ronald and I was wondering if any of = you guys out there can help me get in touch with Mr. Alexander Julliard or any of = the leaders here in the WINE community. We've been trying to get in touch = with him for months now and we have consistently failed to receive a = response.<o:p></o:p> <o:p> </o:p> My company, SpecOps Labs, would like to discuss how = we can contribute and work together with the WINE community. We believe we have = a lot to contribute to the WINE community. However, without contact with any = of the executives at WINEHQ, we are unable to do so. = <o:p></o:p> <o:p> </o:p> We want to engage in an initial dialog with Mr. = Julliard. Our CTO has already tried emailing him twice. It's possible we don't = have the right contact information. We'd greatly appreciate it if someone here = could help us out.<o:p></o:p> </div> </body> </html> ------=_NextPart_000_0023_01C4A0DF.30188140-- E0ú0c£0 *H÷ 0E10 UUS10U GTE Corporation10UGTE CyberTrust Root0 960223230100Z 060223235900Z0E10 UUS10U GTE Corporation10UGTE CyberTrust Root00 *H÷ 0žæOºÛ|q|¯D·ÓFÙdåÁBÇºI5-zçœå1YÆ±/ û§?¢ fV7)é~Ê¥õ£Õ¢FØhLÑ7h¯œø°³ð)õZ aw "%ÔOEªÇœåßùÔšBÌ$À'Jµmc9Ä¢^80 *H÷ ³uÆ_áaUÔK{1#cç=óùô6š»Ùã¥Mê+)àÖjsæÀ£Óñà¥¥"7cÂH ŽÛrãÈöÙ|Ÿ±¯SÚŽ!žÖÕãþNYb¶JùBÝo©qÿô rmmDóttšÕ4Ié^éŽzáåZ0Ó¥%Ø0È01 0 *H÷ 0E10 UUS10U GTE Corporation10UGTE CyberTrust Root0 020827190700Z 060223235900Z0Ü10 UGB10U Comodo Limited10UComodo Trust Network1F0DU=Terms and Conditions of use: http://www.comodo.net/repository10U(c)2002 Comodo Limited1,0*U#Comodo Class 3 Security Services CA0"0 *H÷ 0 ±`fàC'h/ÇßëÛeìÔIgz.ÍÜ,Ö¬òF:]À=,Z Y%B£rÀ(Ò<1âKû^ëš3Öi²Zê,IŠ&.LðÌ«@ÒªÞ,Nµº{ž\Ð{œGõÀÒÀä×GÛb@¯¡QÛžÐ»Ç<yê%d®&á<fGg{U«4ÂunÙ'ðÚk¢µêÏû9Cšð-÷,/áÐ±ÿ×YÄÍ@2ù×ÛQòARA±žÈ þ"GOË®à(Õ¬pG°%«¡8Bkújn_yøö)0€nFÔ]ª@8vÛ}å¥£§0£0EU>0<0: 8 64http://www.public-trust.com/cgi-bin/CRL/2006/cdp.crl0UöR"Y¿HŽ¹éþøf0U 00I *Høc0;09+-http://www.public-trust.com/CPS/OmniRoot.html0:+²10*0(+https://secure.comodo.net/CP0XU#Q0O¡I€G0E10 UUS10U GTE Corporation10UGTE CyberTrust Root£0+U$0"20020827190731Z20050223235900Z0Uÿæ0U0ÿ0 *H÷ ¶§°zqàº³62zÖñ«M9qZg Kå0@mµª±Çô Æ\é7ÞšÇÜÎÍqûtÜ_'SvÔ¹éÂwPÊÉ°ÂFDª\Ö ÙU2ŸVñêœ ãŒ :êÌûWíx¥6=VêÑçtÊ4ÃÏ±Qéà0w0_ e/y0áGÞ£ö0 *H÷ 0Ü10 UGB10U Comodo Limited10UComodo Trust Network1F0DU=Terms and Conditions of use: http://www.comodo.net/repository10U(c)2002 Comodo Limited1,0*U#Comodo Class 3 Security Services CA0 040922000000Z 050922235959Z0Ý1503U,Comodo Trust Network - PERSONA NOT VALIDATED1F0DU=Terms and Conditions of use: http://www.comodo.net/repository10U(c)2003 Comodo Limited10URonald Robin1$0" *H÷ robin@specopslabs.com00 *H÷ 0ŠYiFøÀeö Å¯êÁÔAùP9Êó1ªvØ-Õ1k·çâé¥aÃÂB'å£ÍkÔ 8JcIï/OñßeYÓkÃSÄ`¶ûË €7A°ðûôèJÄ(å3Þ?Ë¢JþmW £Ž0°0U#0öR"Y¿HŽ¹éþøf0U*fÇÆ55ÖÇ6Áv_Ü:*¬0Uÿ 0Uÿ00 U%0++²10FU ?0=0;+²10+0)+https://secure.comodo.net/CPS0°Uš0¥08 6 42http://crl.comodo.net/Class3SecurityServices_2.crl0: 8 64http://crl.comodoca.com/Class3SecurityServices_2.crl0- + )'Class3SecurityServices_2(a)crl.comodo.net0 `HøB 0 U0robin(a)specopslabs.com0 *H÷ ïN'z?·ÿxCRŒ9Z`iPCÖ!Š+€bÑŠÄe[»U¥ÜÂðuàçuyœZ~2ýroN"ÝwFãÍŽb³aîX¶î9 7òÊU×°V»;·¹¯uH>Û`<%Ü=òK0oA²£ž®á(?1 Ò!¬ÂÈ}0-ŒlT=vµŽÏbó·DÿýÅ.x6×ñQÐ³L£ð-O_Œßú*å7÷#Âò0~š\ý>ý Áà ,ÒkæC{ã8Ïøz ÙÔ¹·)tÆÍÅ¹ÎcßtuÇ<²i7Ù«1p0l0ñ0Ü10 UGB10U Comodo Limited10UComodo Trust Network1F0DU=Terms and Conditions of use: http://www.comodo.net/repository10U(c)2002 Comodo Limited1,0*U#Comodo Class 3 Security Services CAe/y0áGÞ£ö0 + Ô0 *H÷ 1 *H÷ 0 *H÷ 1 040922120311Z0# *H÷ 1Íñ€§wçÊŸÚÍ«Ž3nXº`ø¡!0g *H÷ 1Z0X0 *H÷ 0*H÷ 0 *H÷ @0+0 *H÷ (0+0 *H÷ 0 +71ô0ñ0Ü10 UGB10U Comodo Limited10UComodo Trust Network1F0DU=Terms and Conditions of use: http://www.comodo.net/repository10U(c)2002 Comodo Limited1,0*U#Comodo Class 3 Security Services CAe/y0áGÞ£ö0*H÷ 1ô ñ0Ü10 UGB10U Comodo Limited10UComodo Trust Network1F0DU=Terms and Conditions of use: http://www.comodo.net/repository10U(c)2002 Comodo Limited1,0*U#Comodo Class 3 Security Services CAe/y0áGÞ£ö0 *H÷ 0r²ž!&ÆÞj30<ì,ðB_5_°ÅO>&6ß»3ÁzÌÓÉÔ>ßZ/ÙNŠd0Ï[n;N³£JúPMçcìÎPû2œëS-ÕÖãÉ·ã[ÜÙ_×Þâ*¢æÍ?WþG>Y¡Éñ<KxåG&{=.trÈ

9 11

Re: Disable DPMI
by Robert Shearman 22 Sep '04

22 Sep '04

Jukka Heinonen wrote: >Robert Shearman: > > >>This patch disables DPMI. If sti has been executed beforehand and an >>instruction (such as an interrupt) must be emulated then it can cause an >>infinite loop around the enumation of the iret instruction in the DPMI >>call. Even after (probably rather poorly) hacking around this issue I >>still got unprivileged instruction exceptions from the iret instruction. >>Without more expert eyes being cast on this code the only thing I can >>suggest to fix non-DPMI applications with the above case is to disable >>DPMI event checking. >> >> > >Well, your patch actually just disables checking for asynchronous >events in DPMI mode, not the DPMI mode itself, which leaves open >whether you are trying to run a Win16 program or a DOS program >that does not need working IRQ handling in DPMI mode. > It is a Win16 program and I don't think it uses DPMI at all. >I'm sure DPMI >asynchronous event handling still has bugs and I guess disabling >it is acceptable if it looks like it causes problems and fixing >the bugs seems to require too much work. > I have tried to fix it in a sane way, but I don't have any more time to work on it. >However, the patch comment >and the quote above tell me next to nothing about the bug you are >seeing, more information would be required in order to have any >hope of fixing the bug. And I'm probably going to be quite busy, >anyway, so I'm not sure when I have time to look at this bug. > > I think the program does this: sti int 1a cli This seems to cause the problem after the "int 1a" has been emulated as it inserts an event check and then tries to emulate the iret instruction which then seems to cause another event check and so on. I would like to fix this in a sane way, but I don't really know what is going on in this area. Rob

2 1

division by zero in winword
by Robbert Xerox 22 Sep '04

22 Sep '04

Hi, in quite a few programs i can not browse the filesystem when opening a "listbox"; to be more clear: for example when i do in winword Open and the listbox appears, and i try to open the pull down menu winword just quits(without an error message in wine). In another program like "Camel join" it quits as soon as i go up to the level of "my computer" with a message "division by zero in Volme_ReadFATSuperblock. I was able to track the problem down to the following lines in volume.c (starting from line 502) nsect -= GETWORD(buff, 0x0e) + buff[0x10] * sz + (GETWORD(buff, 0x11) * 32 + (GETWORD(buff, 0x0b) - 1)) / GETWORD(buff, 0x0b); nclust = nsect / buff[0x0d]; when i change these into this: nsect -= GETWORD(buff, 0x0e) + buff[0x10] * sz + (GETWORD(buff, 0x11) * 32 + (GETWORD(buff, 0x0b) - 1)) / (GETWORD(buff, 0x0b)-1); nclust = nsect / (buff[0x0d]+1); i can (obviously) avoid the division by zero and everything (winword and camel join) just works fine. I'm not a programmer, so this solution obviously sucks, so my question is: how can this error be fixed, and do more people encounter this problem. PS i'm using the august version of wine, and in the april version this whole problem didn't show up! everything just worked fine there. Thanks in advance, Robbert ___________________________________________________________ALL-NEW Yahoo! Messenger - all new features - even more fun! http://uk.messenger.yahoo.com

4 3

Re: FW: [dx9-1] resent - this time with extra file!
by Robert Shearman 22 Sep '04

22 Sep '04

Ann and Jason Edmeades wrote: >>I think the direction is OK, now if you sent me the new directx.c file >>too I could actually apply the patch ;-) >> >> > >D'oh - I always forget about new files as cvs diff doesnt do it. I couldnt >work out how to do this in patch format, so the c file is attached. For >future reference, how can I put new files into either a cvs diff or patch >format please! > > diff -u /dev/null dlls/d3d9/directx.c >> dx9.1.patch Rob

1 0

Re: Get AdjustWindowRect working better
by Dmitry Timoshkov 22 Sep '04

22 Sep '04

"Richard Cohen" <richard(a)daijobu.co.uk> wrote: > Changelog: > + Improve AdjustWindowRect > + add a test dlls/user/tests/win.c already has AdjustWindowRect tests, see test_nonclient_area. If you could add your tests there that would be great. -- Dmitry.

3 2

Re: System font width
by Huw D M Davies 22 Sep '04

22 Sep '04

On Tue, Sep 21, 2004 at 07:40:17AM -0700, Jon Griffiths wrote: > Hi, > > I have an app that calls GetObject on SYSTEM_FONT and then uses the > returned LOGFONT.lfWidth in a calculation. Wine currently returns 0 > for the width, which causes a divide by zero error here. > > Testing under XP home shows that the returned with is 7 for the > system font. This patch changes the width specified in the stock font > list. Although this makes my app run and doesn't appear to have any > ill consequenses, it may be better to get some advice from a font > expert before committing this patch. This probably won't hurt anything. The correct way would be to load the system font and get its metrics. Huw. -- Huw Davies huw(a)codeweavers.com

2 1

Re: Lostwages add seti@home link
by Ivan Leo Puoti 22 Sep '04

22 Sep '04

> mybe some > other place? Resources -> others ? I would say links -> others but we don't > have that :) If you know about a better place, I'm open to suggestions. Ivan.

3 2

load_dll: MODULE_GetLoadOrderW on filename versus libname
by Uwe Bonnes 22 Sep '04

22 Sep '04

Hallo, some installer (extracted from slvc009j.zip from Texas instruments (www.ti.com)) loaded the native msi.dll, also I gave WINEDLLOVERRIDES=msi=b on the command line. The program copies some msi.dll to some directory, and prepends that directory to the loadpath. Then it calls: 000d:Call kernel32.LoadLibraryA(010013f8 "msi.dll") ret=01004283 load_dll now does a find_dll_file and sees "L:\\temp\\IXP000.TMP\\msi.dll" . sets filename to "L:\\temp\\IXP000.TMP\\msi.dll" and compares "L:\\temp\\IXP000.TMP\\msi.dll" for the loadorder. 000d:Call ntdll.LdrLoadDll(403dc0e8 L"L:\\temp\\IXP000.TMP;.;c:\\nt4sp5g\\system32;c:\\nt4sp5g;d:\\wine95;d:\\ wine95\\system;c:\\cae\\pasic\\spde;f:;",00000000,4070f424,4070f404) ret=4052392b trace:module:load_dll looking for L"msi.dll" in L"L:\\temp\\IXP000.TMP;.;c:\\nt4sp5g\\system32;c:\\nt4sp5g;d:\ \wine95;d:\\wine95\\system;c:\\cae\\pasic\\spde;f:;" trace:module:MODULE_GetLoadOrderW looking for L"L:\\temp\\IXP000.TMP\\msi.dll" trace:module:open_app_key searching L"L:\\temp\\IXP000.TMP\\msi" in L"Machine\\Software\\Wine\\Wine\\Config\\A ppDefaults\\msiinst.exe\\DllOverrides" trace:module:MODULE_GetLoadOrderW got hardcoded path default "n,b" for L"L:\\temp\\IXP000.TMP\\msi.dll" trace:module:load_dll Trying native dll L"L:\\temp\\IXP000.TMP\\msi.dll" trace:module:load_native_dll loading L"L:\\temp\\IXP000.TMP\\msi.dll" This leads to the native dll getting loaded. Is this the right thing? Shouldn't MODULE_GetLoadOrderW compare for libname and not filename? Only if libname has an explicit path, we should compare for that path. Bye Index: wine/dlls/ntdll/loader.c =================================================================== RCS file: /home/wine/wine/dlls/ntdll/loader.c,v retrieving revision 1.77 diff -u -w -r1.77 loader.c --- wine/dlls/ntdll/loader.c 15 Sep 2004 18:02:49 -0000 1.77 +++ wine/dlls/ntdll/loader.c 22 Sep 2004 10:08:48 -0000 @@ -1507,7 +1507,7 @@ } main_exe = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); - MODULE_GetLoadOrderW( loadorder, main_exe ? main_exe->ldr.BaseDllName.Buffer : NULL, filename ); + MODULE_GetLoadOrderW( loadorder, main_exe ? main_exe->ldr.BaseDllName.Buffer : NULL, libname ); nts = STATUS_DLL_NOT_FOUND; for (i = 0; i < LOADORDER_NTYPES; i++) -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

2 2

Bugzilla Bug 2075: *printf incompatibilities
by Aneurin Price 22 Sep '04

22 Sep '04

I've been looking at Warcraft III today, and had the problem of single player campaigns not showing up. The reason behind this is explained at http://bugs.winehq.org/show_bug.cgi?id=2075, and sure enough adding the special case described for the I64 argument type specification solves the problem in W3. Now I'm wondering how the problem should really be solved. Currently most (possibly all) of the *printf functions in msvcrt call MSVCRT_vsnprintfW. Should the same be done for vsnprintf, or should there be an independent MSVCRT_vsnprintfA? Either way I don't really know how the implementation would work. I was kind of hoping that this might be an okay place to start learning about WINE development, so if this in fact hinges on something far more complicated than I've been able to grasp, somebody please point this out to me :). Any pointers? Thanks, Aneurin Price

2 2

raw parallel port access
by BRC 22 Sep '04

22 Sep '04

After quite a few days of perusing wine doc/source/config/mailing lists, I have found very scant references to accessing the raw parallel ports using wine. I am running FC2 linux (up-to-date) and have confirmed I can access the parallel port (dongle) presented to VMWare running a Windows 2000 guest OS successfully ie. access to /dev/parport0 works. I can also run all the programs included with wine-20040914 as well as some tests I wrote with mingw as well as those I compiled with VC++. The latter just cannot access the parallel port as VMWARE can though it runs normally until it can't access the dongle on LPT1. I've tried running as root too to no avail. What am I missing? If no answer is available, can someone at least point to the relevant sources so I can puzzle it out further: I am determined. Running with WINEDEBUG=+io yields no output yet WINEDEBUG=+all spews the world as expected. The relevant setup options I've played with are: ln -s /dev/parport0 ~chris/.wine/dosdevices/lpt1 When I run as root, I symlink ~root/.wine -> ~chris/.wine for convenience. The config ( I go back and forth on [ports] as I've found different messages/doc professing both). [parallelports] "lpt1" = "/dev/lp0" [ppdev] ;; key: io-base of the emulated port ;; value : parport-device{,timeout} ;; timeout for auto closing an open device ( not yet implemented) "378" = "/dev/parport0" ;;"278" = "/dev/parport1" ;;"3bc" = "/dev/parport2" [spooler] "FILE:" = "tmp.ps" "LPT1:" = "|lpr" "LPT2:" = "|gs -sDEVICE=bj200 -sOutputFile=/tmp/fred -q -" "LPT3:" = "/dev/lp3" [ports] "read" = "0x779,0x379,0x280-0x2a0" "write" = "0x779,0x379,0x280-0x2a0" #"read" = "0x378,0x379,0x37a,0x37c,0x77a" #"write" = "0x378,0x379,0x37a,0x37c,0x77a" Thanks! Chris __________________________________ Do you Yahoo!? Yahoo! Mail - 50x more storage than other providers! http://promotions.yahoo.com/new_mail

5 6

"optimized" assembly functions in wine
by Rein Klazes 22 Sep '04

22 Sep '04

Hi, Just did not feel like chasing bugs the other day. I decided to have some fun with something that I wondering for a long time: the usefulness of inline i86 assembly in string functions. This is the test program as.c: ---------------------------------8<------------------------------------- #include <malloc.h> typedef unsigned short WCHAR, *PWCHAR; static inline WCHAR *strcpyW( WCHAR *dst, const WCHAR *src ) { #ifdef ASM int dummy1, dummy2, dummy3; __asm__ __volatile__( "cld\n" "1:\tlodsw\n\t" "stosw\n\t" "testw %%ax,%%ax\n\t" "jne 1b" : "=&S" (dummy1), "=&D" (dummy2), "=&a" (dummy3) : "0" (src), "1" (dst) : "memory" ); #else WCHAR *p = dst; while ((*p++ = *src++)); #endif return dst; } #define SZ 3000 main() { int i; PWCHAR s,d; s=malloc(SZ*sizeof(WCHAR)); d=malloc(SZ*sizeof(WCHAR)); memset(s,'x',SZ); s[SZ-1]=0; for(i=0;i<1000000;i++) strcpyW(d,s); } ---------------------------------8<------------------------------------- The function strcpyW is a copy from Wine with the #ifdef modified. I used the following commands gcc-3.3 -O2 as.c -o as -DASM ; time ./as;time ./as; time ./as and gcc-3.3 -O2 as.c -o as ; time ./as;time ./as; time ./as The resulting times are (all user time): test# asm C ----------------------- 1 15.970 15.899 2 15.966 15.943 3 15.959 15.941 ------ ------ ave 15.964 15.928 Notes: - tested on a PII 450 MHz; - I tested with gcc 2.95 and 3.4.2 as well, result are essentially the same. - size of main() is 0x7a (assembly) vs 0x82 (C-code) bytes; - I experimented with longer strings to see if there was any mem cache hit/miss effects and found none. Conclusions: 1. these routines are so fast that it is hard to imagine that these functions will be a bottleneck, justifying such optimization; 2. nothing shows here that inline assembly brings any advantage. Rein. -- Rein Klazes rklazes(a)xs4all.nl

4 4

Re: Epoll patch (rev 6)
by Marcus Meissner 22 Sep '04

22 Sep '04

On Wed, Sep 22, 2004 at 04:54:53PM +0900, Mike McCormack wrote: > > Updated epoll patch for the current cvs. > Shachar, take heart! One hunk of the epoll patch has been committed, > only 15 to go! :) > > Mike > > > ChangeLog: > * add support for using epoll instead of select to the wineserver > > Index: configure.ac > =================================================================== > RCS file: /home/wine/wine/configure.ac,v > retrieving revision 1.310 > diff -u -r1.310 configure.ac > --- configure.ac 22 Sep 2004 04:08:38 -0000 1.310 > +++ configure.ac 22 Sep 2004 06:15:27 -0000 > @@ -132,6 +132,10 @@ > AC_CHECK_LIB(xpg4,_xpg4_setrunelocale) > dnl Check for -lpoll for Mac OS X/Darwin > AC_CHECK_LIB(poll,poll) > +dnl Check for -lepoll > +AC_CHECK_LIB(epoll,epoll_create, > + [AC_SUBST(LIBEPOLL,-lepoll) > + AC_DEFINE(HAVE_LIBEPOLL)]) Newer glibc versions have epoll_create built-in, so better use something like: LIBEPOLL= AC_SUBST(LIBEPOLL) AC_CHECK_FUNC(epoll_create,[ AC_DEFINE(HAVE_LIBEPOLL) ], [ AC_CHECK_LIB(epoll,epoll_create,[ LIBEPOLL="-lepoll" AC_DEFINE(HAVE_LIBEPOLL) ] ) ] )

1 0

Re: winefile sync with ReactOS
by Alexandre Julliard 22 Sep '04

22 Sep '04

"Martin Fuchs" <martin-fuchs(a)gmx.net> writes: > + if (order1 && order2) { > + order1 = fd1->cFileName[0]!='.'? 1: fd1->cFileName[1]=='.'? 2: fd1->cFileName[1]=='\0'? 3: 1; > + order2 = fd2->cFileName[0]!='.'? 1: fd2->cFileName[1]=='.'? 2: fd2->cFileName[1]=='\0'? 3: 1; You need to check that cFileName[2] == 0 too; but I'd suggest getting rid of the ?: operator abuse first, otherwise this is going to become totally unreadable. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: fonts: 20 ppem Wine Sans Serif
by Dimitrie O. Paun 21 Sep '04

21 Sep '04

On Mon, Sep 20, 2004 at 11:51:24AM +0100, Huw D M Davies wrote: > Huw Davies <huw(a)codeweavers.com> > Add a 20 ppem strike with cp1252 coverage to Wine Sans Serif. > Add U+201a to all strikes. Huw, What's the current status for fonts. I think they deserve a section under the UI Status: http://www.winehq.org/site/status_ui What do we have currently, in what state, what's left to do? -- Dimi.

4 4

UpdateWindow vs. WM_PAINT
by Michael Kaufmann 21 Sep '04

21 Sep '04

Hi, I've noticed that many Windows controls don't wait for a WM_PAINT message. They redraw themselves immediately (with GetDC/ReleaseDC, UpdateWindow or RedrawWindow). This is necessary if a program is carrying out a lengthy operation without fetching messages. TextPad is such a program: Its progress control doesn't get updated in WINE while loading a file. To see the redraw differences between Windows and WINE, I've created this test program: http://www.michael-kaufmann.ch/WINE/ControlsRepaintTest.zip It changes properties of different controls and then calls Sleep() to simulate a lengthy operation. The big problem is that it's undocumented in which cases a control should wait for a WM_PAINT message and in which cases it should redraw itself immediately. I've observed that many controls redraw themselves immediately if an important property of the control gets changed (e.g. the position of a progress control, the text of a status bar) or if the user selects an item (ListBox, ListView, TreeView) or if he presses a key (Edit box). Most controls wait for WM_PAINT if the data that they display was modified. But sometimes it's just arbitrary. Examples (tested on Windows 2000): Edit Control: - Redraw immediately: WM_REPLACESEL, EM_SETSEL, WM_CLEAR, WM_PASTE, WM_CUT - Don't redraw immediately: WM_SETTEXT, EM_UNDO, other messages Listbox Control: - Redraw immediately: LB_SETCURSEL, LB_SETTOPINDEX - Don't redraw immediately: LB_SETSEL, LB_RESETCONTENT, LB_ADDSTRING, other messages I've created a patch which should work for most lazy programs. Please review it. Regards Michael Index: dlls/comctl32/progress.c =================================================================== RCS file: /home/wine/wine/dlls/comctl32/progress.c,v retrieving revision 1.38 diff -u -r1.38 progress.c --- dlls/comctl32/progress.c 25 Aug 2004 17:33:01 -0000 1.38 +++ dlls/comctl32/progress.c 19 Sep 2004 21:45:55 -0000 @@ -485,7 +485,7 @@ infoPtr->MinVal = low; infoPtr->MaxVal = high; PROGRESS_CoercePos(infoPtr); - InvalidateRect(infoPtr->Self, NULL, TRUE); + RedrawWindow(infoPtr->Self, NULL, NULL, RDW_ERASE | RDW_INVALIDATE | RDW_UPDATENOW); return res; } @@ -562,6 +562,7 @@ PROGRESS_CoercePos (infoPtr); TRACE("PBM_DELTAPOS: current pos changed from %d to %d\n", oldVal, infoPtr->CurVal); PROGRESS_Invalidate( infoPtr, oldVal, infoPtr->CurVal ); + UpdateWindow(infoPtr->Self); } return oldVal; } @@ -575,6 +576,7 @@ PROGRESS_CoercePos(infoPtr); TRACE("PBM_SETPOS: current pos changed from %d to %d\n", oldVal, infoPtr->CurVal); PROGRESS_Invalidate( infoPtr, oldVal, infoPtr->CurVal ); + UpdateWindow(infoPtr->Self); } return oldVal; } @@ -601,6 +603,7 @@ { TRACE("PBM_STEPIT: current pos changed from %d to %d\n", oldVal, infoPtr->CurVal); PROGRESS_Invalidate( infoPtr, oldVal, infoPtr->CurVal ); + UpdateWindow(infoPtr->Self); } return oldVal; } Index: dlls/comctl32/status.c =================================================================== RCS file: /home/wine/wine/dlls/comctl32/status.c,v retrieving revision 1.66 diff -u -r1.66 status.c --- dlls/comctl32/status.c 14 Sep 2004 00:45:26 -0000 1.66 +++ dlls/comctl32/status.c 19 Sep 2004 21:45:56 -0000 @@ -539,14 +539,14 @@ return TRUE; infoPtr->part0.hIcon = hIcon; if (infoPtr->simple) - InvalidateRect(infoPtr->Self, &infoPtr->part0.bound, FALSE); + RedrawWindow(infoPtr->Self, &infoPtr->part0.bound, NULL, RDW_INVALIDATE | RDW_UPDATENOW); } else { if (infoPtr->parts[nPart].hIcon == hIcon) /* same as - no redraw */ return TRUE; infoPtr->parts[nPart].hIcon = hIcon; if (!(infoPtr->simple)) - InvalidateRect(infoPtr->Self, &infoPtr->parts[nPart].bound, FALSE); + RedrawWindow(infoPtr->Self, &infoPtr->parts[nPart].bound, NULL, RDW_INVALIDATE | RDW_UPDATENOW); } return TRUE; } @@ -641,7 +641,7 @@ } } STATUSBAR_SetPartBounds (infoPtr); - InvalidateRect(infoPtr->Self, NULL, FALSE); + RedrawWindow(infoPtr->Self, NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW); return TRUE; } @@ -708,7 +708,7 @@ Free (part->text); part->text = ntext; } - InvalidateRect(infoPtr->Self, &part->bound, FALSE); + RedrawWindow(infoPtr->Self, &part->bound, NULL, RDW_INVALIDATE | RDW_UPDATENOW); return TRUE; } @@ -780,7 +780,8 @@ nmhdr.idFrom = GetWindowLongPtrW (infoPtr->Self, GWLP_ID); nmhdr.code = SBN_SIMPLEMODECHANGE; SendMessageW (infoPtr->Notify, WM_NOTIFY, 0, (LPARAM)&nmhdr); - InvalidateRect(infoPtr->Self, NULL, FALSE); + RedrawWindow(infoPtr->Self, NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW); + return TRUE; } @@ -839,9 +840,7 @@ i = SendMessageW(infoPtr->Notify, WM_NOTIFYFORMAT, (WPARAM)hwnd, NF_QUERY); infoPtr->NtfUnicode = (i == NFR_UNICODE); - GetClientRect (hwnd, &rect); - InvalidateRect (hwnd, &rect, 0); - UpdateWindow(hwnd); + RedrawWindow(hwnd, NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW); ZeroMemory (&nclm, sizeof(nclm)); nclm.cbSize = sizeof(nclm); @@ -1051,7 +1050,7 @@ } } - InvalidateRect(infoPtr->Self, &part->bound, FALSE); + RedrawWindow(infoPtr->Self, &part->bound, NULL, RDW_INVALIDATE | RDW_UPDATENOW); return TRUE; } Index: dlls/comctl32/tab.c =================================================================== RCS file: /home/wine/wine/dlls/comctl32/tab.c,v retrieving revision 1.99 diff -u -r1.99 tab.c --- dlls/comctl32/tab.c 14 Sep 2004 00:44:26 -0000 1.99 +++ dlls/comctl32/tab.c 19 Sep 2004 21:45:58 -0000 @@ -236,6 +236,7 @@ infoPtr->iSelected=iItem; TAB_EnsureSelectionVisible(hwnd, infoPtr); TAB_InvalidateTabArea(hwnd, infoPtr); + UpdateWindow(hwnd); } return prevItem; } Index: dlls/comctl32/trackbar.c =================================================================== RCS file: /home/wine/wine/dlls/comctl32/trackbar.c,v retrieving revision 1.62 diff -u -r1.62 trackbar.c --- dlls/comctl32/trackbar.c 14 Sep 2004 00:45:26 -0000 1.62 +++ dlls/comctl32/trackbar.c 19 Sep 2004 21:45:59 -0000 @@ -375,12 +375,6 @@ TRACKBAR_CalcThumb(infoPtr, infoPtr->lPos, &infoPtr->rcThumb); } -static inline void -TRACKBAR_InvalidateAll(TRACKBAR_INFO * infoPtr) -{ - InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); -} - static void TRACKBAR_InvalidateThumb (TRACKBAR_INFO *infoPtr, LONG thumbPos) { @@ -951,7 +945,8 @@ infoPtr->lSelMax = 0; infoPtr->flags |= TB_SELECTIONCHANGED; - if (fRedraw) TRACKBAR_InvalidateAll(infoPtr); + if (fRedraw) + RedrawWindow(infoPtr->hwndSelf, NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW); return 0; } @@ -966,7 +961,8 @@ infoPtr->uNumTics = 0; } - if (fRedraw) TRACKBAR_InvalidateAll(infoPtr); + if (fRedraw) + RedrawWindow(infoPtr->hwndSelf, NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW); return 0; } @@ -1096,7 +1092,11 @@ infoPtr->lPos = infoPtr->lRangeMax; infoPtr->flags |= TB_THUMBPOSCHANGED; - if (fPosition) TRACKBAR_InvalidateThumbMove(infoPtr, oldPos, lPosition); + if (fPosition) + { + TRACKBAR_InvalidateThumbMove(infoPtr, oldPos, lPosition); + UpdateWindow(infoPtr->hwndSelf); + } return 0; } @@ -1121,7 +1121,8 @@ infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; - if (fRedraw) TRACKBAR_InvalidateAll(infoPtr); + if (fRedraw) + RedrawWindow(infoPtr->hwndSelf, NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW); return 0; } @@ -1139,7 +1140,8 @@ infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; - if (fRedraw) TRACKBAR_InvalidateAll(infoPtr); + if (fRedraw) + RedrawWindow(infoPtr->hwndSelf, NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW); return 0; } @@ -1157,7 +1159,8 @@ infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; - if (fRedraw) TRACKBAR_InvalidateAll(infoPtr); + if (fRedraw) + RedrawWindow(infoPtr->hwndSelf, NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW); return 0; } @@ -1178,7 +1181,8 @@ if (infoPtr->lSelMax > infoPtr->lRangeMax) infoPtr->lSelMax = infoPtr->lRangeMax; - if (fRedraw) TRACKBAR_InvalidateAll(infoPtr); + if (fRedraw) + RedrawWindow(infoPtr->hwndSelf, NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW); return 0; } @@ -1196,7 +1200,8 @@ if (infoPtr->lSelMax > infoPtr->lRangeMax) infoPtr->lSelMax = infoPtr->lRangeMax; - if (fRedraw) TRACKBAR_InvalidateAll(infoPtr); + if (fRedraw) + RedrawWindow(infoPtr->hwndSelf, NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW); return 0; } @@ -1214,7 +1219,8 @@ if (infoPtr->lSelMin < infoPtr->lRangeMin) infoPtr->lSelMin = infoPtr->lRangeMin; - if (fRedraw) TRACKBAR_InvalidateAll(infoPtr); + if (fRedraw) + RedrawWindow(infoPtr->hwndSelf, NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW); return 0; } @@ -1226,7 +1232,7 @@ if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_FIXEDLENGTH) { infoPtr->uThumbLen = iLength; infoPtr->flags |= TB_THUMBSIZECHANGED; - InvalidateRect (infoPtr->hwndSelf, &infoPtr->rcThumb, FALSE); + RedrawWindow(infoPtr->hwndSelf, &infoPtr->rcThumb, NULL, RDW_INVALIDATE | RDW_UPDATENOW); } return 0; @@ -1254,8 +1260,8 @@ } infoPtr->tics[infoPtr->uNumTics-1] = lPos; - TRACKBAR_InvalidateAll(infoPtr); - + RedrawWindow(infoPtr->hwndSelf, NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW); + return TRUE; } @@ -1266,7 +1272,7 @@ if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_AUTOTICKS) { infoPtr->uTicFreq = wFreq; TRACKBAR_RecalculateTics (infoPtr); - TRACKBAR_InvalidateAll(infoPtr); + RedrawWindow(infoPtr->hwndSelf, NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW); } return 0; @@ -1412,7 +1418,7 @@ { TRACE("\n"); infoPtr->bFocussed = FALSE; - TRACKBAR_InvalidateAll(infoPtr); + InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); return 0; } @@ -1496,7 +1502,7 @@ { TRACE("\n"); infoPtr->bFocussed = TRUE; - TRACKBAR_InvalidateAll(infoPtr); + InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); return 0; } Index: dlls/comctl32/treeview.c =================================================================== RCS file: /home/wine/wine/dlls/comctl32/treeview.c,v retrieving revision 1.151 diff -u -r1.151 treeview.c --- dlls/comctl32/treeview.c 13 Sep 2004 23:22:30 -0000 1.151 +++ dlls/comctl32/treeview.c 19 Sep 2004 21:46:02 -0000 @@ -4114,7 +4114,9 @@ TREEVIEW_Invalidate(infoPtr, NULL); break; } - + + UpdateWindow(infoPtr->hwnd); + TRACE("Leaving state %d\n", newSelect ? newSelect->state : 0); return TRUE; } Index: dlls/user/combo.c =================================================================== RCS file: /home/wine/wine/dlls/user/combo.c,v retrieving revision 1.1 diff -u -r1.1 combo.c --- dlls/user/combo.c 31 Aug 2004 01:10:08 -0000 1.1 +++ dlls/user/combo.c 19 Sep 2004 21:46:07 -0000 @@ -1141,9 +1141,9 @@ SWP_NOACTIVATE | SWP_SHOWWINDOW); - if( !(lphc->wState & CBF_NOREDRAW) ) - RedrawWindow( lphc->self, NULL, 0, RDW_INVALIDATE | - RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN ); + if( !(lphc->wState & CBF_NOREDRAW) && !IsRectEmpty(&lphc->buttonRect) ) + RedrawWindow ( lphc->self, &lphc->buttonRect, 0, RDW_INVALIDATE | + RDW_ERASE | RDW_UPDATENOW); EnableWindow( lphc->hWndLBox, TRUE ); if (GetCapture() != lphc->self) @@ -1314,7 +1314,7 @@ case (EN_CHANGE >> 8): /* * In some circumstances (when the selection of the combobox - * is changed for example) we don't wans the EN_CHANGE notification + * is changed for example) we don't want the EN_CHANGE notification * to be forwarded to the parent of the combobox. This code * checks a flag that is set in these occasions and ignores the * notification. @@ -1382,6 +1382,10 @@ CB_NOTIFY( lphc, CBN_SELCHANGE ); + /* FIXME: Calling this before CB_NOTIFY looks much nicer, + but Windows does it this way */ + UpdateWindow(lphc->self); + /* fall through */ case LBN_SETFOCUS: Index: dlls/user/edit.c =================================================================== RCS file: /home/wine/wine/dlls/user/edit.c,v retrieving revision 1.3 diff -u -r1.3 edit.c --- dlls/user/edit.c 16 Sep 2004 20:28:10 -0000 1.3 +++ dlls/user/edit.c 19 Sep 2004 21:46:11 -0000 @@ -229,7 +229,7 @@ static BOOL EDIT_EM_LineScroll(EDITSTATE *es, INT dx, INT dy); static BOOL EDIT_EM_LineScroll_internal(EDITSTATE *es, INT dx, INT dy); static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap); -static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, LPCWSTR lpsz_replace, BOOL send_update, BOOL honor_limit); +static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, LPCWSTR lpsz_replace, BOOL send_update, BOOL honor_limit, BOOL drawImmediately); static LRESULT EDIT_EM_Scroll(EDITSTATE *es, INT action); static void EDIT_EM_ScrollCaret(EDITSTATE *es); static void EDIT_EM_SetHandle(EDITSTATE *es, HLOCAL hloc); @@ -237,7 +237,7 @@ static void EDIT_EM_SetLimitText(EDITSTATE *es, INT limit); static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, INT left, INT right); static void EDIT_EM_SetPasswordChar(EDITSTATE *es, WCHAR c); -static void EDIT_EM_SetSel(EDITSTATE *es, UINT start, UINT end, BOOL after_wrap); +static void EDIT_EM_SetSel(EDITSTATE *es, UINT start, UINT end, BOOL after_wrap, BOOL drawImmediately); static BOOL EDIT_EM_SetTabStops(EDITSTATE *es, INT count, LPINT tabs); static BOOL EDIT_EM_SetTabStops16(EDITSTATE *es, INT count, LPINT16 tabs); static void EDIT_EM_SetWordBreakProc(EDITSTATE *es, LPARAM lParam); @@ -330,7 +330,7 @@ if(es->style & ES_READONLY) return; - EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); + EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE, TRUE); } @@ -445,15 +445,15 @@ case EM_SETSEL16: if ((short)LOWORD(lParam) == -1) - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); + EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE, TRUE); else - EDIT_EM_SetSel(es, LOWORD(lParam), HIWORD(lParam), FALSE); + EDIT_EM_SetSel(es, LOWORD(lParam), HIWORD(lParam), FALSE, TRUE); if (!wParam) EDIT_EM_ScrollCaret(es); result = 1; break; case EM_SETSEL: - EDIT_EM_SetSel(es, wParam, lParam, FALSE); + EDIT_EM_SetSel(es, wParam, lParam, FALSE, TRUE); EDIT_EM_ScrollCaret(es); result = 1; break; @@ -608,7 +608,7 @@ MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, countW); } - EDIT_EM_ReplaceSel(es, (BOOL)wParam, textW, TRUE, TRUE); + EDIT_EM_ReplaceSel(es, (BOOL)wParam, textW, TRUE, TRUE, TRUE); result = 1; if(!unicode) @@ -1813,7 +1813,7 @@ e--; } } - EDIT_EM_SetSel(es, extend ? es->selection_start : e, e, FALSE); + EDIT_EM_SetSel(es, extend ? es->selection_start : e, e, FALSE, TRUE); EDIT_EM_ScrollCaret(es); } @@ -1839,7 +1839,7 @@ e = EDIT_CharFromPos(es, x, y + es->line_height, &after_wrap); if (!extend) s = e; - EDIT_EM_SetSel(es, s, e, after_wrap); + EDIT_EM_SetSel(es, s, e, after_wrap, TRUE); EDIT_EM_ScrollCaret(es); } @@ -1860,7 +1860,7 @@ HIWORD(EDIT_EM_PosFromChar(es, es->selection_end, es->flags & EF_AFTER_WRAP)), &after_wrap); else e = strlenW(es->text); - EDIT_EM_SetSel(es, extend ? es->selection_start : e, e, after_wrap); + EDIT_EM_SetSel(es, extend ? es->selection_start : e, e, after_wrap, TRUE); EDIT_EM_ScrollCaret(es); } @@ -1883,7 +1883,7 @@ e += 2; } } - EDIT_EM_SetSel(es, extend ? es->selection_start : e, e, FALSE); + EDIT_EM_SetSel(es, extend ? es->selection_start : e, e, FALSE, TRUE); EDIT_EM_ScrollCaret(es); } @@ -1905,7 +1905,7 @@ HIWORD(EDIT_EM_PosFromChar(es, es->selection_end, es->flags & EF_AFTER_WRAP)), NULL); else e = 0; - EDIT_EM_SetSel(es, extend ? es->selection_start : e, e, FALSE); + EDIT_EM_SetSel(es, extend ? es->selection_start : e, e, FALSE, TRUE); EDIT_EM_ScrollCaret(es); } @@ -1933,7 +1933,7 @@ &after_wrap); if (!extend) s = e; - EDIT_EM_SetSel(es, s, e, after_wrap); + EDIT_EM_SetSel(es, s, e, after_wrap, TRUE); EDIT_EM_ScrollCaret(es); } @@ -1961,7 +1961,7 @@ &after_wrap); if (!extend) s = e; - EDIT_EM_SetSel(es, s, e, after_wrap); + EDIT_EM_SetSel(es, s, e, after_wrap, TRUE); EDIT_EM_ScrollCaret(es); } @@ -1987,7 +1987,7 @@ e = EDIT_CharFromPos(es, x, y - es->line_height, &after_wrap); if (!extend) s = e; - EDIT_EM_SetSel(es, s, e, after_wrap); + EDIT_EM_SetSel(es, s, e, after_wrap, TRUE); EDIT_EM_ScrollCaret(es); } @@ -2019,7 +2019,7 @@ } if (!extend) s = e; - EDIT_EM_SetSel(es, s, e, FALSE); + EDIT_EM_SetSel(es, s, e, FALSE, TRUE); EDIT_EM_ScrollCaret(es); } @@ -2049,7 +2049,7 @@ } if (!extend) s = e; - EDIT_EM_SetSel(es, s, e, FALSE); + EDIT_EM_SetSel(es, s, e, FALSE, TRUE); EDIT_EM_ScrollCaret(es); } @@ -2897,7 +2897,7 @@ * FIXME: handle ES_NUMBER and ES_OEMCONVERT here * */ -static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, LPCWSTR lpsz_replace, BOOL send_update, BOOL honor_limit) +static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, LPCWSTR lpsz_replace, BOOL send_update, BOOL honor_limit, BOOL drawImmediately) { UINT strl = strlenW(lpsz_replace); UINT tl = strlenW(es->text); @@ -3009,7 +3009,7 @@ else EDIT_CalcLineWidth_SL(es); - EDIT_EM_SetSel(es, s, s, FALSE); + EDIT_EM_SetSel(es, s, s, FALSE, FALSE); es->flags |= EF_MODIFIED; if (send_update) es->flags |= EF_UPDATE; if (hrgn) @@ -3025,6 +3025,7 @@ /* force scroll info update */ EDIT_UpdateScrollInfo(es); + if (drawImmediately) UpdateWindow(es->hwndSelf); if(es->flags & EF_UPDATE) { @@ -3421,7 +3422,7 @@ * In other words: this handler is OK * */ -static void EDIT_EM_SetSel(EDITSTATE *es, UINT start, UINT end, BOOL after_wrap) +static void EDIT_EM_SetSel(EDITSTATE *es, UINT start, UINT end, BOOL after_wrap, BOOL drawImmediately) { UINT old_start = es->selection_start; UINT old_end = es->selection_end; @@ -3466,6 +3467,8 @@ } } else EDIT_InvalidateText(es, start, old_end); + + if (drawImmediately) UpdateWindow(es->hwndSelf); } @@ -3578,10 +3581,10 @@ TRACE("before UNDO:insertion length = %d, deletion buffer = %s\n", es->undo_insert_count, debugstr_w(utext)); - EDIT_EM_SetSel(es, es->undo_position, es->undo_position + es->undo_insert_count, FALSE); + EDIT_EM_SetSel(es, es->undo_position, es->undo_position + es->undo_insert_count, FALSE, FALSE); EDIT_EM_EmptyUndoBuffer(es); - EDIT_EM_ReplaceSel(es, TRUE, utext, TRUE, TRUE); - EDIT_EM_SetSel(es, es->undo_position, es->undo_position + es->undo_insert_count, FALSE); + EDIT_EM_ReplaceSel(es, TRUE, utext, TRUE, TRUE, FALSE); + EDIT_EM_SetSel(es, es->undo_position, es->undo_position + es->undo_insert_count, FALSE, FALSE); /* send the notification after the selection start and end are set */ EDIT_NOTIFY_PARENT(es, EN_CHANGE, "EN_CHANGE"); EDIT_EM_ScrollCaret(es); @@ -3616,7 +3619,7 @@ EDIT_MoveDown_ML(es, FALSE); } else { static const WCHAR cr_lfW[] = {'\r','\n',0}; - EDIT_EM_ReplaceSel(es, TRUE, cr_lfW, TRUE, TRUE); + EDIT_EM_ReplaceSel(es, TRUE, cr_lfW, TRUE, TRUE, TRUE); } } break; @@ -3624,7 +3627,7 @@ if ((es->style & ES_MULTILINE) && !(es->style & ES_READONLY)) { static const WCHAR tabW[] = {'\t',0}; - EDIT_EM_ReplaceSel(es, TRUE, tabW, TRUE, TRUE); + EDIT_EM_ReplaceSel(es, TRUE, tabW, TRUE, TRUE, TRUE); } break; case VK_BACK: @@ -3633,7 +3636,7 @@ EDIT_WM_Clear(es); else { /* delete character left of caret */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); + EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE, TRUE); EDIT_MoveBackward(es, TRUE); EDIT_WM_Clear(es); } @@ -3660,7 +3663,7 @@ WCHAR str[2]; str[0] = c; str[1] = '\0'; - EDIT_EM_ReplaceSel(es, TRUE, str, TRUE, TRUE); + EDIT_EM_ReplaceSel(es, TRUE, str, TRUE, TRUE, TRUE); } break; } @@ -3694,7 +3697,7 @@ EDIT_WM_Clear(es); break; case EM_SETSEL: - EDIT_EM_SetSel(es, 0, (UINT)-1, FALSE); + EDIT_EM_SetSel(es, 0, (UINT)-1, FALSE, TRUE); EDIT_EM_ScrollCaret(es); break; default: @@ -3792,7 +3795,7 @@ EDIT_EM_EmptyUndoBuffer(es); if (name && *name) { - EDIT_EM_ReplaceSel(es, FALSE, name, FALSE, TRUE); + EDIT_EM_ReplaceSel(es, FALSE, name, FALSE, TRUE, FALSE); /* if we insert text to the editline, the text scrolls out * of the window, as the caret is placed after the insert * pos normally; thus we reset es->selection... to 0 and @@ -4158,17 +4161,17 @@ } else { if (shift) { /* delete character left of caret */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); + EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE, TRUE); EDIT_MoveBackward(es, TRUE); EDIT_WM_Clear(es); } else if (control) { /* delete to end of line */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); + EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE, TRUE); EDIT_MoveEnd(es, TRUE); EDIT_WM_Clear(es); } else { /* delete character right of caret */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); + EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE, TRUE); EDIT_MoveForward(es, TRUE); EDIT_WM_Clear(es); } @@ -4240,7 +4243,7 @@ ll = EDIT_EM_LineLength(es, e); s = li + EDIT_CallWordBreakProc(es, li, e - li, ll, WB_LEFT); e = li + EDIT_CallWordBreakProc(es, li, e - li, ll, WB_RIGHT); - EDIT_EM_SetSel(es, s, e, FALSE); + EDIT_EM_SetSel(es, s, e, FALSE, TRUE); EDIT_EM_ScrollCaret(es); return 0; } @@ -4264,7 +4267,7 @@ SetCapture(es->hwndSelf); EDIT_ConfinePoint(es, &x, &y); e = EDIT_CharFromPos(es, x, y, &after_wrap); - EDIT_EM_SetSel(es, (keys & MK_SHIFT) ? es->selection_start : e, e, after_wrap); + EDIT_EM_SetSel(es, (keys & MK_SHIFT) ? es->selection_start : e, e, after_wrap, TRUE); EDIT_EM_ScrollCaret(es); es->region_posx = es->region_posy = 0; SetTimer(es->hwndSelf, 0, 100, NULL); @@ -4323,7 +4326,7 @@ es->region_posx = (prex < x) ? -1 : ((prex > x) ? 1 : 0); es->region_posy = (prey < y) ? -1 : ((prey > y) ? 1 : 0); e = EDIT_CharFromPos(es, x, y, &after_wrap); - EDIT_EM_SetSel(es, es->selection_start, e, after_wrap); + EDIT_EM_SetSel(es, es->selection_start, e, after_wrap, TRUE); EDIT_SetCaretPos(es,es->selection_end,es->flags & EF_AFTER_WRAP); return 0; } @@ -4533,7 +4536,7 @@ OpenClipboard(es->hwndSelf); if ((hsrc = GetClipboardData(CF_UNICODETEXT))) { src = (LPWSTR)GlobalLock(hsrc); - EDIT_EM_ReplaceSel(es, TRUE, src, TRUE, TRUE); + EDIT_EM_ReplaceSel(es, TRUE, src, TRUE, TRUE, TRUE); GlobalUnlock(hsrc); } CloseClipboard(); @@ -4634,20 +4637,20 @@ MultiByteToWideChar(CP_ACP, 0, textA, -1, text, countW); } - EDIT_EM_SetSel(es, 0, (UINT)-1, FALSE); + EDIT_EM_SetSel(es, 0, (UINT)-1, FALSE, FALSE); if (text) { TRACE("%s\n", debugstr_w(text)); - EDIT_EM_ReplaceSel(es, FALSE, text, FALSE, FALSE); + EDIT_EM_ReplaceSel(es, FALSE, text, FALSE, FALSE, FALSE); if(!unicode) HeapFree(GetProcessHeap(), 0, text); } else { static const WCHAR empty_stringW[] = {0}; TRACE("<NULL>\n"); - EDIT_EM_ReplaceSel(es, FALSE, empty_stringW, FALSE, FALSE); + EDIT_EM_ReplaceSel(es, FALSE, empty_stringW, FALSE, FALSE, FALSE); } es->x_offset = 0; es->flags &= ~EF_MODIFIED; - EDIT_EM_SetSel(es, 0, 0, FALSE); + EDIT_EM_SetSel(es, 0, 0, FALSE, FALSE); /* Send the notification after the selection start and end have been set * edit control doesn't send notification on WM_SETTEXT * if it is multiline, or it is part of combobox @@ -4890,7 +4893,7 @@ /********************************************************************* * - * EDIT_UpdateText + * EDIT_UpdateTextRegion * */ static void EDIT_UpdateTextRegion(EDITSTATE *es, HRGN hrgn, BOOL bErase) Index: dlls/user/listbox.c =================================================================== RCS file: /home/wine/wine/dlls/user/listbox.c,v retrieving revision 1.1 diff -u -r1.1 listbox.c --- dlls/user/listbox.c 31 Aug 2004 01:10:08 -0000 1.1 +++ dlls/user/listbox.c 19 Sep 2004 21:46:13 -0000 @@ -2363,6 +2363,12 @@ descr->anchor_item = caret; LISTBOX_MoveCaret( hwnd, descr, caret, TRUE ); LISTBOX_SetSelection( hwnd, descr, caret, TRUE, FALSE); + + /* If the content has been scrolled, the new items + * need to be drawn immediately (Windows does it this way) + */ + UpdateWindow(hwnd); + if (descr->style & LBS_NOTIFY) { if( descr->lphc ) @@ -2712,7 +2718,9 @@ case LB_SETTOPINDEX16: case LB_SETTOPINDEX: - return LISTBOX_SetTopItem( hwnd, descr, wParam, TRUE ); + ret = LISTBOX_SetTopItem( hwnd, descr, wParam, TRUE ); + UpdateWindow(hwnd); /* Windows does this too */ + return ret; case LB_SETCOLUMNWIDTH16: case LB_SETCOLUMNWIDTH: @@ -2831,7 +2839,9 @@ case LB_SETCURSEL: if (IS_MULTISELECT(descr)) return LB_ERR; LISTBOX_SetCaretIndex( hwnd, descr, wParam, TRUE ); - return LISTBOX_SetSelection( hwnd, descr, wParam, TRUE, FALSE ); + ret = LISTBOX_SetSelection( hwnd, descr, wParam, TRUE, FALSE ); + UpdateWindow(hwnd); /* Windows does this too */ + return ret; case LB_GETSELCOUNT16: case LB_GETSELCOUNT: Index: dlls/user/static.c =================================================================== RCS file: /home/wine/wine/dlls/user/static.c,v retrieving revision 1.1 diff -u -r1.1 static.c --- dlls/user/static.c 31 Aug 2004 01:10:08 -0000 1.1 +++ dlls/user/static.c 19 Sep 2004 21:46:14 -0000 @@ -319,8 +319,6 @@ else lResult = DefWindowProcA( hwnd, WM_SETTEXT, wParam, lParam ); } - if (uMsg == WM_SETTEXT) - STATIC_TryPaintFcn( hwnd, full_style ); break; } default: @@ -331,9 +329,10 @@ else lResult = DefWindowProcA( hwnd, WM_SETTEXT, wParam, lParam ); } - if(uMsg == WM_SETTEXT) - InvalidateRect(hwnd, NULL, TRUE); } + + STATIC_TryPaintFcn( hwnd, full_style ); + return 1; /* success. FIXME: check text length */ case WM_SETFONT:

2 1

problem testing (winemine)
by Internet 21 Sep '04

21 Sep '04

Sorry if I write to this address (guess thousands of people do it :) ) but I've searched all the web for a solution and I wasn't able to find it, maybe it's just too stupid to be noticed by anyone :D I wish I could post it on any newsgroup, but I haven't access to newsservers from my workplace... I've found problems compiling one of the sample applications (winemine, as in user guide). After running winemaker I have no configure script generated, and just typing "make" gives me a parse error in De.rc Maybe there's something wrong with my installation? I'm running slackware 10.0 and I simply installed from source version 20040914, without any error. Is this a known problem? Thanks in advance for the attention and for all your work! Bono Carlo Re S.p.a. Controlli Industriali ARTD - Almost Re Technical Department internet(a)re-spa.com

1 0

Re: WIDL: use __RPC_FAR attribute for pointers in proxies
by Alexandre Julliard 21 Sep '04

21 Sep '04

Mike McCormack <mike(a)codeweavers.com> writes: > ChangeLog: > * use __RPC_FAR attribute for pointers in proxies Is this really useful? __RPC_FAR will always be an empty define, even when building on Windows, and I doubt we'll want to add 16-bit support to widl... -- Alexandre Julliard julliard(a)winehq.org

4 9

Re: MSCMS: new dll
by Robert Shearman 21 Sep '04

21 Sep '04

Hans Leidekker wrote: >Hi, > >Here's the beginnings of an MSCMS.DLL (color management) on top of the >LittleCMS library. I had to resort to some rather ugly preprocessor >trickery to be able to include lcms.h, since it happens to define basic >Windows types when not compiled on Windows ;-(. > > -Hans > >Changelog: > Beginnings of an MSCMS implementation based on LittleCMS. > > Is adding this to the Wine tree likely to break more apps than it fixes? How much work will you be doing on this library? Will we get into the same state as SHDOCVW where the DLL is essentially useless? Rob

11 21

Installing dot net framework 1.1 on wine
by Lara Joy Francia 21 Sep '04

21 Sep '04

I tried installing .net framework 1.1 on wine but it always fails. It says, "Microsoft .NET Framework 1.1 setup has ended prematurely.. ". Does anyone know what should be done like what are the dlls and configuration needed in order for it to finish installing? ________________________________________________________________________ Yahoo! Messenger - Communicate instantly..."Ping" your friends today! Download Messenger Now http://uk.messenger.yahoo.com/download/index.html

2 1

Re: security provider
by Juan Lang 21 Sep '04

21 Sep '04

Paul wrote: > I see there is a secur32 implementation but can see > no providers? Are there any providers anywhere? Is > there a sample? Is there a ms-kerberos clone? Are > there any docs on how to create a provider - or do I > just do it like a Windows one and it should just > work? There aren't any providers in Wine atm. The native ones should mostly work, if they don't depend on other undocumented or missing bits. There's a sample provider in the platform SDK. Do one just like a Windows one and it should work--post here or email me if you run into trouble. --Juan __________________________________ Do you Yahoo!? New and Improved Yahoo! Mail - 100MB free storage! http://promotions.yahoo.com/new_mail

1 0

\\ in paths causing problem, known bug?
by J. Grant 20 Sep '04

20 Sep '04

Hello, I just ran the eDonkey2000 Installer. The default install directory was invalid: C:\\Program Files\eDonkey2000 The extra \ was the problem. I think this is a WINE issue. Is this problem know about already? (Bugzilla does not contain this). I thought I would check before considering filing a bug report. Please include my email address in replies. You can download this exe from www.overnet.com, it is the free version of eDonkey2000 if you would like to test. Kind regards JG -- Homepage: http://jguk.org/ Blog: http://jguk.org/index.html#blog Radio: http://jguk.org/index.html#radio

1 0

Latest CVS config upgrade of drive letters problem
by J. Grant 20 Sep '04

20 Sep '04

Hello, I just built and installed CVS WINE using the work around for asla suggested by Ivan. However, the config file does not seem to have been converted correctly. I fixed the symbolic link manually. Read on if you are interested to know the details of this bug. Kind regards JG $ wcmd Created symlink /home/now3d/.wine/dosdevices/com1 -> /dev/ttyS0 Created symlink /home/now3d/.wine/dosdevices/com2 -> /dev/ttyS1 Created symlink /home/now3d/.wine/dosdevices/com3 -> /dev/ttyS2 Created symlink /home/now3d/.wine/dosdevices/com4 -> /dev/modem Created symlink /home/now3d/.wine/dosdevices/lpt1 -> /dev/lp0 Created symlink /home/now3d/.wine/dosdevices/c: -> /home/now3d/c Created symlink /home/now3d/.wine/dosdevices/d: -> ../${HOME} Created symlink /home/now3d/.wine/dosdevices/e: -> /tmp Created symlink /home/now3d/.wine/dosdevices/f: -> /mnt/cdrom2 Created symlink /home/now3d/.wine/dosdevices/g: -> /mnt/cdrom Created symlink /home/now3d/.wine/dosdevices/f:: -> /dev/scd0 Created symlink /home/now3d/.wine/dosdevices/g:: -> /dev/scd1 You can now remove the [SerialPorts], [ParallelPorts], and [Drive] sections in your configuration file, they are replaced by the above symlinks. Converted drive type to new entry HKLM\Software\Wine\Drives "C:" = L"hd" Converted drive type to new entry HKLM\Software\Wine\Drives "D:" = L"network" Converted drive type to new entry HKLM\Software\Wine\Drives "E:" = L"hd" Converted drive type to new entry HKLM\Software\Wine\Drives "F:" = L"cdrom" Converted drive type to new entry HKLM\Software\Wine\Drives "G:" = L"cdrom" Converted temp dir to new entry HKCU\Environment "TEMP" = L"e:\\" Converted path dir to new entry HKCU\Environment "PATH" = L"d:\\vs\\vc98\\bin;d:\\vs\\common\\msdev98\\bin;c:\\windows;c:\\windows\\system" Converted profile dir to new entry HKCU\Environment "USERPROFILE" = L"c:\\windows\\Profiles\\Administrator" Converted windows dir to new entry HKCU\Environment "windir" = L"c:\\windows" Converted system dir to new entry HKCU\Environment "winsysdir" = L"c:\\windows\\system" Warning: could not find DOS drive for current working directory '/home/now3d', starting in the Windows directory. Please use the registry key HKEY_CURRENT_CONFIG\Software\Fonts\LogPixels to set the screen resolution and remove the "Resolution" entry in the config file fixme:font:WineEngCreateFontInstance just using first face for now WCMD Version 0.17 C:\windows>ls File not found C:\windows>cd .. C:\>ver WCMD Version 0.17 C:\>d: Path not found C:\>d:\ Path not found C:\>cd d: Path not found This worked before I ugpraded. 10 Sep 20 00:13 d: -> ../${HOME} Thats a duff sym link, so I assume it was not evaluated correctly in that script..? Are these double links meant to be present? lrwxrwxrwx 1 now3d now3d 11 Sep 20 00:13 f: -> /mnt/cdrom2/ lrwxrwxrwx 1 now3d now3d 9 Sep 20 00:13 f:: -> /dev/scd0 lrwxrwxrwx 1 now3d now3d 10 Sep 20 00:13 g: -> /mnt/cdrom/ lrwxrwxrwx 1 now3d now3d 9 Sep 20 00:13 g:: -> /dev/scd1 lrwxrwxrwx 1 now3d now3d 10 Sep 20 00:13 com2 -> /dev/ttyS1 lrwxrwxrwx 1 now3d now3d 10 Sep 20 00:13 com3 -> /dev/ttyS2 these are also duff links, but maybe it will not effect anything. -- Homepage: http://jguk.org/ Blog: http://jguk.org/index.html#blog Radio: http://jguk.org/index.html#radio

2 3

security provider
by Paul Moore 20 Sep '04

20 Sep '04

I see there is a secur32 implementation but can see no providers? Are there any providers anywhere? Is there a sample? Is there a ms-kerberos clone? Are there any docs on how to create a provider - or do I just do it like a Windows one and it should just work?

1 0

fonts
by Ivan Leo Puoti 20 Sep '04

20 Sep '04

What is required to build /fonts? Ivan.

3 2

RE: Help with GetConsoleWindow()
by Ewert, Mark 20 Sep '04

20 Sep '04

I think you're right. The program seems to crash at a point much later than the GetConsoleWindow call. Here's what I see: "wine: Unhandled exception (thread 000d), starting debugger... WineDbg starting on pid 0x8 Unhandled exception: page fault on write access to 0x41a417a4 in 32-bit code (0x10007239). In 32 bit mode." A window pops up that says: "Uhandled page fault on write access to 0x41a417a4 at address 0x10007239 Do you wish to debug it?" When I click yes I get a dump of all the register/memory locations. Is there anything in particular I should look for? -----Original Message----- From: Eric Pouech [mailto:pouech-eric@wanadoo.fr] Sent: Saturday, September 18, 2004 12:12 AM To: Ewert, Mark Cc: wine-devel(a)winehq.org Subject: Re: Help with GetConsoleWindow() > Any ideas on what GetConsoleWindow() should actually return? it should return the handle of the window (user32) where the console actually runs (it is attached to a console). Anyway, are you sure the segfault you see is related to returning a non NULL value in GetConsoleWindow compared to another bug in Wine (because you are running on another codepath - the first one being the graphical display). Where does you program actually crash ? A+

2 1

Re: A couple of menu fixes
by Andreas Mohr 20 Sep '04

20 Sep '04

Hi, On Mon, Sep 20, 2004 at 07:03:47PM +0900, Dmitry Timoshkov wrote: > Hello, > > this patch fixes 2 problems with menu tracking: > 1. menu navigation keys do not work when there is no focus window, > i.e. menu code does not handle WM_SYSKEY*/WM_SYSCHAR messages. > 2. when a window owning a menu is being destroyed its menu loop > never unblocks. Pietrek's book mentions that it's the responsibility > of DestroyWindow to call EndMenu() in that case. Great! But... I'm currently working on some other menu aspects (ModifyMenu/InsertMenu), since Microsoft Works 2000 is horribly broken. I intend to submit some fixes soon, so it'd be useful if other people chose to not work in this area. I've been trying to simply "fix" these issues, but it's so confusing (if you fix one thing, then the next one fails) that I should have started with menu tests first... So I'll do extensive tests and try to fix everything that I find. Andreas Mohr

2 1

(no subject)
by lara joy Francia 20 Sep '04

20 Sep '04

I tried installing .net framework 1.1 on wine but it always fails. It says, "Microsoft .NET Framework 1.1 setup has ended prematurely.. ". Does anyone know what should be done like what are the dlls and configuration needed in order for it to finish installing? ________________________________________________________________________ Yahoo! Messenger - Communicate instantly..."Ping" your friends today! Download Messenger Now http://uk.messenger.yahoo.com/download/index.html

1 0

Internet Explorer 5.5 on wine (os version = "win2k")
by Lara Joy Francia 20 Sep '04

20 Sep '04

Does anyone know how to install internet explorer 5.5 on Linux with wine (os version = win2k)? I already tried installing ie5.5 on wine with os version as win98 and it worked however, I need to set the os version to win2k because it is the required os version of the other application that I'm trying install on wine. Thanks in advance. ________________________________________________________________________ Yahoo! Messenger - Communicate instantly..."Ping" your friends today! Download Messenger Now http://uk.messenger.yahoo.com/download/index.html

3 2

cdega question
by Jonathan Wilson 20 Sep '04

20 Sep '04

Does the transgaming WINE have anything above what stock WINE has when it comes to OpenGL apps/games?

2 1

Re: Latest CVS alsa problem
by J. Grant 19 Sep '04

19 Sep '04

Hi Ivan, Thanks for your quick response. on the 19/09/04 22:14, Ivan Leo Puoti wrote: >> libalsa2-devel-0.9.0-0.8rc2mdk > This package contains the alsa development headers, so unless you have some good > reason to keep this RPM installed (For example you develop an app that needs > these headers), you can just uninstall this package and wine will compile > without alsa support. Wine's OSS driver should work with alsa's oss emulation. Ok, I did as you suggested and it now works. However it was a bit of a pain, because I use this version of ALSA for SDL development, so I am going to have to reinstall those packages and their deps to let me work on that. Would you be able to consider adding ./configure --disable-alsa ? (a la MPlayer and other projects) Also perhaps the alsa detection could not set it up when only alsa 0.9.0 is installed if WINE requires 1.0.x alsa now..? Please include my email address in any replies. Kind regards JG -- Homepage: http://jguk.org/ Blog: http://jguk.org/index.html#blog Radio: http://jguk.org/index.html#radio

1 0

http://winehq.org/ - W3C validation problem at present
by J. Grant 19 Sep '04

19 Sep '04

[resent following direction from Ivan] Hello, There is a problem on this page at present: http://validator.w3.org/ 1. Line 317, column 12: an attribute value must be a literal unless it contains only name characters <a href=?issue=239>WWN Issue 239</a> was released today. You have used a character that is not considered a "name character" in an attribute value. Which characters are considered "name characters" varies between the different document types, but a good rule of thumb is that unless the value contains only lower or upper case letters in the range a-z you must put quotation marks around the value. In fact, unless you have extreme file size requirements it is a very very good idea to always put quote marks around your attribute values. It is never wrong to do so, and very often it is absolutely necessary. Kind regards JG -- Homepage: http://jguk.org/ Blog: http://jguk.org/index.html#blog Radio: http://jguk.org/index.html#radio

1 0

Latest CVS alsa problem
by J. Grant 19 Sep '04

19 Sep '04

Greetings, I am trying to build the latest CVS. My last build was from last year, I want to check if something works with a newer build. Unfortunately, the latest WINE cvs does not work with alsa shipped with mdk 9.0: libalsa2-0.9.0-0.8rc2mdk alsamixergui-0.9.0-0.5rc1_2mdk libalsa2-devel-0.9.0-0.8rc2mdk Is there any way I can ./configure --disable-alsa ? configure does not complain when I pass it --disable-alsa, however it is still broken whey I try and build. I wonder if there is OSS support in WINE? Should the ./configure script not have noticed that alsa was not working? It configured it all ok. This is the error log (below) if someone is interested. I am not on this list, so please include my email address in any replies. Kind regards JG ================================================================== gcc -c -I. -I. -I../../include -I../../include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o vwin32.vxd.dbg.o vwin32.vxd.dbg.c ../../tools/winegcc/winegcc -B../../tools/winebuild -shared ./vwin32.vxd.spec vwin32.o vwin32.vxd.dbg.o -o vwin32.vxd.so -L../../dlls -lwinedos -lkernel32 -L../../libs/wine -lwine -L../../libs/port -lwine_port make[2]: Leaving directory `/home/now3d/wine/wine/dlls/vwin32.vxd' rm -f vwin32.vxd.so && ln -s vwin32.vxd/vwin32.vxd.so vwin32.vxd.so make[2]: Entering directory `/home/now3d/wine/wine/dlls/winmm/winealsa' gcc -c -I. -I. -I../../../include -I../../../include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o audio.o audio.c audio.c: In function `ALSA_TraceParameters': audio.c:514: too many arguments to function `snd_pcm_hw_params_get_access' audio.c:515: too many arguments to function `snd_pcm_hw_params_get_format' audio.c:564: too many arguments to function `snd_pcm_hw_params_get_channels' audio.c:568: too many arguments to function `snd_pcm_hw_params_get_channels_min' audio.c:569: too many arguments to function `snd_pcm_hw_params_get_channels_max' audio.c:578: too many arguments to function `snd_pcm_hw_params_get_buffer_size' audio.c:582: too many arguments to function `snd_pcm_hw_params_get_buffer_size_min' audio.c:583: too many arguments to function `snd_pcm_hw_params_get_buffer_size_max' audio.c:605: too many arguments to function `snd_pcm_hw_params_get_rate' audio.c:605: too many arguments to function `snd_pcm_hw_params_get_rate_min' audio.c:605: too many arguments to function `snd_pcm_hw_params_get_rate_max' audio.c:606: too many arguments to function `snd_pcm_hw_params_get_buffer_time' audio.c:606: too many arguments to function `snd_pcm_hw_params_get_buffer_time_min' audio.c:606: too many arguments to function `snd_pcm_hw_params_get_buffer_time_max' audio.c:607: too many arguments to function `snd_pcm_hw_params_get_periods' audio.c:607: too many arguments to function `snd_pcm_hw_params_get_periods_min' audio.c:607: too many arguments to function `snd_pcm_hw_params_get_periods_max' audio.c:612: warning: passing arg 2 of `snd_pcm_hw_params_get_period_size' from incompatible pointer type audio.c:612: too many arguments to function `snd_pcm_hw_params_get_period_size' audio.c:616: warning: passing arg 2 of `snd_pcm_hw_params_get_period_size_min' from incompatible pointer type audio.c:616: too many arguments to function `snd_pcm_hw_params_get_period_size_min' audio.c:617: warning: passing arg 2 of `snd_pcm_hw_params_get_period_size_max' from incompatible pointer type audio.c:617: too many arguments to function `snd_pcm_hw_params_get_period_size_max' audio.c:624: too many arguments to function `snd_pcm_hw_params_get_period_time' audio.c:624: too many arguments to function `snd_pcm_hw_params_get_period_time_min' audio.c:624: too many arguments to function `snd_pcm_hw_params_get_period_time_max' audio.c:625: too many arguments to function `snd_pcm_hw_params_get_tick_time' audio.c:625: too many arguments to function `snd_pcm_hw_params_get_tick_time_min' audio.c:625: too many arguments to function `snd_pcm_hw_params_get_tick_time_max' audio.c: In function `ALSA_WaveInit': audio.c:744: too many arguments to function `snd_pcm_hw_params_get_rate_min' audio.c:745: too many arguments to function `snd_pcm_hw_params_get_rate_max' audio.c:746: too many arguments to function `snd_pcm_hw_params_get_channels_min' audio.c:747: too many arguments to function `snd_pcm_hw_params_get_channels_max' audio.c:851: too many arguments to function `snd_pcm_hw_params_get_rate_min' audio.c:852: too many arguments to function `snd_pcm_hw_params_get_rate_max' audio.c:853: too many arguments to function `snd_pcm_hw_params_get_channels_min' audio.c:854: too many arguments to function `snd_pcm_hw_params_get_channels_max' audio.c: In function `wodPlayer_DSPWait': audio.c:1200: too many arguments to function `snd_pcm_hw_params_get_period_time' audio.c: In function `wodOpen': audio.c:1717: warning: passing arg 3 of `snd_pcm_hw_params_set_rate_near' makes integer from pointer without a cast audio.c:1729: warning: passing arg 3 of `snd_pcm_hw_params_set_buffer_time_near' makes integer from pointer without a cast audio.c:1731: warning: passing arg 3 of `snd_pcm_hw_params_set_period_time_near' makes integer from pointer without a cast audio.c:1735: warning: passing arg 2 of `snd_pcm_hw_params_get_period_size' from incompatible pointer type audio.c:1735: too many arguments to function `snd_pcm_hw_params_get_period_size' audio.c:1736: too many arguments to function `snd_pcm_hw_params_get_buffer_size' audio.c: In function `DSDB_MMAPCopy': audio.c:2248: too many arguments to function `snd_pcm_hw_params_get_channels' audio.c:2249: too many arguments to function `snd_pcm_hw_params_get_format' audio.c:2251: warning: passing arg 2 of `snd_pcm_hw_params_get_period_size' from incompatible pointer type audio.c:2251: too many arguments to function `snd_pcm_hw_params_get_period_size' audio.c: In function `DSDB_CreateMMAP': audio.c:2302: too many arguments to function `snd_pcm_hw_params_get_format' audio.c:2303: too many arguments to function `snd_pcm_hw_params_get_buffer_size' audio.c:2304: too many arguments to function `snd_pcm_hw_params_get_channels' audio.c: In function `IDsDriverBufferImpl_GetPosition': audio.c:2459: warning: passing arg 2 of `snd_pcm_hw_params_get_period_size' from incompatible pointer type audio.c:2459: too many arguments to function `snd_pcm_hw_params_get_period_size' audio.c: In function `widOpen': audio.c:3205: warning: passing arg 3 of `snd_pcm_hw_params_set_rate_near' makes integer from pointer without a cast audio.c:3218: warning: passing arg 3 of `snd_pcm_hw_params_set_buffer_time_near' makes integer from pointer without a cast audio.c:3220: warning: passing arg 3 of `snd_pcm_hw_params_set_period_time_near' makes integer from pointer without a cast audio.c:3225: warning: passing arg 2 of `snd_pcm_hw_params_get_period_size' from incompatible pointer type audio.c:3225: too many arguments to function `snd_pcm_hw_params_get_period_size' audio.c:3226: too many arguments to function `snd_pcm_hw_params_get_buffer_size' make[2]: *** [audio.o] Error 1 make[2]: Leaving directory `/home/now3d/wine/wine/dlls/winmm/winealsa' make[1]: *** [winmm/winealsa] Error 2 make[1]: Leaving directory `/home/now3d/wine/wine/dlls' make: *** [dlls] Error 2 -- Homepage: http://jguk.org/ Blog: http://jguk.org/index.html#blog Radio: http://jguk.org/index.html#radio

1 0

Re: CreateDIBitmap fix
by Stefan Leichter 19 Sep '04

19 Sep '04

Am Montag, 13. September 2004 13:12 schrieb Huw D M Davies: > Michael Kaufmann <hallo(a)michael-kaufmann.ch> > Huw Davies <huw(a)codeweavers.com> > CreateDIBitmap should return bitmaps at the depth of the > supplied dc. > Add a test to exercise this behaviour. Hello, this patch broke my Freecell (the version shiped with the win32s extension). When starting the game i am get now these fixme's: fixme:bitmap:CreateCompatibleBitmap got bad width 6291527 or height 65537, please look for reason Grepping the logfile i found the values first in a call of CreateBitmap, but i have no idea where the values are created. I noticed that the lower word of the width is correct. Does anyone have a clue how to debug / fix this ? Bye Stefan

3 3

Re: MSCMS: new dll
by Dmitry Timoshkov 19 Sep '04

19 Sep '04

"Hans Leidekker" <hans(a)it.vu.nl> wrote: > Here's the beginnings of an MSCMS.DLL (color management) on top of the > LittleCMS library. I had to resort to some rather ugly preprocessor > trickery to be able to include lcms.h, since it happens to define basic > Windows types when not compiled on Windows ;-(. Then perhaps it's better to make lcms.h think that it's used in a Windows environment (define WIN32 or whatever it wants to see before inclusion). That will help to completely avoid all the ugliness with redefined stuff. > +HPROFILE WINAPI OpenColorProfileA( PPROFILE profile, DWORD access, DWORD sharing, DWORD creation ) > +{ > + TRACE("stub ( %p, %lx, %lx, %lx )\n", profile, access, sharing, creation ); > + > + return NULL; > +} > + > +HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing, DWORD creation ) > +{ > + TRACE("stub ( %p, %lx, %lx, %lx )\n", profile, access, sharing, creation ); > + > + return NULL; > +} > + > +BOOL WINAPI CloseColorProfile( HPROFILE profile ) > +{ > + TRACE("stub ( %p )\n", profile ); > + > + return FALSE; > +} You have to use FIXMEs not TRACEs above to clearly indicate the status of the APIs. -- Dmitry.

3 3

Scrollbars and scrollwheel: -fomit-frame-pointer problems
by Diego 'Flameeyes' Pettenò 18 Sep '04

18 Sep '04

Hi, Seems like I found out which flags causes trouble with the scrollbars and the mouse's scrollwheel: building wine without -fomit-frame-pointer flag makes it work right. This fixes my problem ( http://article.gmane.org/gmane.comp.emulators.wine.devel/23780 ) and seems to fix (at least for me) the problem reported by Nguyen Tuan Anh ( http://article.gmane.org/gmane.comp.emulators.wine.user/7169 ). I actually don't know how to filter with autoconf and stuff the specified flag, I only know with gentoo's portage, but I hope there's a way to make this flag doesn't go to the gcc parameters. Regards, -- Diego "Flameeyes" Pettenò dgp85(a)users.sourceforge.net - http://flameeyes.web.ctonet.it/

6 10

Re: Added service database names
by Dmitry Timoshkov 18 Sep '04

18 Sep '04

"Alexander Yaworsky" <yaworsky(a)migusoft.ru> wrote: > +#ifdef UNICODE > +# define SERVICES_ACTIVE_DATABASE SERVICES_ACTIVE_DATABASEW > +#else > +# define SERVICES_ACTIVE_DATABASE SERVICES_ACTIVE_DATABASEA > +#endif Wine uses WINELIB_NAME_AW macro in order to simplify '#ifdef UNICODE' magic, so in the above case it would look like this: #define SERVICES_ACTIVE_DATABASE WINELIB_NAME_AW(SERVICES_ACTIVE_DATABASE) -- Dmitry.

2 1

Terminal Font
by pcunite＠fsmail.net 18 Sep '04

18 Sep '04

I have a windows app that works really well under wine. I have placed the fonts from my XP workstation to my Fedora 2 wine directory in "./wine/windows/fonts/" so that I could have more fonts available to the app. My problem is that the "Terminal" font is not showing up when using a windows API "Font Dialog". Where can I get this "Terminal dos/oem" font? Thank you Jason -- Whatever you Wanadoo: http://www.wanadoo.co.uk/time/ This email has been checked for most known viruses - find out more at: http://www.wanadoo.co.uk/help/id/7098.htm

2 1

Help with GetConsoleWindow()
by Ewert, Mark 18 Sep '04

18 Sep '04

I'm running an application that calls the stubbed out function GetConsoleWindow(). I want the application to stay in the dos console when it runs but unfortunately when it sees a NULL from GetConsoleWindow() it loads a graphical window. I tried hacking the function to return the value 1 and this gave me the result I had hoped where it did not call up a graphical window but at a later point I get the error: wine: Unhandled exception (thread 000d), starting debugger... Any ideas on what GetConsoleWindow() should actually return? Cheers, Mark

3 2

Wine-20040918 preblems in
by Green, Shaun E. 18 Sep '04

18 Sep '04

Wine does not function correctly under Yoper Linux with kernel 2.6.8.1-7 (this kernel has performance patches applied). It seems to build fine, but it does not run correctly and running MFC apps do not even open. I tried changing the /tmp link in dosdevices directory, etc but to no avail. I've tried previous Wine versions and stable May release, but same results. Codeweavers crossover office works, but it's too slow for my purposes. I've used Wine-20040818 successfully since it's release on Yoper Linux with kernel 2.4.26 vanilla, so that's why I'm betting it's a kernel 2.6.8.1 issue. Can anyone help? Shaun

2 1

Re: dinput header fixes
by Alexandre Julliard 18 Sep '04

18 Sep '04

Robert Reif <reif(a)earthlink.net> writes: > Add some more version checks. As a rule we avoid such version checks in Wine, they are not necessary and will only cause trouble since we compile our code with the same headers. I know there are some similar checks in there already but they should probably be removed. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: buffer: ref count cleanup
by Robert Reif 18 Sep '04

18 Sep '04

James Hawkins wrote: >Changelog > * Use InterlockedDecrement and InterlockedIncrement instead of ++/--. > > > That ref doesn't belong to a com object. I belongs to a duplicated memory buffer and should probably be protected by a lock someday.

1 0

[OT] AMD64 Implications
by Ann and Jason Edmeades 17 Sep '04

17 Sep '04

Hello, Slightly off topic, but I am looking at purchasing a new PC and intend to continue doing wine development on it (especially d3d9). Is there any wine implications to buying an AMD64 compared to a 'normal' 32 bit chip. Will I be able to continue my wine development, obviously for running emulation of 32 bit windows apps (games)? Would I need to ensure I use 32 bit kernels, or can I make use of any 64 bit ones (dont know if these exist even!). Sorry if this is an obvious question, but I didnt want to go so far and find I have caused myself problems Jason

2 1

Re: fonts: wine_marlett
by Ivan Leo Puoti 17 Sep '04

17 Sep '04

> That works but then we're maintaining two codepaths, one or other of > which will hardly be tested at all. Why not just check in the font > binaries? What is required to build the fonts? Should I install fontforge? I've been in hospital with appendicitis and haven't followed wine development recently. Ivan.

1 0

Re: olefont: ref count cleanup
by Robert Shearman 17 Sep '04

17 Sep '04

James Hawkins wrote: >Changelog > * Use InterlockedDecrement and InterlockedIncrement instead of ++/--. > > Again, all of these patches do not fix the whole point about using the Interlocked* functions, which is that the variable must always be used *atomically*. That means if you grep the file for uses of "This->ref" (or the equivalent) then they should all only be as parameters to Interlocked* functions. Rob

2 2

Re: InternetSetStatusCallback Fix (resend)
by Alexandre Julliard 17 Sep '04

17 Sep '04

Robert Shearman <rob(a)codeweavers.com> writes: > Any reason this patch wasn't applied? Yes, it doesn't apply. Could you please resend an updated patch? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: olepicture: ref count cleanup
by Alexandre Julliard 17 Sep '04

17 Sep '04

James Hawkins <truiken(a)gmail.com> writes: > Changelog > * Use InterlockedDecrement and InterlockedIncrement instead of ++/--. When making these changes please fix the rest of the function too, any place that uses This->ref directly is broken, it should use the return value of the Interlocked call instead. Otherwise there's no point in making the changes since it still won't be thread-safe. -- Alexandre Julliard julliard(a)winehq.org

1 0

autoconf issues on HP-UX
by Warren_Baird＠cimmetry.com 17 Sep '04

17 Sep '04

Hi all, I'm in the process of trying to get winelib working on an HP-UX / PA-RISC machine. The first issue I've come across is related to autoconf, and I'm afraid I'm far from an autoconf guru, so I wanted to post my proposed solution here before submitting a patch. The problem is that the current autoconf tests done to determine how to link a shared library aren't very good - they use WINE_TRY_CFLAGS, which builds a c file containing something like "void main() { } " and tries to link it. The problem is that this isn't a very good test about whether you can link a *shared library* - since you've got a main line defined. Unfortunately the gnu ld doesn't work on hpux, so I have to use the system linker, and the UnixWare link test succeed when it should fail - since the HPUX linker doesn't understand the arguments it is given, it goes on to link an executable and generates a warning about not being able to hide symbol "conftest.so.1.0". I believe that a better test is to try to link a shared lib from a C file containing "void myfunc() {}" - this way if the provided arguments don't convince the linker to create a shared lib, you'll get a error about "main" being undefined. My proposed solution is to define a new function "WINE_TRY_SHLIB" that does what I describe above, and then use it in the 3 existing places we're checking for shared libs, and add a new test specifically for hpux. I've attached my proposed patch file (although I'm still trying to sort out exactly what flags I need for hpux libs)... Does this seem reasonable? thanks, Warren (See attached file: patch.txt)

2 1

Re: fonts: wine_marlett
by Robert Shearman 17 Sep '04

17 Sep '04

Huw D M Davies wrote: > TransGaming > Add a Marlett replacement font > > Cool! Is there any policy for using it? E.g. a lot of the arrows and stuff in the native comctl32 are drawn using this font, so would we now be able to do this with our version of the common controls? Rob

5 5

Re: [DPNET] Cleanup/Correct
by Alexandre Julliard 17 Sep '04

17 Sep '04

Raphael <fenix(a)club-internet.fr> writes: > I'm back (after a long time without coding) and seems that many directx dlls > are brokens after COM "migrations" No, the dlls are fine, probably your tree has not been updated properly. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: ADVAPI32: SHA functions
by Filip Navara 17 Sep '04

17 Sep '04

Filip Navara wrote: > Changelog: > Implement A_SHA* functions present in Windows XP and later systems. Now with a correct diff... Index: dlls/advapi32/Makefile.in =================================================================== RCS file: /home/wine/wine/dlls/advapi32/Makefile.in,v retrieving revision 1.19 diff -u -r1.19 Makefile.in --- dlls/advapi32/Makefile.in 11 Oct 2003 01:09:21 -0000 1.19 +++ dlls/advapi32/Makefile.in 16 Sep 2004 20:42:22 -0000 @@ -10,6 +10,7 @@ C_SRCS = \ advapi.c \ crypt.c \ + crypt_sha.c \ eventlog.c \ registry.c \ security.c \ Index: dlls/advapi32/advapi32.spec =================================================================== RCS file: /home/wine/wine/dlls/advapi32/advapi32.spec,v retrieving revision 1.56 diff -u -r1.56 advapi32.spec --- dlls/advapi32/advapi32.spec 16 Sep 2004 19:09:13 -0000 1.56 +++ dlls/advapi32/advapi32.spec 16 Sep 2004 20:42:07 -0000 @@ -1,6 +1,6 @@ -@ stub A_SHAFinal -@ stub A_SHAInit -@ stub A_SHAUpdate +@ stdcall A_SHAFinal(ptr str) +@ stdcall A_SHAInit(ptr) +@ stdcall A_SHAUpdate(ptr str long) @ stdcall AbortSystemShutdownA(ptr) @ stdcall AbortSystemShutdownW(ptr) @ stdcall AccessCheck(ptr long long ptr ptr ptr ptr ptr) Index: dlls/advapi32/tests/Makefile.in =================================================================== RCS file: /home/wine/wine/dlls/advapi32/tests/Makefile.in,v retrieving revision 1.4 diff -u -r1.4 Makefile.in --- dlls/advapi32/tests/Makefile.in 9 Aug 2004 18:47:22 -0000 1.4 +++ dlls/advapi32/tests/Makefile.in 17 Sep 2004 14:18:58 -0000 @@ -7,6 +7,7 @@ CTESTS = \ crypt.c \ + crypt_sha.c \ registry.c \ security.c --- /dev/null Fri Sep 17 17:41:26 2004 +++ dlls/advapi32/crypt_sha.c Thu Sep 16 22:34:13 2004 @@ -0,0 +1,188 @@ +/* + * Copyright 2004 Filip Navara + * Based on public domain SHA code by Steve Reid <steve(a)edmweb.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +/* SHA Context Structure Declaration */ + +typedef struct { + ULONG Unknown[6]; + ULONG State[5]; + ULONG Count[2]; + UCHAR Buffer[64]; +} SHA_CTX, *PSHA_CTX; + +/* SHA1 Helper Macros */ + +#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits)))) +/* FIXME: This definition of DWORD2BE is little endian specific! */ +#define DWORD2BE(x) (((x) >> 24) & 0xff) | (((x) >> 8) & 0xff00) | (((x) << 8) & 0xff0000) | (((x) << 24) & 0xff000000); +/* FIXME: This definition of blk0 is little endian specific! */ +#define blk0(i) (Block[i] = (rol(Block[i],24)&0xFF00FF00)|(rol(Block[i],8)&0x00FF00FF)) +#define blk1(i) (Block[i&15] = rol(Block[(i+13)&15]^Block[(i+8)&15]^Block[(i+2)&15]^Block[i&15],1)) +#define f1(x,y,z) (z^(x&(y^z))) +#define f2(x,y,z) (x^y^z) +#define f3(x,y,z) ((x&y)|(z&(x|y))) +#define f4(x,y,z) (x^y^z) +/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */ +#define R0(v,w,x,y,z,i) z+=f1(w,x,y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30); +#define R1(v,w,x,y,z,i) z+=f1(w,x,y)+blk1(i)+0x5A827999+rol(v,5);w=rol(w,30); +#define R2(v,w,x,y,z,i) z+=f2(w,x,y)+blk1(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30); +#define R3(v,w,x,y,z,i) z+=f3(w,x,y)+blk1(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30); +#define R4(v,w,x,y,z,i) z+=f4(w,x,y)+blk1(i)+0xCA62C1D6+rol(v,5);w=rol(w,30); + +/* Hash a single 512-bit block. This is the core of the algorithm. */ +void SHA1Transform(ULONG State[5], CHAR Buffer[64]) +{ + ULONG a, b, c, d, e; + ULONG *Block; + + Block = (ULONG*)Buffer; + + /* Copy Context->State[] to working variables */ + a = State[0]; + b = State[1]; + c = State[2]; + d = State[3]; + e = State[4]; + + /* 4 rounds of 20 operations each. Loop unrolled. */ + R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3); + R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7); + R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11); + R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15); + R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19); + R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23); + R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27); + R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31); + R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35); + R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39); + R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43); + R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47); + R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51); + R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55); + R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59); + R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63); + R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67); + R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71); + R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75); + R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79); + + /* Add the working variables back into Context->State[] */ + State[0] += a; + State[1] += b; + State[2] += c; + State[3] += d; + State[4] += e; + + /* Wipe variables */ + a = b = c = d = e = 0; +} + + +/****************************************************************************** + * A_SHAInit [ADVAPI32.@] + * + * Initialize a SHA context structure. + */ +VOID WINAPI +A_SHAInit(PSHA_CTX Context) +{ + /* SHA1 initialization constants */ + Context->State[0] = 0x67452301; + Context->State[1] = 0xEFCDAB89; + Context->State[2] = 0x98BADCFE; + Context->State[3] = 0x10325476; + Context->State[4] = 0xC3D2E1F0; + Context->Count[0] = + Context->Count[1] = 0; +} + +/****************************************************************************** + * A_SHAUpdate [ADVAPI32.@] + * + * Update a SHA context with a hashed data from supplied buffer. + */ +VOID WINAPI +A_SHAUpdate(PSHA_CTX Context, PCHAR Buffer, UINT BufferSize) +{ + ULONG BufferContentSize; + + BufferContentSize = Context->Count[1] & 63; + Context->Count[1] += BufferSize; + if (Context->Count[1] < BufferSize) + Context->Count[0]++; + Context->Count[0] += (BufferSize >> 29); + + if (BufferContentSize + BufferSize < 64) + { + RtlCopyMemory(&Context->Buffer[BufferContentSize], Buffer, + BufferSize); + } + else + { + while (BufferContentSize + BufferSize >= 64) + { + RtlCopyMemory(Context->Buffer + BufferContentSize, Buffer, + 64 - BufferContentSize); + Buffer += 64 - BufferContentSize; + BufferSize -= 64 - BufferContentSize; + SHA1Transform(Context->State, Context->Buffer); + BufferContentSize = 0; + } + RtlCopyMemory(Context->Buffer + BufferContentSize, Buffer, BufferSize); + } +} + +/****************************************************************************** + * A_SHAUpdate [ADVAPI32.@] + * + * Finalize SHA context and return the resulting hash. + */ +VOID WINAPI +A_SHAFinal(PSHA_CTX Context, PULONG Result) +{ + INT Pad, Index; + UCHAR Buffer[72]; + ULONG *Count; + ULONG BufferContentSize, LengthHi, LengthLo; + + BufferContentSize = Context->Count[1] & 63; + if (BufferContentSize >= 56) + Pad = 56 + 64 - BufferContentSize; + else + Pad = 56 - BufferContentSize; + + LengthHi = (Context->Count[0] << 3) | (Context->Count[1] >> (32 - 3)); + LengthLo = (Context->Count[1] << 3); + + RtlZeroMemory(Buffer + 1, Pad - 1); + Buffer[0] = 0x80; + Count = (ULONG*)(Buffer + Pad); + Count[0] = DWORD2BE(LengthHi); + Count[1] = DWORD2BE(LengthLo); + A_SHAUpdate(Context, Buffer, Pad + 8); + + for (Index = 0; Index < 5; Index++) + Result[Index] = DWORD2BE(Context->State[Index]); + + A_SHAInit(Context); +} --- /dev/null Fri Sep 17 17:41:59 2004 +++ dlls/advapi32/tests/crypt_sha.c Fri Sep 17 16:20:32 2004 @@ -0,0 +1,85 @@ +/* + * Unit tests for SHA functions + * + * Copyright (c) 2004 Filip Navara + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdio.h> + +#include "wine/test.h" +#include "windef.h" +#include "winbase.h" +#include "winerror.h" + +typedef struct { + ULONG Unknown[6]; + ULONG State[5]; + ULONG Count[2]; + UCHAR Buffer[64]; +} SHA_CTX, *PSHA_CTX; + +typedef VOID (WINAPI *fnA_SHAInit)(PSHA_CTX Context); +typedef VOID (WINAPI *fnA_SHAUpdate)(PSHA_CTX Context, PCHAR Buffer, UINT BufferSize); +typedef VOID (WINAPI *fnA_SHAFinal)(PSHA_CTX Context, PULONG Result); + +fnA_SHAInit pA_SHAInit; +fnA_SHAUpdate pA_SHAUpdate; +fnA_SHAFinal pA_SHAFinal; + +#define ctxcmp(a,b) memcmp((char*)a, (char*)b, FIELD_OFFSET(SHA_CTX, Buffer)) + +void test_sha_ctx() +{ + PCHAR test_buffer = "In our Life there's If" + "In our beliefs there's Lie" + "In our business there is Sin" + "In our bodies, there is Die"; + ULONG test_buffer_size = strlen(test_buffer); + HMODULE hmod; + SHA_CTX ctx; + SHA_CTX ctx_initialized = {{0, 0, 0, 0, 0}, {0x67452301, 0xefcdab89, 0x98badcfe, 0x10325476, 0xc3d2e1f0}, {0, 0}}; + SHA_CTX ctx_update1 = {{0, 0, 0, 0, 0}, {0xdbe5eba8, 0x6b4335ca, 0xf7c94abe, 0xc9f34e31, 0x311023f0}, {0, 0x67}}; + SHA_CTX ctx_update2 = {{0, 0, 0, 0, 0}, {0x5ecc818d, 0x52498169, 0xf6758559, 0xd035a164, 0x871dd125}, {0, 0xce}}; + ULONG result[5]; + ULONG result_correct[5] = {0xe014f93, 0xe09791ec, 0x6dcf96c8, 0x8e9385fc, 0x1611c1bb}; + + hmod = LoadLibrary("advapi32.dll"); + pA_SHAInit = (fnA_SHAInit)GetProcAddress(hmod, "A_SHAInit"); + pA_SHAUpdate = (fnA_SHAUpdate)GetProcAddress(hmod, "A_SHAUpdate"); + pA_SHAFinal = (fnA_SHAFinal)GetProcAddress(hmod, "A_SHAFinal"); + + RtlZeroMemory(&ctx, sizeof(ctx)); + pA_SHAInit(&ctx); + ok(!ctxcmp(&ctx, &ctx_initialized), "invalid initialization\n"); + + pA_SHAUpdate(&ctx, test_buffer, test_buffer_size); + ok(!ctxcmp(&ctx, &ctx_update1), "update doesn't work correctly\n"); + + pA_SHAUpdate(&ctx, test_buffer, test_buffer_size); + ok(!ctxcmp(&ctx, &ctx_update2), "update doesn't work correctly\n"); + + pA_SHAFinal(&ctx, result); + ok(!ctxcmp(&ctx, &ctx_initialized), "context hasn't been reinitialized\n"); + ok(!memcmp(result, result_correct, sizeof(result)), "incorrect result\n"); + + FreeLibrary(hmod); +} + +START_TEST(crypt_sha) +{ + test_sha_ctx(); +}

1 0

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