wine-devel

wine-devel@winehq.org

2 participants
84469 discussions

Moving some 16-bit code
by Ge van Geldorp 23 Sep '04

23 Sep '04

dlls/shell32/control.c contains some 16-bit code (function RunDLL_CallEntry16), which I would like to separate out. I wonder if the attached patch is the correct way to do that? On Win2k export 122 is just a stub. Maybe it would be ok to turn our export 122 into an empty function too? Ge van Geldorp. Index: control.c =================================================================== RCS file: /home/wine/wine/dlls/shell32/control.c,v retrieving revision 1.20 diff -u -r1.20 control.c --- control.c 12 Jul 2004 19:50:56 -0000 1.20 +++ control.c 22 Sep 2004 19:28:18 -0000 @@ -456,30 +456,6 @@ return Control_FillCache_RunDLLW(hWnd, hModule, w, x); } - -/************************************************************************* - * RunDLL_CallEntry16 [SHELL32.122] - * the name is probably wrong - */ -void WINAPI RunDLL_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, - LPCSTR cmdline, INT cmdshow ) -{ - WORD args[5]; - SEGPTR cmdline_seg; - - TRACE( "proc %lx hwnd %p inst %p cmdline %s cmdshow %d\n", - proc, hwnd, inst, debugstr_a(cmdline), cmdshow ); - - cmdline_seg = MapLS( cmdline ); - args[4] = HWND_16(hwnd); - args[3] = MapHModuleLS(inst); - args[2] = SELECTOROF(cmdline_seg); - args[1] = OFFSETOF(cmdline_seg); - args[0] = cmdshow; - WOWCallback16Ex( proc, WCB16_PASCAL, sizeof(args), args, NULL ); - UnMapLS( cmdline_seg ); -} - /************************************************************************* * CallCPLEntry16 [SHELL32.166] * Index: shell.c =================================================================== RCS file: /home/wine/wine/dlls/shell32/shell.c,v retrieving revision 1.61 diff -u -r1.61 shell.c --- shell.c 15 Jun 2004 18:27:50 -0000 1.61 +++ shell.c 22 Sep 2004 19:28:18 -0000 @@ -657,3 +657,27 @@ return HINSTANCE_16(seiW.hInstApp); } + + +/************************************************************************* + * RunDLL_CallEntry16 [SHELL32.122] + * the name is probably wrong + */ +void WINAPI RunDLL_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, + LPCSTR cmdline, INT cmdshow ) +{ + WORD args[5]; + SEGPTR cmdline_seg; + + TRACE( "proc %lx hwnd %p inst %p cmdline %s cmdshow %d\n", + proc, hwnd, inst, debugstr_a(cmdline), cmdshow ); + + cmdline_seg = MapLS( cmdline ); + args[4] = HWND_16(hwnd); + args[3] = MapHModuleLS(inst); + args[2] = SELECTOROF(cmdline_seg); + args[1] = OFFSETOF(cmdline_seg); + args[0] = cmdshow; + WOWCallback16Ex( proc, WCB16_PASCAL, sizeof(args), args, NULL ); + UnMapLS( cmdline_seg ); +} Index: shell32.spec =================================================================== RCS file: /home/wine/wine/dlls/shell32/shell32.spec,v retrieving revision 1.87 diff -u -r1.87 shell32.spec --- shell32.spec 6 Sep 2004 20:24:10 -0000 1.87 +++ shell32.spec 22 Sep 2004 19:28:19 -0000 @@ -115,7 +115,6 @@ 119 stdcall IsLFNDrive(ptr) IsLFNDriveAW 120 stdcall FileMenu_AbortInitMenu () 121 stdcall SHFlushClipboard () - 122 stdcall -noname RunDLL_CallEntry16(long long long str long) #name wrong? 123 stdcall SHFreeUnusedLibraries () 124 stdcall FileMenu_AppendFilesForPidl(long ptr long) 125 stdcall FileMenu_AddFilesForPidl(long long long ptr long long ptr) Index: shell.spec =================================================================== RCS file: /home/wine/wine/dlls/shell32/shell.spec,v retrieving revision 1.10 diff -u -r1.10 shell.spec --- shell.spec 26 Sep 2003 04:32:20 -0000 1.10 +++ shell.spec 22 Sep 2004 19:28:19 -0000 @@ -29,6 +29,8 @@ 102 pascal -ret16 RegisterShellHook(word word) RegisterShellHook16 103 pascal ShellHookProc(word word long) ShellHookProc16 +122 pascal RunDLL_CallEntry16(long long long str long) #name wrong? + 157 stub RESTARTDIALOG # 166 PICKICONDLG

