February 2007 - Wine-Devel - list.winehq.org

wineboot: Start items in StartUp folder on boot, includes security measures. [with the patch]
by Misha Koshelev Feb. 11, 2007

Feb. 11, 2007

I forgot to include the patch, so here it is. Misha --- Hi everybody, Thanks for your suggestions. I just posted a new patch on wine-patches where I tried to incorporate these and now it does the following (in addition to my previous patch which just started items in the StartUp folder): - When wineboot finds a file that it wants to start in the StartUp folder, it asks the user whether he wants to run the program. His options are: Always, Yes, No (default), and Never. - If he selects Yes the program is run, if he select No it is not. - If he selects Always or Never, I create a registry key in: HKEY_CURRENT_USER\Software\Wine\StartupItems with the full pathname of the program and the value "always" or "never." When wineboot sees this program in the StartUp folder it checks this key, and if it is set it performs the appropriate action. What do you guys think? If you like the system, it would be pretty easy to incorporate this into the run key running as well (which are currently just run without any user confirmation)? Thanks Misha

1 0

Re: wineboot: Start items in StartUp folder on boot, includes security measures.
by Joris Huizer Feb. 11, 2007

Feb. 11, 2007

It seems the patch itself got lost ____________________________________________________________________________________ Food fight? Enjoy some healthy debate in the Yahoo! Answers Food & Drink Q&A. http://answers.yahoo.com/dir/?link=list&sid=396545367

1 0

Re: First implementation of a directplay service provider
by Kai Blin Feb. 11, 2007

Feb. 11, 2007

