wine-devel

wine-devel@winehq.org

2 participants
84469 discussions

Re: question about modal messageboxes.
by Ivan Leo Puoti 30 Oct '04

30 Oct '04

>WS_EX_TOPMOST does nothing on Wine anyway, so I wouldn't worry too >much about it. We certainly don't want 2 different resources, but it >would probably be cleaner to remove DS_SYSMODAL on the existing >resource, since the default is MB_APPLMODAL. So if I get WS_EX_TOPMOST to work should I use 2 resources? The only other solution I can think of is using an atom, that sounds quite ridiculous for such a trivial thing. AFAIK apart from this detail sysmodal boxes have no reason for being a fixme. Ivan. ____________________________________________________________ Libero ADSL: navighi gratis a 1.2 Mega, senza canone e costi di attivazione. Abbonati subito su http://www.libero.it

2 1

Re: SHDOCVW: download the Mozilla Active X control on demand (take 2)
by Alexandre Julliard 30 Oct '04

30 Oct '04

Mike McCormack <mike(a)codeweavers.com> writes: > This patch downloads the mozilla active control on demand. It needs > the following registry key to be present to function correctly: > > [Software\\Wine\\Mozilla Control] 1089668326 > "Url"="http://www.iol.ie/~locka/mozilla/MozillaControl16.exe" > "Prog"="%TEMP%\\MozillaControl16.exe" The user shouldn't have to specify the temp file name, we can clearly figure this out by ourselves. Also the registry entry should be under Software\Wine\shdocvw, config parameters specific to a dll should use the dll name as key to avoid namespace conflicts. -- Alexandre Julliard julliard(a)winehq.org

1 0

question about modal messageboxes.
by Ivan Leo Puoti 30 Oct '04

30 Oct '04

I looked at MSDN docs for MessageBox http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winui/winu… and found that MB_SYSTEMMODAL is identical to MB_APPLMODAL, the only difference is that the dialogue box is created with WS_EX_TOPMOST. In Wine the window style is loaded from user32_En.rc, and STYLE contains, amongst other things, DS_SYSMODAL. MSDN http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winui/winu… says that if this value is used the window will be created using the WS_EX_TOPMOST style. But what this means is that in Wine a messagebox is *always* created with this style, while, if MSDN is correct, this should only happen when MB_SYSTEMMODAL is passed to MessageBox. Am I getting something wrong or is this a bug? If yes, would creating 2 resources, one for MB_APPLMODAL and one for MB_SYSTEMMODAL be a good solution? Ivan. ____________________________________________________________ Libero ADSL: navighi gratis a 1.2 Mega, senza canone e costi di attivazione. Abbonati subito su http://www.libero.it

2 1

Re: rsaenh
by Juan Lang 29 Oct '04

29 Oct '04

Michael wrote: > If I use /dev/random in my patch the unit tests take more than three > minutes without any user interaction. As to be expected, it runs faster > if I move the mouse around wildly to generate entropy => You're right, this seems unreasonable for 32 bytes of random data, especially in this context. Alexandre has the final word anyway, so submitting to wine-patches was a good idea. Again, sorry I didn't see all this up front, but I'd like to suggest the following improvement: If OpenSSL is available, go ahead and use RAND_bytes, but call RAND_add first with the input buffer. I don't have a good estimate for the number of bits of entropy to expect, since we don't know whether the caller will actually have provided a seed. Assuming it's unlikely, maybe RAND_add(pbBuffer, dwLen, dwLen / 16.0f)? And go ahead and fall back to /dev/urandom if OpenSSL isn't available. Thanks, --Juan __________________________________ Do you Yahoo!? Yahoo! Mail Address AutoComplete - You start. We finish. http://promotions.yahoo.com/new_mail

1 0

We hit 5mb for 3 months running!
by Mike Hearn 29 Oct '04

29 Oct '04