2 1

Promoting WINE
by Andreas Rosenberg 23 Sep '04

23 Sep '04

Hello Wine developers, perhaps some guys will remember me. I'm working for a small software company making a tool for FMEA and risk management. Late last year I managed to make our application work with Wine by submitting some patches. Our company held it's anual user meeting this week in Pforzheim (Germany) where about 150 people, working mostly for automotive companies (Daimler Crysler, BMW, BOSCH, VALEO, AUTOLIV, TRW etc.) attended. Since we had some requests for a Linux version of our software, I could arrange a short presenation of WINE in combination with our software. Two people talked to me after the presentation,indicating that they have a strong interest in this topic and asked for a german documentation how to install Wine. Perhaps this presentation has put a seed into certain heads and will show them ways to alternatives using software written for Windows. I thought, this might interest some of the developers. Regards Andy

1 0

Re: [4/5] GetWindowLongPtr: Windows
by Dmitry Timoshkov 23 Sep '04

23 Sep '04

"Robert Shearman" <rob(a)codeweavers.com> wrote: > - if (!(context.Eax = GetWindowWord( HWND_32(hwnd), GWL_HINSTANCE ))) context.Eax = context.SegDs; > + if (!(context.Eax = GetWindowWord( HWND_32(hwnd), GWLP_HINSTANCE ))) context.Eax = context.SegDs; GetWindowWord above probably should be replaced by GetWindowLongPtrW. And all appropriate ANSI variants of the GetWindowLongPtr call should have been replaced by a unicode one while you were at it. Of course that's not critical at all, just a nit pick. -- Dmitry.

3 2

winemaker/winelib problems
by Tim Ruehsen 23 Sep '04

23 Sep '04

Hi, i want to compile a small MFC based app using winelib/winemaker. The system is Debian SID (upto date, daily patched) (wine 20040716). As I understood from doc 'winelib-user/mfc-compiling' I have to compile MFC first. I copied dir 'atlmfc' from VC7 onto my machine, cd'ing into atlmfc/src/mfc und executing: winemaker --mfc . No errors. Now ./configure --with-wine=/usr/bin --with-wine-includes=/usr/include/wine/windows --with-wine-libraries=/usr/lib --with-wine-dlls=/usr/lib/wine --with-mfc=/usr/oms/atlmfc --with-atl-includes=/usr/oms/atlmfc/include says 'checking for libntdll.so... configure: error: Could not find the Wine dlls (libntdll.so)' And really: libntdll.so is not on my system, but I can find /usr/lib/wine/ntdll.dll.so Now I try to work around it by making a symbolic link ln -s /usr/lib/wine/ntdll.dll.so /usr/lib/wine/libntdll.so Again calling ./configure with the same options as above results in 'checking for atldef.h header... configure: error: Could not find the ATL includes' atldef.h does exist: -rwxr--r-- 1 oms users 7569 Sep 23 13:09 /usr/oms/atlmfc/include/atldef.h I played around with some other options to ./configure but the result stays the same. I edited configure to wrok around it, but I get similar errors with other includes (which exist as well). Can anyone give me a hint what to do? (Yes, I read the docs, but they are somewhat confusing... looks like something is missing there). Thanks for your patience! Tim

1 0

Re: icmp - allow building on MS_VC and Mingw
by Hans Leidekker 23 Sep '04

23 Sep '04

On Thursday 23 September 2004 06:02, Steven Edwards wrote: > Feel free to drop the gettimeofday part from this patch. There are 16 > other source files where we call gettimeofday in Wine and I am sure if > you dont accept it I can come up a good implementation in libwine. Why not use Windows time functions directly in ICMP? Reimplementing gettimeofday on top of Windows time fuctions doesn't seem like an ideal solution for ReactOS nor Wine. In Reactos you'd already have unnecessary loss of precision but even more so in Wine since we'd be doing: gettimeofday() -> GetSysTemTimeAsFileTime() -> gettimeofday(). Not to mention the maintenance burden of a Unix api in Reactos and Wine. -Hans

1 0

RFC: more Windows-NT like user directories?
by Juan Lang 23 Sep '04

23 Sep '04

Folks, I'm still working on the shell path functions, and I was thinking of changing the directory layout for the shell directories (desktop, start menu, my documents and whatnot) from the Windows 95-ish way to the NT-ish way. That is, rather than being children of c:\windows, they'd generally be children of c:\documents and settings\<username>. Any complaints? --Juan _______________________________ Do you Yahoo!? Declare Yourself - Register online to vote today! http://vote.yahoo.com

7 17

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

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