On Saturday 10 February 2007 19:39, Alessandro Pignotti wrote: > I'm working to implement a service provider compatible with the protocol > used by directplay over TCP/IP. > Currently i've implemented the lobby code and tested it against > simpleconnect.exe and chatconnect.exe from the DirectX 7 SDK. At the very end of the patch, you missed a C++ style comment. (+ data->dwReserved1=0x1f4; //Values taken from registry (are they useful at all?)) Btw, I think you should set that data to NULL for now, rather than any random magic value. You shouldn't need the +#define LOBBYINFORMATIONFLAG_CLIENTSERVER 0x00000001 +#define LOBBYINFORMATIONFLAG_MIGRATEHOST 0x00000004 +#define LOBBYINFORMATIONFLAG_NODPSRV 0x00000040 +#define LOBBYINFORMATIONFLAG_PASSWORD 0x00000080 +#define LOBBYINFORMATIONFLAG_NOENUMS 0x00000100 +#define LOBBYINFORMATIONFLAG_FASTSIGN 0x00000200 +#define LOBBYINFORMATIONFLAG_FULLSIGN 0x00000400 +#define LOBBYINFORMATIONFLAG_ENCAPSULATE 0x00002000 stuff, as dplay.h defines that already, iirc. + inf->lobbyID=0x01020304;//Just a fixed Id now, will randomize someday There is some pattern to the DPIDs after the first. They're not random. I just didn't quite figure out how it works yet. Btw, you missed a C++ style comment there.. A few lines over that line, too. You're not sending a dplay version in your header so far. Is that intentional? Why are you declaring dummy functions and then comment out setting them in SPInit()? Good work, anyhow. Kai -- Kai Blin, <kai Dot blin At gmail Dot com> WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin/ -- Will code for cotton.

1 0

Re: Some thoughts about the ominous DIB Engine
by Rolf Kalbermatter Feb. 11, 2007

Feb. 11, 2007

Felix Nawothnig wrote: >I suggested to do all the work server-side a while back: > >http://www.winehq.org/pipermail/wine-devel/2005-July/038695.html > >Especially see: > >http://www.winehq.org/pipermail/wine-devel/2005-July/038703.html Well, this would mostly mirror the Windows architecture nowadays where almost all of this is in win32k.sys and GDI32 is mostly a user space wrapper around that. A bit like ntdll does for kernel operations. But I would be a bit concerned about performance if most calls have to be passed to the server side to be handled but maybe that is not really an issue? Didn't MS put part of the GDI somehow back in user space when going from NT4 to 2K just because of performance concerns? Would still remain the question where and how to hook this into dib handling but I think GDI would be better. Basically call the dc driver and if that fails branch into the local dibeng API for apropriate functions. Rolf Kalbermatter

4 4

signedness/WINAPI changing question
by Joris Huizer Feb. 11, 2007

Feb. 11, 2007

I have a small question: I find some function LONG WINAPI AVIStreamSampleToTime(PAVISTREAM pstream, LONG lSample) (in the avifil32 dll), the second parameter should really be an ULONG instead of a LONG. It'd fix the signedness problems. My question is, is such a change allowed? And what should I do to update for such a change (except for the header gcc warns about) In case such change must not be performed, I'll just add a local variable which is a casted version. I thought this needs asking; adding in unnecessary variables doesn't seem the best fix to me. regards, Joris ____________________________________________________________________________________ Don't pick lemons. See all the new 2007 cars at Yahoo! Autos. http://autos.yahoo.com/new_cars.html

3 2

doc: Add a Quick start to the Wine User Guide
by Jeff L Feb. 11, 2007

Feb. 11, 2007

This change came about when a friend described his problems in getting wine going to see if it would help him with making a Windows app run under Linux. He did not want to get into the details of wine as his was a opportunistic need and his comment that hit home was "that many a newbie expects software to just install but wine seems too complicated and there is not a cheat sheet". It seems that there is nowhere where the basics are described step by step for the first time casual user. Jeff Latimer Index: en/wineusr-introduction.sgml =================================================================== RCS file: /cvsroot/wine/docs/en/wineusr-introduction.sgml,v retrieving revision 1.4 diff -u -u -r1.4 wineusr-introduction.sgml --- en/wineusr-introduction.sgml 12 Dec 2006 04:11:06 -0000 1.4 +++ en/wineusr-introduction.sgml 11 Feb 2007 08:04:31 -0000 @@ -52,6 +52,50 @@ </para> </sect2> + <sect2> + <title>Quick start</title> + <para> + The process of installing and running wine can be summarised as + follows: + <itemizedlist> + <listitem> + <para> + Get a distribution as indicated in <link + linkend="getting-wine">Getting Wine</link> and see + the <ulink url="http://www.winehq.org/site/download">Wine + Downloads</> page. For the casual or new user the simplest + is to get an rpm distribution. + </para> + </listitem> + <listitem> + <para> + Configure wine using the <link + linkend="config-wine-main"><emphasis><filename>winecfg</></> + </link> command. For most people wine should now be usable. + </para> + </listitem> + <listitem> + <para> + To test your installation run wine's Windows 3.1 like file + manager using the <filename>wine winefile</> command. + </para> + </listitem> + <listitem> + <para> + Run wine using the <link + linkend="running"><emphasis><filename>wine</> + <filename>filespec/appname.exe</></></link> command. + </para> + <para> + The first command you will run will be to install a package. + Typically something like <filename>wine + /media/cdrom/setup.exe</> or the equivalent. + </para> + </listitem> + </itemizedlist> + </para> + </sect2> + </sect1> <sect1 id="what-is-wine">

2 1

wineboot: Start items in StartUp folder on boot.
by Misha Koshelev Feb. 11, 2007

Feb. 11, 2007

Hi, As you all may have noticed, I have been making quite a few patches within the last two weeks (or at least quite a few when compared to zero before then) because I had figured out that the Vector NTI program that is quite important in molecular biologThis patch makes sure that wine will start items in the StartUp folder (Programs) just like Windows. The reason this is necessary, well #1 this is something Windows does that Wine doesn't do, but #2 this is required by the Vector NTI installer (bug #7384), which installs necessary dependencies (MDAC and about 6 other things) by installing one, then placing a link to itself in StartUp, then rebooting. With this patch, it will actually restart correctly, and in fact just running wine installer.exe will actually successfully do the install from start to finish (for the alternative to install this prior to this and a few other patches, see my shell script http://misha680.googlepages.com/InstallVectorNTI10.sh) There is still the lack of JScript support which fails to install some things, but that's about it.y (and freely available to academic researchers) can be installed on Wine and run with quite little problem with a quite complicated install script I made http://misha680.googlepages.com/InstallVectorNTI10.sh) There was one pretty significant bug, but after that I wanted to try to track down and patch other bugs that forced the above script to be required. With the exception of a pretty significant lack of JScript support in wine/MSI which causes installation of quite a few files to fail (and thus still require native jscript.dll and native MSI), this final patch I just sent out makes the install work from start to finish, which is quite a change from before. I posted two patches earlier (a conformance test and a fix) that adds path searching to shell link creation (which the conformance test shows exists in Windows for a file like rundll32.exe that is not found in the current directory), and if anyone has comments about those patches please send them to me. My last patch ensures that this shelllink that the Vector NTI installer creates every time it tries to restart (about six or so times after every Microsoft component it installs that it needs and comes with) will be executed, and in fact is meant to reproduce the Windows behavior of starting items in the StartUp program group on login that occurs in Windows. I am new to the whole IShellFolder thing, though, and I tried to make it as proper as I could. But I certainly feel that I would like to have someone more experience to look at it. Oh, and I just wanted to say a big thanks to Dan Kegel, James Hawkings, Mike McCormack, and others who have helped me so far (not to mention Alexandre Julliard for committing some of my patches). Misha

7 8

Re: wineshelllink: disable startup notification
by Alexander Nicolaysen Sørnes Feb. 10, 2007

Feb. 10, 2007

Fredag 09 februar 2007 18:25, skrev Tijl Coosemans: > Wine doesn't support startup notification afaict and endlessly bouncing > cursors are annoying. Wine does support startup notifications, but not if the 'enable window manager to control windows applications' is disabled in winecfg. Regards, Alexander N. Sørnes > > --- tools/wineshelllink.orig Fri Feb 9 17:46:58 2007 > +++ tools/wineshelllink Fri Feb 9 17:59:14 2007 > @@ -88,6 +88,7 @@ > [Desktop Entry] > Name=$linkname > Exec=wine "$path" $args > +StartupNotify=false > Type=Application > EOF > [ -z "$descr" ] || echo "Comment=$descr"

1 0

Handling of EXCEPTION_BREAKPOINT
by Vitaliy Margolen Feb. 10, 2007

Feb. 10, 2007

It seems Wine has problems with correct return address for the int3 brakepoint exception. It's covered in bug http://bugs.winehq.org/show_bug.cgi?id=7063 There is even a test case with a proposed fixes. Can anyone with knowledge of the debugger events take a look at it? If the patch can be committed Wine will get that much closer to the supporting more unti-debugger protection schemes. Vitaliy Margolen.

1 0

Fullscreen broken in XVidMode
by Vitaliy Margolen Feb. 10, 2007

Feb. 10, 2007

For about a month now Wine is completely unusable for fullscreen games when using XVidMode instead of XRandr extension. Worse, this is a regression, caused by this patch: f6702ec4afb4098cbb67d6bd670a9f0527191f80 is first bad commit commit f6702ec4afb4098cbb67d6bd670a9f0527191f80 Author: Dmitry Timoshkov Date: Tue Jan 9 23:57:33 2007 +0800 winex11.drv: Force the fullscreen state update once the window is mapped. :040000 040000 f83b3a76eeecd52a04ed04201c49ac15244b0a25 d57c3162633300eabdb9fea65d530eb91cd929f5 M dlls Can we get some ideas going about why this is happening and how to fix it? Vitaliy Margolen.

1 0

Wine beta ASIO-driver.
by Tor Einar Tønnessen Feb. 10, 2007

Feb. 10, 2007

Hello, First let me introduce myself. I am Tor Einar Toennessen ( actually Tønnessen ). I am from Norway. I have followed the development of Wine a little bit on and off over some years ( maybe about 10 ). My main interrest with Wine is in the audio and midi area. I would like to comment on the asio-driver. I think its marvellous that wine has got an ASIO-capable audio-driver. The patch do however no longer apply cleanly to todays git-version. Secondly I had some trouble getting it to work, until I found out that I had to run "autoheader" not just "autoconf" in order to to get the symbol HAVE_ASIO_SDK_ASIO_H into config.h (via config.h.in). Also I would like very much that you (Robert Reif isn't it ?) develop the driver a little further. The first thing beeing a control-panel. But what is most import I think , is to make a new patch that works on todays wine, and get it into the ReadMe that one must run autoheader to. In that way more people can make it work and test it out... Tor Einar

2 1

name conflicts - Wine and OpenWatcom
by Wesley Parish Feb. 10, 2007

Feb. 10, 2007

I'm running Mandriva 2k7 and started installing Wine. The installation stalled on discovering I have OpenWatcom installed. Wine didn't like /usr/bin/wrc, the OpenWatcom Windows Resource Compiler. I could rename wrc to wwrc - what would people suggest? Wesley Parish -- Clinersterton beademung, with all of love - RIP James Blish ----- Mau e ki, he aha te mea nui? You ask, what is the most important thing? Maku e ki, he tangata, he tangata, he tangata. I reply, it is people, it is people, it is people.

1 0

Helping a user migrate an odbc app to Wine
by Dan Kegel Feb. 10, 2007

Feb. 10, 2007

Can somebody help this (german-speaking) fellow: http://www.unixboard.de/vb3/showthread.php?t=26943 He says his company's internal application requires you to input a DSN when installing it, and he doesn't know how to come up with a DSN under Wine. Presumably he doesn't want to mess with Unixodbc, he just wants to keep using the Microsoft drivers...? - Dan

5 5

Re: shell32[3/3]: allow overwriting files in SHFileOperation(FO_COPY) (with confirmation dialogs, fixes bug #7046)
by James Hawkins Feb. 9, 2007

Feb. 9, 2007

On 2/9/07, Mikołaj Zalewski <mikolaj(a)zalewski.pl> wrote: > The return codes when the user cancelled the operation as in Vista, as > they are more logical and easier to implement than the XP ones. If > Microsoft changed them there are probably not many apps that would > depend on it. With this change the program in bug #7046 works fine. > > From 799ff7b7cc6092fbd3e2030c7b4eb84d829b9842 Mon Sep 17 00:00:00 2001 > From: =?utf-8?q?Miko=C5=82aj_Zalewski?= <mikolaj(a)zalewski.pl> > Date: Fri, 9 Feb 2007 16:43:06 +0100 > Subject: [PATCH] shell32: allow overwriting files in SHFileOperation(FO_COPY) (with confirmation dialogs) > > --- > dlls/shell32/shell32_Bg.rc | 6 ++- > dlls/shell32/shell32_Cs.rc | 8 ++- > dlls/shell32/shell32_De.rc | 6 ++- > dlls/shell32/shell32_En.rc | 8 ++- > dlls/shell32/shell32_Eo.rc | 6 ++- > dlls/shell32/shell32_Es.rc | 6 ++- > dlls/shell32/shell32_Fi.rc | 6 ++- > dlls/shell32/shell32_Fr.rc | 6 ++- > dlls/shell32/shell32_It.rc | 6 ++- > dlls/shell32/shell32_Ko.rc | 6 ++- > dlls/shell32/shell32_No.rc | 6 ++- > dlls/shell32/shell32_Pl.rc | 6 ++- > dlls/shell32/shell32_Pt.rc | 6 ++- > dlls/shell32/shell32_Ru.rc | 6 ++- > dlls/shell32/shell32_Tr.rc | 6 ++- > dlls/shell32/shell32_Uk.rc | 6 ++- > dlls/shell32/shell32_main.h | 3 +- > dlls/shell32/shfldr_unixfs.c | 2 +- > dlls/shell32/shlfileop.c | 128 +++++++++++++++++++++++++++++++--------- > dlls/shell32/shresdef.h | 1 + > dlls/shell32/tests/shlfileop.c | 55 +++++++++++++++++ > 21 files changed, 241 insertions(+), 48 deletions(-) > > diff --git a/dlls/shell32/shell32_Bg.rc b/dlls/shell32/shell32_Bg.rc > index 100b9b6..4c4d16b 100644 > --- a/dlls/shell32/shell32_Bg.rc > +++ b/dlls/shell32/shell32_Bg.rc > @@ -165,8 +165,12 @@ STRINGTABLE DISCARDABLE > IDS_DELETEITEM_TEXT "Наистина ли искате да изтриете '%1'?" > IDS_DELETEMULTIPLE_TEXT "Наистина ли искате да изтриете тези %1 елемента?" > IDS_DELETESELECTED_TEXT "Наистина ли искате да изтриете избраните елементи?" > - IDS_OVERWRITEFILE_TEXT "Наистина ли искате да презапишете %1?" > + IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" > IDS_OVERWRITEFILE_CAPTION "Потвърдете презаписа на файла" > + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ > + "If the files in the destination folder have the same names as files in the\n"\ > + "selected folder they will be replaced. Do you still want to move or copy\n"\ > + "the folder?" > > /* message box strings */ > IDS_RESTART_TITLE "Рестартиране" > diff --git a/dlls/shell32/shell32_Cs.rc b/dlls/shell32/shell32_Cs.rc > index 6451dbb..8790db4 100644 > --- a/dlls/shell32/shell32_Cs.rc > +++ b/dlls/shell32/shell32_Cs.rc > @@ -163,10 +163,14 @@ STRINGTABLE DISCARDABLE > IDS_CREATEFOLDER_CAPTION "Chyba pшi pokusu vytvoшit novэ adresбш" > IDS_DELETEITEM_CAPTION "Potvrdit odstranмnн souboru" > IDS_DELETEFOLDER_CAPTION "Potvrdit odstranмnн adresбшe" > - IDS_OVERWRITEFILE_CAPTION "Potvrdit pшepsбnн souboru" > IDS_DELETEITEM_TEXT "Opravdu chcete odstranit '%1'?" > IDS_DELETEMULTIPLE_TEXT "Opravdu chcete odstranit tмchto %1 poloћek?" > - IDS_OVERWRITEFILE_TEXT "Pшejete si pшepsat soubor '%1'?" > + IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" > + IDS_OVERWRITEFILE_CAPTION "Potvrdit pшepsбnн souboru" > + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ > + "If the files in the destination folder have the same names as files in the\n"\ > + "selected folder they will be replaced. Do you still want to move or copy\n"\ > + "the folder?" > } > > /* columns in the shellview */ > diff --git a/dlls/shell32/shell32_De.rc b/dlls/shell32/shell32_De.rc > index bde62bf..d6cb815 100644 > --- a/dlls/shell32/shell32_De.rc > +++ b/dlls/shell32/shell32_De.rc > @@ -173,8 +173,12 @@ STRINGTABLE DISCARDABLE > IDS_TRASHFOLDER_TEXT "Sind Sie sich sicher, dass Sie '%1' und seinen Inhalt in den Mьll verschieben mцchten?" > IDS_TRASHMULTIPLE_TEXT "Sind Sie sich sicher, dass Sie diese %1 Dateien in den Mьll verschieben mцchten?" > IDS_CANTTRASH_TEXT "Das Objekt '%1' kann nicht in den Mьll verschoben werden. Mцchten Sie es stattdessen lцschen?" > - IDS_OVERWRITEFILE_TEXT "Mцchten Sie, dass die Datei '%1' ьberschrieben wird ?" > + IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" > IDS_OVERWRITEFILE_CAPTION "Bestдtigung: Datei ьberschreiben" > + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ > + "If the files in the destination folder have the same names as files in the\n"\ > + "selected folder they will be replaced. Do you still want to move or copy\n"\ > + "the folder?" > > /* message box strings */ > IDS_RESTART_TITLE "Neustarten" > diff --git a/dlls/shell32/shell32_En.rc b/dlls/shell32/shell32_En.rc > index 09530c6..a67cc8a 100644 > --- a/dlls/shell32/shell32_En.rc > +++ b/dlls/shell32/shell32_En.rc > @@ -185,8 +185,12 @@ STRINGTABLE DISCARDABLE > IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all it's content to the Trash?" > IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Trash?" > IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you want to delete it instead?" > - IDS_OVERWRITEFILE_TEXT "OverWrite File %1?" > - IDS_OVERWRITEFILE_CAPTION "Confirm File OverWrite" > + IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" > + IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" > + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ > + "If the files in the destination folder have the same names as files in the\n"\ > + "selected folder they will be replaced. Do you still want to move or copy\n"\ > + "the folder?" > > /* message box strings */ > IDS_RESTART_TITLE "Restart" > diff --git a/dlls/shell32/shell32_Eo.rc b/dlls/shell32/shell32_Eo.rc > index e8fa407..3bfca07 100644 > --- a/dlls/shell32/shell32_Eo.rc > +++ b/dlls/shell32/shell32_Eo.rc > @@ -163,8 +163,12 @@ STRINGTABLE DISCARDABLE > IDS_DELETEFOLDER_CAPTION "Konfirmu forigon de dosierujo" > IDS_DELETEITEM_TEXT "Жu vi estas certa pri forigo de '%1'?" > IDS_DELETEMULTIPLE_TEXT "Жu vi estas certa pri forigo de жi tiuj %1 komponantoj?" > - IDS_OVERWRITEFILE_TEXT "Жu vi supreskribas la dosieron %1?" > + IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" > IDS_OVERWRITEFILE_CAPTION "Konfirmu supreskribiton de dosieron" > + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ > + "If the files in the destination folder have the same names as files in the\n"\ > + "selected folder they will be replaced. Do you still want to move or copy\n"\ > + "the folder?" > } > > /* columns in the shellview */ > diff --git a/dlls/shell32/shell32_Es.rc b/dlls/shell32/shell32_Es.rc > index dd83a6e..c3d2f4c 100644 > --- a/dlls/shell32/shell32_Es.rc > +++ b/dlls/shell32/shell32_Es.rc > @@ -162,8 +162,12 @@ STRINGTABLE DISCARDABLE > IDS_DELETEFOLDER_CAPTION "Confirmar eliminaciуn de carpeta" > IDS_DELETEITEM_TEXT "їSeguro que desea eliminar '%1'?" > IDS_DELETEMULTIPLE_TEXT "їSeguro que desea eliminar estos %1 elementos?" > - IDS_OVERWRITEFILE_TEXT "їSobreescribir el archivo '%1'?" > + IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" > IDS_OVERWRITEFILE_CAPTION "Confirmar sobreescritura de archivo" > + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ > + "If the files in the destination folder have the same names as files in the\n"\ > + "selected folder they will be replaced. Do you still want to move or copy\n"\ > + "the folder?" > } > > /* columns in the shellview */ > diff --git a/dlls/shell32/shell32_Fi.rc b/dlls/shell32/shell32_Fi.rc > index e842bbd..e43a94e 100644 > --- a/dlls/shell32/shell32_Fi.rc > +++ b/dlls/shell32/shell32_Fi.rc > @@ -164,8 +164,12 @@ STRINGTABLE DISCARDABLE > IDS_DELETEFOLDER_CAPTION "Vahvista kansion tuhoaminen" > IDS_DELETEITEM_TEXT "Haluatko varmasti tuhota '%1':n?" > IDS_DELETEMULTIPLE_TEXT "Haluatko varmasti tuhota nдmд %1?" > - IDS_OVERWRITEFILE_TEXT "Ylikirjoita tiedosto %1?" > + IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" > IDS_OVERWRITEFILE_CAPTION "Vahvista tiedoston ylikirjoitus" > + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ > + "If the files in the destination folder have the same names as files in the\n"\ > + "selected folder they will be replaced. Do you still want to move or copy\n"\ > + "the folder?" > > /* message box strings */ > IDS_RESTART_TITLE "Kдynnistд uudelleen" > diff --git a/dlls/shell32/shell32_Fr.rc b/dlls/shell32/shell32_Fr.rc > index 043c66c..246045c 100644 > --- a/dlls/shell32/shell32_Fr.rc > +++ b/dlls/shell32/shell32_Fr.rc > @@ -176,8 +176,12 @@ STRINGTABLE DISCARDABLE > IDS_TRASHFOLDER_TEXT "Кtes-vous sыr de vouloir mettre «%1» et tout ce qu'il contient dans la corbeille?" > IDS_TRASHMULTIPLE_TEXT "Кtes-vous sыr de vouloir mettre ces %1 йlйments dans la corbeille?" > IDS_CANTTRASH_TEXT "L'йlйment «%1» ne peut pas кtre mis dans la corbeille. Souhaitez-vous le supprimer а la place?" > - IDS_OVERWRITEFILE_TEXT "Йcraser le fichier %1?" > + IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" > IDS_OVERWRITEFILE_CAPTION "Confirmer l'йcrasement du fichier" > + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ > + "If the files in the destination folder have the same names as files in the\n"\ > + "selected folder they will be replaced. Do you still want to move or copy\n"\ > + "the folder?" > > /* message box strings */ > IDS_RESTART_TITLE "Redйmarrer" > diff --git a/dlls/shell32/shell32_It.rc b/dlls/shell32/shell32_It.rc > index 809f44a..19f7339 100644 > --- a/dlls/shell32/shell32_It.rc > +++ b/dlls/shell32/shell32_It.rc > @@ -164,8 +164,12 @@ STRINGTABLE DISCARDABLE > IDS_DELETEFOLDER_CAPTION "Confermare la cancellazione della cartella" > IDS_DELETEITEM_TEXT "Sei sicuro di voler cancellare '%1'?" > IDS_DELETEMULTIPLE_TEXT "Sei sicuro di voler cancellare questi %1 elementi?" > - IDS_OVERWRITEFILE_TEXT "Sovrascrivere il File %1?" > + IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" > IDS_OVERWRITEFILE_CAPTION "Confermare la sovrascrizione del File" > + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ > + "If the files in the destination folder have the same names as files in the\n"\ > + "selected folder they will be replaced. Do you still want to move or copy\n"\ > + "the folder?" > > /* message box strings */ > IDS_RESTART_TITLE "Riavvia" > diff --git a/dlls/shell32/shell32_Ko.rc b/dlls/shell32/shell32_Ko.rc > index 413ad7b..bb00f83 100644 > --- a/dlls/shell32/shell32_Ko.rc > +++ b/dlls/shell32/shell32_Ko.rc > @@ -173,8 +173,12 @@ IDS_TRASHITEM_TEXT "ґзЅЕАє '%1' А»(ё¦) ИЮБцЕлАё·О єёі»±вё¦ №Щ¶шґП±о?" > IDS_TRASHFOLDER_TEXT "ґзЅЕАє '%1' °ъ ±Ч ѕИАЗ і»їлА» ИЮБцЕлАё·О єёі»±вё¦ №Щ¶шґП±о?" > IDS_TRASHMULTIPLE_TEXT "ґзЅЕАє '%1' µйА»(ё¦) ИЮБцЕлАё·О єёі»±вё¦ №Щ¶шґП±о?" > IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you want to delete it instead?" > -IDS_OVERWRITEFILE_TEXT "ЖДАП %1А» µ¤ѕоѕІ°ЪЅАґП±о?" > +IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" > IDS_OVERWRITEFILE_CAPTION "ЖДАП µ¤ѕоѕІ±в И(r)АО" > +IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ > + "If the files in the destination folder have the same names as files in the\n"\ > + "selected folder they will be replaced. Do you still want to move or copy\n"\ > + "the folder?" > > /* message box strings */ > IDS_RESTART_TITLE "ґЩЅГ ЅГАЫ" > diff --git a/dlls/shell32/shell32_No.rc b/dlls/shell32/shell32_No.rc > index a7ad4f4..c7ec269 100644 > --- a/dlls/shell32/shell32_No.rc > +++ b/dlls/shell32/shell32_No.rc > @@ -172,8 +172,12 @@ STRINGTABLE DISCARDABLE > IDS_TRASHFOLDER_TEXT "Virkelig legge «%1» og alt innholdet i papirkurven?" > IDS_TRASHMULTIPLE_TEXT "Virkelig legge disse %1 valgte elementene i papirkurven?" > IDS_CANTTRASH_TEXT "Elementet «%1» kan ikke legges i papirkurven. Vil du slette det i stedet?" > - IDS_OVERWRITEFILE_TEXT "Overskrive filen «%1»?" > + IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" > IDS_OVERWRITEFILE_CAPTION "Bekreft overskriving av fil" > + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ > + "If the files in the destination folder have the same names as files in the\n"\ > + "selected folder they will be replaced. Do you still want to move or copy\n"\ > + "the folder?" > > /* message box strings */ > IDS_RESTART_TITLE "Starte pе nytt" > diff --git a/dlls/shell32/shell32_Pl.rc b/dlls/shell32/shell32_Pl.rc > index 60b6a75..d6139e7 100644 > --- a/dlls/shell32/shell32_Pl.rc > +++ b/dlls/shell32/shell32_Pl.rc > @@ -173,8 +173,12 @@ STRINGTABLE DISCARDABLE > IDS_TRASHFOLDER_TEXT "Czy jesteњ pewien, їe chcesz umieњciж folder '%1' i caі№ jego zawartoњж w koszu" > IDS_TRASHMULTIPLE_TEXT "Elementуw: %1 - czy na pewno chcesz je umieњciж w Koszu?" > IDS_CANTTRASH_TEXT "Nie mogк przenieњж elementu '%1' do Kosza. Czy chcesz go zamiast tego usun№ж?" > - IDS_OVERWRITEFILE_TEXT "Zast№piж plik %1?" > + IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" > IDS_OVERWRITEFILE_CAPTION "Potwierdџ zast№pienie pliku" > + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ > + "If the files in the destination folder have the same names as files in the\n"\ > + "selected folder they will be replaced. Do you still want to move or copy\n"\ > + "the folder?" > > /* message box strings */ > IDS_RESTART_TITLE "Uruchom ponownie" > diff --git a/dlls/shell32/shell32_Pt.rc b/dlls/shell32/shell32_Pt.rc > index 1826162..0a6a274 100644 > --- a/dlls/shell32/shell32_Pt.rc > +++ b/dlls/shell32/shell32_Pt.rc > @@ -256,8 +256,12 @@ STRINGTABLE DISCARDABLE > IDS_DELETEFOLDER_CAPTION "Confirmar exclusгo de pasta" > IDS_DELETEITEM_TEXT "Vocк tem certeza que deseja excluir '%1'?" > IDS_DELETEMULTIPLE_TEXT "Vocк tem certeza que deseja excluir estes %1 itens?" > - IDS_OVERWRITEFILE_TEXT "Sobreescrever arquivo %1?" > + IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" > IDS_OVERWRITEFILE_CAPTION "Confirmar sobreescrever arquivo" > + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ > + "If the files in the destination folder have the same names as files in the\n"\ > + "selected folder they will be replaced. Do you still want to move or copy\n"\ > + "the folder?" > > /* message box strings */ > IDS_RESTART_TITLE "Reiniciar" > diff --git a/dlls/shell32/shell32_Ru.rc b/dlls/shell32/shell32_Ru.rc > index a3c5da8..65fa824 100644 > --- a/dlls/shell32/shell32_Ru.rc > +++ b/dlls/shell32/shell32_Ru.rc > @@ -165,8 +165,12 @@ STRINGTABLE DISCARDABLE > IDS_DELETEFOLDER_CAPTION "Подтверждение удаления папки" > IDS_DELETEITEM_TEXT "Удалить '%1'?" > IDS_DELETEMULTIPLE_TEXT "Удалить эти обьекты (%1?" > - IDS_OVERWRITEFILE_TEXT "Заменить файл(ы) %1?" > + IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" > IDS_OVERWRITEFILE_CAPTION "Подтверждение замены файла" > + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ > + "If the files in the destination folder have the same names as files in the\n"\ > + "selected folder they will be replaced. Do you still want to move or copy\n"\ > + "the folder?" > > /* message box strings */ > IDS_RESTART_TITLE "Перезагрузить" > diff --git a/dlls/shell32/shell32_Tr.rc b/dlls/shell32/shell32_Tr.rc > index b41be53..197562c 100644 > --- a/dlls/shell32/shell32_Tr.rc > +++ b/dlls/shell32/shell32_Tr.rc > @@ -172,8 +172,12 @@ STRINGTABLE DISCARDABLE > IDS_TRASHFOLDER_TEXT "'%1' adlэ црeyi ve tьm iзeriрini зцpe gцndermek istediрinizden emin misiniz?" > IDS_TRASHMULTIPLE_TEXT "Bu %1 црeyi зцpe gцndermek istediрinizden emin misiniz?" > IDS_CANTTRASH_TEXT "'%1' adlэ црe зцpe gцnderilemiyor. Tamamen silmek ister misiniz?" > - IDS_OVERWRITEFILE_TEXT "%1 dosyasэnэn ьzerine yazmak istiyor musunuz?" > + IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" > IDS_OVERWRITEFILE_CAPTION "Dosya Ьzerine Yazmayэ Onayla" > + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ > + "If the files in the destination folder have the same names as files in the\n"\ > + "selected folder they will be replaced. Do you still want to move or copy\n"\ > + "the folder?" > > /* message box strings */ > IDS_RESTART_TITLE "Yeniden Baюlat" > diff --git a/dlls/shell32/shell32_Uk.rc b/dlls/shell32/shell32_Uk.rc > index c535ba9..a4cf564 100644 > --- a/dlls/shell32/shell32_Uk.rc > +++ b/dlls/shell32/shell32_Uk.rc > @@ -161,8 +161,12 @@ STRINGTABLE DISCARDABLE > IDS_DELETEFOLDER_CAPTION "Підтвердження вилучення теки" > IDS_DELETEITEM_TEXT "Ви впевнені, що хочете вилучити '%1'?" > IDS_DELETEMULTIPLE_TEXT "Ви впевнені, що хочете вилучити ці %1 елементи(ів)?" > - IDS_OVERWRITEFILE_TEXT "Переписати Файл %1?" > + IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" > IDS_OVERWRITEFILE_CAPTION "Підтвердження Перезапису Файлу" > + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ > + "If the files in the destination folder have the same names as files in the\n"\ > + "selected folder they will be replaced. Do you still want to move or copy\n"\ > + "the folder?" > } > > /* columns in the shellview */ > diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h > index a17eec4..2937065 100644 > --- a/dlls/shell32/shell32_main.h > +++ b/dlls/shell32/shell32_main.h > @@ -153,9 +153,10 @@ void FreeChangeNotifications(void); > #define ASK_TRASH_FOLDER 8 > #define ASK_TRASH_MULTIPLE_ITEM 9 > #define ASK_CANT_TRASH_ITEM 10 > +#define ASK_OVERWRITE_FOLDER 11 > > BOOL SHELL_DeleteDirectoryW(HWND hwnd, LPCWSTR pwszDir, BOOL bShowUI); > -BOOL SHELL_ConfirmDialogW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir); > +BOOL SHELL_ConfirmYesNoW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir); > > /* 16-bit functions */ > void WINAPI DragAcceptFiles16(HWND16 hWnd, BOOL16 b); > diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c > index 4668afe..a4f4ade 100644 > --- a/dlls/shell32/shfldr_unixfs.c > +++ b/dlls/shell32/shfldr_unixfs.c > @@ -1829,7 +1829,7 @@ static HRESULT UNIXFS_delete_with_syscalls(UnixFolder *This, UINT cidl, LPCITEMI > static const WCHAR empty[] = {0}; > int i; > > - if (!SHELL_ConfirmDialogW(GetActiveWindow(), ASK_DELETE_SELECTED, empty)) > + if (!SHELL_ConfirmYesNoW(GetActiveWindow(), ASK_DELETE_SELECTED, empty)) > return S_OK; > > lstrcpyA(szAbsolute, This->m_pszPath); > diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c > index d1ea475..b245e00 100644 > --- a/dlls/shell32/shlfileop.c > +++ b/dlls/shell32/shlfileop.c > @@ -27,6 +27,7 @@ > #include <stdarg.h> > #include <string.h> > #include <ctype.h> > +#include <assert.h> > > #include "windef.h" > #include "winbase.h" > @@ -65,6 +66,14 @@ static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest); > static DWORD SHNotifyCopyFileW(LPCWSTR src, LPCWSTR dest, BOOL bFailIfExists); > static DWORD SHFindAttrW(LPCWSTR pName, BOOL fileOnly); > > +typedef struct > +{ > + SHFILEOPSTRUCTW *req; > + DWORD dwYesToAllMask; > + BOOL bManyItems; > + BOOL bCancelled; > +} FILE_OPERATION; > + > /* Confirm dialogs with an optional "Yes To All" as used in file operations confirmations > */ > static const WCHAR CONFIRM_MSG_PROP[] = {'W','I','N','E','_','C','O','N','F','I','R','M','E',0}; > @@ -250,22 +259,32 @@ static BOOL SHELL_ConfirmIDs(int nKindOfDialog, SHELL_ConfirmIDstruc *ids) > ids->icon_resource_id = IDI_WARNING; > ids->caption_resource_id = IDS_OVERWRITEFILE_CAPTION; > ids->text_resource_id = IDS_OVERWRITEFILE_TEXT; > - return TRUE; > + return TRUE; > + case ASK_OVERWRITE_FOLDER: > + ids->hIconInstance = NULL; > + ids->icon_resource_id = IDI_WARNING; > + ids->caption_resource_id = IDS_OVERWRITEFILE_CAPTION; > + ids->text_resource_id = IDS_OVERWRITEFOLDER_TEXT; > + return TRUE; > default: > FIXME(" Unhandled nKindOfDialog %d stub\n", nKindOfDialog); > } > return FALSE; > } > > -BOOL SHELL_ConfirmDialogW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir) > +static BOOL SHELL_ConfirmDialogW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir, FILE_OPERATION *op) > { > WCHAR szCaption[255], szText[255], szBuffer[MAX_PATH + 256]; > SHELL_ConfirmIDstruc ids; > DWORD_PTR args[1]; > HICON hIcon; > + int ret; > > - if (!SHELL_ConfirmIDs(nKindOfDialog, &ids)) > - return FALSE; > + assert(nKindOfDialog >= 0 && nKindOfDialog < 32); > + if (op && (op->dwYesToAllMask & (1 << nKindOfDialog))) > + return IDYES; > + > + assert(SHELL_ConfirmIDs(nKindOfDialog, &ids)); > > LoadStringW(shell32_hInstance, ids.caption_resource_id, szCaption, sizeof(szCaption)/sizeof(WCHAR)); > LoadStringW(shell32_hInstance, ids.text_resource_id, szText, sizeof(szText)/sizeof(WCHAR)); > @@ -275,7 +294,23 @@ BOOL SHELL_ConfirmDialogW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir) > szText, 0, 0, szBuffer, sizeof(szBuffer), (va_list*)args); > hIcon = LoadIconW(ids.hIconInstance, (LPWSTR)MAKEINTRESOURCE(ids.icon_resource_id)); > > - return (IDYES == SHELL_ConfirmMsgBox(hWnd, szBuffer, szCaption, hIcon, FALSE)); > + ret = SHELL_ConfirmMsgBox(hWnd, szBuffer, szCaption, hIcon, op && op->bManyItems); > + if (op) { > + if (ret == IDD_YESTOALL) { > + op->dwYesToAllMask |= (1 << nKindOfDialog); > + ret = IDYES; > + } > + if (ret == IDCANCEL) > + op->bCancelled = TRUE; > + if (ret != IDYES) > + op->req->fAnyOperationsAborted = TRUE; > + } > + return ret == IDYES; > +} > You need to conform to the style of the rest of the file, e.g., if (IsAttribDir(entryToCopy->attributes) && bCancelIfAnyDirectories) return ERROR_CANCELLED; create_dest_dirs(fileDest->szDirectory); if (!lstrcmpiW(entryToCopy->szFullPath, fileDest->szFullPath)) { if (IsAttribFile(entryToCopy->attributes)) return ERROR_NO_MORE_SEARCH_HANDLES; else return ERROR_SUCCESS; } 4 space indentation, empty lines between logical pieces of code, brackets underneath. -- James Hawkins

1 0

Bugzilla: Adding a 'patch' keyword
by Francois Gouget Feb. 9, 2007

Feb. 9, 2007

During a query I've stumbled on bug 5012 which happens to have a patch attached to it. Nine months ago it was suggested to the author to send this patch to wine-patches but either he didn't do it or it was not accepted. Now, I don't consider myself qualified to judge the patch and I have no particular interest in it. So I may not send it to wine-patches myself. But it would be nice if there was an easy way to find bugs that have a patch, even, and maybe especially, if it is incorrect. This would make it easier for interested parties to survey what potential fixes are languishing in Bugzilla and push them to wine-devel or wine-patches. And it would also give a starting point for someone interested in taking an existing patch that did not get committed to then update it, clean it up, and fix it to make it acceptable. Does that make sense? And for reference: * Missing NOVST timezone http://bugs.winehq.org/show_bug.cgi?id=5012 (in fact the timezone data seems wrong) -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Indifference will certainly be the downfall of mankind, but who cares?

4 5

re: comctl32: rebar: rewrite the layouting code
by Dan Kegel Feb. 9, 2007

Feb. 9, 2007

Mikołaj wrote: >I've tested it also with WinRAR, WinSCP3 3.30, 7-Zip and Pirch98 (the >last two have Bugzilla entries and are fixed by the new code). The only >thing I've found not to work are the sidebars of IE. Did they work with the old code? > For the next week I won't work on wine but what should I do later - > would such a big patch be accepted? As long as it doesn't cause regressions in IE, probably, though adding more conformance tests would make acceptance more likely. I think everyone would be thrilled to see progress in rebar, especially if the code ends up simpler. - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

3 2

Re: shell32[2/3]: add a confirmation dialog with a "Yes to All" option
by Robert Shearman Feb. 9, 2007

Feb. 9, 2007

Mikołaj Zalewski wrote: > +SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 > +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU > +CAPTION "Message" > +FONT 8, "MS Shell Dlg" > +{ > + DEFPUSHBUTTON "&Yes", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP > + PUSHBUTTON "Yes to &all", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP > + PUSHBUTTON "&No", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP > + PUSHBUTTON "&Cancel", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP > + ICON "", IDD_ICON, 10, 10, 16, 16 > + LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 > +} > + > The usual convention is that IDD_* are used for IDs of dialogs and IDC_* are used for IDs of controls. -- Rob Shearman

2 1

RasError.h? Where is this or does it not exist?
by John Smith Feb. 9, 2007

Feb. 9, 2007

Hey all, I cannot find the raserror.h file. I have tried looking around the wine directories to no avail. A find ./wine -name raserror.h -type f -print turns up nothing. Am I looking in the wrong spot or in the wrong way? I really want to think that the file isn't there but I can't rule out that I'm not somewhat stupid =P. So I appeal to you such wise guys as you are. Sorry for the dumb question, I just would hate to make the file if it already exists somewhere. Regards, John Klehm

2 2

Some thoughts about the ominous DIB Engine
by Rolf Kalbermatter Feb. 9, 2007

Feb. 9, 2007

I have been following this discussion for quite some time and finally decided to look into it a little bit. While the Wiki mentions that a difficult part of this would be to get any design accepted by Alexandre it does absolutely not say in any way what kind of approach would be likely to be accepted, other than it needs to be in small incremental steps. I must admit that I haven't entirely looked through the whole Wine tree yet so I might be missing something but from the old Transgaming patch and some investigation into GDI32 I would see two principal aproaches to add such an interface to Wine. 1) Like in the Transgaming patch hook into winex11.drv where apropriate. 2) Add the dib engine as a dibdrv into GDI32 directly similar to what has been done for enhmfdrv and mfdrv already. Obviously 1) has been tried and seemed to work in some ways eventhough there would still need to be quite some more work to be done. What I don't like about this aproach is that conceptually it seems to add this functionality at the wrong end. If there is ever going to be another display driver than winex11.drv all the hooking would have to be done again and also adding new GDI methods to the driver as development goes always requires also some significant changes to winex11.drv. Not sure if someone ever attempted 2) but IMHO it would place DIB handling where it conceptually should be. The dibdrv function array could be added as extra field to the private DIB data structure and initialized on DIB creation. On non existing DIB methods (NULL pointer) the operation would be simply sent to the display driver as is done now. I believe this could be generalized enough to make it a single time change, with new dibdrv methods getting then available whenever implemented in small incremental patches. Possible problems I could see are however synchronizing with X (not sure if that is really a possible problem as I do not understand X so far) and maybe other drivers such as wine3d3.drv that seem to hook into winex11.drv too (not sure if for DIB related operations). This last one could however be gotten around by implementing the dibdrv as loadable driver too, so that other drivers needing to use operations from it could load it too. I would like to hear comments of anyone that could add something to this and maybe we can then add the result to the wiki page for further reference. As it is now Wiki mostly says it is rather desirable, sort of hard to do and the hardest part would be getting it into Wine at all. Maybe if there is a more clear picture as to how it could be done and what is likely to have a chance to pass Alexandre's critical eyes, there would be a bigger chance of someone trying to get it finally started the right way. Rolf Kalbermatter

6 6

Re: comctl32: rebar: rewrite the layouting code
by Robert Shearman Feb. 9, 2007

Feb. 9, 2007

Mikołaj Zalewski wrote: > I've been trying to fix the rebar layouting code. But fixes in one > place caused regressions because of bugs in other places and I ended > up rewriting the whole layouting code. It does roughly the same as the > current code however the details are quite different and I hope more > correct. It's also much shorter so it should be earier to > understand/debug. My code work for me for all apps I tested (except > for the sidebars of IE but I'm trying to find out why). It also passes > some tests I've written and produces identical results that the > native. Two things could be potentially better in the old code: > - it contains some support for RBBS_FIXEDSIZE (however different from > what Windows does) > - it can break rows to fill the given space (but that should be only > done for RBS_AUTOSIZE rebars) > > I have yet to test the REBAR_Maximize and REBAR_Minimize but I have > two questions. Does this code cause regressions in apps that works > with the current code and would such big patch be accepted? I haven't got any apps to test with (other than IE and it looks like you've already tried that), but nice work! -- Rob Shearman

2 1

Re: shell32: make sure BrowseForFolder doesn't return NULL for the Desktop folder as this means a cancel (should fix bug #5533)
by Robert Shearman Feb. 9, 2007

Feb. 9, 2007

Mikołaj Zalewski wrote: > +/************************************************************************* > + * _ILMakePidlNotNull > + * > + * A null pidl is a valid pidl that represents the Desktop. However if we don't > + * want a NULL pidl (e.g. because NULL indicates an error) this function will > + * make an explicit empty pidl if the parameter is NULL. > + */ > +HRESULT _ILMakePidlNotNull(LPITEMIDLIST *pidl) > +{ > + if (*pidl == NULL) > + *pidl = _ILCreateDesktop(); > + if (*pidl == NULL) > + return E_OUTOFMEMORY; > + return S_OK; > +} > This function is a bit ugly. It seems this policy should be made in the BrsFolder_OnCommand function, rather than in pidl.c as a file. -- Rob Shearman

2 1

Re: ntdll: Add prototypes to winnt.h for the SList functions.
by Alexandre Julliard Feb. 9, 2007

Feb. 9, 2007

Francois Gouget <fgouget(a)free.fr> writes: > Fix the implementation to match the official prototypes. > --- > > I've had trouble with the placement of 'volatile' in 'const > SLIST_HEADER* volatile'. I think putting 'volatile' last is correct > because it applies to the pointer, not to the pointed-to data like > 'const'. No, it applies to the data, it doesn't make sense to have the pointer itself be volatile. Though it's probably useless either way, and since the SDK prototypes apparently don't have it we shouldn't either. -- Alexandre Julliard julliard(a)winehq.org

1 0

Questions about gdi32:WidenPath patch sent on jan. 27
by Laurent Vromman Feb. 9, 2007

Feb. 9, 2007

Hi, I've tried to send my first patch on jan. 27. This patch is supposed to add a partial implementation of WidenPath to gdi32.dll. After two weeks, I don't have any news about the patch. Is it still pending ? Is there something wrong with it ? I am ready to improve it if necessary, but I need some advice to now what needs to be improved in it. Thank you for your help. Laurent

1 0

Re: [1/9] WineD3D: BeginScene and EndScene tests and fixes
by Alexandre Julliard Feb. 9, 2007

Feb. 9, 2007

Stefan Dösinger <stefan(a)codeweavers.com> writes: > From 4dc1b3cd7faf9c61bc6f862f416b6af07e1e85e8 Mon Sep 17 00:00:00 2001 > From: Stefan Doesinger <stefan(a)codeweavers.com> > Date: Fri, 19 Jan 2007 19:30:09 +0100 > Subject: [PATCH] WineD3D: BeginScene and EndScene tests and fixes This causes 'make test' to fail to restore the correct display resolution, it's stuck at 800x600 on exit. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: winegcc: sign-compare fixes
by Joris Huizer Feb. 9, 2007

Feb. 9, 2007

I believe this one causes problems -- please do not commit yet Joris Huizer <joris_huizer(a)yahoo.com> wrote: --------------------------------- Need Mail bonding? Go to the Yahoo! Mail Q&A for great tips from Yahoo! Answers users.>From 8686a200bd1f1cbd934d761013c487a9ddc195c9 Mon Sep 17 00:00:00 2001 From: Joris Huizer Date: Wed, 7 Feb 2007 15:19:25 +0100 Subject: [PATCH] winegcc sign-compare fixes To: wine-patches --- tools/winegcc/utils.c | 13 +++++++------ tools/winegcc/winegcc.c | 11 ++++++----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index 1af91e9..c144077 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -120,14 +120,14 @@ void strarray_add(strarray* arr, const c void strarray_del(strarray* arr, int i) { - if (i < 0 || i >= arr->size) error("Invalid index i=%d", i); + if (i < 0 || (unsigned int)i >= arr->size) error("Invalid index i=%d", i); memmove(&arr->base[i], &arr->base[i + 1], (arr->size - i - 1) * sizeof(arr->base[0])); arr->size--; } void strarray_addall(strarray* arr, const strarray* from) { - int i; + unsigned int i; for (i = 0; i < from->size; i++) strarray_add(arr, from->base[i]); @@ -136,7 +136,7 @@ void strarray_addall(strarray* arr, cons strarray* strarray_dup(const strarray* arr) { strarray* dup = strarray_alloc(); - int i; + unsigned int i; for (i = 0; i < arr->size; i++) strarray_add(dup, arr->base[i]); @@ -160,7 +160,7 @@ strarray* strarray_fromstring(const char char* strarray_tostring(const strarray* arr, const char* sep) { char *str, *newstr; - int i; + unsigned int i; str = strmake("%s", arr->base[0]); for (i = 1; i < arr->size; i++) @@ -277,7 +277,7 @@ static file_type guess_lib_type(const ch file_type get_lib_type(strarray* path, const char* library, char** file) { - int i; + unsigned int i; for (i = 0; i < path->size; i++) { @@ -289,7 +289,8 @@ file_type get_lib_type(strarray* path, c void spawn(const strarray* prefix, const strarray* args, int ignore_errors) { - int i, status; + unsigned int i; + int status; strarray* arr = strarray_dup(args); const char** argv; char* prog = 0; diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index f1aa87e..f1a7bb0 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -170,7 +170,7 @@ struct options static void clean_temp_files(void) { - int i; + unsigned int i; if (keep_generated) return; @@ -239,7 +239,8 @@ static const strarray* get_translator(en static void compile(struct options* opts, const char* lang) { strarray* comp_args = strarray_alloc(); - int j, gcc_defs = 0; + unsigned int j; + int gcc_defs = 0; switch(opts->processor) { @@ -434,7 +435,7 @@ static void build(struct options* opts) const char *output_name, *spec_file, *lang; const char* winebuild = getenv("WINEBUILD"); int generate_app_loader = 1; - int j; + unsigned int j; /* NOTE: for the files array we'll use the following convention: * -axxx: xxx is an archive (.a) @@ -719,7 +720,7 @@ static int is_linker_arg(const char* arg "-static", "-static-libgcc", "-shared", "-shared-libgcc", "-symbolic", "-framework" }; - int j; + unsigned int j; switch (arg[1]) { @@ -769,7 +770,7 @@ static int is_mingw_arg(const char* arg) { "-mno-cygwin", "-mwindows", "-mconsole", "-mthreads", "-municode" }; - int j; + unsigned int j; for (j = 0; j < sizeof(mingw_switches)/sizeof(mingw_switches[0]); j++) if (strcmp(mingw_switches[j], arg) == 0) return 1; -- 1.4.4 --------------------------------- Need a quick answer? Get one in minutes from people who know. Ask your question on Yahoo! Answers.

2 4