Hey guys, Here's a great excuse for a party: wine-patches has had 5mb of traffic per month for the last three months now. Apart from a short dip over the summer, it looks like we've been consistently generating 5mb/month for most of the year! 2003 was mostly hovering around the 4mb level, and 2002 was mostly 1-2mb (apart from when Dimi had his listview hackfest and we got 6mb!) so we seem to be doing something right :) Let's see if we can keep it up and who knows, maybe 2005 will be averaging at 6mb/month! Expect me to be doing my bit in a few days (ADSL on Nov 1st now :) thanks -mike

1 0

Wine, openssl, kerberos, and "fixme:crypt:RSA_CPAcquireContext You have to install libcrypto.so..."
by Dan Kegel 29 Oct '04

29 Oct '04

Maybe this is old hat, but: I ran into the message fixme:crypt:RSA_CPAcquireContext You have to install libcrypto.so and development headers in order to use crypto API while running an app. Looking at the code, it's only issued if wine's configure can't find /usr/include/openssl/ssl.h. But I have that file! Digging deeper, I saw that ssl.h includes krb5.h, which isn't on the standard include path. http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=82369 explains the issue. It looks like configure.ac needs to be modified as described in that bug report to check for pkgconfig-openssl, and use it if present to guess the cflags needed to use openssl: $ pkg-config openssl --cflags -I/usr/kerberos/include A workaround seems to be to configure like this: ./configure CFLAGS="-I /usr/kerberos/include " This happily sets HAVE_OPENSSL_SSL_H in include/config.h. - Dan -- Trying to get a job as a c++ developer? See http://kegel.com/academy/getting-hired.html

2 1

Re: SHDOCVW: download the Mozilla Active X control on demand (take 2)
by Andreas Mohr 29 Oct '04

29 Oct '04

Hi, On Fri, Oct 29, 2004 at 01:52:27PM +0900, Mike McCormack wrote: > I think we should not put Adam's page in our registry by default, but > perhaps host the control on WineHQ somewhere and use the URL for that > instead, so as not to direct too much traffic to Adam's page... Well, the least we should do is have the URL point to WineHQ and then use a forward page to his URL IMHO. Hosting it on WineHQ would probably be the best way indeed. Andreas Mohr

2 1

Re: USER32: add a short test for child windows (take 2)
by Dmitry Timoshkov 29 Oct '04

29 Oct '04

"Mike McCormack" <mike(a)codeweavers.com> wrote: > ChangeLog: > * add a short test for child windows > START_TEST(win) > { > + test_child_window(); > + > pGetAncestor = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetAncestor" ); > pGetWindowInfo = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetWindowInfo" ); Please add your test at the end of existing tests. By placing the test before everything else you are at least skipping the tests performed in the hook procedure. -- Dmitry.

1 0

Re: USER32: add a short test for child windows
by Dmitry Timoshkov 29 Oct '04

29 Oct '04

"Mike McCormack" <mike(a)codeweavers.com> wrote: > ChangeLog: > * add a short test for child windows Could you please merge it with existing win.c tests? -- Dmitry.

1 0

Re: Success Stories?
by Brian Vincent 29 Oct '04

29 Oct '04

On Thu, 28 Oct 2004 16:06:56 -0700 (PDT), M-Halo <masochisthalo(a)yahoo.com> wrote: > Are there any plans to spotlight Wine-use success > stories on the WineHQ home page? I always think of Nope, there's no plans. Are you volunteering? It would be great if you could do it. Rather than just provide links, I think it would be nice to put together short summaries and short interviews about it. In other words, create original content rather than regurgitate an article. -Brian Vincent

2 2

signaling unix threads
by Markus Amsler 29 Oct '04

29 Oct '04

Hi, There's a fundamental bug in winedos/dosvm. c[1]. SIGUSR2 is sent to the current process, but it should be sent to the dosvm thread. This causes various ugly bugs. I found no way signaling a unix thread, without modifing the wineserver. I have implemented a thread_kill command in the wineserver, this solves my problem, but i'm quite sure it won't get applied. I'm really not a wineserver/threading expert. Have I missed something? Markus

2 1

Re: [Wine]How to help improving Wine?
by Walt Ogburn 29 Oct '04

29 Oct '04

Hi Emanuele, After poking around a bit, there seems to be a logical problem in Wine's GDI code. From the backtrace, SelectObject on this object calls BRUSH_SelectObject, which uses a bitmap and eventually GetDIBits, which tries to CreateCompatibleDC (or sometimes DeleteDC instead). However, SelectObject always calls GDI_GetObjPtr, which calls _EnterSysLevel and not _LeaveSysLevel. But the CreateCompatibleDC complains and dies if you have had an _EnterSysLevel and not a _LeaveSysLevel. It might be that BRUSH_SelectObject really should use a different set of "internal" functions that won't complain about locking. Or maybe DeleteDC and CreateCompatibleDC should just increment the recursion level instead of erroring out. I don't know, so I'm forwarding to wine-devel for greater insight. - Walter Here's a summary of the relevant part of my backtrace again: 1 _CheckNotSysLevel (complains!) 2 GDI_CheckNotLock 3 DeleteDC 4 GetDIBits 5 MFDRV_CreateBrushIndirect 6 MFDRV_SelectBrush 7 BRUSH_SelectObject 8 SelectObject - calls GDI_GetObjPtr, which does _EnterSysLevel. On Thu, 28 Oct 2004, Emanuele Gissi wrote: > Hi, > I really did my best to understand how I can help improving Wine, but I did > not succed. > > Well, everything started when I installed a win application on my Debian 3.1, > Wine 2004.07.16 deb (clean install, no dlls). > > The application is ALOHA (http://www.epa.gov/ceppo/cameo/aloha.htm) > It's a free application from US-Environment Protection Agency used for > chemical emergency planning (I am an officer firefighter). > > On Wine it has a problem that prevents its wide use. > After having entered all the needed data (or loading the included prova.alo > example in "planning mode"), Wine crashes when tring to show the chemical > footprint result. > > The application works perfectly on Codeweavers Crossover Office 3.0.1 (trial). > And I am ready to buy it (as they support the free Wine, I think.) > > But I would like to understand why it does not work on Wine! > > The included log finishes with this: > [...] > warn:heap:HEAP_ValidateInUseArena Heap 40360000: invalid in-use arena magic > for 403bd120 > warn:heap:HEAP_ValidateInUseArena Heap 40360000: invalid in-use arena magic > for 403b46f0 > warn:heap:HEAP_ValidateInUseArena Heap 40360000: invalid in-use arena magic > for 403b6948 > warn:heap:HEAP_ValidateInUseArena Heap 40360000: invalid in-use arena magic > for 403b1570 > warn:heap:HEAP_ValidateInUseArena Heap 40360000: invalid in-use arena magic > for 403b11c0 > warn:gdi:GDI_GetObjPtr Invalid handle (nil) > warn:gdi:GDI_GetObjPtr Invalid handle (nil) > warn:gdi:GDI_GetObjPtr Invalid handle (nil) > err:syslevel:_CheckNotSysLevel Holding lock 0x408f15e0 level 3 > wine: Unhandled exception (thread 0009), starting debugger... > > 1) What should I do next time I encounter a similar problem with an app? That > is: how to use winedbg? > 2) Why does ALOHA work on Crossover and not on Wine? > 3) Which are the main differences between Crossover and Wine? > 4) Does Codewaver really contribute back to Wine? > > I thank you in advance. > > (Please, CC: me as I am not on the list for now) > -- > Ing. Emanuele Gissi - Ispettore Antincendio > Comando Provinciale dei Vigili del Fuoco di Ravenna > viale Randi, 25 - 48100 Ravenna - Italia > tel: 0544 281.501 - fax: 0544 281.531 >

1 0

Success Stories?
by M-Halo 28 Oct '04

28 Oct '04

Hi all, Are there any plans to spotlight Wine-use success stories on the WineHQ home page? I always think of how Disney used Wine to run Photoshop 7 so they could move to a Linux platform. I'm sure it could draw additional attention/ support and provide additional credibility to non-Wine users. I know this article is a year old, but I think it's the type of thing that should be shown to the world: :) http://www.eweek.com/article2/0,3959,1210083,00.asp Hiji __________________________________ Do you Yahoo!? Y! Messenger - Communicate in real time. Download now. http://messenger.yahoo.com

1 0

Re: Windows XP Setup
by Ivan Leo Puoti 28 Oct '04

28 Oct '04

> How much effort would it take to get setup.exe on windows XP CD to run > from begining to end. I guess the setup wants direct hardware access. Also, it probably reboots, and after reboot you'll be running on the windows kernel anyway. I don't think this is really possible. Ivan. ____________________________________________________________ Libero ADSL: navighi gratis a 1.2 Mega, senza canone e costi di attivazione. Abbonati subito su http://www.libero.it

2 1

rsaenh
by Michael Jung 28 Oct '04

28 Oct '04

Hello, this is an updated version of my rsaenh.dll patch from yesterday with Juan's suggestions implemented: 1.) Changed destruct_... function names to destroy_... . 2.) Removed the multiple-of-four behaviour for handles. 3.) Got rid of the splitting of handle management functions into one table locking function and one function, which actually does the real work. 4.) MD4, MD5 and SHA hashes as well as random number generation will work now even if rsaenh was compiled with libssl-dev headers available, but no libcrypto.so at run-time. 5.) Compilation fixes for the case that OpenSSL was configured to support only a subset of the functions imported by rsaenh.dll. 6.) Uses /dev/urandom instead of OpenSSL's RAND_bytes function. (Do we have to check for the availability of /dev/urandom in the configure script?) If you want to try the patch note the following: - After you have applied the patch you have to run autoheader and autoconf. Then cd dlls ; make_dlls ; cd .. ; configure. - After you have compiled and installed wine, you have to unregister rsabase and register rsaenh (regsvr32 /U rsabase ; regsvr32 rsaenh). rsaenh.dll is meant to replace rsabase.dll sometime (Windows XP also has rsaenh.dll only). Greetings, Michael

4 8

_wrapped_ java application with wine
by Mario Ohnewald 28 Oct '04

28 Oct '04

Hello Devel List! I am sorry to bother you. But i cant seem to solve my wine/java issue in the users mailing list. I have already asked in the users list, but nobody seems to know an answer. http://www.winehq.org/hypermail/wine-users/2004/10/0344.html I have already tried to install JRE with the latest wine snapshot, and with a debian package. This is the error i get, where wine cant seem to be able to handle the memory request: Invoking /usr/lib/wine/wine.bin jre-1_5_0-windows-i586.exe ... fixme:msi:MsiGetProductInfoA "{3248F0A8-6813-11D6-A77B-00B0D0150000}" "PackageCode" 0x4067dbbc 0x4067dc2c fixme:msi:MsiGetProductInfoW L"{3248F0A8-6813-11D6-A77B-00B0D0150000}" L"PackageCode" 0x4037f728 0x4067dc2c err:msi:MsiGetSummaryInformationW IStorage -> IPropertySetStorage failed Wine failed with return code 133 Any idea how i could solve this? Maybe one of you would like to give it a try. Here is the JRE Download page: http://java.sun.com/j2se/1.5.0/download.jsp Thanks a lot! Mario -- NEU +++ DSL Komplett von GMX +++ http://www.gmx.net/de/go/dsl GMX DSL-Netzanschluss + Tarif zum superg�nstigen Komplett-Preis!

2 1

Writing tests
by Walt Ogburn 28 Oct '04

28 Oct '04

Hi folks, I have a question about dependencies when writing tests. Some tests use LoadLibraryA and GetProcessAddress to get access to Windows / Wine APIs, and other tests just include the appropriate header files and link to the DLLs. One example of the first type is dlls/oleaut32/olefont.c: ================ <snip> ============================================== static HMODULE hOleaut32; static HRESULT (WINAPI *pOleCreateFontIndirect)(LPFONTDESC,REFIID,LPVOID*); START_TEST(olefont) { LPVOID pvObj = NULL; HRESULT hres; IFont* font = NULL; hOleaut32 = LoadLibraryA("oleaut32.dll"); pOleCreateFontIndirect = (void*)GetProcAddress(hOleaut32, "OleCreateFontIndirect"); if (!pOleCreateFontIndirect) return; ===================================================================== What is the reason for this difference? Which example should new tests follow? My guess is that LoadLibraryA and GetProcAddress are used if the headers, DLLs, and APIs might not be present on some Windows machines, so that the tests don't fail. If that's correct, is there a list somewhere of which ones are safe and which ones should be handled like in the olefont test? Thanks, Walter

2 1

Re: change default colors to winxp colors; add COLOR_MENUHILIGHT and COLOR_MENUBAR
by William Poetra Yoga H 28 Oct '04

28 Oct '04

--- William Poetra Yoga H <williampoetra(a)yahoo.com> wrote: > Use default colors for Windows XP's Windows Classic style, Windows Standard > color scheme. > > Added new indexes for DefSysColors: COLOR_MENUHILIGHT and COLOR_MENUBAR > My patch was not merged... :( Um... any problems with the patch? Please comment. Thanks :) __________________________________ Do you Yahoo!? Yahoo! Mail Address AutoComplete - You start. We finish. http://promotions.yahoo.com/new_mail

1 0

Re: Gradient Color for Caption Bar
by Mike McCormack 28 Oct '04

28 Oct '04

William Poetra Yoga H wrote: > Use GdiGradientFill (not GradientFill) to implement gradient caption bar (for now). GradientFill is pretty slow, as it files the rectangle line by line. I'm not sure how much this is going to slow down a normal application. It used to draw pixel by pixel, and that was a very noticable slowdown... line by line is much faster than that, but it still may cause a slowdown in some circumstances. Anybody have any ideas about how to speed up GradientFill? Mike

3 2

rsaenh and /dev/urandom
by Michael Jung 28 Oct '04

28 Oct '04

Hello, some more thoughts on the security of using /dev/urandom. This is from MSDN (CryptGenRandom): > With Microsoft CSPs, CryptGenRandom uses the same random number generator > used by other security components. This allows numerous processes to > contribute to a system-wide seed. CryptoAPI stores an intermediate random > seed with every user. To form the seed for the random number generator, a > calling application supplies bits it might have—for instance, mouse or > keyboard timing input—that are then added to both the stored seed and > various system data and user data such as the process ID and thread ID, the > system clock, the system time, the system counter, memory status, free disk > clusters, the hashed user environment block. This result is SHA-1 hashed, > and the output is used to seed an RC4 stream, which is then used as the > random stream and used to update the stored seed. This is from the linux kernel sources (2.6.8.1 drivers/char/random.c): > When random bytes are desired, they are obtained by taking the SHA > hash of the contents of the "entropy pool". The SHA hash avoids > exposing the internal state of the entropy pool. It is believed to > be computationally infeasible to derive any useful information > about the input of SHA from its output. Even if it is possible to > analyze SHA in some clever way, as long as the amount of data > returned from the generator is less than the inherent entropy in > the pool, the output data is totally unpredictable. For this > reason, the routine decreases its internal estimate of how many > bits of "true randomness" are contained in the entropy pool as it > outputs random numbers. > > If this estimate goes to zero, the routine can still generate > random numbers; however, an attacker may (at least in theory) be > able to infer the future output of the generator from prior > outputs. This requires successful cryptanalysis of SHA, which is > not believed to be feasible, but there is a remote possibility. > Nonetheless, these numbers should be useful for the vast majority > of purposes. Condensed, I read this as follows: - Microsoft uses an entropy source to seed a pseudo-random generator. If the seed is known, then the pseudo-random numbers are predictable. - /dev/urandom is also seeded with an entropy source. However, whenever the kernel collects new entropy, this also affects /dev/urandom. As I understand it, this basically means the following: In the worst case (kernel doesn't collect new entropy), we are as good as Microsoft. In all other cases /dev/urandom is better. Given this and the fact that OpenSSL also seems to apply /dev/urandom, I think rsaenh should also do it this way. Greetings, Michael

1 0

Re: Re-implement MSVCRT *printf
by Mike McCormack 28 Oct '04

28 Oct '04

Aneurin Price wrote: > Comments, anyone? Looks like you've put quite a bit of effort into that. I think it's a worthwhile effort, however, please consider: * using a style more consistent with the rest of the Wine codebase * not abusing the preprocessor in printf.h, * not writing C code in the header in printf.h * preventing code duplication by implementing the A functions using the W functions * writing some regression tests to show your code is correct thanks, Mike

4 3

Windows XP Setup
by Jacobus Erasmus 28 Oct '04

28 Oct '04

Just a quick question, How much effort would it take to get setup.exe on windows XP CD to run from begining to end. (And in the process install the DLL's fonts etc.) The second question is if somebody is willing to take on this task and how much would it cost me. Regards jacobus(a)kewlconcepts.co.za

1 0

Re: shell32: SHFileOperation improvements
by Mike McCormack 28 Oct '04

28 Oct '04

Rolf, Thanks for cleaning up SHFileOperation. Can you please try restructuring your code further to get rid of the excessive number of branching points in that function? Last time I counted, SHFileOperation had more than 60 if/while/for/case statements in the one +500 line function... that makes it hard to read. If you were to make use of helper functions more often, you'd improve your code's readability, eliminate the need for 2-space indent, the pointless /* end-if */ comments, reduce the excessive number of local variables and reduce side effects, thus making it easier for other people to understand and fix the code. Try make small functions that fit in ~50 lines. If a function gets over 50 lines, cut it up into two new functions. Mike Rolf Kalbermatter wrote: > + if (b_Multi || IsAttribFile(FromAttr)) > + continue; > + if (IsAttribDir(FromAttr)) > + { > + /* in w98/w2k/wXp endless recursive move until it aborts due to filename getting to > + long, we don't do this stupidity but return the according error anyhow here */ > + retCode = ERROR_FILENAME_EXCED_RANGE; > + break; > + } > } > - } > + if (( b_SameRoot_MOVE && (b_Multi) && !(b_MultiFrom) && IsAttribFile(FromAttr) && IsAttribDir(ToAttr)) > + || (!(b_MultiFrom) && IsAttribFile(FromAttr) && IsAttribFile(ToAttr)) > + || ( (b_Multi) && IsAttribDir(FromAttr) && IsAttribDir(ToAttr)) > + || (!b_SameRoot_MOVE && IsAttribDir(FromAttr) && IsAttribFile(ToAttr)) > + ) > + { > + ToAttr = SHRenameOnCollision(&nFileOp, pToFile + 1, pFromFile + 1); > + } /* endif */ > + } /* endif */ > + if (!(b_MultiFrom) && (!FlagRenameOnCollision(&nFileOp) || b_SameRoot_MOVE) && > + ((SFSC_IDENTIICAL | SFSC_SOURCE_CONTAINS_TARGET) & f_SameDrive)) > + { > + if (!FlagRenameOnCollision(&nFileOp) && (IsAttribFile(FromAttr))) > + { > + /* target is the same as source */ > + retCode = 0x71; > + } > + break; > + } /* endif */ > + > + /* Analyzing for moving SourceName to TargetName */ > + if ((b_MultiFrom || !b_Multi) && ((IsAttribFile(FromAttr) && IsAttribDir(ToAttr)) || > + (!b_MultiTo && IsAttribDir(ToAttr)) || > + (!b_MultiTo && IsAttribDir(FromAttr) && b_MultiFrom && !b_SameRoot_MOVE))) > + { > + SHFileStrCpyCatW(pTempTo, NULL, pFromFile); > + /* without FOF_MULTIDESTFILES shlfileop would create dir's recursively */ > + nFileOp.fFlags |= FOF_MULTIDESTFILES; > + retCode = SHFileOperationW(&nFileOp); > + continue; > + } > + /* What can we do with one pair and FO_MOVE/FO_COPY ? */ > + /* w98se, nt40 does create recursive dirs, W2K not! wMe ist not tested */ > + if (IsAttribDir(ToPathAttr) || !b_SameRoot_MOVE) > + { > + if (!b_MultiFrom) > + { > + if (IsAttribFile(FromAttr)) > + { > + if (b_SameRoot_MOVE && > + /* windows-bug, MOVE for File also with pToTailSlash, COPY not for this */ > + (!(IsAttribFile(ToAttr)) || (!(FlagAskOverwrite(&nFileOp)) && FlagNotOverwrite(&nFileOp))) && > + (IsAttribDir(ToPathAttr) || b_ToMask)) > + { > + /* With the same drive, we can move for FO_MOVE, dir to dir is solved later */ > + retCode = SHNotifyMoveFileW(nFileOp.pFrom, nFileOp.pTo); > + continue; > + } /* endif */ > + if (IsAttribDir(ToPathAttr) && !pToTailSlash && !IsAttribDir(ToAttr)) > + { > + if (!(FOI_NeverOverwrite & nFileOp.fAnyOperationsAborted)) > + { > + if (!FlagNotOverwrite(&nFileOp)) > + { > + ToAttr = INVALID_FILE_ATTRIBUTES; > + } > + if (IsAttribFile(ToAttr) && FlagNotOverwrite(&nFileOp)) > + { > + if (FlagAskOverwrite(&nFileOp)) > + { > + /* FIXME: we must change the dialog in the future to allow 3-4 cases, > + * 'Yes','No','Yes for all','Never ?' */ > + if ((INVALID_FILE_ATTRIBUTES != ToAttr) && !SHELL_ConfirmDialogW(ASK_OVERWRITE_FILE, pTempTo)) > + { > + retCode = 0x10008; > + nFileOp.fAnyOperationsAborted |= TRUE; > + break; > + } > + ToAttr = INVALID_FILE_ATTRIBUTES; > + } /* endif */ > + } /* endif */ > + } /* endif */ > + if (INVALID_FILE_ATTRIBUTES == ToAttr) > + { > + if (SHNotifyCopyFileW(pTempFrom, pTempTo, FlagRenameOnCollision(&nFileOp))) > + { > + /* the retcode for this case is unknown */ > + retCode = 0x10009; > + } > + if ((FO_COPY != FuncSwitch) && !retCode) > + { > + nFileOp.wFunc = ((level + 1) << FO_LevelShift) + FO_DELETE; > + retCode = SHFileOperationW(&nFileOp); > + } > + continue; > + } > + } > + } > + if (IsAttribDir(FromAttr)) > + { > + if (INVALID_FILE_ATTRIBUTES == ToAttr) > + { > + SetIfPointer(pToTailSlash, '\0'); > + ToAttr = SHRenameOnCollision(&nFileOp, pToFile + 1, pFromFile + 1); > + if (INVALID_FILE_ATTRIBUTES != ToAttr) > + { > + /* w2k returns ERROR_ALREADY_EXISTS, if it found the target with mask */ > +#if 1 > + retCode = ERROR_ALREADY_EXISTS; > +#else > + retCode = ERROR_INVALID_NAME; > +#endif > + nFileOp.fAnyOperationsAborted |= TRUE; > + break; > + } > + lpFileName = &pToFile[lstrlenW(pToFile)]; > + if (pToTailSlash) > + { > + pToTailSlash = lpFileName; > + lpFileName++; > + } > + ((DWORD*)lpFileName)[0] = '\0'; > + retCode = SHNotifyCreateDirectoryW(pTempTo, NULL); > + > + if (retCode) > + { > + retCode = (ERROR_PATH_NOT_FOUND | 0x10000); /* nt40,w98se,w2k,wxp */ > + break; > + } > + ToAttr = GetFileAttributesW(pTempTo); > + SetIfPointer(pToTailSlash,'\\'); > + nFileOp.fFlags &= ~FOF_RENAMEONCOLLISION; > + } > + if (IsAttribDir(ToAttr)) > + { > + /* both are existing dirs, we (FO_)MOVE/COPY the content */ > + pToFile = SHFileStrCpyCatW(pTempFrom, NULL, wWildcardFile); > + nFileOp.fFlags &= ~FOF_MULTIDESTFILES; > + retCode = SHFileOperationW(&nFileOp); > + if ((FO_COPY != FuncSwitch) && !retCode) > + { > + ((DWORD*)pToFile)[0] = '\0'; > + nFileOp.wFunc = ((level + 1) << FO_LevelShift) + FO_DELETE; > + retCode = SHFileOperationW(&nFileOp); > + } > + continue; > + } > + } /* endif IsAttribDir(from) */ > + } /* endif !b_MultiFrom */ > + } > + if (!b_SameRoot_MOVE) > + { > + nFileOp.fAnyOperationsAborted |= TRUE; > + } /* endif */ > + retCode = ERROR_CANCELLED; > + } /* end-while */

1 0

Re: rsaenh
by Juan Lang 27 Oct '04

27 Oct '04

Hi Michael, that was quick! Okay, more feedback: 1. English note: destruct_handle_table really should be destroy_handle_table. I know, "destructor" came into common use, but the verb is to destroy. Same with destruct_key, destruct_hash, etc. 2. A CSP isn't allocating a "real" handle, it's sort of a pseudohandle, so the multiple-of-four business isn't necessary. When I was testing SSPs, I found some of them return 0 as a valid handle value. So I think using the index directly would be fine. 3. Do you really need to separate all the functions into an impl version and a non-impl version? It looks as though the non-impl version does the locking, while the impl assumes the table is locked. It seems you could at least document this, and it also doesn't seem necessary in every case, if at all--EnterCriticalSection won't deadlock if a thread that's already entered it calls it again. 4. Some of the OpenSSL checks don't seem valid. In init_hash_impl, for example, you fail if libcrypto isn't available, even if it isn't necessary for the hash. Please fail only if you really need an OpenSSL func. E.g., if (!pMD2_Init) { SetLastError()... } seems better to me. 5. This may be open to debate, but as far as a "more elegant way": perhaps you should protect each typedef with the header file that defines it, e.g. in HASH_CONTEXT, rather than: #ifdef HAVE_OPENSSL MD2_CTX md2; #endif you could use: #ifdef HAVE_OPENSSL_MD2_H MD2_CTX md2; #endif This way you could support the algorithms you were compiled with, even if they aren't the entire set. Sorry I didn't mention these last time.. --Juan __________________________________ Do you Yahoo!? Yahoo! Mail Address AutoComplete - You start. We finish. http://promotions.yahoo.com/new_mail

2 2

Re: Re-implement MSVCRT *printf
by Mike Hearn 27 Oct '04

27 Oct '04

I'm not sure if this is just Mozilla acting up but the patch doesn't seem to be fully indented. Is this just UA wierdness? Aneurin Price wrote: > Comments, anyone? >

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel